chore: update to Volar 2.4.0-alpha.1

volarjs · Jun 29, 2024 · 0d3f989 · 0d3f989
1 parent 7ccf0e8
commit 0d3f989
Show file tree

Hide file tree

Showing 19 changed files with 71 additions and 70 deletions.
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
 		"@lerna-lite/publish": "latest",
 		"@tsslint/cli": "latest",
 		"@tsslint/config": "latest",
-		"@volar/language-service": "~2.4.0-alpha.0",
+		"@volar/language-service": "~2.4.0-alpha.1",
 		"typescript": "latest",
 		"vitest": "latest"
 	}

diff --git a/packages/css/package.json b/packages/css/package.json
@@ -32,7 +32,7 @@
 		"@types/node": "latest"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.4.0-alpha.0"
+		"@volar/language-service": "~2.4.0-alpha.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {

diff --git a/packages/emmet/package.json b/packages/emmet/package.json
@@ -33,7 +33,7 @@
 		"@types/node": "latest"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.4.0-alpha.0"
+		"@volar/language-service": "~2.4.0-alpha.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {

diff --git a/packages/html/package.json b/packages/html/package.json
@@ -32,7 +32,7 @@
 		"@types/node": "latest"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.4.0-alpha.0"
+		"@volar/language-service": "~2.4.0-alpha.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {

diff --git 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.4.0-alpha.0"
+		"@volar/language-service": "~2.4.0-alpha.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {

diff --git 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.4.0-alpha.0"
+		"@volar/language-service": "~2.4.0-alpha.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {

diff --git a/packages/prettier/package.json b/packages/prettier/package.json
@@ -32,7 +32,7 @@
 		"prettier": "^3.3.2"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.4.0-alpha.0",
+		"@volar/language-service": "~2.4.0-alpha.1",
 		"prettier": "^2.2 || ^3.0"
 	},
 	"peerDependenciesMeta": {

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

diff --git 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.4.0-alpha.0"
+		"@volar/language-service": "~2.4.0-alpha.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {

diff --git a/packages/pug/package.json b/packages/pug/package.json
@@ -24,7 +24,7 @@
 		"url": "https://github.com/johnsoncodehk"
 	},
 	"dependencies": {
-		"@volar/language-service": "~2.4.0-alpha.0",
+		"@volar/language-service": "~2.4.0-alpha.1",
 		"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
@@ -27,7 +27,7 @@
 		"sass-formatter": "^0.7.9"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.4.0-alpha.0"
+		"@volar/language-service": "~2.4.0-alpha.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {

diff --git a/packages/typescript-twoslash-queries/package.json b/packages/typescript-twoslash-queries/package.json
@@ -30,7 +30,7 @@
 		"volar-service-typescript": "0.0.55"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.4.0-alpha.0"
+		"@volar/language-service": "~2.4.0-alpha.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {

diff --git a/packages/typescript/lib/configs/getUserPreferences.ts b/packages/typescript/lib/configs/getUserPreferences.ts
@@ -11,8 +11,8 @@ export async function getUserPreferences(
 	document: TextDocument
 ): Promise<ts.UserPreferences> {
 	let currentDirectory = '';
-	if (ctx.language.typescript) {
-		currentDirectory = ctx.language.typescript.languageServiceHost.getCurrentDirectory();
+	if (ctx.project.typescript) {
+		currentDirectory = ctx.project.typescript.languageServiceHost.getCurrentDirectory();
 	}
 	const uri = URI.parse(document.uri);
 	const documentUri = ctx.decodeEmbeddedDocumentUri(uri)?.[0] ?? uri;

diff --git a/packages/typescript/lib/plugins/semantic.ts b/packages/typescript/lib/plugins/semantic.ts
@@ -164,10 +164,11 @@ export function create(
 			},
 		},
 		create(context): LanguageServicePluginInstance<Provide> {
-			if (!context.language.typescript) {
+			if (!context.project.typescript) {
+				console.warn(`[volar] typescript-semantic requires typescript project.`);
 				return {};
 			}
-			const { sys, languageServiceHost, asFileName, asScriptId, getExtraServiceScript } = context.language.typescript;
+			const { sys, languageServiceHost, asFileName, asUri, getExtraServiceScript } = context.project.typescript;
 			const created = tsWithImportCache.createLanguageService(
 				ts,
 				sys,
@@ -193,7 +194,7 @@ export function create(
 						return context.encodeEmbeddedDocumentUri(sourceScript.id, extraServiceScript.code.id);
 					}
 
-					const uri = asScriptId(fileName);
+					const uri = asUri(fileName);
 					const sourceScript = context.language.scripts.get(uri);
 					const serviceScript = sourceScript?.generated?.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
 					if (sourceScript && serviceScript) {
@@ -916,7 +917,7 @@ export function create(
 					}
 					const token: ts.CancellationToken = {
 						isCancellationRequested() {
-							return ctx.language.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested() ?? false;
+							return ctx.project.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested() ?? false;
 						},
 						throwIfCancellationRequested() { },
 					};

diff --git a/packages/typescript/lib/semanticFeatures/semanticTokens.ts b/packages/typescript/lib/semanticFeatures/semanticTokens.ts
@@ -10,7 +10,7 @@ export function register(ts: typeof import('typescript'), ctx: SharedContext) {
 		const start = range ? document.offsetAt(range.start) : 0;
 		const length = range ? (document.offsetAt(range.end) - start) : document.getText().length;
 
-		if (ctx.language.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested()) {
+		if (ctx.project.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested()) {
 			return;
 		}
 		const response = safeCall(() => ctx.languageService.getEncodedSemanticClassifications(fileName, { start, length }, ts.SemanticClassificationFormat.TwentyTwenty));

diff --git a/packages/typescript/package.json b/packages/typescript/package.json
@@ -26,7 +26,7 @@
 	"devDependencies": {
 		"@types/path-browserify": "latest",
 		"@types/semver": "latest",
-		"@volar/typescript": "~2.4.0-alpha.0"
+		"@volar/typescript": "~2.4.0-alpha.1"
 	},
 	"dependencies": {
 		"path-browserify": "^1.0.1",
@@ -37,7 +37,7 @@
 		"vscode-uri": "^3.0.8"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.4.0-alpha.0"
+		"@volar/language-service": "~2.4.0-alpha.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {

diff --git a/packages/vetur/package.json b/packages/vetur/package.json
@@ -29,7 +29,7 @@
 		"vscode-uri": "^3.0.8"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.4.0-alpha.0"
+		"@volar/language-service": "~2.4.0-alpha.1"
 	},
 	"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.4.0-alpha.0"
+		"@volar/language-service": "~2.4.0-alpha.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {