diff --git a/package.json b/package.json index bceda47..c3354b8 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@lerna-lite/publish": "latest", "@tsslint/cli": "latest", "@tsslint/config": "latest", - "@volar/language-service": "~2.3.1", + "@volar/language-service": "~2.4.0-alpha.0", "typescript": "latest", "vitest": "latest" } diff --git a/packages/css/package.json b/packages/css/package.json index 9c64299..9379fe7 100644 --- a/packages/css/package.json +++ b/packages/css/package.json @@ -32,7 +32,7 @@ "@types/node": "latest" }, "peerDependencies": { - "@volar/language-service": "~2.3.1" + "@volar/language-service": "~2.4.0-alpha.0" }, "peerDependenciesMeta": { "@volar/language-service": { diff --git a/packages/emmet/package.json b/packages/emmet/package.json index 5ce8ddc..646b903 100644 --- a/packages/emmet/package.json +++ b/packages/emmet/package.json @@ -33,7 +33,7 @@ "@types/node": "latest" }, "peerDependencies": { - "@volar/language-service": "~2.3.1" + "@volar/language-service": "~2.4.0-alpha.0" }, "peerDependenciesMeta": { "@volar/language-service": { diff --git a/packages/html/package.json b/packages/html/package.json index 54b45fd..2aa15f6 100644 --- a/packages/html/package.json +++ b/packages/html/package.json @@ -32,7 +32,7 @@ "@types/node": "latest" }, "peerDependencies": { - "@volar/language-service": "~2.3.1" + "@volar/language-service": "~2.4.0-alpha.0" }, "peerDependenciesMeta": { "@volar/language-service": { diff --git a/packages/json/package.json b/packages/json/package.json index b571845..df9432b 100644 --- a/packages/json/package.json +++ b/packages/json/package.json @@ -31,7 +31,7 @@ "vscode-languageserver-textdocument": "^1.0.11" }, "peerDependencies": { - "@volar/language-service": "~2.3.1" + "@volar/language-service": "~2.4.0-alpha.0" }, "peerDependenciesMeta": { "@volar/language-service": { diff --git a/packages/markdown/index.ts b/packages/markdown/index.ts index f30fe53..cd54910 100644 --- a/packages/markdown/index.ts +++ b/packages/markdown/index.ts @@ -59,15 +59,16 @@ export function create({ resolveProvider: true, }, documentSymbolProvider: true, - // fileReferencesProvider: true foldingRangeProvider: true, hoverProvider: true, referencesProvider: true, + fileReferencesProvider: true, renameProvider: { prepareProvider: true, }, + fileRenameProvider: true, selectionRangeProvider: true, - workspaceSymbolProvider: true, + workspaceSymbolProvider: {}, }, create(context): LanguageServicePluginInstance { const logger: ILogger = { diff --git a/packages/markdown/package.json b/packages/markdown/package.json index a31da1b..b4e591b 100644 --- a/packages/markdown/package.json +++ b/packages/markdown/package.json @@ -34,7 +34,7 @@ "vscode-languageserver-textdocument": "^1.0.11" }, "peerDependencies": { - "@volar/language-service": "~2.3.1" + "@volar/language-service": "~2.4.0-alpha.0" }, "peerDependenciesMeta": { "@volar/language-service": { diff --git a/packages/prettier/package.json b/packages/prettier/package.json index 9bcf9a5..cde3b5a 100644 --- a/packages/prettier/package.json +++ b/packages/prettier/package.json @@ -32,7 +32,7 @@ "prettier": "^3.3.2" }, "peerDependencies": { - "@volar/language-service": "~2.3.1", + "@volar/language-service": "~2.4.0-alpha.0", "prettier": "^2.2 || ^3.0" }, "peerDependenciesMeta": { diff --git a/packages/prettyhtml/package.json b/packages/prettyhtml/package.json index b98d99a..30c4c71 100644 --- a/packages/prettyhtml/package.json +++ b/packages/prettyhtml/package.json @@ -27,7 +27,7 @@ "@starptech/prettyhtml": "^0.10.0" }, "peerDependencies": { - "@volar/language-service": "~2.3.1" + "@volar/language-service": "~2.4.0-alpha.0" }, "peerDependenciesMeta": { "@volar/language-service": { diff --git a/packages/pug-beautify/package.json b/packages/pug-beautify/package.json index 80b371a..1274225 100644 --- a/packages/pug-beautify/package.json +++ b/packages/pug-beautify/package.json @@ -27,7 +27,7 @@ "@johnsoncodehk/pug-beautify": "^0.2.2" }, "peerDependencies": { - "@volar/language-service": "~2.3.1" + "@volar/language-service": "~2.4.0-alpha.0" }, "peerDependenciesMeta": { "@volar/language-service": { diff --git a/packages/pug/package.json b/packages/pug/package.json index 709fa12..4a8b943 100644 --- a/packages/pug/package.json +++ b/packages/pug/package.json @@ -24,7 +24,7 @@ "url": "https://github.com/johnsoncodehk" }, "dependencies": { - "@volar/language-service": "~2.3.1", + "@volar/language-service": "~2.4.0-alpha.0", "muggle-string": "^0.4.1", "pug-lexer": "^5.0.1", "pug-parser": "^6.0.0", diff --git a/packages/sass-formatter/package.json b/packages/sass-formatter/package.json index 4f31a38..1a5d714 100644 --- a/packages/sass-formatter/package.json +++ b/packages/sass-formatter/package.json @@ -27,7 +27,7 @@ "sass-formatter": "^0.7.9" }, "peerDependencies": { - "@volar/language-service": "~2.3.1" + "@volar/language-service": "~2.4.0-alpha.0" }, "peerDependenciesMeta": { "@volar/language-service": { diff --git a/packages/typescript-twoslash-queries/package.json b/packages/typescript-twoslash-queries/package.json index 26ff4d4..8b3c844 100644 --- a/packages/typescript-twoslash-queries/package.json +++ b/packages/typescript-twoslash-queries/package.json @@ -30,7 +30,7 @@ "volar-service-typescript": "0.0.54" }, "peerDependencies": { - "@volar/language-service": "~2.3.1" + "@volar/language-service": "~2.4.0-alpha.0" }, "peerDependenciesMeta": { "@volar/language-service": { diff --git a/packages/typescript/lib/configs/getUserPreferences.ts b/packages/typescript/lib/configs/getUserPreferences.ts index b5e4035..c4ef533 100644 --- a/packages/typescript/lib/configs/getUserPreferences.ts +++ b/packages/typescript/lib/configs/getUserPreferences.ts @@ -4,6 +4,7 @@ import type { TextDocument } from 'vscode-languageserver-textdocument'; import { getConfigTitle } from '../shared'; import type { LanguageServiceContext } from '@volar/language-service'; import { URI } from 'vscode-uri'; +import type * as _ from '@volar/typescript'; export async function getUserPreferences( ctx: LanguageServiceContext, diff --git a/packages/typescript/lib/plugins/semantic.ts b/packages/typescript/lib/plugins/semantic.ts index 5721475..2ba1bff 100644 --- a/packages/typescript/lib/plugins/semantic.ts +++ b/packages/typescript/lib/plugins/semantic.ts @@ -105,6 +105,7 @@ export function create( renameProvider: { prepareProvider: true, }, + fileRenameProvider: true, codeActionProvider: { codeActionKinds: [ '' satisfies typeof CodeActionKind.Empty, @@ -127,7 +128,7 @@ export function create( hoverProvider: true, implementationProvider: true, referencesProvider: true, - // fileReferencesProvider: true, + fileReferencesProvider: true, documentHighlightProvider: true, semanticTokensProvider: { // https://code.visualstudio.com/api/language-extensions/semantic-highlight-guide#standard-token-types-and-modifiers @@ -156,8 +157,7 @@ export function create( ], }, }, - workspaceSymbolProvider: true, - // fileRenameEdits: true, + workspaceSymbolProvider: {}, signatureHelpProvider: { triggerCharacters: ['(', ',', '<'], retriggerCharacters: [')'], diff --git a/packages/typescript/package.json b/packages/typescript/package.json index cc9af88..672d96d 100644 --- a/packages/typescript/package.json +++ b/packages/typescript/package.json @@ -25,7 +25,8 @@ }, "devDependencies": { "@types/path-browserify": "latest", - "@types/semver": "latest" + "@types/semver": "latest", + "@volar/typescript": "~2.4.0-alpha.0" }, "dependencies": { "path-browserify": "^1.0.1", @@ -36,7 +37,7 @@ "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.1" + "@volar/language-service": "~2.4.0-alpha.0" }, "peerDependenciesMeta": { "@volar/language-service": { diff --git a/packages/vetur/package.json b/packages/vetur/package.json index 184020a..3c4282a 100644 --- a/packages/vetur/package.json +++ b/packages/vetur/package.json @@ -29,7 +29,7 @@ "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.1" + "@volar/language-service": "~2.4.0-alpha.0" }, "peerDependenciesMeta": { "@volar/language-service": { diff --git a/packages/yaml/package.json b/packages/yaml/package.json index 7aa14d4..1681ce3 100644 --- a/packages/yaml/package.json +++ b/packages/yaml/package.json @@ -31,7 +31,7 @@ "vscode-languageserver-textdocument": "^1.0.11" }, "peerDependencies": { - "@volar/language-service": "~2.3.1" + "@volar/language-service": "~2.4.0-alpha.0" }, "peerDependenciesMeta": { "@volar/language-service": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6aebc07..2865ef4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,8 +24,8 @@ importers: specifier: latest version: 1.0.13 '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 typescript: specifier: latest version: 5.5.2 @@ -36,8 +36,8 @@ importers: packages/css: dependencies: '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 vscode-css-languageservice: specifier: ^6.3.0 version: 6.3.0 @@ -61,8 +61,8 @@ importers: specifier: ^1.3.0 version: 1.3.0 '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 '@vscode/emmet-helper': specifier: ^2.9.3 version: 2.9.3 @@ -77,8 +77,8 @@ importers: packages/html: dependencies: '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 vscode-html-languageservice: specifier: ^5.3.0 version: 5.3.0 @@ -96,8 +96,8 @@ importers: packages/json: dependencies: '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 vscode-json-languageservice: specifier: ^5.4.0 version: 5.4.0 @@ -112,8 +112,8 @@ importers: packages/markdown: dependencies: '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 markdown-it: specifier: ^14.1.0 version: 14.1.0 @@ -137,8 +137,8 @@ importers: packages/prettier: dependencies: '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 vscode-uri: specifier: ^3.0.8 version: 3.0.8 @@ -156,14 +156,14 @@ importers: specifier: ^0.10.0 version: 0.10.0 '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 packages/pug: dependencies: '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 muggle-string: specifier: ^0.4.1 version: 0.4.1 @@ -193,8 +193,8 @@ importers: specifier: ^0.2.2 version: 0.2.2 '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 devDependencies: '@types/node': specifier: latest @@ -203,8 +203,8 @@ importers: packages/sass-formatter: dependencies: '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 sass-formatter: specifier: ^0.7.9 version: 0.7.9 @@ -212,8 +212,8 @@ importers: packages/typescript: dependencies: '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 path-browserify: specifier: ^1.0.1 version: 1.0.1 @@ -239,12 +239,15 @@ importers: '@types/semver': specifier: latest version: 7.5.8 + '@volar/typescript': + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 packages/typescript-twoslash-queries: dependencies: '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 vscode-uri: specifier: ^3.0.8 version: 3.0.8 @@ -256,8 +259,8 @@ importers: packages/vetur: dependencies: '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 vls: specifier: ^0.8.5 version: 0.8.5 @@ -275,8 +278,8 @@ importers: packages/yaml: dependencies: '@volar/language-service': - specifier: ~2.3.1 - version: 2.3.1 + specifier: ~2.4.0-alpha.0 + version: 2.4.0-alpha.0 vscode-uri: specifier: ^3.0.8 version: 3.0.8 @@ -924,14 +927,17 @@ packages: '@vitest/utils@1.6.0': resolution: {integrity: sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==} - '@volar/language-core@2.3.1': - resolution: {integrity: sha512-25CZ3ulM6jWgQsPQjKb7maKDlryvXWvsl7ytw4uj1Yyy17BgdiTWqMuNSxIODC3+/7IBOOGYoINC/1OOLACLLw==} + '@volar/language-core@2.4.0-alpha.0': + resolution: {integrity: sha512-cxjq/Hn3Bm4sU9nA5EB0bEm3quT9MmKEtggiIviTyfWXW/LhEYKLyOUQv8hPo3TdBWQfd+lw/1Mmg8l30HFxLA==} - '@volar/language-service@2.3.1': - resolution: {integrity: sha512-Ug02z8pnClC27HNI66tq5VOBJSTMaAaCHK+0a7X/uMPsxzLo9IrGGkPuRWN3s+CnsY7Ho7l+kd9kjVfvd3kB9A==} + '@volar/language-service@2.4.0-alpha.0': + resolution: {integrity: sha512-byJtJIEM4YCCJngOrP5/2+4QxR0pu5aPZyl9l0jsw4CixZY1YOZ6M7pGR5uM/ck5qDYUHOg9swyN2y0Z80bzpQ==} - '@volar/source-map@2.3.1': - resolution: {integrity: sha512-fU3IL19wRy5S5OaGq67ejSl+/xdMuOHgp9Rsp3OiOhLyg25CctLYDdGZ9Y3+MJ1iqTLDh94PdvdR1BZX6I0hNQ==} + '@volar/source-map@2.4.0-alpha.0': + resolution: {integrity: sha512-sVP18DjST+axol4/+N/ZvE0IWpp7VOb7s4n2pmNRN/r+X7+UApYhv9cheh0lMS8Yqd0e4RhjBk5ESrdULpjHIg==} + + '@volar/typescript@2.4.0-alpha.0': + resolution: {integrity: sha512-uBmX5+53dnfX5QD7FIARb2xhlBKUp8ejUwjKjt1df3zNDDo/GuPckRbXf6f8LhtXa9dP5FQxU4dC9FpBpzo5mw==} '@vscode/emmet-helper@2.9.3': resolution: {integrity: sha512-rB39LHWWPQYYlYfpv9qCoZOVioPCftKXXqrsyqN1mTWZM6dTnONT63Db+03vgrBbHzJN45IrgS/AGxw9iiqfEw==} @@ -4560,18 +4566,24 @@ snapshots: loupe: 2.3.7 pretty-format: 29.7.0 - '@volar/language-core@2.3.1': + '@volar/language-core@2.4.0-alpha.0': dependencies: - '@volar/source-map': 2.3.1 + '@volar/source-map': 2.4.0-alpha.0 - '@volar/language-service@2.3.1': + '@volar/language-service@2.4.0-alpha.0': dependencies: - '@volar/language-core': 2.3.1 + '@volar/language-core': 2.4.0-alpha.0 vscode-languageserver-protocol: 3.17.5 vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 - '@volar/source-map@2.3.1': {} + '@volar/source-map@2.4.0-alpha.0': {} + + '@volar/typescript@2.4.0-alpha.0': + dependencies: + '@volar/language-core': 2.4.0-alpha.0 + path-browserify: 1.0.1 + vscode-uri: 3.0.8 '@vscode/emmet-helper@2.9.3': dependencies: