Merge remote-tracking branch 'origin/master' into Takadimi/36562

.github/classifier.yml

@@ -23,7 +23,6 @@
         editor-wrapping: [],
         emmet: [ ramya-rao-a ],
         error-list: [],
-        extensions: [],
         git: [ joaomoreno ],
         hot-exit: [ Tyriar ],
         html: [ aeschli ],
@@ -41,6 +40,6 @@
         snippets: [ jrieken ],
         tasks: [ dbaeumer ],
         typescript: [ mjbvz ],
-        workbench: [ bpasero, isidorn, sandy081]
+        workbench: [ bpasero ]
     }
 }

.github/insiders.yml

@@ -1,4 +1,4 @@
 {
     insidersLabel: 'insiders',
-    perform: false
+    perform: true
 }

.github/new_release.yml

@@ -1,5 +1,5 @@
 {
     newReleaseLabel: 'new release',
-    newReleases: ['1.17.2'],
-    perform: false
+    newReleases: ['1.18'],
+    perform: true
 }

.travis.yml

@@ -41,12 +41,15 @@ before_install:
       sh -e /etc/init.d/xvfb start;
       sleep 3;
     fi
+  # Make npm logs less verbose
+  - npm config set depth 0
+  - npm config set loglevel warn
 
 install:
   - ./scripts/npm.sh install
 
 script:
-  - node_modules/.bin/gulp hygiene --silent
+  - node_modules/.bin/gulp hygiene
   - node_modules/.bin/gulp electron --silent
   - node_modules/.bin/gulp compile --silent --max_old_space_size=4096
   - node_modules/.bin/gulp optimize-vscode --silent --max_old_space_size=4096

.vscode/settings.json

@@ -15,6 +15,8 @@
 		"**/bower_components": true,
 		".build/**": true,
 		"out/**": true,
+		"out-build/**": true,
+		"out-vscode/**": true,
 		"i18n/**": true,
 		"extensions/**/out/**": true,
 		"test/smoke/out/**": true

.vscode/tasks.json

@@ -33,11 +33,11 @@
 			"task": "tslint",
 			"label": "Run tslint",
 			"problemMatcher": [
-				"$tslint4"
+				"$tslint5"
 			]
 		},
 		{
-			"taskName": "Run tests",
+			"label": "Run tests",
 			"type": "shell",
 			"command": "./scripts/test.sh",
 			"windows": {
@@ -50,7 +50,7 @@
 			}
 		},
 		{
-			"taskName": "Run Dev",
+			"label": "Run Dev",
 			"type": "shell",
 			"command": "./scripts/code.sh",
 			"windows": {

ThirdPartyNotices.txt

@@ -38,11 +38,11 @@ This project incorporates components from the projects listed below. The origina
 31.	language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust)
 32.	MagicStack/MagicPython (https://github.com/MagicStack/MagicPython)
 33.	Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
-34.	octicons-code version 3.1.0 (https://octicons.github.com)
-35.	octicons-font version 3.1.0 (https://octicons.github.com)
-36.	seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
-37.	shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage)
-38.	string_scorer version 0.1.20 (https://github.com/joshaven/string_score)
+34.	Microsoft/vscode-mssql (https://github.com/Microsoft/vscode-mssql)
+35.	octicons-code version 3.1.0 (https://octicons.github.com)
+36.	octicons-font version 3.1.0 (https://octicons.github.com)
+37.	seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
+38.	shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage)
 39.	sublimehq/Packages (https://github.com/sublimehq/Packages)
 40.	SublimeText/PowerShell (https://github.com/SublimeText/PowerShell)
 41.	textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle)
@@ -58,10 +58,9 @@ This project incorporates components from the projects listed below. The origina
 51.	textmate/perl.tmbundle (https://github.com/textmate/perl.tmbundle)
 52.	textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle)
 53.	textmate/shellscript.tmbundle (https://github.com/textmate/shellscript.tmbundle)
-54.	textmate/sql.tmbundle (https://github.com/textmate/sql.tmbundle)
-55.	textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle)
-56.	TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage)
-57.	vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
+54.	textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle)
+55.	TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage)
+56.	vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
 
 
 %% atom/language-c NOTICES AND INFORMATION BEGIN HERE
@@ -1289,6 +1288,21 @@ THE SOFTWARE.
 =========================================
 END OF Microsoft/TypeScript-TmLanguage NOTICES AND INFORMATION
 
+%% Microsoft/vscode-mssql NOTICES AND INFORMATION BEGIN HERE
+=========================================
+------------------------------------------ START OF LICENSE -----------------------------------------
+vscode-mssql
+Copyright (c) Microsoft Corporation
+All rights reserved.
+MIT License
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Copyright (c) 2016 Sanjay Nagamangalam
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+----------------------------------------------- END OF LICENSE ------------------------------------------
+=========================================
+END OF Microsoft/vscode-mssql NOTICES AND INFORMATION
+
 %% octicons-code NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
@@ -1457,31 +1471,6 @@ SOFTWARE.
 =========================================
 END OF shaders-tmLanguage NOTICES AND INFORMATION
 
-%% string_scorer NOTICES AND INFORMATION BEGIN HERE
-=========================================
-This software is released under the MIT license:
-
-Copyright (c) Joshaven Potter
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF string_scorer NOTICES AND INFORMATION
-
 %% sublimehq/Packages NOTICES AND INFORMATION BEGIN HERE
 =========================================
 Copyright (c) Sublime Packages project authors
@@ -1757,24 +1746,6 @@ to the base-name name of the original file, and an extension of txt, html, or si
 =========================================
 END OF textmate/shellscript.tmbundle NOTICES AND INFORMATION
 
-%% textmate/sql.tmbundle NOTICES AND INFORMATION BEGIN HERE
-=========================================
-Copyright (c) textmate-sql.tmbundle project authors
-
-If not otherwise specified (see below), files in this folder fall under the following license:
-
-Permission to copy, use, modify, sell and distribute this
-software is granted. This software is provided "as is" without
-express or implied warranty, and with no claim as to its
-suitability for any purpose.
-
-An exception is made for files in readable text which contain their own license information,
-or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-to the base-name name of the original file, and an extension of txt, html, or similar. For example
-"tidy" is accompanied by "tidy-license.txt".
-=========================================
-END OF textmate/sql.tmbundle NOTICES AND INFORMATION
-
 %% textmate/yaml.tmbundle NOTICES AND INFORMATION BEGIN HERE
 =========================================
 Copyright (c) 2015 FichteFoll <fichtefoll2@googlemail.com>
@@ -1848,4 +1819,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF vscode-swift NOTICES AND INFORMATION
+END OF vscode-swift NOTICES AND INFORMATION

build/gulpfile.hygiene.js

@@ -123,7 +123,8 @@ const tslintFilter = [
 	'!**/node_modules/**',
 	'!extensions/typescript/test/colorize-fixtures/**',
 	'!extensions/vscode-api-tests/testWorkspace/**',
-	'!extensions/**/*.test.ts'
+	'!extensions/**/*.test.ts',
+	'!extensions/html/server/lib/jquery.d.ts'
 ];
 
 const copyrightHeader = [
@@ -133,32 +134,21 @@ const copyrightHeader = [
 	' *--------------------------------------------------------------------------------------------*/'
 ].join('\n');
 
-function reportFailures(failures) {
-	failures.forEach(failure => {
-		const name = failure.name || failure.fileName;
-		const position = failure.startPosition;
-		const line = position.lineAndCharacter ? position.lineAndCharacter.line : position.line;
-		const character = position.lineAndCharacter ? position.lineAndCharacter.character : position.character;
-
-		console.error(`${name}:${line + 1}:${character + 1}:${failure.failure}`);
-	});
-}
-
 gulp.task('eslint', () => {
-	return gulp.src(all, { base: '.' })
+	return vfs.src(all, { base: '.', follow: true, allowEmpty: true })
 		.pipe(filter(eslintFilter))
 		.pipe(gulpeslint('src/.eslintrc'))
 		.pipe(gulpeslint.formatEach('compact'))
 		.pipe(gulpeslint.failAfterError());
 });
 
 gulp.task('tslint', () => {
-	const options = { summarizeFailureOutput: true };
+	const options = { emitError: true };
 
-	return gulp.src(all, { base: '.' })
+	return vfs.src(all, { base: '.', follow: true, allowEmpty: true })
 		.pipe(filter(tslintFilter))
 		.pipe(gulptslint({ rulesDirectory: 'build/lib/tslint' }))
-		.pipe(gulptslint.report(reportFailures, options));
+		.pipe(gulptslint.report(options));
 });
 
 const hygiene = exports.hygiene = (some, options) => {
@@ -220,6 +210,17 @@ const hygiene = exports.hygiene = (some, options) => {
 		});
 	});
 
+	function reportFailures(failures) {
+		failures.forEach(failure => {
+			const name = failure.name || failure.fileName;
+			const position = failure.startPosition;
+			const line = position.lineAndCharacter ? position.lineAndCharacter.line : position.line;
+			const character = position.lineAndCharacter ? position.lineAndCharacter.character : position.character;
+
+			console.error(`${name}:${line + 1}:${character + 1}:${failure.failure}`);
+		});
+	}
+
 	const tsl = es.through(function (file) {
 		const configuration = tslint.Configuration.findConfiguration(null, '.');
 		const options = { formatter: 'json', rulesDirectory: 'build/lib/tslint' };
@@ -228,9 +229,9 @@ const hygiene = exports.hygiene = (some, options) => {
 		linter.lint(file.relative, contents, configuration.results);
 		const result = linter.getResult();
 
-		if (result.failureCount > 0) {
+		if (result.failures.length > 0) {
 			reportFailures(result.failures);
-			errorCount += result.failureCount;
+			errorCount += result.failures.length;
 		}
 
 		this.emit('data', file);
@@ -256,8 +257,16 @@ const hygiene = exports.hygiene = (some, options) => {
 		.pipe(gulpeslint.formatEach('compact'))
 		.pipe(gulpeslint.failAfterError());
 
+	let count = 0;
 	return es.merge(typescript, javascript)
-		.pipe(es.through(null, function () {
+		.pipe(es.through(function (data) {
+			count++;
+			if (process.env['TRAVIS'] && count % 10 === 0) {
+				process.stdout.write('.');
+			}
+			this.emit('data', data);
+		}, function () {
+			process.stdout.write('\n');
 			if (errorCount > 0) {
 				this.emit('error', 'Hygiene failed with ' + errorCount + ' errors. Check \'build/gulpfile.hygiene.js\'.');
 			} else {
@@ -299,11 +308,13 @@ if (require.main === module) {
 				.split(/\r?\n/)
 				.filter(l => !!l);
 
-			hygiene(some, { skipEOL: skipEOL }).on('error', err => {
-				console.error();
-				console.error(err);
-				process.exit(1);
-			});
+			if (some.length > 0) {
+				hygiene(some, { skipEOL: skipEOL }).on('error', err => {
+					console.error();
+					console.error(err);
+					process.exit(1);
+				});
+			}
 		});
 	});
 }

build/gulpfile.vscode.js

@@ -45,8 +45,8 @@ const nodeModules = ['electron', 'original-fs']
 // Build
 
 const builtInExtensions = [
-	{ name: 'ms-vscode.node-debug', version: '1.18.2' },
-	{ name: 'ms-vscode.node-debug2', version: '1.18.4' }
+	{ name: 'ms-vscode.node-debug', version: '1.19.1' },
+	{ name: 'ms-vscode.node-debug2', version: '1.19.0' }
 ];
 
 const excludedExtensions = [
@@ -68,7 +68,7 @@ const vscodeResources = [
 	'out-build/bootstrap-amd.js',
 	'out-build/paths.js',
 	'out-build/vs/**/*.{svg,png,cur,html}',
-	'out-build/vs/base/node/startupTimers.js',
+	'out-build/vs/base/common/performance.js',
 	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh}',
 	'out-build/vs/base/browser/ui/octiconLabel/octicons/**',
 	'out-build/vs/workbench/browser/media/*-theme.css',
@@ -210,7 +210,6 @@ function computeChecksum(filename) {
 	return hash;
 }
 
-const settingsSearchBuildId = getBuildNumber();
 function packageTask(platform, arch, opts) {
 	opts = opts || {};
 
@@ -275,6 +274,7 @@ function packageTask(platform, arch, opts) {
 		const packageJsonStream = gulp.src(['package.json'], { base: '.' })
 			.pipe(json({ name, version }));
 
+		const settingsSearchBuildId = getBuildNumber();
 		const date = new Date().toISOString();
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 			.pipe(json({ commit, date, checksums, settingsSearchBuildId }));
@@ -452,7 +452,7 @@ gulp.task('upload-vscode-sourcemaps', ['minify-vscode'], () => {
 const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json');
 gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () => {
 	const branch = process.env.BUILD_SOURCEBRANCH;
-	if (!branch.endsWith('/master') && !branch.indexOf('/release/') >= 0) {
+	if (!branch.endsWith('/master') && !branch.startsWith('release/')) {
 		console.log(`Only runs on master and release branches, not ${branch}`);
 		return;
 	}
@@ -462,6 +462,7 @@ gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () =
 		return;
 	}
 
+	const settingsSearchBuildId = getBuildNumber();
 	if (!settingsSearchBuildId) {
 		console.error('Failed to compute build number');
 		return;
@@ -500,7 +501,7 @@ function getBuildNumber() {
 function getPreviousVersion(versionStr) {
 	function tagExists(tagName) {
 		try {
-			cp.execSync(`git rev-parse ${tagName}`);
+			cp.execSync(`git rev-parse ${tagName}`, { stdio: 'ignore' });
 			return true;
 		} catch (e) {
 			return false;

build/lib/i18n.resources.json

@@ -190,9 +190,13 @@
 			"name": "vs/workbench/services/workspace",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/decorations",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "setup_messages",
 			"project": "vscode-workbench"
 		}
 	]
-}
+}