Merge remote-tracking branch 'upstream/master' into titlebar

Author: rianadon

.github/calendar.yml

@@ -10,4 +10,11 @@
   '2018-03-15 12:00, US/Pacific':    'release', # 1.21.1
   '2018-03-20 12:00, US/Pacific':    'development',
   '2018-03-26 18:00, US/Pacific':    'endgame',
-}
+  '2018-04-06 18:00, US/Pacific':    'release', # 1.22.1
+  '2018-04-11 18:00, US/Pacific':    'development',
+  '2018-04-12 12:00, US/Pacific':    'release', # 1.22.2
+  '2018-04-17 12:00, US/Pacific':    'development',
+  '2018-04-23 18:00, US/Pacific':    'endgame',
+  '2018-05-03 12:00, US/Pacific':    'release', # 1.23.0
+  '2018-05-08 12:00, US/Pacific':    'development',
+}

.github/classifier.yml

@@ -35,15 +35,15 @@
         error-list: [],
         extensions: [],
         file-encoding: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         file-io: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         file-watcher: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         file-explorer: {
@@ -65,7 +65,7 @@
         markdown: [ mjbvz ],
         merge-conflict: [ chrmarti ],
         multi-root: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         perf-profile: [],
@@ -86,59 +86,63 @@
         themes: [],
         typescript: [ mjbvz ],
         workbench: {
-            assignees: [ bpasero ],
+            assignees: [],
+            assignLabel: false
+        },
+        workbench-diagnostics: {
+            assignees: [],
             assignLabel: false
         },
         workbench-dnd: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-editors: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-electron: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-feedback: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-history: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-layout: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-menu: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-notifications: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-state: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-status: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-tabs: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-title: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-touchbar: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-welcome: [ chrmarti ]

.github/issue_template.md

@@ -1,4 +1,8 @@
-<!-- Do you have a question? Please ask it on https://stackoverflow.com/questions/tagged/vscode. -->
+<!--
+Do you have a question? Please ask it on https://stackoverflow.com/questions/tagged/vscode.
+
+For bug reports, please fill in the details below. For feature requests, please describe the desired feature.
+-->
 
 <!-- Use Help > Report Issue to prefill these. -->
 - VSCode Version:

.travis.yml

@@ -1,9 +1,9 @@
 {
-	// See http://go.microsoft.com/fwlink/?LinkId=827846
+	// See https://go.microsoft.com/fwlink/?LinkId=827846
 	// for the documentation about the extensions.json format
 	"recommendations": [
 		"eg2.tslint",
 		"dbaeumer.vscode-eslint",
 		"msjsdiag.debugger-for-chrome"
 	]
-}
+}

.vscode/extensions.json

@@ -162,7 +162,7 @@
 		{
 			"type": "extensionHost",
 			"request": "launch",
-			"name": "VS Code Markdown Extension Tests",
+			"name": "Markdown Extension Tests",
 			"runtimeExecutable": "${execPath}",
 			"args": [
 				"${workspaceFolder}/extensions/markdown-language-features/test-fixtures",
@@ -173,6 +173,20 @@
 				"${workspaceFolder}/extensions/markdown-language-features/out/**/*.js"
 			]
 		},
+		{
+			"type": "extensionHost",
+			"request": "launch",
+			"name": "TypeScript Extension Tests",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"${workspaceFolder}/extensions/typescript-language-features/test-fixtures",
+				"--extensionDevelopmentPath=${workspaceFolder}/extensions/typescript-language-features",
+				"--extensionTestsPath=${workspaceFolder}/extensions/typescript-language-features/out/test"
+			],
+			"outFiles": [
+				"${workspaceFolder}/extensions/typescript-language-features/out/**/*.js"
+			]
+		},
 		{
 			"type": "node",
 			"request": "launch",

.vscode/launch.json

@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "1.7.13"
+target "1.7.12"
 runtime "electron"