Skip to content

Commit 2e559db

Browse files
committed
chore: bump next volar
1 parent 0e52a2d commit 2e559db

File tree

6 files changed

+109
-111
lines changed

6 files changed

+109
-111
lines changed

extensions/vscode/src/common.ts

-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
234234
lsp.activateAutoInsertion(selectors, client);
235235
lsp.activateDocumentDropEdit(selectors, client);
236236
lsp.activateWriteVirtualFiles('vue.action.writeVirtualFiles', client);
237-
lsp.activateServerSys(client);
238237

239238
if (!enabledHybridMode) {
240239
lsp.activateTsConfigStatusItem(selectors, 'vue.tsconfig', client);

package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
},
3232
"pnpm": {
3333
"overrides": {
34-
"@volar/kit": "https://pkg.pr.new/volarjs/volar.js/@volar/kit@7f93034",
35-
"@volar/language-core": "https://pkg.pr.new/volarjs/volar.js/@volar/language-core@7f93034",
36-
"@volar/language-server": "https://pkg.pr.new/volarjs/volar.js/@volar/language-server@7f93034",
37-
"@volar/language-service": "https://pkg.pr.new/volarjs/volar.js/@volar/language-service@7f93034",
38-
"@volar/source-map": "https://pkg.pr.new/volarjs/volar.js/@volar/source-map@7f93034",
39-
"@volar/typescript": "https://pkg.pr.new/volarjs/volar.js/@volar/typescript@7f93034",
40-
"@volar/vscode": "https://pkg.pr.new/volarjs/volar.js/@volar/vscode@7f93034",
34+
"@volar/kit": "https://pkg.pr.new/volarjs/volar.js/@volar/kit@ab44192",
35+
"@volar/language-core": "https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192",
36+
"@volar/language-server": "https://pkg.pr.new/volarjs/volar.js/@volar/language-server@ab44192",
37+
"@volar/language-service": "https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192",
38+
"@volar/source-map": "https://pkg.pr.new/volarjs/volar.js/@volar/source-map@ab44192",
39+
"@volar/typescript": "https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192",
40+
"@volar/vscode": "https://pkg.pr.new/volarjs/volar.js/@volar/vscode@ab44192",
4141
"volar-service-css": "https://pkg.pr.new/volarjs/services/volar-service-css@f520ee3",
4242
"volar-service-emmet": "https://pkg.pr.new/volarjs/services/volar-service-emmet@f520ee3",
4343
"volar-service-html": "https://pkg.pr.new/volarjs/services/volar-service-html@f520ee3",

packages/language-server/lib/hybridModeProject.ts

+5-6
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ export function createHybridModeProject(
2525
setup(_server) {
2626
server = _server;
2727
onSomePipeReadyCallbacks.push(() => {
28-
server.diagnosticsSupport?.refresh(project, false);
28+
server.languageFeatures.refreshDiagnostics(false);
2929
});
30-
server.onDidChangeWatchedFiles(({ changes }) => {
30+
server.fileWatcher.onDidChangeWatchedFiles(({ changes }) => {
3131
for (const change of changes) {
3232
const changeUri = URI.parse(change.uri);
3333
if (tsconfigProjects.has(changeUri)) {
@@ -90,11 +90,10 @@ export function createHybridModeProject(
9090
asFileName,
9191
});
9292
const language = createLanguage([
93-
{ getLanguageId: uri => server.documents.get(server.getSyncedDocumentKey(uri) ?? uri.toString())?.languageId },
93+
{ getLanguageId: uri => server.documents.get(uri)?.languageId },
9494
...languagePlugins,
9595
], createUriMap(), uri => {
96-
const documentKey = server.getSyncedDocumentKey(uri);
97-
const document = documentKey ? server.documents.get(documentKey) : undefined;
96+
const document = server.documents.get(uri);
9897
if (document) {
9998
language.scripts.set(uri, document.getSnapshot(), document.languageId);
10099
}
@@ -107,7 +106,7 @@ export function createHybridModeProject(
107106
return createLanguageService(
108107
language,
109108
server.languageServicePlugins,
110-
createLanguageServiceEnvironment(server, [...server.workspaceFolders.keys()]),
109+
createLanguageServiceEnvironment(server, [...server.workspaceFolders.all]),
111110
project
112111
);
113112
}

packages/language-server/lib/initialize.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export function initialize(
7070
watchingExtensions.add(ext);
7171
}
7272
fileWatcher?.then(dispose => dispose.dispose());
73-
fileWatcher = server.watchFiles(['**/*.{' + [...watchingExtensions].join(',') + '}']);
73+
fileWatcher = server.fileWatcher.watchFiles(['**/*.{' + [...watchingExtensions].join(',') + '}']);
7474
}
7575
}
7676
}

packages/language-service/lib/plugins/vue-document-drop.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function create(
1414
return {
1515
name: 'vue-document-drop',
1616
capabilities: {
17-
// documentDropEditsProvider: true,
17+
documentDropEditsProvider: true,
1818
},
1919
create(context): LanguageServicePluginInstance {
2020
if (!context.project.vue) {

0 commit comments

Comments
 (0)