From efdc3280582369bb1dca98065d95c7ce994d6a47 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 19 Sep 2017 11:21:41 +0200 Subject: [PATCH] ${workspaceRoot} -> ${workspaceFolder} --- .vscode/launch.json | 70 +++++++++---------- .vscode/settings.json | 4 +- extensions/css/.vscode/launch.json | 10 +-- extensions/css/.vscode/tasks.json | 2 +- extensions/css/server/.vscode/launch.json | 8 +-- extensions/emmet/.vscode/launch.json | 4 +- extensions/html/.vscode/launch.json | 10 +-- extensions/html/.vscode/tasks.json | 2 +- extensions/html/server/.vscode/launch.json | 8 +-- extensions/javascript/.vscode/launch.json | 8 +-- extensions/javascript/.vscode/tasks.json | 2 +- extensions/json/.vscode/launch.json | 10 +-- extensions/json/.vscode/tasks.json | 2 +- extensions/json/server/.vscode/launch.json | 8 +-- extensions/npm/.vscode/launch.json | 4 +- extensions/php/.vscode/launch.json | 6 +- extensions/php/.vscode/tasks.json | 2 +- extensions/python/.vscode/launch.json | 6 +- extensions/python/.vscode/tasks.json | 2 +- .../vscode-api-tests/.vscode/launch.json | 2 +- .../vscode-api-tests/.vscode/tasks.json | 2 +- .../vscode-colorize-tests/.vscode/launch.json | 4 +- .../vscode-colorize-tests/.vscode/tasks.json | 2 +- src/vs/vscode.d.ts | 2 +- src/vs/workbench/api/node/extHostTask.ts | 2 +- .../test/electron-browser/emmetAction.test.ts | 2 +- .../node/configurationResolverService.test.ts | 28 ++++---- test/smoke/src/areas/debug/debug.test.ts | 4 +- 28 files changed, 108 insertions(+), 108 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 5665ba67416..efe1edad82e 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,12 +6,12 @@ "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", @@ -21,7 +21,7 @@ "port": 5870, "restart": true, "outFiles": [ - "${workspaceRoot}/out/**/*.js" + "${workspaceFolder}/out/**/*.js" ] }, { @@ -31,7 +31,7 @@ "protocol": "inspector", "port": 5871, "outFiles": [ - "${workspaceRoot}/out/**/*.js" + "${workspaceFolder}/out/**/*.js" ] }, { @@ -41,7 +41,7 @@ "name": "Attach to Search Process", "port": 5876, "outFiles": [ - "${workspaceRoot}/out/**/*.js" + "${workspaceFolder}/out/**/*.js" ] }, { @@ -51,7 +51,7 @@ "protocol": "inspector", "port": 5874, "outFiles": [ - "${workspaceRoot}/out/**/*.js" + "${workspaceFolder}/out/**/*.js" ] }, { @@ -61,7 +61,7 @@ "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,30 +117,30 @@ "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": [ "--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" ] }, { @@ -148,38 +148,38 @@ "request": "launch", "name": "Unit Tests", "protocol": "inspector", - "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha", - "runtimeExecutable": "${workspaceRoot}/.build/electron/Code - OSS.app/Contents/MacOS/Electron", + "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": "${workspaceRoot}/test/smoke/out/main.js", - "cwd": "${workspaceRoot}/test/smoke", + "program": "${workspaceFolder}/test/smoke/out/main.js", + "cwd": "${workspaceFolder}/test/smoke", "timeout": 240000, "port": 9999, "args": [ "-l", - "${workspaceRoot}/.build/electron/Code - OSS.app/Contents/MacOS/Electron" + "${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Electron" ], "outFiles": [ "${cwd}/out/**/*.js" diff --git a/.vscode/settings.json b/.vscode/settings.json index 39adc0e7f24..363bb9bcd4e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -27,9 +27,9 @@ "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}" } } ] diff --git a/extensions/css/.vscode/launch.json b/extensions/css/.vscode/launch.json index 6efc025be79..2f7deadca42 100644 --- a/extensions/css/.vscode/launch.json +++ b/extensions/css/.vscode/launch.json @@ -7,11 +7,11 @@ "request": "launch", "runtimeExecutable": "${execPath}", "args": [ - "--extensionDevelopmentPath=${workspaceRoot}" + "--extensionDevelopmentPath=${workspaceFolder}" ], "stopOnEntry": false, "sourceMaps": true, - "outFiles": ["${workspaceRoot}/client/out/**/*.js"], + "outFiles": ["${workspaceFolder}/client/out/**/*.js"], "preLaunchTask": "npm" }, { @@ -19,10 +19,10 @@ "type": "extensionHost", "request": "launch", "runtimeExecutable": "${execPath}", - "args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/client/out/test" ], + "args": ["--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/client/out/test" ], "stopOnEntry": false, "sourceMaps": true, - "outFiles": ["${workspaceRoot}/client/out/test/**/*.js"], + "outFiles": ["${workspaceFolder}/client/out/test/**/*.js"], "preLaunchTask": "npm" }, { @@ -32,7 +32,7 @@ "protocol": "legacy", "port": 6004, "sourceMaps": true, - "outFiles": ["${workspaceRoot}/server/out/**/*.js"] + "outFiles": ["${workspaceFolder}/server/out/**/*.js"] } ] } \ No newline at end of file diff --git a/extensions/css/.vscode/tasks.json b/extensions/css/.vscode/tasks.json index a132a04214d..9e5593ade83 100644 --- a/extensions/css/.vscode/tasks.json +++ b/extensions/css/.vscode/tasks.json @@ -1,5 +1,5 @@ // Available variables which can be used inside of strings. -// ${workspaceRoot}: the root folder of the team +// ${workspaceFolder}: the root folder of the team // ${file}: the current opened file // ${fileBasename}: the current opened file's basename // ${fileDirname}: the current opened file's dirname diff --git a/extensions/css/server/.vscode/launch.json b/extensions/css/server/.vscode/launch.json index a09436fd912..764c1456f17 100644 --- a/extensions/css/server/.vscode/launch.json +++ b/extensions/css/server/.vscode/launch.json @@ -8,25 +8,25 @@ "request": "attach", "port": 6004, "sourceMaps": true, - "outDir": "${workspaceRoot}/out" + "outDir": "${workspaceFolder}/out" }, { "name": "Unit Tests", "type": "node", "request": "launch", - "program": "${workspaceRoot}/../../../node_modules/mocha/bin/_mocha", + "program": "${workspaceFolder}/../../../node_modules/mocha/bin/_mocha", "stopOnEntry": false, "args": [ "--timeout", "999999", "--colors" ], - "cwd": "${workspaceRoot}", + "cwd": "${workspaceFolder}", "runtimeExecutable": null, "runtimeArgs": [], "env": {}, "sourceMaps": true, - "outDir": "${workspaceRoot}/out" + "outDir": "${workspaceFolder}/out" } ] } \ No newline at end of file diff --git a/extensions/emmet/.vscode/launch.json b/extensions/emmet/.vscode/launch.json index 1009ac683fa..8a89122dafb 100644 --- a/extensions/emmet/.vscode/launch.json +++ b/extensions/emmet/.vscode/launch.json @@ -10,11 +10,11 @@ "name": "Launch Extension", "runtimeExecutable": "${execPath}", "args": [ - "--extensionDevelopmentPath=${workspaceRoot}" + "--extensionDevelopmentPath=${workspaceFolder}" ], "sourceMaps": true, "outFiles": [ - "${workspaceRoot}/out/**/*.js" + "${workspaceFolder}/out/**/*.js" ] } ] diff --git a/extensions/html/.vscode/launch.json b/extensions/html/.vscode/launch.json index c794c543acd..753220eccdf 100644 --- a/extensions/html/.vscode/launch.json +++ b/extensions/html/.vscode/launch.json @@ -7,11 +7,11 @@ "request": "launch", "runtimeExecutable": "${execPath}", "args": [ - "--extensionDevelopmentPath=${workspaceRoot}" + "--extensionDevelopmentPath=${workspaceFolder}" ], "stopOnEntry": false, "sourceMaps": true, - "outFiles": ["${workspaceRoot}/client/out/**/*.js"], + "outFiles": ["${workspaceFolder}/client/out/**/*.js"], "preLaunchTask": "npm" }, { @@ -19,10 +19,10 @@ "type": "extensionHost", "request": "launch", "runtimeExecutable": "${execPath}", - "args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/client/out/test" ], + "args": ["--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/client/out/test" ], "stopOnEntry": false, "sourceMaps": true, - "outFiles": ["${workspaceRoot}/client/out/test/**/*.js"], + "outFiles": ["${workspaceFolder}/client/out/test/**/*.js"], "preLaunchTask": "npm" }, { @@ -32,7 +32,7 @@ "port": 6004, "protocol": "legacy", "sourceMaps": true, - "outFiles": ["${workspaceRoot}/server/out/**/*.js"] + "outFiles": ["${workspaceFolder}/server/out/**/*.js"] } ] } \ No newline at end of file diff --git a/extensions/html/.vscode/tasks.json b/extensions/html/.vscode/tasks.json index a132a04214d..9e5593ade83 100644 --- a/extensions/html/.vscode/tasks.json +++ b/extensions/html/.vscode/tasks.json @@ -1,5 +1,5 @@ // Available variables which can be used inside of strings. -// ${workspaceRoot}: the root folder of the team +// ${workspaceFolder}: the root folder of the team // ${file}: the current opened file // ${fileBasename}: the current opened file's basename // ${fileDirname}: the current opened file's dirname diff --git a/extensions/html/server/.vscode/launch.json b/extensions/html/server/.vscode/launch.json index a09436fd912..764c1456f17 100644 --- a/extensions/html/server/.vscode/launch.json +++ b/extensions/html/server/.vscode/launch.json @@ -8,25 +8,25 @@ "request": "attach", "port": 6004, "sourceMaps": true, - "outDir": "${workspaceRoot}/out" + "outDir": "${workspaceFolder}/out" }, { "name": "Unit Tests", "type": "node", "request": "launch", - "program": "${workspaceRoot}/../../../node_modules/mocha/bin/_mocha", + "program": "${workspaceFolder}/../../../node_modules/mocha/bin/_mocha", "stopOnEntry": false, "args": [ "--timeout", "999999", "--colors" ], - "cwd": "${workspaceRoot}", + "cwd": "${workspaceFolder}", "runtimeExecutable": null, "runtimeArgs": [], "env": {}, "sourceMaps": true, - "outDir": "${workspaceRoot}/out" + "outDir": "${workspaceFolder}/out" } ] } \ No newline at end of file diff --git a/extensions/javascript/.vscode/launch.json b/extensions/javascript/.vscode/launch.json index 2bfe2a16420..da4bc0f01e1 100644 --- a/extensions/javascript/.vscode/launch.json +++ b/extensions/javascript/.vscode/launch.json @@ -7,11 +7,11 @@ "request": "launch", "runtimeExecutable": "${execPath}", "args": [ - "--extensionDevelopmentPath=${workspaceRoot}" + "--extensionDevelopmentPath=${workspaceFolder}" ], "stopOnEntry": false, "sourceMaps": true, - "outDir": "${workspaceRoot}/out", + "outDir": "${workspaceFolder}/out", "preLaunchTask": "npm" }, { @@ -19,10 +19,10 @@ "type": "extensionHost", "request": "launch", "runtimeExecutable": "${execPath}", - "args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ], + "args": ["--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/out/test" ], "stopOnEntry": false, "sourceMaps": true, - "outDir": "${workspaceRoot}/out/test", + "outDir": "${workspaceFolder}/out/test", "preLaunchTask": "npm" } ] diff --git a/extensions/javascript/.vscode/tasks.json b/extensions/javascript/.vscode/tasks.json index a132a04214d..9e5593ade83 100644 --- a/extensions/javascript/.vscode/tasks.json +++ b/extensions/javascript/.vscode/tasks.json @@ -1,5 +1,5 @@ // Available variables which can be used inside of strings. -// ${workspaceRoot}: the root folder of the team +// ${workspaceFolder}: the root folder of the team // ${file}: the current opened file // ${fileBasename}: the current opened file's basename // ${fileDirname}: the current opened file's dirname diff --git a/extensions/json/.vscode/launch.json b/extensions/json/.vscode/launch.json index ac84c7bdf26..b2d26ad6c35 100644 --- a/extensions/json/.vscode/launch.json +++ b/extensions/json/.vscode/launch.json @@ -7,11 +7,11 @@ "request": "launch", "runtimeExecutable": "${execPath}", "args": [ - "--extensionDevelopmentPath=${workspaceRoot}" + "--extensionDevelopmentPath=${workspaceFolder}" ], "stopOnEntry": false, "sourceMaps": true, - "outFiles": ["${workspaceRoot}/client/out"], + "outFiles": ["${workspaceFolder}/client/out"], "preLaunchTask": "npm" }, { @@ -19,10 +19,10 @@ "type": "extensionHost", "request": "launch", "runtimeExecutable": "${execPath}", - "args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/client/out/test" ], + "args": ["--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/client/out/test" ], "stopOnEntry": false, "sourceMaps": true, - "outFiles": ["${workspaceRoot}/client/out/test"], + "outFiles": ["${workspaceFolder}/client/out/test"], "preLaunchTask": "npm" }, { @@ -31,7 +31,7 @@ "request": "attach", "port": 6004, "sourceMaps": true, - "outFiles": ["${workspaceRoot}/server/out"] + "outFiles": ["${workspaceFolder}/server/out"] } ] diff --git a/extensions/json/.vscode/tasks.json b/extensions/json/.vscode/tasks.json index a132a04214d..9e5593ade83 100644 --- a/extensions/json/.vscode/tasks.json +++ b/extensions/json/.vscode/tasks.json @@ -1,5 +1,5 @@ // Available variables which can be used inside of strings. -// ${workspaceRoot}: the root folder of the team +// ${workspaceFolder}: the root folder of the team // ${file}: the current opened file // ${fileBasename}: the current opened file's basename // ${fileDirname}: the current opened file's dirname diff --git a/extensions/json/server/.vscode/launch.json b/extensions/json/server/.vscode/launch.json index a09436fd912..764c1456f17 100644 --- a/extensions/json/server/.vscode/launch.json +++ b/extensions/json/server/.vscode/launch.json @@ -8,25 +8,25 @@ "request": "attach", "port": 6004, "sourceMaps": true, - "outDir": "${workspaceRoot}/out" + "outDir": "${workspaceFolder}/out" }, { "name": "Unit Tests", "type": "node", "request": "launch", - "program": "${workspaceRoot}/../../../node_modules/mocha/bin/_mocha", + "program": "${workspaceFolder}/../../../node_modules/mocha/bin/_mocha", "stopOnEntry": false, "args": [ "--timeout", "999999", "--colors" ], - "cwd": "${workspaceRoot}", + "cwd": "${workspaceFolder}", "runtimeExecutable": null, "runtimeArgs": [], "env": {}, "sourceMaps": true, - "outDir": "${workspaceRoot}/out" + "outDir": "${workspaceFolder}/out" } ] } \ No newline at end of file diff --git a/extensions/npm/.vscode/launch.json b/extensions/npm/.vscode/launch.json index da043ff85d9..017c8762415 100644 --- a/extensions/npm/.vscode/launch.json +++ b/extensions/npm/.vscode/launch.json @@ -7,11 +7,11 @@ "request": "launch", "runtimeExecutable": "${execPath}", "args": [ - "--extensionDevelopmentPath=${workspaceRoot}" + "--extensionDevelopmentPath=${workspaceFolder}" ], "stopOnEntry": false, "sourceMaps": true, - "outFiles": ["${workspaceRoot}/client/out/**/*.js"], + "outFiles": ["${workspaceFolder}/client/out/**/*.js"], "preLaunchTask": "npm" } ] diff --git a/extensions/php/.vscode/launch.json b/extensions/php/.vscode/launch.json index 476551bebae..5e5696dce52 100644 --- a/extensions/php/.vscode/launch.json +++ b/extensions/php/.vscode/launch.json @@ -7,12 +7,12 @@ "request": "launch", "runtimeExecutable": "${execPath}", "args": [ - "--extensionDevelopmentPath=${workspaceRoot}" + "--extensionDevelopmentPath=${workspaceFolder}" ], "stopOnEntry": false, "sourceMaps": true, - "outDir": "${workspaceRoot}/out", + "outDir": "${workspaceFolder}/out", "preLaunchTask": "npm" - } + } ] } \ No newline at end of file diff --git a/extensions/php/.vscode/tasks.json b/extensions/php/.vscode/tasks.json index a132a04214d..9e5593ade83 100644 --- a/extensions/php/.vscode/tasks.json +++ b/extensions/php/.vscode/tasks.json @@ -1,5 +1,5 @@ // Available variables which can be used inside of strings. -// ${workspaceRoot}: the root folder of the team +// ${workspaceFolder}: the root folder of the team // ${file}: the current opened file // ${fileBasename}: the current opened file's basename // ${fileDirname}: the current opened file's dirname diff --git a/extensions/python/.vscode/launch.json b/extensions/python/.vscode/launch.json index 476551bebae..5e5696dce52 100644 --- a/extensions/python/.vscode/launch.json +++ b/extensions/python/.vscode/launch.json @@ -7,12 +7,12 @@ "request": "launch", "runtimeExecutable": "${execPath}", "args": [ - "--extensionDevelopmentPath=${workspaceRoot}" + "--extensionDevelopmentPath=${workspaceFolder}" ], "stopOnEntry": false, "sourceMaps": true, - "outDir": "${workspaceRoot}/out", + "outDir": "${workspaceFolder}/out", "preLaunchTask": "npm" - } + } ] } \ No newline at end of file diff --git a/extensions/python/.vscode/tasks.json b/extensions/python/.vscode/tasks.json index a132a04214d..9e5593ade83 100644 --- a/extensions/python/.vscode/tasks.json +++ b/extensions/python/.vscode/tasks.json @@ -1,5 +1,5 @@ // Available variables which can be used inside of strings. -// ${workspaceRoot}: the root folder of the team +// ${workspaceFolder}: the root folder of the team // ${file}: the current opened file // ${fileBasename}: the current opened file's basename // ${fileDirname}: the current opened file's dirname diff --git a/extensions/vscode-api-tests/.vscode/launch.json b/extensions/vscode-api-tests/.vscode/launch.json index b6ed0f7a674..8f8a11a2a5e 100644 --- a/extensions/vscode-api-tests/.vscode/launch.json +++ b/extensions/vscode-api-tests/.vscode/launch.json @@ -7,7 +7,7 @@ "type": "extensionHost", "request": "launch", "runtimeExecutable": "${execPath}", - "args": ["${workspaceRoot}/../../", "${workspaceRoot}/testWorkspace", "--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out" ], + "args": ["${workspaceFolder}/../../", "${workspaceFolder}/testWorkspace", "--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/out" ], "stopOnEntry": false, "sourceMaps": true, "outDir": "out", diff --git a/extensions/vscode-api-tests/.vscode/tasks.json b/extensions/vscode-api-tests/.vscode/tasks.json index d31b15910ee..e2a020d0645 100644 --- a/extensions/vscode-api-tests/.vscode/tasks.json +++ b/extensions/vscode-api-tests/.vscode/tasks.json @@ -1,5 +1,5 @@ // Available variables which can be used inside of strings. -// ${workspaceRoot}: the root folder of the team +// ${workspaceFolder}: the root folder of the team // ${file}: the current opened file // ${fileBasename}: the current opened file's basename // ${fileDirname}: the current opened file's dirname diff --git a/extensions/vscode-colorize-tests/.vscode/launch.json b/extensions/vscode-colorize-tests/.vscode/launch.json index 76d6fa69865..73c3753c75c 100644 --- a/extensions/vscode-colorize-tests/.vscode/launch.json +++ b/extensions/vscode-colorize-tests/.vscode/launch.json @@ -7,10 +7,10 @@ "type": "extensionHost", "request": "launch", "runtimeExecutable": "${execPath}", - "args": ["${workspaceRoot}/../../", "${workspaceRoot}/test", "--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out" ], + "args": ["${workspaceFolder}/../../", "${workspaceFolder}/test", "--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/out" ], "stopOnEntry": false, "sourceMaps": true, - "outDir": "${workspaceRoot}/out", + "outDir": "${workspaceFolder}/out", "preLaunchTask": "npm" } ] diff --git a/extensions/vscode-colorize-tests/.vscode/tasks.json b/extensions/vscode-colorize-tests/.vscode/tasks.json index 97e40acf632..3b6c357da2d 100644 --- a/extensions/vscode-colorize-tests/.vscode/tasks.json +++ b/extensions/vscode-colorize-tests/.vscode/tasks.json @@ -1,5 +1,5 @@ // Available variables which can be used inside of strings. -// ${workspaceRoot}: the root folder of the team +// ${workspaceFolder}: the root folder of the team // ${file}: the current opened file // ${relativeFile}: the current opened file relative to cwd // ${fileBasename}: the current opened file's basename diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 92310b76a73..019e8d45a08 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -5689,7 +5689,7 @@ declare module 'vscode' { * or by directly passing a [DebugConfiguration](#DebugConfiguration). * The named configurations are looked up in '.vscode/launch.json' found in the given folder. * Before debugging starts, all unsaved files are saved and the launch configurations are brought up-to-date. - * Folder specific variables used in the configuration (e.g. '${workspaceRoot}') are resolved against the given folder. + * Folder specific variables used in the configuration (e.g. '${workspaceFolder}') are resolved against the given folder. * @param folder The [workspace folder](#WorkspaceFolder) for looking up named configurations and resolving variables or `undefined` for a non-folder setup. * @param nameOrConfiguration Either the name of a debug or compound configuration or a [DebugConfiguration](#DebugConfiguration) object. * @return A thenable that resolves when debugging could be successfully started. diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts index b644dfb2424..8f1642cfd12 100644 --- a/src/vs/workbench/api/node/extHostTask.ts +++ b/src/vs/workbench/api/node/extHostTask.ts @@ -118,7 +118,7 @@ namespace FileLocation { case types.FileLocationKind.Absolute: return { kind: Problems.FileLocationKind.Absolute }; case types.FileLocationKind.Relative: - return { kind: Problems.FileLocationKind.Relative, prefix: '${workspaceRoot}' }; + return { kind: Problems.FileLocationKind.Relative, prefix: '${workspaceFolder}' }; } return { kind: Problems.FileLocationKind.Auto }; } diff --git a/src/vs/workbench/parts/emmet/test/electron-browser/emmetAction.test.ts b/src/vs/workbench/parts/emmet/test/electron-browser/emmetAction.test.ts index 7cd89850e85..387beba3f81 100644 --- a/src/vs/workbench/parts/emmet/test/electron-browser/emmetAction.test.ts +++ b/src/vs/workbench/parts/emmet/test/electron-browser/emmetAction.test.ts @@ -16,7 +16,7 @@ import { LanguageId, LanguageIdentifier } from 'vs/editor/common/modes'; // "name": "Stacks Tests", // "type": "node", // "request": "launch", -// "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha", +// "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha", // "stopOnEntry": false, // "args": [ // "--timeout", diff --git a/src/vs/workbench/services/configurationResolver/test/node/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/node/configurationResolverService.test.ts index fae08146711..139e1c758b6 100644 --- a/src/vs/workbench/services/configurationResolver/test/node/configurationResolverService.test.ts +++ b/src/vs/workbench/services/configurationResolver/test/node/configurationResolverService.test.ts @@ -42,9 +42,9 @@ suite('Configuration Resolver Service', () => { test('substitute one', () => { if (platform.isWindows) { - assert.strictEqual(configurationResolverService.resolve(workspace, 'abc ${workspaceRoot} xyz'), 'abc \\VSCode\\workspaceLocation xyz'); + assert.strictEqual(configurationResolverService.resolve(workspace, 'abc ${workspaceFolder} xyz'), 'abc \\VSCode\\workspaceLocation xyz'); } else { - assert.strictEqual(configurationResolverService.resolve(workspace, 'abc ${workspaceRoot} xyz'), 'abc /VSCode/workspaceLocation xyz'); + assert.strictEqual(configurationResolverService.resolve(workspace, 'abc ${workspaceFolder} xyz'), 'abc /VSCode/workspaceLocation xyz'); } }); @@ -58,25 +58,25 @@ suite('Configuration Resolver Service', () => { test('substitute many', () => { if (platform.isWindows) { - assert.strictEqual(configurationResolverService.resolve(workspace, '${workspaceRoot} - ${workspaceRoot}'), '\\VSCode\\workspaceLocation - \\VSCode\\workspaceLocation'); + assert.strictEqual(configurationResolverService.resolve(workspace, '${workspaceFolder} - ${workspaceFolder}'), '\\VSCode\\workspaceLocation - \\VSCode\\workspaceLocation'); } else { - assert.strictEqual(configurationResolverService.resolve(workspace, '${workspaceRoot} - ${workspaceRoot}'), '/VSCode/workspaceLocation - /VSCode/workspaceLocation'); + assert.strictEqual(configurationResolverService.resolve(workspace, '${workspaceFolder} - ${workspaceFolder}'), '/VSCode/workspaceLocation - /VSCode/workspaceLocation'); } }); test('substitute one env variable', () => { if (platform.isWindows) { - assert.strictEqual(configurationResolverService.resolve(workspace, 'abc ${workspaceRoot} ${env:key1} xyz'), 'abc \\VSCode\\workspaceLocation Value for Key1 xyz'); + assert.strictEqual(configurationResolverService.resolve(workspace, 'abc ${workspaceFolder} ${env:key1} xyz'), 'abc \\VSCode\\workspaceLocation Value for Key1 xyz'); } else { - assert.strictEqual(configurationResolverService.resolve(workspace, 'abc ${workspaceRoot} ${env:key1} xyz'), 'abc /VSCode/workspaceLocation Value for Key1 xyz'); + assert.strictEqual(configurationResolverService.resolve(workspace, 'abc ${workspaceFolder} ${env:key1} xyz'), 'abc /VSCode/workspaceLocation Value for Key1 xyz'); } }); test('substitute many env variable', () => { if (platform.isWindows) { - assert.strictEqual(configurationResolverService.resolve(workspace, '${workspaceRoot} - ${workspaceRoot} ${env:key1} - ${env:key2}'), '\\VSCode\\workspaceLocation - \\VSCode\\workspaceLocation Value for Key1 - Value for Key2'); + assert.strictEqual(configurationResolverService.resolve(workspace, '${workspaceFolder} - ${workspaceFolder} ${env:key1} - ${env:key2}'), '\\VSCode\\workspaceLocation - \\VSCode\\workspaceLocation Value for Key1 - Value for Key2'); } else { - assert.strictEqual(configurationResolverService.resolve(workspace, '${workspaceRoot} - ${workspaceRoot} ${env:key1} - ${env:key2}'), '/VSCode/workspaceLocation - /VSCode/workspaceLocation Value for Key1 - Value for Key2'); + assert.strictEqual(configurationResolverService.resolve(workspace, '${workspaceFolder} - ${workspaceFolder} ${env:key1} - ${env:key2}'), '/VSCode/workspaceLocation - /VSCode/workspaceLocation Value for Key1 - Value for Key2'); } }); @@ -118,7 +118,7 @@ suite('Configuration Resolver Service', () => { let configurationService: IConfigurationService; configurationService = new MockConfigurationService({ editor: { - fontFamily: 'foo ${workspaceRoot} ${config:terminal.integrated.fontFamily}' + fontFamily: 'foo ${workspaceFolder} ${config:terminal.integrated.fontFamily}' }, terminal: { integrated: { @@ -139,7 +139,7 @@ suite('Configuration Resolver Service', () => { let configurationService: IConfigurationService; configurationService = new MockConfigurationService({ editor: { - fontFamily: 'foo ${workspaceRoot} ${config:terminal.integrated.fontFamily} ${config:editor.fontFamily}' + fontFamily: 'foo ${workspaceFolder} ${config:terminal.integrated.fontFamily} ${config:editor.fontFamily}' }, terminal: { integrated: { @@ -171,9 +171,9 @@ suite('Configuration Resolver Service', () => { let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); if (platform.isWindows) { - assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} ${workspaceRoot} ${env:key1} xyz'), 'abc foo \\VSCode\\workspaceLocation Value for Key1 xyz'); + assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} ${workspaceFolder} ${env:key1} xyz'), 'abc foo \\VSCode\\workspaceLocation Value for Key1 xyz'); } else { - assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} ${workspaceRoot} ${env:key1} xyz'), 'abc foo /VSCode/workspaceLocation Value for Key1 xyz'); + assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} ${workspaceFolder} ${env:key1} xyz'), 'abc foo /VSCode/workspaceLocation Value for Key1 xyz'); } }); @@ -192,9 +192,9 @@ suite('Configuration Resolver Service', () => { let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); if (platform.isWindows) { - assert.strictEqual(service.resolve(workspace, '${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} ${workspaceRoot} - ${workspaceRoot} ${env:key1} - ${env:key2}'), 'foo bar \\VSCode\\workspaceLocation - \\VSCode\\workspaceLocation Value for Key1 - Value for Key2'); + assert.strictEqual(service.resolve(workspace, '${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} ${workspaceFolder} - ${workspaceFolder} ${env:key1} - ${env:key2}'), 'foo bar \\VSCode\\workspaceLocation - \\VSCode\\workspaceLocation Value for Key1 - Value for Key2'); } else { - assert.strictEqual(service.resolve(workspace, '${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} ${workspaceRoot} - ${workspaceRoot} ${env:key1} - ${env:key2}'), 'foo bar /VSCode/workspaceLocation - /VSCode/workspaceLocation Value for Key1 - Value for Key2'); + assert.strictEqual(service.resolve(workspace, '${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} ${workspaceFolder} - ${workspaceFolder} ${env:key1} - ${env:key2}'), 'foo bar /VSCode/workspaceLocation - /VSCode/workspaceLocation Value for Key1 - Value for Key2'); } }); diff --git a/test/smoke/src/areas/debug/debug.test.ts b/test/smoke/src/areas/debug/debug.test.ts index a6e35ef4ea7..a6fcf6c9bb2 100644 --- a/test/smoke/src/areas/debug/debug.test.ts +++ b/test/smoke/src/areas/debug/debug.test.ts @@ -55,9 +55,9 @@ describe('Debug', () => { assert.equal(json.configurations[0].request, 'launch'); assert.equal(json.configurations[0].type, 'node'); if (process.platform === 'win32') { - assert.equal(json.configurations[0].program, '${workspaceRoot}\\bin\\www'); + assert.equal(json.configurations[0].program, '${workspaceFolder}\\bin\\www'); } else { - assert.equal(json.configurations[0].program, '${workspaceRoot}/bin/www'); + assert.equal(json.configurations[0].program, '${workspaceFolder}/bin/www'); } }); -- GitLab