Skip to content

Commit d1a56dd

Browse files
committed
upgrade lsp and vscode related packages to latest versions
1 parent e68574d commit d1a56dd

8 files changed

+141
-154
lines changed

client/package-lock.json

+35-35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"author": "chenglou",
88
"license": "MIT",
99
"dependencies": {
10-
"vscode-languageclient": "^7.0.0"
10+
"vscode-languageclient": "^8.0.1"
1111
}
1212
}

client/src/extension.ts

+17-14
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
LanguageClient,
1313
LanguageClientOptions,
1414
ServerOptions,
15+
State,
1516
TransportKind,
1617
} from "vscode-languageclient/node";
1718

@@ -113,18 +114,20 @@ export function activate(context: ExtensionContext) {
113114
// compilation has finished, and the most reliable source for that is the LS
114115
// server, that already keeps track of when the compiler finishes in order to
115116
// other provide fresh diagnostics.
116-
client.onReady().then(() => {
117-
context.subscriptions.push(
118-
client.onNotification("rescript/compilationFinished", () => {
119-
if (inCodeAnalysisState.active === true) {
120-
customCommands.codeAnalysisWithReanalyze(
121-
inCodeAnalysisState.activatedFromDirectory,
122-
diagnosticsCollection,
123-
diagnosticsResultCodeActions
124-
);
125-
}
126-
})
127-
);
117+
client.onDidChangeState(({ newState }) => {
118+
if (newState === State.Running) {
119+
context.subscriptions.push(
120+
client.onNotification("rescript/compilationFinished", () => {
121+
if (inCodeAnalysisState.active === true) {
122+
customCommands.codeAnalysisWithReanalyze(
123+
inCodeAnalysisState.activatedFromDirectory,
124+
diagnosticsCollection,
125+
diagnosticsResultCodeActions
126+
);
127+
}
128+
})
129+
);
130+
}
128131
});
129132

130133
return client;
@@ -223,12 +226,12 @@ export function activate(context: ExtensionContext) {
223226
commands.registerCommand("rescript-vscode.restart_language_server", () => {
224227
client.stop().then(() => {
225228
client = createLanguageClient();
226-
context.subscriptions.push(client.start());
229+
client.start();
227230
});
228231
});
229232

230233
// Start the client. This will also launch the server
231-
context.subscriptions.push(client.start());
234+
client.start();
232235

233236
// Autostart code analysis if wanted
234237
if (

package-lock.json

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"language-server"
2222
],
2323
"engines": {
24-
"vscode": "^1.55.0"
24+
"vscode": "^1.68.0"
2525
},
2626
"activationEvents": [
2727
"onLanguage:rescript"
@@ -164,7 +164,7 @@
164164
},
165165
"devDependencies": {
166166
"@types/node": "^14.14.41",
167-
"@types/vscode": "1.55.0",
167+
"@types/vscode": "1.68.0",
168168
"typescript": "^4.7.3"
169169
}
170170
}

server/package-lock.json

+34-49
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
},
1414
"dependencies": {
1515
"chokidar": "^3.5.1",
16-
"vscode-jsonrpc": "^5.0.1",
17-
"vscode-languageserver": "^7.0.0",
18-
"vscode-languageserver-protocol": "^3.16.0"
16+
"vscode-jsonrpc": "^8.0.1",
17+
"vscode-languageserver": "^8.0.1",
18+
"vscode-languageserver-protocol": "^3.17.1"
1919
},
2020
"scripts": {}
2121
}

0 commit comments

Comments
 (0)