Merge remote-tracking branch 'origin/master' into highlight_brackets_…

…scrollbar

.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: [ weinand ],
+        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
 }

.github/issue_template.md

@@ -1,6 +1,6 @@
-<!-- Do you have a question? Please ask it on http://stackoverflow.com/questions/tagged/vscode. -->
+<!-- Do you have a question? Please ask it on https://stackoverflow.com/questions/tagged/vscode. -->
 
-<!-- Use Help > Report Issues to prefill these. -->
+<!-- Use Help > Report Issue to prefill these. -->
 - VSCode Version:
 - OS Version:
 
@@ -10,4 +10,4 @@ Steps to Reproduce:
 2.
 
 <!-- Launch with `code --disable-extensions` to check. -->
-Reproduces without extensions: Yes/No
+Does this issue occur when all extensions are disabled?: Yes/No

.nvmrc

@@ -0,0 +1 @@
+8.9.2

.travis.yml

@@ -31,6 +31,7 @@ addons:
       - libsecret-1-dev
 
 before_install:
+  - export GITHUB_TOKEN=$PUBLIC_GITHUB_TOKEN
   - git submodule update --init --recursive
   - git clone --depth 1 https://github.com/creationix/nvm.git ./.nvm
   - source ./.nvm/nvm.sh
@@ -51,12 +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}"
 		},
 		{

.vscode/settings.json

@@ -10,6 +10,9 @@
 			"when": "$(basename).ts"
 		}
 	},
+	"files.associations": {
+		"OSSREADME.json": "jsonc"
+	},
 	"search.exclude": {
 		"**/node_modules": true,
 		"**/bower_components": true,
@@ -36,4 +39,4 @@
 		}
 	],
 	"typescript.tsdk": "node_modules/typescript/lib"
-}
+}