fix: fix a few refactor regressions

johnsoncodehk · johnsoncodehk · commit 69be534eb20c · 2023-11-24T16:58:04.000+08:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,7 +8,7 @@
 			"request": "launch",
 			"runtimeExecutable": "${execPath}",
 			"args": [
-				"--extensionDevelopmentPath=${workspaceRoot}/packages/labs"
+				"--extensionDevelopmentPath=${workspaceRoot}/extensions/labs"
 			],
 			"outFiles": [
 				"${workspaceRoot}/extensions/labs/dist/**/*.js"
diff --git a/extensions/labs/src/extension.ts b/extensions/labs/src/extension.ts
@@ -1,4 +1,4 @@
-import * as vscode from 'vscode';
+import type * as vscode from 'vscode';
 import * as serverView from './views/serversView';
 import * as virtualFilesView from './views/virtualFilesView';
 
diff --git a/extensions/labs/src/views/serversView.ts b/extensions/labs/src/views/serversView.ts
@@ -1,12 +1,12 @@
-import { type ExportsInfoForLabs } from '@volar/vscode';
 import { LoadedTSFilesMetaRequest } from '@volar/language-server/protocol';
-import * as path from 'path';
+import type { ExportsInfoForLabs } from '@volar/vscode';
+import * as lsp from '@volar/vscode';
 import * as fs from 'fs';
 import * as os from 'os';
+import * as path from 'path';
 import * as vscode from 'vscode';
-import * as lsp from '@volar/vscode';
-import { useVolarExtensions, getIconPath } from '../common/shared';
 import { quickPick } from '../common/quickPick';
+import { getIconPath, useVolarExtensions } from '../common/shared';
 
 interface LanguageClientItem {
 	extension: vscode.Extension<ExportsInfoForLabs>;
diff --git a/extensions/labs/src/views/virtualFilesView.ts b/extensions/labs/src/views/virtualFilesView.ts
@@ -1,10 +1,10 @@
+import type { GetVirtualFilesRequest } from '@volar/language-server';
+import type * as lsp from '@volar/vscode';
 import type { ExportsInfoForLabs } from '@volar/vscode';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import * as lsp from '@volar/vscode';
 import { getIconPath, useVolarExtensions } from '../common/shared';
-import type { GetVirtualFilesRequest } from '@volar/language-server';
-import { sourceUriToVirtualUris, virtualUriToSourceUri, activate as activateShowVirtualFiles } from '../common/showVirtualFile';
+import { activate as activateShowVirtualFiles, sourceUriToVirtualUris, virtualUriToSourceUri } from '../common/showVirtualFile';
 
 interface LanguageClientItem {
 	extension: vscode.Extension<ExportsInfoForLabs>;
diff --git a/packages/language-server/lib/register/registerEditorFeatures.ts b/packages/language-server/lib/register/registerEditorFeatures.ts
@@ -47,7 +47,7 @@ export function registerEditorFeatures(
 		let content: string = '';
 		let codegenStacks: Stack[] = [];
 		const mappings: Record<string, Mapping<CodeInformation>[]> = {};
-		const [virtualFile] = languageService.context.project.fileProvider.getVirtualFile(params.virtualFileName);
+		const [virtualFile] = languageService.context.project.fileProvider.getVirtualFile(env.fileNameToUri(params.virtualFileName));
 		if (virtualFile) {
 			for (const map of languageService.context.documents.getMaps(virtualFile)) {
 				content = map.virtualFileDocument.getText();
diff --git a/packages/language-service/lib/types.ts b/packages/language-service/lib/types.ts
@@ -80,7 +80,7 @@ export type SemanticToken = [number, number, number, number, number];
 
 type ServiceProvide<P> = P extends undefined ? { provide?: undefined; } : { provide: P; };
 
-export type Service<P = any> = {
+export interface Service<P = any> {
 	(context: ServiceContext | undefined, modules: SharedModules | undefined): {
 		isAdditionalCompletion?: boolean; // volar specific
 		triggerCharacters?: string[];
@@ -132,7 +132,7 @@ export type Service<P = any> = {
 		transformCodeAction?(item: vscode.CodeAction): vscode.CodeAction | undefined; // volar specific
 		dispose?(): void;
 	} & ServiceProvide<P>;
-};
+}
 
 export interface AutoInsertionContext {
 	lastChange: {
diff --git a/packages/source-map/lib/buildMappings.ts b/packages/source-map/lib/buildMappings.ts
@@ -15,6 +15,7 @@ export function buildMappings<T>(chunks: Segment<T>[]) {
 			mapping[MappingKey.GENERATED_CODE_RANGE] = [length, length + segment[0].length];
 			mapping[MappingKey.DATA] = segment[3]!;
 			length += segment[0].length;
+			mappings.push(mapping);
 		}
 	}
 	return mappings;
diff --git a/packages/source-map/lib/sourceMap.ts b/packages/source-map/lib/sourceMap.ts
@@ -80,7 +80,7 @@ export class SourceMap<Data = any> {
 	private getMemoBasedOnRange(fromRange: CodeRangeKey) {
 		return fromRange === MappingKey.SOURCE_CODE_RANGE
 			? this.sourceCodeRangeMemo ??= this.createMemo(MappingKey.SOURCE_CODE_RANGE)
-			: this.generatedCodeRangeMemo ??= this.createMemo(MappingKey.SOURCE_CODE_RANGE);
+			: this.generatedCodeRangeMemo ??= this.createMemo(MappingKey.GENERATED_CODE_RANGE);
 	}
 
 	private createMemo(key: CodeRangeKey): RangeMemo<Data> {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import * as vscode from 'vscode';`
	`1`	`+import type * as vscode from 'vscode';`
`2`	`2`	`import * as serverView from './views/serversView';`
`3`	`3`	`import * as virtualFilesView from './views/virtualFilesView';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ export function buildMappings<T>(chunks: Segment<T>[]) {`
`15`	`15`	`mapping[MappingKey.GENERATED_CODE_RANGE] = [length, length + segment[0].length];`
`16`	`16`	`mapping[MappingKey.DATA] = segment[3]!;`
`17`	`17`	`length += segment[0].length;`
	`18`	`+ mappings.push(mapping);`
`18`	`19`	`}`
`19`	`20`	`}`
`20`	`21`	`return mappings;`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ export class SourceMap<Data = any> {`
`80`	`80`	`private getMemoBasedOnRange(fromRange: CodeRangeKey) {`
`81`	`81`	`return fromRange === MappingKey.SOURCE_CODE_RANGE`
`82`	`82`	`? this.sourceCodeRangeMemo ??= this.createMemo(MappingKey.SOURCE_CODE_RANGE)`
`83`		`- : this.generatedCodeRangeMemo ??= this.createMemo(MappingKey.SOURCE_CODE_RANGE);`
	`83`	`+ : this.generatedCodeRangeMemo ??= this.createMemo(MappingKey.GENERATED_CODE_RANGE);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`private createMemo(key: CodeRangeKey): RangeMemo<Data> {`