Skip to content

Commit 6ece9d0

Browse files
committed
refactor(typescript-plugin): rename getFileId to asScriptId for consistency
1 parent 88cbc3a commit 6ece9d0

File tree

11 files changed

+19
-19
lines changed

11 files changed

+19
-19
lines changed

packages/language-service/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export function getFullLanguageServicePlugins(ts: typeof import('typescript')) {
105105
languageService,
106106
languageServiceHost: context.project.typescript.languageServiceHost,
107107
isTsPlugin: false,
108-
getFileId: s => context.project.typescript!.uriConverter.asUri(s),
108+
asScriptId: s => context.project.typescript!.uriConverter.asUri(s),
109109
};
110110
return {
111111
async collectExtractProps(...args) {

packages/typescript-plugin/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export = createLanguageServicePlugin(
143143
languageServiceHost: service[1],
144144
language: service[0],
145145
isTsPlugin: true,
146-
getFileId: (fileName: string) => fileName,
146+
asScriptId: (fileName: string) => fileName,
147147
};
148148
}
149149
}

packages/typescript-plugin/lib/requests/collectExtractProps.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ export function collectExtractProps(
66
fileName: string,
77
templateCodeRange: [number, number]
88
) {
9-
const { typescript: ts, languageService, language, isTsPlugin, getFileId } = this;
9+
const { typescript: ts, languageService, language, isTsPlugin, asScriptId } = this;
1010

11-
const sourceScript = language.scripts.get(getFileId(fileName));
11+
const sourceScript = language.scripts.get(asScriptId(fileName));
1212
if (!sourceScript?.generated) {
1313
return;
1414
}

packages/typescript-plugin/lib/requests/getComponentDirectives.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ export function getComponentDirectives(
66
this: RequestContext,
77
fileName: string
88
) {
9-
const { typescript: ts, language, languageService, getFileId } = this;
10-
const volarFile = language.scripts.get(getFileId(fileName));
9+
const { typescript: ts, language, languageService, asScriptId } = this;
10+
const volarFile = language.scripts.get(asScriptId(fileName));
1111
if (!(volarFile?.generated?.root instanceof VueVirtualCode)) {
1212
return;
1313
}

packages/typescript-plugin/lib/requests/getComponentEvents.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export function getComponentEvents(
77
fileName: string,
88
tag: string
99
) {
10-
const { typescript: ts, language, languageService, getFileId } = this;
11-
const volarFile = language.scripts.get(getFileId(fileName));
10+
const { typescript: ts, language, languageService, asScriptId } = this;
11+
const volarFile = language.scripts.get(asScriptId(fileName));
1212
if (!(volarFile?.generated?.root instanceof VueVirtualCode)) {
1313
return;
1414
}

packages/typescript-plugin/lib/requests/getComponentNames.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export function getComponentNames(
77
this: RequestContext,
88
fileName: string
99
) {
10-
const { typescript: ts, language, languageService, getFileId } = this;
11-
const volarFile = language.scripts.get(getFileId(fileName));
10+
const { typescript: ts, language, languageService, asScriptId } = this;
11+
const volarFile = language.scripts.get(asScriptId(fileName));
1212
if (!(volarFile?.generated?.root instanceof VueVirtualCode)) {
1313
return;
1414
}

packages/typescript-plugin/lib/requests/getComponentProps.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export function getComponentProps(
1717
fileName: string,
1818
tag: string
1919
) {
20-
const { typescript: ts, language, languageService, getFileId } = this;
21-
const volarFile = language.scripts.get(getFileId(fileName));
20+
const { typescript: ts, language, languageService, asScriptId } = this;
21+
const volarFile = language.scripts.get(asScriptId(fileName));
2222
if (!(volarFile?.generated?.root instanceof VueVirtualCode)) {
2323
return;
2424
}

packages/typescript-plugin/lib/requests/getElementAttrs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export function getElementAttrs(
77
fileName: string,
88
tagName: string
99
) {
10-
const { typescript: ts, language, languageService, getFileId } = this;
11-
const volarFile = language.scripts.get(getFileId(fileName));
10+
const { typescript: ts, language, languageService, asScriptId } = this;
11+
const volarFile = language.scripts.get(asScriptId(fileName));
1212
if (!(volarFile?.generated?.root instanceof VueVirtualCode)) {
1313
return;
1414
}

packages/typescript-plugin/lib/requests/getElementNames.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export function getElementNames(
77
this: RequestContext,
88
fileName: string
99
) {
10-
const { typescript: ts, language, languageService, getFileId } = this;
11-
const volarFile = language.scripts.get(getFileId(fileName));
10+
const { typescript: ts, language, languageService, asScriptId } = this;
11+
const volarFile = language.scripts.get(asScriptId(fileName));
1212
if (!(volarFile?.generated?.root instanceof VueVirtualCode)) {
1313
return;
1414
}

packages/typescript-plugin/lib/requests/getPropertiesAtLocation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ export function getPropertiesAtLocation(
99
fileName: string,
1010
position: number
1111
) {
12-
const { languageService, language, typescript: ts, isTsPlugin, getFileId } = this;
12+
const { languageService, language, typescript: ts, isTsPlugin, asScriptId } = this;
1313

1414
// mapping
15-
const file = language.scripts.get(getFileId(fileName));
15+
const file = language.scripts.get(asScriptId(fileName));
1616
if (file?.generated) {
1717
const virtualScript = file.generated.languagePlugin.typescript?.getServiceScript(file.generated.root);
1818
if (!virtualScript) {

packages/typescript-plugin/lib/requests/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ export interface RequestContext<T = any> {
77
languageServiceHost: ts.LanguageServiceHost;
88
language: Language<T>;
99
isTsPlugin: boolean;
10-
getFileId: (fileName: string) => T;
10+
asScriptId: (fileName: string) => T;
1111
}

0 commit comments

Comments
 (0)