Merge branch 'master' of https://github.com/Microsoft/vscode

.editorconfig

@@ -11,6 +11,6 @@ trim_trailing_whitespace = true
 
 # The indent size used in the `package.json` file cannot be changed
 # https://github.com/npm/npm/pull/3180#issuecomment-16336516
-[{.travis.yml,npm-shrinkwrap.json,package.json}]
+[{*.yml,*.yaml,npm-shrinkwrap.json,package.json}]
 indent_style = space
 indent_size = 2

.github/classifier.yml

@@ -6,8 +6,8 @@
         accessibility: [],
         api: [],
         css-less-sass: [],
-        debug: [ weinand ],
-        editor: [ rebornix ],
+        debug: [ isidorn ],
+        editor: [],
         editor-brackets: [],
         editor-clipboard: [],
         editor-colors: [],
@@ -26,20 +26,21 @@
         extensions: [],
         git: [ joaomoreno ],
         hot-exit: [ Tyriar ],
-        html: [],
+        html: [ aeschli ],
         i18n: [],
         install-update: [],
         integrated-terminal: [ Tyriar ],
         javascript: [ mjbvz ],
         json: [],
         languages basic: [],
-        markdown: [],
+        markdown: [ mjbvz ],
+        merge-conflict: [ chrmarti ],
         perf-profile: [],
         php: [ roblourens ],
         search: [ roblourens ],
         snippets: [ jrieken ],
-        tasks: [],
+        tasks: [ dbaeumer ],
         typescript: [ mjbvz ],
-        workbench: [],
+        workbench: [ bpasero, isidorn, sandy081]
     }
 }

.github/insiders.yml

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

.github/new_release.yml

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

.gitignore

@@ -11,4 +11,5 @@ out-monaco-editor-core/
 out-vscode/
 out-vscode-min/
 build/node_modules
-coverage/
+coverage/
+test_data/

.travis.yml

@@ -5,8 +5,14 @@ os:
   - linux
   - osx
 
+cache:
+  directories:
+    - $HOME/.npm
+
 notifications:
   email: false
+  webhooks:
+    - http://vscode-test-probot.westus.cloudapp.azure.com:3450/travis/notifications
 
 addons:
   apt:
@@ -27,10 +33,9 @@ before_install:
   - git submodule update --init --recursive
   - git clone --depth 1 https://github.com/creationix/nvm.git ./.nvm
   - source ./.nvm/nvm.sh
-  - nvm install 7.4.0
-  - nvm use 7.4.0
+  - nvm install 7.9.0
+  - nvm use 7.9.0
   - npm config set python `which python`
-  - npm install -g gulp
   - if [ $TRAVIS_OS_NAME == "linux" ]; then
       export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
       sh -e /etc/init.d/xvfb start;
@@ -41,10 +46,10 @@ install:
   - ./scripts/npm.sh install
 
 script:
-  - gulp hygiene --silent
-  - gulp electron --silent
-  - gulp compile --silent --max_old_space_size=4096
-  - gulp optimize-vscode --silent --max_old_space_size=4096
+  - node_modules/.bin/gulp hygiene --silent
+  - 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
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --coverage --reporter dot; else ./scripts/test.sh --reporter dot; fi
   - ./scripts/test-integration.sh
 

.vscode/launch.json

@@ -6,62 +6,62 @@
 			"type": "node",
 			"request": "launch",
 			"name": "Gulp Build",
-			"program": "${workspaceRoot}/node_modules/gulp/bin/gulp.js",
+			"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
 			"stopOnEntry": true,
 			"args": [
 				"watch-extension:json-client"
 			],
-			"cwd": "${workspaceRoot}"
+			"cwd": "${workspaceFolder}"
 		},
 		{
 			"type": "node",
 			"request": "attach",
 			"name": "Attach to Extension Host",
-			"protocol": "legacy",
+			"protocol": "inspector",
 			"port": 5870,
 			"restart": true,
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/out/**/*.js"
 			]
 		},
 		{
 			"type": "node",
 			"request": "attach",
 			"name": "Attach to Shared Process",
-			"protocol": "legacy",
+			"protocol": "inspector",
 			"port": 5871,
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/out/**/*.js"
 			]
 		},
 		{
 			"type": "node",
 			"request": "attach",
-			"protocol": "legacy",
-			"name": "Attach to Search process",
-			"port": 7890,
+			"protocol": "inspector",
+			"name": "Attach to Search Process",
+			"port": 5876,
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/out/**/*.js"
 			]
 		},
 		{
 			"type": "node",
 			"request": "attach",
 			"name": "Attach to CLI Process",
-			"protocol": "legacy",
+			"protocol": "inspector",
 			"port": 5874,
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/out/**/*.js"
 			]
 		},
 		{
 			"type": "node",
 			"request": "attach",
 			"name": "Attach to Main Process",
-			"protocol": "legacy",
+			"protocol": "inspector",
 			"port": 5875,
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/out/**/*.js"
 			]
 		},
 		{
@@ -70,12 +70,12 @@
 			"name": "VS Code Emmet Tests",
 			"runtimeExecutable": "${execPath}",
 			"args": [
-				"${workspaceRoot}/extensions/emmet/test-fixtures",
-				"--extensionDevelopmentPath=${workspaceRoot}/extensions/emmet",
-				"--extensionTestsPath=${workspaceRoot}/extensions/emmet/out/test"
+				"${workspaceFolder}/extensions/emmet/test-fixtures",
+				"--extensionDevelopmentPath=${workspaceFolder}/extensions/emmet",
+				"--extensionTestsPath=${workspaceFolder}/extensions/emmet/out/test"
 			],
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/out/**/*.js"
 			]
 		},
 		{
@@ -84,12 +84,12 @@
 			"name": "VS Code API Tests",
 			"runtimeExecutable": "${execPath}",
 			"args": [
-				"${workspaceRoot}/extensions/vscode-api-tests/testWorkspace",
-				"--extensionDevelopmentPath=${workspaceRoot}/extensions/vscode-api-tests",
-				"--extensionTestsPath=${workspaceRoot}/extensions/vscode-api-tests/out"
+				"${workspaceFolder}/extensions/vscode-api-tests/testWorkspace",
+				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-api-tests",
+				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-api-tests/out"
 			],
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/out/**/*.js"
 			]
 		},
 		{
@@ -98,12 +98,12 @@
 			"name": "VS Code Tokenizer Tests",
 			"runtimeExecutable": "${execPath}",
 			"args": [
-				"${workspaceRoot}/extensions/vscode-colorize-tests/test",
-				"--extensionDevelopmentPath=${workspaceRoot}/extensions/vscode-colorize-tests",
-				"--extensionTestsPath=${workspaceRoot}/extensions/vscode-colorize-tests/out"
+				"${workspaceFolder}/extensions/vscode-colorize-tests/test",
+				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-colorize-tests",
+				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-colorize-tests/out"
 			],
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/out/**/*.js"
 			]
 		},
 		{
@@ -117,57 +117,78 @@
 			"request": "launch",
 			"name": "Launch VS Code",
 			"windows": {
-				"runtimeExecutable": "${workspaceRoot}/scripts/code.bat"
+				"runtimeExecutable": "${workspaceFolder}/scripts/code.bat"
 			},
 			"osx": {
-				"runtimeExecutable": "${workspaceRoot}/scripts/code.sh"
+				"runtimeExecutable": "${workspaceFolder}/scripts/code.sh"
 			},
 			"linux": {
-				"runtimeExecutable": "${workspaceRoot}/scripts/code.sh"
+				"runtimeExecutable": "${workspaceFolder}/scripts/code.sh"
 			},
 			"urlFilter": "*index.html*",
 			"runtimeArgs": [
-				"--debug=5875"
+				"--inspect=5875"
 			],
-			"webRoot": "${workspaceRoot}"
+			"webRoot": "${workspaceFolder}"
 		},
 		{
 			"type": "node",
 			"request": "launch",
 			"name": "Git Unit Tests",
 			"protocol": "inspector",
-			"program": "${workspaceRoot}/extensions/git/node_modules/mocha/bin/_mocha",
+			"program": "${workspaceFolder}/extensions/git/node_modules/mocha/bin/_mocha",
 			"stopOnEntry": false,
-			"cwd": "${workspaceRoot}/extensions/git",
+			"cwd": "${workspaceFolder}/extensions/git",
 			"outFiles": [
-				"${workspaceRoot}/extensions/git/out/**/*.js"
+				"${workspaceFolder}/extensions/git/out/**/*.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",
+			"protocol": "inspector",
+			"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+			"runtimeExecutable": "${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Electron",
 			"windows": {
-				"runtimeExecutable": "${workspaceRoot}/.build/electron/Code - OSS.exe"
+				"runtimeExecutable": "${workspaceFolder}/.build/electron/Code - OSS.exe"
 			},
 			"linux": {
-				"runtimeExecutable": "${workspaceRoot}/.build/electron/code-oss"
+				"runtimeExecutable": "${workspaceFolder}/.build/electron/code-oss"
 			},
 			"stopOnEntry": false,
 			"args": [
 				"--timeout",
 				"2000"
 			],
-			"cwd": "${workspaceRoot}",
+			"cwd": "${workspaceFolder}",
 			"env": {
 				"ELECTRON_RUN_AS_NODE": "true"
 			},
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/out/**/*.js"
 			]
+		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Launch Smoke Test",
+			"program": "${workspaceFolder}/test/smoke/out/main.js",
+			"cwd": "${workspaceFolder}/test/smoke",
+			"timeout": 240000,
+			"port": 9999,
+			"args": [
+				"-l",
+				"${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Electron"
+			],
+			"outFiles": [
+				"${cwd}/out/**/*.js"
+			],
+			"env": {
+				"NODE_ENV": "development",
+				"VSCODE_DEV": "1",
+				"VSCODE_CLI": "1"
+			}
 		}
 	],
 	"compounds": [
@@ -177,6 +198,13 @@
 				"Launch VS Code",
 				"Attach to Main Process"
 			]
+		},
+		{
+			"name": "Search and Renderer processes",
+			"configurations": [
+				"Launch VS Code",
+				"Attach to Search Process"
+			]
 		}
 	]
 }

.vscode/settings.json

@@ -16,7 +16,8 @@
 		".build/**": true,
 		"out*/**": true,
 		"i18n/**": true,
-		"extensions/**/out/**": true
+		"extensions/**/out/**": true,
+		"test/smoke/out/**": true
 	},
 	"tslint.enable": true,
 	"lcov.path": [
@@ -26,10 +27,10 @@
 	"lcov.watch": [
 		{
 			"pattern": "**/*.test.js",
-			"command": "${workspaceRoot}/scripts/test.sh --coverage --run ${file}",
+			"command": "${workspaceFolder}/scripts/test.sh --coverage --run ${file}",
 			"windows": {
-				"command": "${workspaceRoot}\\scripts\\test.bat --coverage --run ${file}"
+				"command": "${workspaceFolder}\\scripts\\test.bat --coverage --run ${file}"
 			}
 		}
 	]
-}
+}

.vscode/tasks.json

@@ -55,7 +55,8 @@
 			"command": "./scripts/code.sh",
 			"windows": {
 				"command": ".\\scripts\\code.bat"
-			}
+			},
+			"problemMatcher": []
 		},
 		{
 			"type": "gulp",

CODE_OF_CONDUCT.md

@@ -0,0 +1 @@
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.