chore: update volar to 2.0.0-alpha.2

volarjs · Dec 7, 2023 · 567135a · 567135a
1 parent 621eb94
commit 567135a
Show file tree

Hide file tree

Showing 22 changed files with 198 additions and 196 deletions.
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
  "devDependencies": {
  "@lerna-lite/cli": "latest",
  "@lerna-lite/publish": "latest",
- "@volar/language-service": "2.0.0-alpha.0",
+ "@volar/language-service": "2.0.0-alpha.2",
  "typescript": "latest",
  "vscode-languageserver-protocol": "^3.17.5"
  }

diff --git a/packages/css/package.json b/packages/css/package.json
@@ -33,7 +33,7 @@
  "vscode-languageserver-textdocument": "^1.0.11"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git a/packages/emmet/package.json b/packages/emmet/package.json
@@ -29,7 +29,7 @@
  "volar-service-html": "0.0.18"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git a/packages/eslint/package.json b/packages/eslint/package.json
@@ -29,7 +29,7 @@
  "volar-service-typescript": "0.0.18"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0",
+ "@volar/language-service": "2.0.0-alpha.2",
  "eslint": "*"
  },
  "peerDependenciesMeta": {

diff --git a/packages/html/package.json b/packages/html/package.json
@@ -33,7 +33,7 @@
  "vscode-languageserver-textdocument": "^1.0.11"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git a/packages/json/package.json b/packages/json/package.json
@@ -32,7 +32,7 @@
  "vscode-languageserver-textdocument": "^1.0.11"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git a/packages/markdown/package.json b/packages/markdown/package.json
@@ -35,7 +35,7 @@
  "vscode-languageserver-textdocument": "^1.0.11"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git a/packages/markdown/src/index.ts b/packages/markdown/src/index.ts
@@ -154,7 +154,7 @@ export function create(): ServicePlugin {
  if (sourceFile?.virtualFile) {
  for (const virtualFile of Array.from(forEachEmbeddedFile(sourceFile.virtualFile[0]))) {
  if (virtualFile.languageId === 'markdown') {
- const document = context.documents.get(virtualFile.id, virtualFile.languageId, virtualFile.snapshot);
+ const document = context.documents.get(virtualFile.fileName, virtualFile.languageId, virtualFile.snapshot);
  newVersions.set(document.uri, document);
  }
  }
@@ -321,12 +321,12 @@ export function create(): ServicePlugin {
 
  function getTextDocument(uri: string, includeVirtualFile: boolean) {
  if (includeVirtualFile) {
- const virtualFile = context.language.files.getVirtualFile(uri)[0];
+ const virtualFile = context.language.files.getVirtualFile(context.env.uriToFileName(uri))[0];
  if (virtualFile) {
  return context.documents.get(uri, virtualFile.languageId, virtualFile.snapshot);
  }
  }
- const sourceFile = context.language.files.getSourceFile(uri);
+ const sourceFile = context.language.files.getSourceFile(context.env.uriToFileName(uri));
  if (sourceFile && !sourceFile.virtualFile) {
  return context.documents.get(uri, sourceFile.languageId, sourceFile.snapshot);
  }

diff --git a/packages/prettier/package.json b/packages/prettier/package.json
@@ -30,7 +30,7 @@
  "prettier": "^3.0.3"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0",
+ "@volar/language-service": "2.0.0-alpha.2",
  "prettier": "^2.2 || ^3.0"
  },
  "peerDependenciesMeta": {

diff --git a/packages/pretty-ts-errors/package.json b/packages/pretty-ts-errors/package.json
@@ -28,7 +28,7 @@
  "pretty-ts-errors-lsp": "^0.0.3"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git a/packages/prettyhtml/package.json b/packages/prettyhtml/package.json
@@ -28,7 +28,7 @@
  "@starptech/prettyhtml": "^0.10.0"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git a/packages/pug-beautify/package.json b/packages/pug-beautify/package.json
@@ -28,7 +28,7 @@
  "@johnsoncodehk/pug-beautify": "^0.2.2"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git a/packages/pug/package.json b/packages/pug/package.json
@@ -25,7 +25,7 @@
  "url": "https://github.com/johnsoncodehk"
  },
  "dependencies": {
- "@volar/language-service": "2.0.0-alpha.0",
+ "@volar/language-service": "2.0.0-alpha.2",
  "pug-lexer": "^5.0.1",
  "pug-parser": "^6.0.0",
  "volar-service-html": "0.0.18",

diff --git a/packages/sass-formatter/package.json b/packages/sass-formatter/package.json
@@ -28,7 +28,7 @@
  "sass-formatter": "^0.7.8"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json
@@ -33,7 +33,7 @@
  "vscode-uri": "^3.0.8"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git a/packages/tslint/package.json b/packages/tslint/package.json
@@ -29,7 +29,7 @@
  "volar-service-typescript": "0.0.18"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git a/packages/typescript-twoslash-queries/package.json b/packages/typescript-twoslash-queries/package.json
@@ -28,7 +28,7 @@
  "volar-service-typescript": "0.0.18"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git a/packages/typescript/package.json b/packages/typescript/package.json
@@ -38,8 +38,8 @@
  "vscode-uri": "^3.0.8"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0",
- "@volar/typescript": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2",
+ "@volar/typescript": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git a/packages/typescript/src/index.ts b/packages/typescript/src/index.ts
@@ -81,15 +81,16 @@ export function create(ts: typeof import('typescript/lib/tsserverlibrary')): Ser
  },
  ts,
  getTextDocument(uri) {
- const virtualFile = context.language.files.getVirtualFile(uri)[0];
+ const fileName = context.env.uriToFileName(uri);
+ const virtualFile = context.language.files.getVirtualFile(fileName)[0];
  if (virtualFile) {
  return context.documents.get(uri, virtualFile.languageId, virtualFile.snapshot);
  }
- const sourceFile = context.language.files.getSourceFile(uri);
+ const sourceFile = context.language.files.getSourceFile(fileName);
  if (sourceFile && !sourceFile.virtualFile) {
  return context.documents.get(uri, sourceFile.languageId, sourceFile.snapshot);
  }
- const snapshot = syntacticServiceHost.getScriptSnapshot(context.env.uriToFileName(uri));
+ const snapshot = syntacticServiceHost.getScriptSnapshot(fileName);
  if (snapshot) {
  let document = documents.get(snapshot);
  if (!document) {
@@ -251,37 +252,37 @@ export function create(ts: typeof import('typescript/lib/tsserverlibrary')): Ser
 
  if (created.projectUpdated) {
 
- const sourceScriptUris = new Set<string>();
- const normalizeUri = sys.useCaseSensitiveFileNames
+ const sourceScriptNames = new Set<string>();
+ const normalizeFileName = sys.useCaseSensitiveFileNames
  ? (id: string) => id
  : (id: string) => id.toLowerCase();
 
- updateSourceScriptUris();
+ updateSourceScriptFileNames();
 
  context.env.onDidChangeWatchedFiles?.((params) => {
  const someFileCreateOrDeiete = params.changes.some(change => change.type !== 2 satisfies typeof FileChangeType.Changed);
  if (someFileCreateOrDeiete) {
- updateSourceScriptUris();
+ updateSourceScriptFileNames();
  }
  for (const change of params.changes) {
- if (sourceScriptUris.has(normalizeUri(change.uri))) {
+ const fileName = context.env.uriToFileName(change.uri);
+ if (sourceScriptNames.has(normalizeFileName(fileName))) {
  created.projectUpdated?.(languageServiceHost.getCurrentDirectory());
  }
  }
  });
 
- function updateSourceScriptUris() {
- sourceScriptUris.clear();
+ function updateSourceScriptFileNames() {
+ sourceScriptNames.clear();
  for (const fileName of languageServiceHost.getScriptFileNames()) {
- const uri = context.env.fileNameToUri(fileName);
- const virtualFile = context.language.files.getVirtualFile(uri);
+ const virtualFile = context.language.files.getVirtualFile(fileName);
  if (virtualFile) {
- sourceScriptUris.add(normalizeUri(uri));
+ sourceScriptNames.add(normalizeFileName(fileName));
  continue;
  }
- const sourceFile = context.language.files.getSourceFile(uri);
+ const sourceFile = context.language.files.getSourceFile(fileName);
  if (sourceFile && !sourceFile.virtualFile) {
- sourceScriptUris.add(normalizeUri(uri));
+ sourceScriptNames.add(normalizeFileName(fileName));
  continue;
  }
  }
@@ -296,11 +297,12 @@ export function create(ts: typeof import('typescript/lib/tsserverlibrary')): Ser
  languageService,
  },
  getTextDocument(uri) {
- const virtualFile = context.language.files.getVirtualFile(uri)[0];
+ const fileName = context.env.uriToFileName(uri);
+ const virtualFile = context.language.files.getVirtualFile(fileName)[0];
  if (virtualFile) {
  return context.documents.get(uri, virtualFile.languageId, virtualFile.snapshot);
  }
- const sourceFile = context.language.files.getSourceFile(uri);
+ const sourceFile = context.language.files.getSourceFile(fileName);
  if (sourceFile && !sourceFile.virtualFile) {
  return context.documents.get(uri, sourceFile.languageId, sourceFile.snapshot);
  }

diff --git a/packages/vetur/package.json b/packages/vetur/package.json
@@ -29,7 +29,7 @@
  "vscode-html-languageservice": "^5.1.0"
  },
  "peerDependencies": {
- "@volar/language-service": "2.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {

diff --git 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.0.0-alpha.0"
+ "@volar/language-service": "2.0.0-alpha.2"
  },
  "peerDependenciesMeta": {
  "@volar/language-service": {