Merge branch 'master' into #22622

.github/insiders.yml

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

.github/needs_more_info.yml

@@ -0,0 +1,6 @@
+{
+    daysUntilClose: 7,
+    needsMoreInfoLabel: 'needs more info',
+    perform: true,
+    closeComment: 'This issue has been closed automatically because it needs more information and has not had recent activity. Please refer to our [guidelines](https://github.com/Microsoft/vscode/blob/master/CONTRIBUTING.md) for filing issues. Thank you for your contributions.'
+}

.github/new_release.yml

@@ -0,0 +1,5 @@
+{
+    newReleaseLabel: 'new release',
+    newReleases: ['1.13.1'],
+    perform: true
+}

.travis.yml

@@ -26,8 +26,8 @@ before_install:
   - git submodule update --init --recursive
   - git clone --depth 1 https://github.com/creationix/nvm.git ./.nvm
   - source ./.nvm/nvm.sh
-  - nvm install 6.6.0
-  - nvm use 6.6.0
+  - nvm install 7.4.0
+  - nvm use 7.4.0
   - npm config set python `which python`
   - npm install -g gulp
   - if [ $TRAVIS_OS_NAME == "linux" ]; then
@@ -44,7 +44,7 @@ script:
   - gulp electron --silent
   - gulp compile --silent --max_old_space_size=4096
   - gulp optimize-vscode --silent --max_old_space_size=4096
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --reporter dot --coverage; else ./scripts/test.sh --reporter dot; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --coverage; else ./scripts/test.sh; fi
   - ./scripts/test-integration.sh
 
 after_success:

.vscode/launch.json

@@ -1,34 +1,6 @@
 {
 	"version": "0.1.0",
 	"configurations": [
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Unit Tests",
-			"protocol": "legacy",
-			"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
-			"runtimeExecutable": "${workspaceRoot}/.build/electron/Code - OSS.app/Contents/MacOS/Electron",
-			"windows": {
-				"runtimeExecutable": "${workspaceRoot}/.build/electron/Code - OSS.exe"
-			},
-			"linux": {
-				"runtimeExecutable": "${workspaceRoot}/.build/electron/code-oss"
-			},
-			"stopOnEntry": false,
-			"args": [
-				"--timeout",
-				"2000"
-			],
-			"cwd": "${workspaceRoot}",
-			"env": {
-				"ELECTRON_RUN_AS_NODE": "true"
-			},
-			"sourceMaps": true,
-			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
-			],
-			"preLaunchTask": "electron"
-		},
 		{
 			"type": "node",
 			"request": "launch",
@@ -46,7 +18,6 @@
 			"name": "Attach to Extension Host",
 			"protocol": "legacy",
 			"port": 5870,
-			"sourceMaps": true,
 			"restart": true,
 			"outFiles": [
 				"${workspaceRoot}/out/**/*.js"
@@ -58,17 +29,16 @@
 			"name": "Attach to Shared Process",
 			"protocol": "legacy",
 			"port": 5871,
-			"sourceMaps": true,
 			"outFiles": [
 				"${workspaceRoot}/out/**/*.js"
 			]
 		},
 		{
 			"type": "node",
 			"request": "attach",
+			"protocol": "legacy",
 			"name": "Attach to Search process",
 			"port": 7890,
-			"sourceMaps": true,
 			"outFiles": [
 				"${workspaceRoot}/out/**/*.js"
 			]
@@ -79,7 +49,16 @@
 			"name": "Attach to CLI Process",
 			"protocol": "legacy",
 			"port": 5874,
-			"sourceMaps": true,
+			"outFiles": [
+				"${workspaceRoot}/out/**/*.js"
+			]
+		},
+		{
+			"type": "node",
+			"request": "attach",
+			"name": "Attach to Main Process",
+			"protocol": "legacy",
+			"port": 5875,
 			"outFiles": [
 				"${workspaceRoot}/out/**/*.js"
 			]
@@ -94,7 +73,6 @@
 				"--extensionDevelopmentPath=${workspaceRoot}/extensions/vscode-api-tests",
 				"--extensionTestsPath=${workspaceRoot}/extensions/vscode-api-tests/out"
 			],
-			"sourceMaps": true,
 			"outFiles": [
 				"${workspaceRoot}/out/**/*.js"
 			]
@@ -109,7 +87,6 @@
 				"--extensionDevelopmentPath=${workspaceRoot}/extensions/vscode-colorize-tests",
 				"--extensionTestsPath=${workspaceRoot}/extensions/vscode-colorize-tests/out"
 			],
-			"sourceMaps": true,
 			"outFiles": [
 				"${workspaceRoot}/out/**/*.js"
 			]
@@ -133,7 +110,68 @@
 			"linux": {
 				"runtimeExecutable": "${workspaceRoot}/scripts/code.sh"
 			},
-			"urlFilter": "*index.html*"
+			"urlFilter": "*index.html*",
+			"runtimeArgs": [
+				"--debug=5875"
+			],
+			"webRoot": "${workspaceRoot}"
+		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Git Unit Tests",
+			"protocol": "inspector",
+			"program": "${workspaceRoot}/extensions/git/node_modules/mocha/bin/_mocha",
+			"stopOnEntry": false,
+			"cwd": "${workspaceRoot}/extensions/git",
+			"outFiles": [
+				"${workspaceRoot}/extensions/git/out/**/*.js"
+			]
+		},
+		{
+			"name": "Attach to TS Server",
+			"type": "node",
+			"request": "attach",
+			"port": 5859,
+			"protocol": "legacy",
+			"outFiles": [
+				"${workspaceRoot}/extensions/node_modules/typescript/lib/**/*.js"
+			]
+		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Unit Tests",
+			"protocol": "legacy",
+			"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+			"runtimeExecutable": "${workspaceRoot}/.build/electron/Code - OSS.app/Contents/MacOS/Electron",
+			"windows": {
+				"runtimeExecutable": "${workspaceRoot}/.build/electron/Code - OSS.exe"
+			},
+			"linux": {
+				"runtimeExecutable": "${workspaceRoot}/.build/electron/code-oss"
+			},
+			"stopOnEntry": false,
+			"args": [
+				"--timeout",
+				"2000"
+			],
+			"cwd": "${workspaceRoot}",
+			"env": {
+				"ELECTRON_RUN_AS_NODE": "true"
+			},
+			"outFiles": [
+				"${workspaceRoot}/out/**/*.js"
+			]
+		}
+	],
+	"compounds": [
+		{
+			"name": "Debug VS Code Main and Renderer",
+			"configurations": [
+				"Launch VS Code",
+				"Attach to Main Process"
+			]
 		}
 	]
 }

.vscode/settings.json

@@ -6,7 +6,9 @@
 		".git": true,
 		".build": true,
 		"**/.DS_Store": true,
-		"build/**/*.js": { "when": "$(basename).ts" }
+		"build/**/*.js": {
+			"when": "$(basename).ts"
+		}
 	},
 	"search.exclude": {
 		"**/node_modules": true,
@@ -17,7 +19,6 @@
 		"extensions/**/out/**": true
 	},
 	"tslint.enable": true,
-	"tslint.rulesDirectory": "build/lib/tslint",
 	"lcov.path": [
 		"./.build/coverage/lcov.info",
 		"./.build/coverage-single/lcov.info"
@@ -31,4 +32,4 @@
 			}
 		}
 	]
-}
+}

.vscode/tasks.json

@@ -30,7 +30,7 @@
 					"location": 2,
 					"message": 3
 				},
-				"watching": {
+				"background": {
 					"beginsPattern": "Starting compilation",
 					"endsPattern": "Finished compilation"
 				}