Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[css/json/html] adopt latest lsp, update to module: node16 (#230371)

Browse Source 
* adopt latest language-server/client

* update package-locks

* transpiler to support Node16
This commit is contained in:
Martin Aeschlimann
2024-10-03 13:49:56 +02:00
committed by GitHub
parent 52b181c2ce
commit fc6d94b806
35 changed files with 164 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/html-language-features/server/extension-browser.webpack.config.js
View File

@@ -15,6 +15,12 @@ const serverConfig = withBrowserDefaults({
entry: {
extension: './src/browser/htmlServerWorkerMain.ts',
},
resolve: {
extensionAlias: {
// this is needed to resolve dynamic imports that now require the .js extension
'.js': ['.js', '.ts'],
},
},
output: {
filename: 'htmlServerMain.js',
path: path.join(__dirname, 'dist', 'browser'),

32
extensions/html-language-features/server/package-lock.json generated
View File

@@ -12,7 +12,7 @@
"@vscode/l10n": "^0.0.18",
"vscode-css-languageservice": "^6.3.1",
"vscode-html-languageservice": "^5.3.1",
"vscode-languageserver": "10.0.0-next.6",
"vscode-languageserver": "^10.0.0-next.11",
"vscode-languageserver-textdocument": "^1.0.12",
"vscode-uri": "^3.0.8"
},
@@ -73,37 +73,37 @@
}
},
"node_modules/vscode-jsonrpc": {
"version": "9.0.0-next.4",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.4.tgz",
"integrity": "sha512-zSVIr58lJSMYKIsZ5P7GtBbv1eEx25eNyOf0NmEzxmn1GhUNJAVAb5hkA1poKUwj1FRMwN6CeyWxZypmr8SsQQ==",
"version": "9.0.0-next.6",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.6.tgz",
"integrity": "sha512-KCSvUNsFiVciG9iqjJKBZOd66CN3ZKohDlYRmoOi+pd8l15MFLZ8wRG4c+wuzePGba/8WcCG2TM+C/GVlvuaeA==",
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/vscode-languageserver": {
"version": "10.0.0-next.6",
"resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.6.tgz",
"integrity": "sha512-0Lh1nhQfSxo5Ob+ayYO1QTIsDix2/Lc72Urm1KZrCFxK5zIFYaEh3QFeM9oZih4Rzs0ZkQPXXnoHtpvs5GT+Zw==",
"version": "10.0.0-next.11",
"resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.11.tgz",
"integrity": "sha512-cmobSrVDYhlh/t02vz/bV8nNpds8mus5HnILULae2iAvOjoaJPnTAp0jJWoYdUqTpIVzT9JV6JMKqLEvdqpeqg==",
"dependencies": {
"vscode-languageserver-protocol": "3.17.6-next.6"
"vscode-languageserver-protocol": "3.17.6-next.11"
},
"bin": {
"installServerIntoExtension": "bin/installServerIntoExtension"
}
},
"node_modules/vscode-languageserver-protocol": {
"version": "3.17.6-next.6",
"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.6.tgz",
"integrity": "sha512-naxM9kc/phpl0kAFNVPejMUWUtzFXdPYY/BtQTYtfbBbHf8sceHOrKkmf6yynZRu1A4oFtRZNqV3wyFRTWqUHw==",
"version": "3.17.6-next.11",
"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.11.tgz",
"integrity": "sha512-GeJxEp1TiLsp79f8WG5n10wLViXfgFKb99hU9K8m7KDWM95/QFEqWkm79f9LVm54tUK74I91a9EeiQLCS/FABQ==",
"dependencies": {
"vscode-jsonrpc": "9.0.0-next.4",
"vscode-languageserver-types": "3.17.6-next.4"
"vscode-jsonrpc": "9.0.0-next.6",
"vscode-languageserver-types": "3.17.6-next.5"
}
},
"node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
"version": "3.17.6-next.4",
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.4.tgz",
"integrity": "sha512-SeJTpH/S14EbxOAVaOUoGVqPToqpRTld5QO5Ghig3AlbFJTFF9Wu7srHMfa85L0SX1RYAuuCSFKJVVCxDIk1/Q=="
"version": "3.17.6-next.5",
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.5.tgz",
"integrity": "sha512-QFmf3Yl1tCgUQfA77N9Me/LXldJXkIVypQbty2rJ1DNHQkC+iwvm4Z2tXg9czSwlhvv0pD4pbF5mT7WhAglolw=="
},
"node_modules/vscode-languageserver-textdocument": {
"version": "1.0.12",

2
extensions/html-language-features/server/package.json
View File

@@ -12,7 +12,7 @@
"@vscode/l10n": "^0.0.18",
"vscode-css-languageservice": "^6.3.1",
"vscode-html-languageservice": "^5.3.1",
"vscode-languageserver": "10.0.0-next.6",
"vscode-languageserver": "^10.0.0-next.11",
"vscode-languageserver-textdocument": "^1.0.12",
"vscode-uri": "^3.0.8"
},

2
extensions/html-language-features/server/src/browser/htmlServerWorkerMain.ts
View File

@@ -22,7 +22,7 @@ const messageHandler = async (e: any) => {
} else {
l10nLog.push(`l10n: No bundle configured.`);
}
await import('./htmlServerMain');
await import('./htmlServerMain.js');
if (self.onmessage !== messageHandler) {
pendingMessages.forEach(msg => self.onmessage?.(msg));
pendingMessages.length = 0;

2
extensions/html-language-features/server/src/modes/javascriptMode.ts
View File

@@ -22,7 +22,7 @@ function getLanguageServiceHost(scriptKind: ts.ScriptKind) {
const compilerOptions: ts.CompilerOptions = { allowNonTsExtensions: true, allowJs: true, lib: ['lib.es2020.full.d.ts'], target: ts.ScriptTarget.Latest, moduleResolution: ts.ModuleResolutionKind.Classic, experimentalDecorators: false };
let currentTextDocument = TextDocument.create('init', 'javascript', 1, '');
const jsLanguageService = import(/* webpackChunkName: "javascriptLibs" */ './javascriptLibs').then(libs => {
const jsLanguageService = import(/* webpackChunkName: "javascriptLibs" */ './javascriptLibs.js').then(libs => {
const host: ts.LanguageServiceHost = {
getCompilationSettings: () => compilerOptions,
getScriptFileNames: () => [currentTextDocument.uri, 'jquery'],

2
extensions/html-language-features/server/src/node/htmlServerNodeMain.ts
View File

@@ -16,7 +16,7 @@ async function setupMain() {
l10nLog.push(`l10n: Problems loading ${i10lLocation.toString()} : ${e}`);
}
}
await import('./htmlServerMain');
await import('./htmlServerMain.js');
l10nLog.forEach(console.log);
}
setupMain();

4
extensions/html-language-features/server/src/test/words.test.ts
View File

@@ -24,8 +24,8 @@ suite('HTML Language Configuration', () => {
value = value.substr(0, offset) + value.substring(offset + 1);
const actualRange = words.getWordAtText(value, offset, wordRegex);
assert(actualRange.start <= offset);
assert(actualRange.start + actualRange.length >= offset);
assert.ok(actualRange.start <= offset);
assert.ok(actualRange.start + actualRange.length >= offset);
assert.strictEqual(value.substr(actualRange.start, actualRange.length), expected);
}

3
extensions/html-language-features/server/tsconfig.json
View File

@@ -5,7 +5,8 @@
"lib": [
"ES2020",
"WebWorker"
]
],
"module": "Node16",
},
"include": [
"src/**/*"