diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json index b73c0372eb7110a0d8fe64814aa78ac4d58c84aa..46f4eba3a951fc89cf48435fbc21672dd22d1120 100644 --- a/extensions/configuration-editing/package.json +++ b/extensions/configuration-editing/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "jsonc-parser": "2.0.2", - "vscode-nls": "^3.2.4" + "vscode-nls": "^4.0.0" }, "contributes": { "languages": [ diff --git a/extensions/configuration-editing/yarn.lock b/extensions/configuration-editing/yarn.lock index a7a07dcd42add26ef95bbcbea9b3ba27ae007805..c74f1de37ba313c644cf7a7227ef594aaf07227f 100644 --- a/extensions/configuration-editing/yarn.lock +++ b/extensions/configuration-editing/yarn.lock @@ -10,6 +10,6 @@ jsonc-parser@2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.2.tgz#42fcf56d70852a043fadafde51ddb4a85649978d" -vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json index 4a672a448a63884f4075b413c1946b0150dd9926..a565f4309efc688e4b34376a08858d64dd9317e4 100644 --- a/extensions/css-language-features/package.json +++ b/extensions/css-language-features/package.json @@ -709,7 +709,7 @@ }, "dependencies": { "vscode-languageclient": "^5.1.0-next.9", - "vscode-nls": "^3.2.4" + "vscode-nls": "^4.0.0" }, "devDependencies": { "@types/node": "^8.10.25", diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock index f4cd5adbf7ba9da4129b03726711e7009f7f9773..b0af5d6319b092faf0488cdde60819e1edd6f880 100644 --- a/extensions/css-language-features/yarn.lock +++ b/extensions/css-language-features/yarn.lock @@ -159,9 +159,9 @@ vscode-languageserver-types@^3.13.0-next.1: version "3.13.0-next.1" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280" -vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" wrappy@1: version "1.0.2" diff --git a/extensions/git/package.json b/extensions/git/package.json index 712f071eb3a07013f5d0d6a279de9bb561020d87..2e0d5985172e0b9b5821023ac87d073fadc3f528 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -1198,7 +1198,7 @@ "iconv-lite": "0.4.19", "jschardet": "^1.6.0", "vscode-extension-telemetry": "0.0.18", - "vscode-nls": "^3.2.4", + "vscode-nls": "^4.0.0", "which": "^1.3.0" }, "devDependencies": { diff --git a/extensions/git/yarn.lock b/extensions/git/yarn.lock index cf3f64be85380b9d42abc452055ff323ba258bce..0a7fcbe67593169732c7d69ea34d20f585bb1ae0 100644 --- a/extensions/git/yarn.lock +++ b/extensions/git/yarn.lock @@ -263,9 +263,9 @@ vscode-extension-telemetry@0.0.18: dependencies: applicationinsights "1.0.1" -vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" which@^1.3.0: version "1.3.0" diff --git a/extensions/grunt/package.json b/extensions/grunt/package.json index c1839be2cc9fcd096988b24b4a61a36cfb5b8e94..dc2520b4982ee9071f887ee5ec652ed3d7bbeaa9 100644 --- a/extensions/grunt/package.json +++ b/extensions/grunt/package.json @@ -16,7 +16,7 @@ "watch": "gulp watch-extension:grunt" }, "dependencies": { - "vscode-nls": "^3.2.4" + "vscode-nls": "^4.0.0" }, "devDependencies": { "@types/node": "^8.10.25" diff --git a/extensions/grunt/yarn.lock b/extensions/grunt/yarn.lock index fe244123db7dc28fd97f07ed9602ed222618db4b..913d2622d188ad391993bad20d36a0a2a7fad3e6 100644 --- a/extensions/grunt/yarn.lock +++ b/extensions/grunt/yarn.lock @@ -6,6 +6,6 @@ version "8.10.25" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e" -vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" diff --git a/extensions/gulp/package.json b/extensions/gulp/package.json index 5c5656a126dc8bffcbb7098797ef752c99e9aa99..0c78e7fada018e2bb71d815ea6f633e73dc40cbb 100644 --- a/extensions/gulp/package.json +++ b/extensions/gulp/package.json @@ -16,7 +16,7 @@ "watch": "gulp watch-extension:gulp" }, "dependencies": { - "vscode-nls": "^3.2.4" + "vscode-nls": "^4.0.0" }, "devDependencies": { "@types/node": "^8.10.25" diff --git a/extensions/gulp/yarn.lock b/extensions/gulp/yarn.lock index fe244123db7dc28fd97f07ed9602ed222618db4b..913d2622d188ad391993bad20d36a0a2a7fad3e6 100644 --- a/extensions/gulp/yarn.lock +++ b/extensions/gulp/yarn.lock @@ -6,6 +6,6 @@ version "8.10.25" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e" -vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json index 4599b7e67bf341ffe5b48cff69a2b704424ba452..c479c3f9359f9b34dbff8cd841d00655f884b385 100644 --- a/extensions/html-language-features/package.json +++ b/extensions/html-language-features/package.json @@ -177,7 +177,7 @@ "dependencies": { "vscode-extension-telemetry": "0.0.18", "vscode-languageclient": "^5.1.0-next.9", - "vscode-nls": "^3.2.5" + "vscode-nls": "^4.0.0" }, "devDependencies": { "@types/node": "^8.10.25" diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json index 8260558933f73b2975c406d80b16d51e53587782..212c3e66399e909d85baaa2e0bf0dc4a50a5124a 100644 --- a/extensions/html-language-features/server/package.json +++ b/extensions/html-language-features/server/package.json @@ -13,7 +13,7 @@ "vscode-html-languageservice": "^2.1.7", "vscode-languageserver": "^5.1.0-next.5", "vscode-languageserver-types": "^3.10.0", - "vscode-nls": "^3.2.5", + "vscode-nls": "^4.0.0", "vscode-uri": "^1.0.6" }, "devDependencies": { diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock index 7211219f37f831005ab550869c372c6627350882..f3d0c4a98b78d094f261f9235c6685247e4f0da9 100644 --- a/extensions/html-language-features/server/yarn.lock +++ b/extensions/html-language-features/server/yarn.lock @@ -243,6 +243,10 @@ vscode-nls@^3.2.5: version "3.2.5" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" + vscode-uri@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.5.tgz#3b899a8ef71c37f3054d79bdbdda31c7bf36f20d" diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock index 4f9ad8f6aa3e880562ec38d417b5996e17778c06..0d575e41a3207d0b15adf9a1172ae8f7f74cfad6 100644 --- a/extensions/html-language-features/yarn.lock +++ b/extensions/html-language-features/yarn.lock @@ -56,9 +56,9 @@ vscode-languageserver-types@^3.13.0-next.1: version "3.13.0-next.1" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280" -vscode-nls@^3.2.5: - version "3.2.5" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" zone.js@0.7.6: version "0.7.6" diff --git a/extensions/jake/package.json b/extensions/jake/package.json index 34a149cf355995d027eea2c486192c94cad35d31..f35e49fee26b7e90b0a3a839c63c1871ccac984a 100644 --- a/extensions/jake/package.json +++ b/extensions/jake/package.json @@ -16,7 +16,7 @@ "watch": "gulp watch-extension:jake" }, "dependencies": { - "vscode-nls": "^3.2.4" + "vscode-nls": "^4.0.0" }, "devDependencies": { "@types/node": "^8.10.25" diff --git a/extensions/jake/yarn.lock b/extensions/jake/yarn.lock index fe244123db7dc28fd97f07ed9602ed222618db4b..913d2622d188ad391993bad20d36a0a2a7fad3e6 100644 --- a/extensions/jake/yarn.lock +++ b/extensions/jake/yarn.lock @@ -6,6 +6,6 @@ version "8.10.25" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e" -vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json index eaabe1ac9d201f93ecc4aaf576366a74765e2f61..99af0a42c57a473a2fad0490a26599827c6c6676 100644 --- a/extensions/json-language-features/package.json +++ b/extensions/json-language-features/package.json @@ -102,7 +102,7 @@ "dependencies": { "vscode-extension-telemetry": "0.0.18", "vscode-languageclient": "^5.1.0-next.9", - "vscode-nls": "^3.2.5" + "vscode-nls": "^4.0.0" }, "devDependencies": { "@types/node": "^8.10.25" diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json index 9efdc8931a6a6c8a325585176650c8de64757806..5d0708d1af2f1a2d14a878cf4e4d721aaf1b7c16 100644 --- a/extensions/json-language-features/server/package.json +++ b/extensions/json-language-features/server/package.json @@ -16,7 +16,7 @@ "request-light": "^0.2.3", "vscode-json-languageservice": "^3.1.6", "vscode-languageserver": "^5.1.0-next.3", - "vscode-nls": "^3.2.5", + "vscode-nls": "^4.0.0", "vscode-uri": "^1.0.6" }, "devDependencies": { diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock index cce1d336f7efeda7813e335ba3eb17b01a33f766..7ad4e279765b3701adfa72ed16b59ef04e971b9d 100644 --- a/extensions/json-language-features/server/yarn.lock +++ b/extensions/json-language-features/server/yarn.lock @@ -101,9 +101,9 @@ vscode-nls@^3.2.2, vscode-nls@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" -vscode-nls@^3.2.5: - version "3.2.5" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" vscode-uri@^1.0.5: version "1.0.5" diff --git a/extensions/json-language-features/yarn.lock b/extensions/json-language-features/yarn.lock index b1b343e67899c3f2feaf7a8483dedb72c6238a8b..6c37fe1c0981f2c22b834aeb9b3182013fa0240c 100644 --- a/extensions/json-language-features/yarn.lock +++ b/extensions/json-language-features/yarn.lock @@ -60,9 +60,9 @@ vscode-languageserver-types@^3.13.0-next.1: version "3.13.0-next.1" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280" -vscode-nls@^3.2.5: - version "3.2.5" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" zone.js@0.7.6: version "0.7.6" diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json index 81b65c21ac62f3d1237abb6a363f0644349d8408..cbf3b4755bd497a47d2048e1b77cb3983c349590 100644 --- a/extensions/merge-conflict/package.json +++ b/extensions/merge-conflict/package.json @@ -79,7 +79,7 @@ { "category": "%command.category%", "title": "%command.compare%", - "original":"Compare Current Conflict", + "original": "Compare Current Conflict", "command": "merge-conflict.compare" } ], @@ -100,9 +100,9 @@ } }, "dependencies": { - "vscode-nls": "^3.2.4" + "vscode-nls": "^4.0.0" }, "devDependencies": { "@types/node": "8.0.33" } -} \ No newline at end of file +} diff --git a/extensions/merge-conflict/yarn.lock b/extensions/merge-conflict/yarn.lock index 5b1dccc447c34e2e61ebbf9b7966bc495f7fb97f..888e8da826d546eb3d19677700909a419029ee38 100644 --- a/extensions/merge-conflict/yarn.lock +++ b/extensions/merge-conflict/yarn.lock @@ -6,6 +6,6 @@ version "8.0.33" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd" -vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" diff --git a/extensions/npm/package.json b/extensions/npm/package.json index 2e478c09e5ec71a0201c841cd3d23ac312a66662..ebaa3f9cd69c28e3e4eb2c7501f6798e374222d3 100644 --- a/extensions/npm/package.json +++ b/extensions/npm/package.json @@ -20,7 +20,7 @@ "jsonc-parser": "^1.0.0", "minimatch": "^3.0.4", "request-light": "^0.2.2", - "vscode-nls": "^3.2.4" + "vscode-nls": "^4.0.0" }, "devDependencies": { "@types/minimatch": "^3.0.3", diff --git a/extensions/npm/yarn.lock b/extensions/npm/yarn.lock index 395adb4e49648d8bfc672eaa2a776bcfe24a878e..0cb54a6c9ba7c57ad2a0e272d90e050faa47c3e8 100644 --- a/extensions/npm/yarn.lock +++ b/extensions/npm/yarn.lock @@ -93,6 +93,6 @@ vscode-nls@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" -vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" diff --git a/extensions/search-rg/package.json b/extensions/search-rg/package.json index a967105f8556d27a03881b4079fb5fdd24ee6787..db787871c9e69124001344236d689703f081ece4 100644 --- a/extensions/search-rg/package.json +++ b/extensions/search-rg/package.json @@ -14,7 +14,7 @@ "categories": [], "dependencies": { "vscode-extension-telemetry": "0.0.18", - "vscode-nls": "^3.2.4", + "vscode-nls": "^4.0.0", "vscode-ripgrep": "1.1.0" }, "devDependencies": { diff --git a/extensions/search-rg/yarn.lock b/extensions/search-rg/yarn.lock index 33381ca1f0dc5e41f0bf3c7392b1d0bb180965f4..453a2ba6ef4f8494754eebc9d34ab6ceab1b5a56 100644 --- a/extensions/search-rg/yarn.lock +++ b/extensions/search-rg/yarn.lock @@ -1545,9 +1545,9 @@ vscode-extension-telemetry@0.0.18: dependencies: applicationinsights "1.0.1" -vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" vscode-ripgrep@1.1.0: version "1.1.0" diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json index 50a132b565b182fcb689b29086d99c0e97a008c1..44f2bcce183886a11731c95102a2244bf478c6cd 100644 --- a/extensions/typescript-language-features/package.json +++ b/extensions/typescript-language-features/package.json @@ -19,7 +19,7 @@ "jsonc-parser": "^2.0.1", "semver": "5.5.1", "vscode-extension-telemetry": "0.0.18", - "vscode-nls": "^3.2.4" + "vscode-nls": "^4.0.0" }, "devDependencies": { "@types/node": "8.0.33", diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts index f2977dbb26357be0747fc34594e138a03b83a469..04bee73f6de01e18e5f8dfa6f43a71f9a7f1774e 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts @@ -395,7 +395,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType childProcess.once('error', (err: Error) => { this.lastError = err; this.error('Starting TSServer failed with error.', err); - vscode.window.showErrorMessage(localize('serverCouldNotBeStarted', 'TypeScript language server couldn\'t be started. Error message is: {0}', err.message || err)); + vscode.window.showErrorMessage(localize('serverCouldNotBeStarted', 'TypeScript language server couldn\'t be started. Error message is: {0}', err.message || err.name)); /* __GDPR__ "error" : { "${include}": [ diff --git a/extensions/typescript-language-features/yarn.lock b/extensions/typescript-language-features/yarn.lock index ccd1c649622d74802c914190ffee109bd424ff43..e0094482d5b502ad1cb7ad041cc94a4bdaa0a4bb 100644 --- a/extensions/typescript-language-features/yarn.lock +++ b/extensions/typescript-language-features/yarn.lock @@ -1552,9 +1552,9 @@ vscode-extension-telemetry@0.0.18: dependencies: applicationinsights "1.0.1" -vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" vscode@^1.1.10: version "1.1.17"