Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-17 23:35:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

[html/css/json] update services (#297113)

Browse Source
This commit is contained in:
Martin Aeschlimann
2026-02-23 23:17:23 +01:00
committed by GitHub
parent 74693a9e67
commit 36d424971f
15 changed files with 129 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,9 +10,9 @@
"license": "MIT",
"dependencies": {
"@vscode/l10n": "^0.0.18",
"vscode-css-languageservice": "^6.3.9",
"vscode-html-languageservice": "^5.6.1",
"vscode-languageserver": "^10.0.0-next.15",
"vscode-css-languageservice": "^6.3.10",
"vscode-html-languageservice": "^5.6.2",
"vscode-languageserver": "^10.0.0-next.16",
"vscode-languageserver-textdocument": "^1.0.12",
"vscode-uri": "^3.1.0"
},
@@ -54,9 +54,9 @@
"license": "MIT"
},
"node_modules/vscode-css-languageservice": {
"version": "6.3.9",
"resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.9.tgz",
"integrity": "sha512-1tLWfp+TDM5ZuVWht3jmaY5y7O6aZmpeXLoHl5bv1QtRsRKt4xYGRMmdJa5Pqx/FTkgRbsna9R+Gn2xE+evVuA==",
"version": "6.3.10",
"resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.10.tgz",
"integrity": "sha512-eq5N9Er3fC4vA9zd9EFhyBG90wtCCuXgRSpAndaOgXMh1Wgep5lBgRIeDgjZBW9pa+332yC9+49cZMW8jcL3MA==",
"license": "MIT",
"dependencies": {
"@vscode/l10n": "^0.0.18",
@@ -66,9 +66,9 @@
}
},
"node_modules/vscode-html-languageservice": {
"version": "5.6.1",
"resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.6.1.tgz",
"integrity": "sha512-5Mrqy5CLfFZUgkyhNZLA1Ye5g12Cb/v6VM7SxUzZUaRKWMDz4md+y26PrfRTSU0/eQAl3XpO9m2og+GGtDMuaA==",
"version": "5.6.2",
"resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.6.2.tgz",
"integrity": "sha512-ulCrSnFnfQ16YzvwnYUgEbUEl/ZG7u2eV27YhvLObSHKkb8fw1Z9cgsnUwjTEeDIdJDoTDTDpxuhQwoenoLNMg==",
"license": "MIT",
"dependencies": {
"@vscode/l10n": "^0.0.18",
@@ -78,33 +78,33 @@
}
},
"node_modules/vscode-jsonrpc": {
"version": "9.0.0-next.10",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.10.tgz",
"integrity": "sha512-P+UOjuG/B1zkLM+bGIdmBwSkDejxtgo6EjG0pIkwnFBI0a2Mb7od36uUu8CPbECeQuh+n3zGcNwDl16DhuJ5IA==",
"version": "9.0.0-next.11",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.11.tgz",
"integrity": "sha512-u6LElQNbSiE9OugEEmrUKwH6+8BpPz2S5MDHvQUqHL//I4Q8GPikKLOUf856UnbLkZdhxaPrExac1lA3XwpIPA==",
"license": "MIT",
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/vscode-languageserver": {
"version": "10.0.0-next.15",
"resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.15.tgz",
"integrity": "sha512-vs+bwci/lM83ZhrR9t8DcZ2AgS2CKx4i6Yw86teKKkqlzlrYWTixuBd9w6H/UP9s8EGBvii0jnbjQd6wsKJ0ig==",
"version": "10.0.0-next.16",
"resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.16.tgz",
"integrity": "sha512-RbsYDOhddv1NtBCAR7+oVxxCmOpQUHhrtgUE0xz6J+BJGSCkfOqBCyLUIwSjKk2rK9llxUj/pR5aL8QCsXrxow==",
"license": "MIT",
"dependencies": {
"vscode-languageserver-protocol": "3.17.6-next.15"
"vscode-languageserver-protocol": "3.17.6-next.16"
},
"bin": {
"installServerIntoExtension": "bin/installServerIntoExtension"
}
},
"node_modules/vscode-languageserver-protocol": {
"version": "3.17.6-next.15",
"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz",
"integrity": "sha512-aoWX1wwGCndzfrTRhGKVpKAPVy9+WYhUtZW/PJQfHODmVwhVwb4we68CgsQZRTl36t8ZqlSOO2c2TdBPW7hrCw==",
"version": "3.17.6-next.16",
"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.16.tgz",
"integrity": "sha512-kQTjXEuyxMbdmmZ3U+Lib3oUl12xEKNc73RtWxPSDS3TFtjVwt98Q1CUzfDA9EUpsA24M46Bl6q3sLe9AUOKyw==",
"license": "MIT",
"dependencies": {
"vscode-jsonrpc": "9.0.0-next.10",
"vscode-jsonrpc": "9.0.0-next.11",
"vscode-languageserver-types": "3.17.6-next.6"
}
},

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

@@ -10,9 +10,9 @@
"main": "./out/node/htmlServerMain",
"dependencies": {
"@vscode/l10n": "^0.0.18",
"vscode-css-languageservice": "^6.3.9",
"vscode-html-languageservice": "^5.6.1",
"vscode-languageserver": "^10.0.0-next.15",
"vscode-css-languageservice": "^6.3.10",
"vscode-html-languageservice": "^5.6.2",
"vscode-languageserver": "^10.0.0-next.16",
"vscode-languageserver-textdocument": "^1.0.12",
"vscode-uri": "^3.1.0"
},

15
extensions/html-language-features/server/src/htmlServer.ts
View File

@@ -8,7 +8,10 @@ import {
DocumentRangeFormattingRequest, Disposable, ServerCapabilities,
ConfigurationRequest, ConfigurationParams, DidChangeWorkspaceFoldersNotification,
DocumentColorRequest, ColorPresentationRequest, TextDocumentSyncKind, NotificationType, RequestType0, DocumentFormattingRequest, FormattingOptions, TextEdit,
TextDocumentContentRequest
TextDocumentContentRequest,
TextDocumentContentParams,
CancellationToken,
TextDocumentContentResult
} from 'vscode-languageserver';
import {
getLanguageModes, LanguageModes, Settings, TextDocument, Position, Diagnostic, WorkspaceFolder, ColorInformation,
@@ -52,7 +55,7 @@ interface AutoInsertParams {
}
namespace AutoInsertRequest {
export const type: RequestType<AutoInsertParams, string, any> = new RequestType('html/autoInsert');
export const type: RequestType<AutoInsertParams, string | null, any> = new RequestType('html/autoInsert');
}
// experimental: semantic tokens
@@ -590,16 +593,16 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
});
});
connection.onRequest(TextDocumentContentRequest.type, (params, token) => {
return runSafe(runtime, async () => {
connection.onRequest(TextDocumentContentRequest.type, (params: TextDocumentContentParams, token: CancellationToken) => {
return runSafe<TextDocumentContentResult>(runtime, async () => {
for (const languageMode of languageModes.getAllModes()) {
const content = await languageMode.getTextDocumentContent?.(params.uri);
if (content) {
return { text: content };
}
}
return null;
}, null, `Error while computing text document content for ${params.uri}`, token);
return { text: '' };
}, { text: '' }, `Error while computing text document content for ${params.uri}`, token);
});
// Listen on the connection