Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#### :rocket: New Feature

- Add status bar item tracking compilation state. https://github.com/rescript-lang/rescript-vscode/pull/1119
- Add our own `rescript.json` validation that understands which compiler version is actually in use. https://github.com/rescript-lang/rescript-vscode/pull/1131

#### :house: Internal

Expand Down
64 changes: 32 additions & 32 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"author": "ReScript Team",
"license": "MIT",
"dependencies": {
"vscode-languageclient": "8.1.0-next.5"
"vscode-languageclient": "9.0.1"
}
}
6 changes: 5 additions & 1 deletion client/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,11 @@ export function activate(context: ExtensionContext) {

// Options to control the language client
let clientOptions: LanguageClientOptions = {
documentSelector: [{ scheme: "file", language: "rescript" }],
documentSelector: [
{ scheme: "file", language: "rescript" },
{ scheme: "file", pattern: "**/rescript.json" },
{ scheme: "file", pattern: "**/bsconfig.json" },
],
// We'll send the initial configuration in here, but this might be
// problematic because every consumer of the LS will need to mimic this.
// We'll leave it like this for now, but might be worth revisiting later on.
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 7 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@
"language-server"
],
"engines": {
"vscode": "^1.68.0"
"vscode": "^1.74.0"
},
"activationEvents": [
"onLanguage:rescript"
"onLanguage:rescript",
"onFile:**/rescript.json",
"onFile:**/bsconfig.json",
"workspaceContains:**/rescript.json",
"workspaceContains:**/bsconfig.json"
],
"main": "./client/out/extension",
"contributes": {
Expand All @@ -45,15 +49,6 @@
}
}
],
"jsonValidation": [
{
"fileMatch": [
"bsconfig.json",
"rescript.json"
],
"url": "https://raw.githubusercontent.com/rescript-lang/rescript-compiler/master/docs/docson/build-schema.json"
}
],
"commands": [
{
"command": "rescript-vscode.create_interface",
Expand Down Expand Up @@ -273,7 +268,7 @@
"devDependencies": {
"@types/node": "^20.19.13",
"@types/semver": "^7.7.0",
"@types/vscode": "1.68.0",
"@types/vscode": "1.74.0",
"esbuild": "^0.20.1",
"prettier": "^3.6.2",
"typescript": "^5.8.3"
Expand Down
137 changes: 136 additions & 1 deletion server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading