Merge remote-tracking branch 'origin/master' into alex/asar

.github/classifier.yml

@@ -3,10 +3,16 @@
     alwaysRequireAssignee: false,
     labelsRequiringAssignee: [ feature-request ],
     autoAssignees: {
-        api: [],
+        api: {
+            assignees: [ jrieken ],
+            assignLabel: false
+        },
         color-picker: [],
         css-less-sass: [],
-        debug: [ isidorn ],
+        debug: {
+            assignees: [ isidorn ],
+            assignLabel: false
+        },
         diff-editor: [],
         editor: [],
         editor-1000-limit: [],
@@ -28,8 +34,22 @@
         emmet: [ ramya-rao-a ],
         error-list: [],
         extensions: [],
-        file-encoding: [ bpasero ],
-        file-explorer: [ isidorn ],
+        file-encoding: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        file-io: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        file-watcher: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        file-explorer: {
+            assignees: [ isidorn ],
+            assignLabel: false
+        },
         format: [],
         git: [ joaomoreno ],
         hot-exit: [ Tyriar ],
@@ -44,26 +64,83 @@
         languages basic: [],
         markdown: [ mjbvz ],
         merge-conflict: [ chrmarti ],
+        multi-root: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
         perf-profile: [],
         php: [ roblourens ],
         proxy: [],
+        remote: {
+            assignees: [ jrieken ],
+            assignLabel: false
+        },
         scm: [],
         search: [ roblourens ],
-        snippets: [ jrieken ],
+        snippets: {
+            assignees: [ jrieken ],
+            assignLabel: false
+        },
         tasks: [ dbaeumer ],
         telemetry: [],
         themes: [],
         typescript: [ mjbvz ],
-        workbench: [ bpasero ],
-        workbench-dnd: [ bpasero ],
-        workbench-editors: [ bpasero ],
-        workbench-feedback: [ bpasero ],
-        workbench-layout: [ bpasero ],
-        workbench-menu: [ bpasero ],
-        workbench-notifications: [ bpasero ],
-        workbench-state: [ bpasero ],
-        workbench-status: [ bpasero ],
-        workbench-tabs: [ bpasero ],
-        workbench-welcome: [ chrmarti ],
+        workbench: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-dnd: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-editors: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-electron: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-feedback: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-history: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-layout: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-menu: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-notifications: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-state: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-status: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-tabs: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-title: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-touchbar: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        workbench-welcome: [ chrmarti ]
     }
 }

.github/insiders.yml

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

.travis.yml

@@ -52,13 +52,18 @@ install:
   - yarn
 
 script:
-  - node_modules/.bin/gulp hygiene
   - node_modules/.bin/gulp electron --silent
   - node_modules/.bin/tsc -p ./src/tsconfig.monaco.json --noEmit
   - node_modules/.bin/gulp compile --silent --max_old_space_size=4096
-  - node_modules/.bin/gulp optimize-vscode --silent --max_old_space_size=4096
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --coverage --reporter dot; else ./scripts/test.sh --reporter dot; fi
   - ./scripts/test-integration.sh
 
 after_success:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then node_modules/.bin/coveralls < .build/coverage/lcov.info; fi
+
+matrix:
+  include:
+    - os: linux
+      env: label=hygiene
+      script: node_modules/.bin/gulp hygiene
+      after_success: skip

.vscode/launch.json

@@ -129,6 +129,9 @@
 			"runtimeArgs": [
 				"--inspect=5875"
 			],
+			"skipFiles": [
+				"**/winjs*.js"
+			],
 			"webRoot": "${workspaceFolder}"
 		},
 		{

build/builtInExtensions.json

@@ -0,0 +1,12 @@
+[
+	{
+		"name": "ms-vscode.node-debug",
+		"version": "1.20.4",
+		"repo": "https://github.com/Microsoft/vscode-node-debug"
+	},
+	{
+		"name": "ms-vscode.node-debug2",
+		"version": "1.20.2",
+		"repo": "https://github.com/Microsoft/vscode-node-debug2"
+	}
+]

build/gulpfile.extensions.js

@@ -20,6 +20,7 @@ const sourcemaps = require('gulp-sourcemaps');
 const nlsDev = require('vscode-nls-dev');
 const root = path.dirname(__dirname);
 const commit = util.getVersion(root);
+const i18n = require('./lib/i18n');
 
 const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
 
@@ -29,7 +30,8 @@ const compilations = glob.sync('**/tsconfig.json', {
 });
 
 const getBaseUrl = out => `https://ticino.blob.core.windows.net/sourcemaps/${commit}/${out}`;
-const languages = ['chs', 'cht', 'jpn', 'kor', 'deu', 'fra', 'esn', 'rus', 'ita'];
+
+const languages = i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages: []);
 
 const tasks = compilations.map(function (tsconfigFile) {
 	const absolutePath = path.join(extensionsPath, tsconfigFile);
@@ -55,9 +57,19 @@ const tasks = compilations.map(function (tsconfigFile) {
 	const srcBase = path.join(root, 'src');
 	const src = path.join(srcBase, '**');
 	const out = path.join(root, 'out');
-	const i18n = path.join(__dirname, '..', 'i18n');
+	const i18nPath = path.join(__dirname, '..', 'i18n');
 	const baseUrl = getBaseUrl(out);
 
+	let headerId, headerOut;
+	let index = relativeDirname.indexOf('/');
+	if (index < 0) {
+		headerId = relativeDirname;
+		headerOut = 'out';
+	} else {
+		headerId = relativeDirname.substr(0, index);
+		headerOut = relativeDirname.substr(index + 1) + '/out';
+	}
+
 	function createPipeline(build, emitError) {
 		const reporter = createReporter();
 
@@ -82,7 +94,9 @@ const tasks = compilations.map(function (tsconfigFile) {
 					sourceRoot: '../src'
 				}))
 				.pipe(tsFilter.restore)
-				.pipe(build ? nlsDev.createAdditionalLanguageFiles(languages, i18n, out) : es.through())
+				.pipe(build ? nlsDev.createAdditionalLanguageFiles(languages, i18nPath, out) : es.through())
+				.pipe(build ? nlsDev.bundleMetaDataFiles(headerId, headerOut) : es.through())
+				.pipe(build ? nlsDev.bundleLanguageFiles() : es.through())
 				.pipe(reporter.end(emitError));
 
 			return es.duplex(input, output);