chore: update to Volar 2.3.1

volarjs · Jun 22, 2024 · b0d24c5 · b0d24c5
1 parent a9cecea
commit b0d24c5
Show file tree

Hide file tree

Showing 25 changed files with 141 additions and 141 deletions.
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
 		"@lerna-lite/publish": "latest",
 		"@tsslint/cli": "latest",
 		"@tsslint/config": "latest",
-		"@volar/language-service": "~2.3.0",
+		"@volar/language-service": "~2.3.1",
 		"typescript": "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.3.0"
+		"@volar/language-service": "~2.3.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.3.0"
+		"@volar/language-service": "~2.3.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.3.0"
+		"@volar/language-service": "~2.3.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.3.0"
+		"@volar/language-service": "~2.3.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.3.0"
+		"@volar/language-service": "~2.3.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {

diff --git a/packages/prettier/package.json b/packages/prettier/package.json
@@ -32,7 +32,7 @@
 		"prettier": "^3.0.3"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.3.0",
+		"@volar/language-service": "~2.3.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.3.0"
+		"@volar/language-service": "~2.3.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.3.0"
+		"@volar/language-service": "~2.3.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {

diff --git a/packages/pug/index.ts b/packages/pug/index.ts
@@ -1,5 +1,6 @@
-import type { Diagnostic, DiagnosticSeverity, Disposable, DocumentSelector, ProviderResult, LanguageServiceContext, LanguageServicePlugin, LanguageServicePluginInstance } from '@volar/language-service';
+import type { Diagnostic, DiagnosticSeverity, Disposable, DocumentSelector, LanguageServiceContext, LanguageServicePlugin, LanguageServicePluginInstance, ProviderResult } from '@volar/language-service';
 import { transformDocumentSymbol } from '@volar/language-service';
+import { getSourceRange } from '@volar/language-service/lib/utils/featureWorkers';
 import { create as createHtmlService } from 'volar-service-html';
 import type * as html from 'vscode-html-languageservice';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
@@ -111,10 +112,10 @@ export function create({
 				provideDocumentSymbols(document, token) {
 					return worker(document, async pugDoc => {
 
-						const htmlResult = await htmlService.provideDocumentSymbols?.(pugDoc.map.embeddedDocument, token) ?? [];
+						const htmlResult = await htmlService.provideDocumentSymbols?.(pugDoc.docs[1], token) ?? [];
 						const pugResult = htmlResult.map(htmlSymbol => transformDocumentSymbol(
 							htmlSymbol,
-							range => pugDoc.map.getSourceRange(range)
+							range => getSourceRange(pugDoc.docs, range)
 						)).filter((symbol): symbol is NonNullable<typeof symbol> => symbol !== undefined);
 
 						return pugResult;

diff --git a/packages/pug/lib/pugDocument.ts b/packages/pug/lib/pugDocument.ts
@@ -1,4 +1,5 @@
-import { SourceMap, SourceMapWithDocuments } from '@volar/language-service';
+import { defaultMapperFactory } from '@volar/language-service';
+import type { DocumentsAndMap } from '@volar/language-service/lib/utils/featureWorkers';
 import type * as html from 'vscode-html-languageservice';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { baseParse } from './baseParse';
@@ -11,18 +12,17 @@ export function register(htmlLs: html.LanguageService) {
 
 		const parsed = baseParse(pugCode);
 		const htmlTextDocument = TextDocument.create('foo.html', 'html', 0, parsed.htmlCode);
-		const sourceMap = new SourceMapWithDocuments(
+		const htmlDocument = htmlLs.parseHTMLDocument(htmlTextDocument);
+		const docs: DocumentsAndMap = [
 			parsed.pugTextDocument,
 			htmlTextDocument,
-			new SourceMap(parsed.mappings),
-		);
-		const htmlDocument = htmlLs.parseHTMLDocument(htmlTextDocument);
+			defaultMapperFactory(parsed.mappings),
+		];
 
 		return {
 			...parsed,
-			htmlTextDocument,
 			htmlDocument,
-			map: sourceMap,
+			docs,
 		};
 	};
 }
diff --git a/packages/pug/lib/services/completion.ts b/packages/pug/lib/services/completion.ts
@@ -2,6 +2,7 @@ import type * as html from 'vscode-html-languageservice';
 import { TextDocument } from 'vscode-html-languageservice';
 import type { PugDocument } from '../pugDocument';
 import { LanguageServiceContext, transformCompletionList } from '@volar/language-service';
+import { getGeneratedPositions, getSourceRange } from '@volar/language-service/lib/utils/featureWorkers';
 
 export function register(htmlLs: html.LanguageService) {
 
@@ -33,29 +34,26 @@ export function register(htmlLs: html.LanguageService) {
 			return htmlComplete;
 		}
 
-		const htmlPos = pugDoc.map.getGeneratedPosition(pos);
-		if (!htmlPos) {
-			return;
-		}
+		for (const htmlPos of getGeneratedPositions(pugDoc.docs, pos)) {
+			const htmlComplete = documentContext ? await htmlLs.doComplete2(
+				pugDoc.docs[1],
+				htmlPos,
+				pugDoc.htmlDocument,
+				documentContext,
+				options
+			) : htmlLs.doComplete(
+				pugDoc.docs[1],
+				htmlPos,
+				pugDoc.htmlDocument,
+				options
+			);
 
-		const htmlComplete = documentContext ? await htmlLs.doComplete2(
-			pugDoc.htmlTextDocument,
-			htmlPos,
-			pugDoc.htmlDocument,
-			documentContext,
-			options
-		) : htmlLs.doComplete(
-			pugDoc.htmlTextDocument,
-			htmlPos,
-			pugDoc.htmlDocument,
-			options
-		);
-
-		return transformCompletionList(
-			htmlComplete,
-			htmlRange => pugDoc.map.getSourceRange(htmlRange),
-			pugDoc.map.embeddedDocument,
-			serviceContext
-		);
+			return transformCompletionList(
+				htmlComplete,
+				htmlRange => getSourceRange(pugDoc.docs, htmlRange),
+				pugDoc.docs[1],
+				serviceContext
+			);
+		}
 	};
 }
diff --git a/packages/pug/lib/services/documentHighlight.ts b/packages/pug/lib/services/documentHighlight.ts
@@ -1,24 +1,23 @@
+import { transformLocations } from '@volar/language-service';
+import { getGeneratedPositions, getSourceRange } from '@volar/language-service/lib/utils/featureWorkers';
 import type * as html from 'vscode-html-languageservice';
 import type { PugDocument } from '../pugDocument';
-import { transformLocations } from '@volar/language-service';
 
 export function register(htmlLs: html.LanguageService) {
 	return (pugDoc: PugDocument, pos: html.Position) => {
 
-		const htmlPos = pugDoc.map.getGeneratedPosition(pos);
-		if (!htmlPos) {
-			return;
-		}
+		for (const htmlPos of getGeneratedPositions(pugDoc.docs, pos)) {
 
-		const htmlResult = htmlLs.findDocumentHighlights(
-			pugDoc.map.embeddedDocument,
-			htmlPos,
-			pugDoc.htmlDocument
-		);
+			const htmlResult = htmlLs.findDocumentHighlights(
+				pugDoc.docs[1],
+				htmlPos,
+				pugDoc.htmlDocument
+			);
 
-		return transformLocations(
-			htmlResult,
-			htmlRange => pugDoc.map.getSourceRange(htmlRange)
-		);
+			return transformLocations(
+				htmlResult,
+				htmlRange => getSourceRange(pugDoc.docs, htmlRange)
+			);
+		}
 	};
 }
diff --git a/packages/pug/lib/services/documentLinks.ts b/packages/pug/lib/services/documentLinks.ts
@@ -1,18 +1,19 @@
+import { transformLocations } from '@volar/language-service';
+import { getSourceRange } from '@volar/language-service/lib/utils/featureWorkers';
 import type * as html from 'vscode-html-languageservice';
 import type { PugDocument } from '../pugDocument';
-import { transformLocations } from '@volar/language-service';
 
 export function register(htmlLs: html.LanguageService) {
 	return (pugDoc: PugDocument, docContext: html.DocumentContext) => {
 
 		const htmlResult = htmlLs.findDocumentLinks(
-			pugDoc.map.embeddedDocument,
+			pugDoc.docs[1],
 			docContext
 		);
 
 		return transformLocations(
 			htmlResult,
-			htmlRange => pugDoc.map.getSourceRange(htmlRange)
+			htmlRange => getSourceRange(pugDoc.docs, htmlRange)
 		);
 	};
 }
diff --git a/packages/pug/lib/services/hover.ts b/packages/pug/lib/services/hover.ts
@@ -1,25 +1,24 @@
+import { transformHover } from '@volar/language-service';
+import { getGeneratedPositions, getSourceRange } from '@volar/language-service/lib/utils/featureWorkers';
 import type * as html from 'vscode-html-languageservice';
 import type { PugDocument } from '../pugDocument';
-import { transformHover } from '@volar/language-service';
 
 export function register(htmlLs: html.LanguageService) {
 	return (pugDoc: PugDocument, pos: html.Position, options?: html.HoverSettings | undefined) => {
 
-		const htmlPos = pugDoc.map.getGeneratedPosition(pos);
-		if (!htmlPos) {
-			return;
-		}
+		for (const htmlPos of getGeneratedPositions(pugDoc.docs, pos)) {
 
-		const htmlResult = htmlLs.doHover(
-			pugDoc.map.embeddedDocument,
-			htmlPos,
-			pugDoc.htmlDocument,
-			options
-		);
-		if (!htmlResult) {
-			return;
-		}
+			const htmlResult = htmlLs.doHover(
+				pugDoc.docs[1],
+				htmlPos,
+				pugDoc.htmlDocument,
+				options
+			);
+			if (!htmlResult) {
+				return;
+			}
 
-		return transformHover(htmlResult, htmlRange => pugDoc.map.getSourceRange(htmlRange));
+			return transformHover(htmlResult, htmlRange => getSourceRange(pugDoc.docs, htmlRange));
+		}
 	};
 }
diff --git a/packages/pug/lib/services/quoteComplete.ts b/packages/pug/lib/services/quoteComplete.ts
@@ -1,21 +1,20 @@
+import { getGeneratedPositions } from '@volar/language-service/lib/utils/featureWorkers';
 import type * as html from 'vscode-html-languageservice';
 import type { PugDocument } from '../pugDocument';
 
 export function register(htmlLs: html.LanguageService) {
 	return (pugDoc: PugDocument, pos: html.Position, options?: html.CompletionConfiguration | undefined) => {
 
-		const htmlStart = pugDoc.map.getGeneratedPosition(pos);
-		if (!htmlStart) {
-			return;
-		}
+		for (const htmlStart of getGeneratedPositions(pugDoc.docs, pos)) {
 
-		const text = htmlLs.doQuoteComplete(
-			pugDoc.htmlTextDocument,
-			htmlStart,
-			pugDoc.htmlDocument,
-			options
-		);
+			const text = htmlLs.doQuoteComplete(
+				pugDoc.docs[1],
+				htmlStart,
+				pugDoc.htmlDocument,
+				options
+			);
 
-		return text;
+			return text;
+		}
 	};
 }
diff --git a/packages/pug/lib/services/scanner.ts b/packages/pug/lib/services/scanner.ts
@@ -4,7 +4,7 @@ import type { PugDocument } from '../pugDocument';
 export function register(htmlLs: html.LanguageService) {
 	return (pugDoc: PugDocument, initialOffset = 0) => {
 
-		const htmlOffset = pugDoc.map.map.mappings
+		const htmlOffset = pugDoc.docs[2].mappings
 			.filter(mapping => mapping.sourceOffsets[0] >= initialOffset)
 			.sort((a, b) => a.generatedOffsets[0] - b.generatedOffsets[0])[0]
 			?.generatedOffsets[0];
@@ -13,21 +13,21 @@ export function register(htmlLs: html.LanguageService) {
 			return;
 		}
 
-		const htmlScanner = htmlLs.createScanner(pugDoc.htmlTextDocument.getText(), htmlOffset);
+		const htmlScanner = htmlLs.createScanner(pugDoc.docs[1].getText(), htmlOffset);
 
 		// @ts-expect-error
 		const scanner: html.Scanner = {
 			scan: () => {
 				return htmlScanner.scan();
 			},
 			getTokenOffset: () => {
-				for (const [offset] of pugDoc.map.map.getSourceOffsets(htmlScanner.getTokenOffset())) {
+				for (const [offset] of pugDoc.docs[2].toSourceLocation(htmlScanner.getTokenOffset())) {
 					return offset;
 				}
 				return -1;
 			},
 			getTokenEnd: () => {
-				for (const [offset] of pugDoc.map.map.getSourceOffsets(htmlScanner.getTokenEnd())) {
+				for (const [offset] of pugDoc.docs[2].toSourceLocation(htmlScanner.getTokenEnd())) {
 					return offset;
 				}
 				return -1;

diff --git a/packages/pug/lib/services/selectionRanges.ts b/packages/pug/lib/services/selectionRanges.ts
@@ -1,19 +1,24 @@
 import type * as html from 'vscode-html-languageservice';
 import type { PugDocument } from '../pugDocument';
 import { transformLocations } from '@volar/language-service';
+import { getGeneratedPositions, getSourceRange } from '@volar/language-service/lib/utils/featureWorkers';
 
 export function register(htmlLs: html.LanguageService) {
 	return (pugDoc: PugDocument, posArr: html.Position[]) => {
 
 		const htmlPosArr = posArr
-			.map(position => pugDoc.map.getGeneratedPosition(position))
+			.map(position => {
+				for (const pos of getGeneratedPositions(pugDoc.docs, position)) {
+					return pos;
+				}
+			})
 			.filter((v): v is NonNullable<typeof v> => !!v);
 
 		const htmlResult = htmlLs.getSelectionRanges(
-			pugDoc.map.embeddedDocument,
+			pugDoc.docs[1],
 			htmlPosArr
 		);
 
-		return transformLocations(htmlResult, htmlRange => pugDoc.map.getSourceRange(htmlRange));
+		return transformLocations(htmlResult, htmlRange => getSourceRange(pugDoc.docs, htmlRange));
 	};
 }
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.3.0",
+		"@volar/language-service": "~2.3.1",
 		"muggle-string": "^0.4.1",
 		"pug-lexer": "^5.0.1",
 		"pug-parser": "^6.0.0",