feat: ESLint supports (#2220)

vuejs · Dec 18, 2022 · e5f7b23 · e5f7b23
1 parent 4e8b0e4
commit e5f7b23
Show file tree

Hide file tree

Showing 20 changed files with 827 additions and 497 deletions.
diff --git a/packages/language-core/src/documentRegistry.ts b/packages/language-core/src/documentRegistry.ts
@@ -66,7 +66,7 @@ export function createDocumentRegistry() {
 			}
 		},
 
-		fromEmbeddedLocation: function* (fileName: string, offset: number) {
+		fromEmbeddedLocation: function* (fileName: string, offset: number, baseOnRight: boolean = false) {
 
 			if (fileName.endsWith('/__VLS_types.ts')) { // TODO: monkey fix
 				return;
@@ -78,7 +78,7 @@ export function createDocumentRegistry() {
 
 				const sourceMap = getSourceMap(mapped.sourceFile, mapped.embedded.mappings);
 
-				for (const vueRange of sourceMap.toSourceOffsets(offset)) {
+				for (const vueRange of sourceMap.toSourceOffsets(offset, baseOnRight)) {
 					yield {
 						fileName: mapped.sourceFile.fileName,
 						offset: vueRange[0],

diff --git a/packages/language-service/src/documents.ts b/packages/language-service/src/documents.ts
@@ -110,7 +110,7 @@ export class SourceMap<Data = undefined> extends SourceMapBase<Data> {
 		to: 'sourceRange' | 'generatedRange',
 		baseOffset: 'left' | 'right',
 	) {
-		for (const mapped of this.matcing(fromDoc.offsetAt(position), from, to)) {
+		for (const mapped of this.matcing(fromDoc.offsetAt(position), from, to, baseOffset === 'right')) {
 			if (!filter(mapped[1].data)) {
 				continue;
 			}
@@ -124,21 +124,15 @@ export class SourceMap<Data = undefined> extends SourceMapBase<Data> {
 	}
 
 	protected matchSourcePosition(position: vscode.Position, mapping: Mapping, baseOffset: 'left' | 'right') {
-		let offset = this.matchOffset(this.mappedDocument.offsetAt(position), mapping['generatedRange'], mapping['sourceRange']);
+		let offset = this.matchOffset(this.mappedDocument.offsetAt(position), mapping['generatedRange'], mapping['sourceRange'], baseOffset === 'right');
 		if (offset !== undefined) {
-			if (baseOffset === 'right') {
-				offset += (mapping.sourceRange[1] - mapping.sourceRange[0]) - (mapping.generatedRange[1] - mapping.generatedRange[0]);
-			}
 			return this.sourceDocument.positionAt(offset);
 		}
 	}
 
 	protected matchGeneratedPosition(position: vscode.Position, mapping: Mapping, baseOffset: 'left' | 'right') {
-		let offset = this.matchOffset(this.sourceDocument.offsetAt(position), mapping['sourceRange'], mapping['generatedRange']);
+		let offset = this.matchOffset(this.sourceDocument.offsetAt(position), mapping['sourceRange'], mapping['generatedRange'], baseOffset === 'right');
 		if (offset !== undefined) {
-			if (baseOffset === 'right') {
-				offset += (mapping.generatedRange[1] - mapping.generatedRange[0]) - (mapping.sourceRange[1] - mapping.sourceRange[0]);
-			}
 			return this.mappedDocument.positionAt(offset);
 		}
 	}

diff --git a/packages/source-map/src/index.ts b/packages/source-map/src/index.ts
@@ -82,27 +82,27 @@ export class SourceMapBase<Data = undefined> {
 	constructor(public readonly mappings: Mapping<Data>[]) {
 	}
 
-	public toSourceOffset(start: number) {
-		for (const mapped of this.matcing(start, 'generatedRange', 'sourceRange')) {
+	public toSourceOffset(start: number, baseOnRight: boolean = false) {
+		for (const mapped of this.matcing(start, 'generatedRange', 'sourceRange', baseOnRight)) {
 			return mapped;
 		}
 	}
 
-	public toGeneratedOffset(start: number) {
-		for (const mapped of this.matcing(start, 'sourceRange', 'generatedRange')) {
+	public toGeneratedOffset(start: number, baseOnRight: boolean = false) {
+		for (const mapped of this.matcing(start, 'sourceRange', 'generatedRange', baseOnRight)) {
 			return mapped;
 		}
 	}
 
-	public toSourceOffsets(start: number) {
-		return this.matcing(start, 'generatedRange', 'sourceRange');
+	public toSourceOffsets(start: number, baseOnRight: boolean = false) {
+		return this.matcing(start, 'generatedRange', 'sourceRange', baseOnRight);
 	}
 
-	public toGeneratedOffsets(start: number) {
-		return this.matcing(start, 'sourceRange', 'generatedRange');
+	public toGeneratedOffsets(start: number, baseOnRight: boolean = false) {
+		return this.matcing(start, 'sourceRange', 'generatedRange', baseOnRight);
 	}
 
-	public * matcing(startOffset: number, from: 'sourceRange' | 'generatedRange', to: 'sourceRange' | 'generatedRange') {
+	public * matcing(startOffset: number, from: 'sourceRange' | 'generatedRange', to: 'sourceRange' | 'generatedRange', baseOnRight: boolean) {
 
 		const memo = this.memo[from];
 
@@ -124,17 +124,21 @@ export class SourceMapBase<Data = undefined> {
 				}
 				skip.add(mapping);
 
-				const mapped = this.matchOffset(startOffset, mapping[from], mapping[to]);
+				const mapped = this.matchOffset(startOffset, mapping[from], mapping[to], baseOnRight);
 				if (mapped !== undefined) {
 					yield [mapped, mapping] as const;
 				}
 			}
 		}
 	}
 
-	public matchOffset(start: number, mappedFromRange: [number, number], mappedToRange: [number, number]): number | undefined {
+	public matchOffset(start: number, mappedFromRange: [number, number], mappedToRange: [number, number], baseOnRight: boolean): number | undefined {
 		if (start >= mappedFromRange[0] && start <= mappedFromRange[1]) {
-			return mappedToRange[0] + start - mappedFromRange[0];
+			let offset = mappedToRange[0] + start - mappedFromRange[0];
+			if (baseOnRight) {
+				offset += (mappedToRange[1] - mappedToRange[0]) - (mappedFromRange[1] - mappedFromRange[0]);
+			}
+			return offset;
 		}
 	}
 

diff --git a/packages/typescript/src/getProgram.ts b/packages/typescript/src/getProgram.ts
@@ -109,6 +109,7 @@ export function getProgram(
 					for (const end of core.mapper.fromEmbeddedLocation(
 						diagnostic.file.fileName,
 						diagnostic.start + diagnostic.length,
+						true,
 					)) {
 
 						if (end.mapping && !end.mapping.data.diagnostic)

diff --git a/packages/typescript/src/index.ts b/packages/typescript/src/index.ts
@@ -4,11 +4,18 @@ import * as embedded from '@volar/language-core';
 
 export function createLanguageService(host: embedded.LanguageServiceHost, mods: embedded.LanguageModule[]) {
 
+	type _LanguageService = {
+		__internal__: {
+			languageService: ts.LanguageService;
+			context: embedded.EmbeddedLanguageContext;
+		};
+	} & ts.LanguageService;
+
 	const core = embedded.createEmbeddedLanguageServiceHost(host, mods);
 	const ts = host.getTypeScriptModule();
 	const ls = ts.createLanguageService(core.typescriptLanguageServiceHost);
 
-	return new Proxy<Partial<ts.LanguageService>>({
+	return new Proxy<Partial<_LanguageService>>({
 		organizeImports,
 
 		// only support for .ts for now, not support for .vue
@@ -35,14 +42,19 @@ export function createLanguageService(host: embedded.LanguageServiceHost, mods:
 		// getEditsForRefactor: tsLanguageService.rawLs.getEditsForRefactor,
 
 		getProgram: () => getProgram(ts, core, ls),
+
+		__internal__: {
+			context: core,
+			languageService: ls,
+		},
 	}, {
 		get: (target: any, property: keyof ts.LanguageService) => {
 			if (property in target) {
 				return target[property];
 			}
 			return ls[property];
 		},
-	}) as ts.LanguageService;
+	}) as _LanguageService;
 
 	// apis
 	function organizeImports(args: ts.OrganizeImportsArgs, formatOptions: ts.FormatCodeSettings, preferences: ts.UserPreferences | undefined): ReturnType<ts.LanguageService['organizeImports']> {