Skip to content

Commit

Permalink
adopt vscode-nls 4.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@jrieken
jrieken committed Sep 6, 2018
1 parent 13722b9 commit c2c5819
Show file tree
Hide file tree
Showing 29 changed files with 60 additions and 56 deletions.
2 changes: 1 addition & 1 deletion extensions/configuration-editing/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"dependencies": {
"jsonc-parser": "2.0.2",
"vscode-nls": "^3.2.4"
"vscode-nls": "^4.0.0"
},
"contributes": {
"languages": [
Expand Down
6 changes: 3 additions & 3 deletions extensions/configuration-editing/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion extensions/css-language-features/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions extensions/css-language-features/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion extensions/git/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions extensions/git/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion extensions/grunt/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions extensions/grunt/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion extensions/gulp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions extensions/gulp/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion extensions/html-language-features/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion extensions/html-language-features/server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 4 additions & 0 deletions extensions/html-language-features/server/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions extensions/html-language-features/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion extensions/jake/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions extensions/jake/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion extensions/json-language-features/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion extensions/json-language-features/server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions extensions/json-language-features/server/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions extensions/json-language-features/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions extensions/merge-conflict/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
{
"category": "%command.category%",
"title": "%command.compare%",
"original":"Compare Current Conflict",
"original": "Compare Current Conflict",
"command": "merge-conflict.compare"
}
],
Expand All @@ -100,9 +100,9 @@
}
},
"dependencies": {
"vscode-nls": "^3.2.4"
"vscode-nls": "^4.0.0"
},
"devDependencies": {
"@types/node": "8.0.33"
}
}
}
6 changes: 3 additions & 3 deletions extensions/merge-conflict/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion extensions/npm/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions extensions/npm/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion extensions/search-rg/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions extensions/search-rg/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion extensions/typescript-language-features/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion extensions/typescript-language-features/src/typescriptServiceClient.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}": [
Expand Down
6 changes: 3 additions & 3 deletions extensions/typescript-language-features/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit c2c5819

Please sign in to comment.