Skip to content

Commit c13433c

Browse files
Some upgrades and detect rescript.json files
1 parent c1b3031 commit c13433c

File tree

8 files changed

+180
-55
lines changed

8 files changed

+180
-55
lines changed

client/package-lock.json

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"author": "ReScript Team",
88
"license": "MIT",
99
"dependencies": {
10-
"vscode-languageclient": "8.1.0-next.5"
10+
"vscode-languageclient": "9.0.1"
1111
}
1212
}

client/src/extension.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,11 @@ export function activate(context: ExtensionContext) {
113113

114114
// Options to control the language client
115115
let clientOptions: LanguageClientOptions = {
116-
documentSelector: [{ scheme: "file", language: "rescript" }],
116+
documentSelector: [
117+
{ scheme: "file", language: "rescript" },
118+
{ scheme: "file", pattern: "**/rescript.json" },
119+
{ scheme: "file", pattern: "**/bsconfig.json" },
120+
],
117121
// We'll send the initial configuration in here, but this might be
118122
// problematic because every consumer of the LS will need to mimic this.
119123
// We'll leave it like this for now, but might be worth revisiting later on.

package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@
2222
"language-server"
2323
],
2424
"engines": {
25-
"vscode": "^1.68.0"
25+
"vscode": "^1.74.0"
2626
},
2727
"activationEvents": [
28-
"onLanguage:rescript"
28+
"onLanguage:rescript",
29+
"onFile:**/rescript.json",
30+
"onFile:**/bsconfig.json",
31+
"workspaceContains:**/rescript.json",
32+
"workspaceContains:**/bsconfig.json"
2933
],
3034
"main": "./client/out/extension",
3135
"contributes": {
@@ -45,15 +49,6 @@
4549
}
4650
}
4751
],
48-
"jsonValidation": [
49-
{
50-
"fileMatch": [
51-
"bsconfig.json",
52-
"rescript.json"
53-
],
54-
"url": "https://raw.githubusercontent.com/rescript-lang/rescript-compiler/master/docs/docson/build-schema.json"
55-
}
56-
],
5752
"commands": [
5853
{
5954
"command": "rescript-vscode.create_interface",
@@ -273,7 +268,7 @@
273268
"devDependencies": {
274269
"@types/node": "^20.19.13",
275270
"@types/semver": "^7.7.0",
276-
"@types/vscode": "1.68.0",
271+
"@types/vscode": "1.74.0",
277272
"esbuild": "^0.20.1",
278273
"prettier": "^3.6.2",
279274
"typescript": "^5.8.3"

server/package-lock.json

Lines changed: 124 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
"url": "https://github.com/rescript-lang/rescript-vscode/issues"
3131
},
3232
"dependencies": {
33+
"ajv": "^8.12.0",
34+
"ajv-formats": "^3.0.1",
3335
"semver": "^7.7.2",
3436
"vscode-jsonrpc": "^8.0.1",
3537
"vscode-languageserver": "^9.0.1",
36-
"vscode-languageserver-protocol": "^3.17.1"
38+
"vscode-languageserver-protocol": "^3.17.1",
39+
"vscode-languageserver-textdocument": "^1.0.11"
3740
}
3841
}

server/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
3-
"target": "es2019",
4-
"lib": ["ES2019"],
3+
"target": "es2022",
4+
"lib": ["ES2022"],
55
"module": "commonjs",
66
"moduleResolution": "node",
77
"sourceMap": true,

0 commit comments

Comments
 (0)