adopt vscode-nls 4.0.0

c2c5819f · Johannes Rieken · 13722b94 · c2c5819f · c2c5819f · c2c5819f
29 changed file
--- 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": [

--- 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"
--- 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",

--- 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"

--- 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": {

--- 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"

--- 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"

--- 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"
--- 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"

--- 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"
--- 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"

--- 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": {

--- 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"

--- 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"

--- 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"

--- 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"
--- 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"

--- 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": {

--- 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"

--- 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"

--- 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
+}
--- 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"
--- 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",

--- 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"
--- 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": {

--- 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"

--- 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",

--- 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}": [

--- 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"