Skip to content

Commit

Permalink
Merge pull request rust-lang#18486 from Wilfred/update_minimum_vscode
Browse files Browse the repository at this point in the history
editors/code: Change minimum VS Code from 1.78 to 1.83
  • Loading branch information
lnicola authored Nov 8, 2024
2 parents 668f388 + cd6ddca commit f9d7f6d
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 25 deletions.
44 changes: 22 additions & 22 deletions src/tools/rust-analyzer/editors/code/package-lock.json

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

6 changes: 3 additions & 3 deletions src/tools/rust-analyzer/editors/code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
}
},
"engines": {
"vscode": "^1.78.0"
"vscode": "^1.83.0"
},
"enabledApiProposals": [],
"scripts": {
Expand All @@ -49,12 +49,12 @@
"anser": "^2.1.1",
"d3": "^7.8.5",
"d3-graphviz": "^5.0.2",
"vscode-languageclient": "^8.1.0"
"vscode-languageclient": "^9.0.1"
},
"devDependencies": {
"@tsconfig/strictest": "^2.0.1",
"@types/node": "~16.11.7",
"@types/vscode": "~1.78.1",
"@types/vscode": "~1.83",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@vscode/test-electron": "^2.3.8",
Expand Down
2 changes: 2 additions & 0 deletions src/tools/rust-analyzer/editors/code/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ class ExperimentalFeatures implements lc.StaticFeature {
_documentSelector: lc.DocumentSelector | undefined,
): void {}
dispose(): void {}
clear(): void {}
}

class OverrideFeatures implements lc.StaticFeature {
Expand All @@ -369,6 +370,7 @@ class OverrideFeatures implements lc.StaticFeature {
_documentSelector: lc.DocumentSelector | undefined,
): void {}
dispose(): void {}
clear(): void {}
}

function isCodeActionWithoutEditsAndCommands(value: any): boolean {
Expand Down

0 comments on commit f9d7f6d

Please sign in to comment.