Skip to content

Commit dbbc6f5

Browse files
committed
refactor(typescript-plugin): rename isRefAtLocation to isRefAtPosition and update references
1 parent 274d3fa commit dbbc6f5

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

packages/language-server/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ connection.onInitialize(params => {
129129
getImportPathForFile(...args) {
130130
return sendTsServerRequest('_vue:getImportPathForFile', args);
131131
},
132-
isRefAtLocation(...args) {
133-
return sendTsServerRequest('_vue:isRefAtLocation', args);
132+
isRefAtPosition(...args) {
133+
return sendTsServerRequest('_vue:isRefAtPosition', args);
134134
},
135135
getDocumentHighlights(fileName, position) {
136136
return sendTsServerRequest(

packages/language-service/lib/plugins/vue-autoinsert-dotvalue.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { resolveEmbeddedCode } from '../utils';
55

66
export function create(
77
ts: typeof import('typescript'),
8-
{ isRefAtLocation }: import('@vue/typescript-plugin/lib/requests').Requests,
8+
{ isRefAtPosition }: import('@vue/typescript-plugin/lib/requests').Requests,
99
): LanguageServicePlugin {
1010
return {
1111
name: 'vue-autoinsert-dotvalue',
@@ -60,7 +60,7 @@ export function create(
6060
}
6161
}
6262

63-
if (await isRefAtLocation(info.root.fileName, sourceOffset)) {
63+
if (await isRefAtPosition(info.root.fileName, sourceOffset)) {
6464
return '${1:.value}';
6565
}
6666
},

packages/typescript-plugin/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { getComponentSlots } from './lib/requests/getComponentSlots';
1212
import { getElementAttrs } from './lib/requests/getElementAttrs';
1313
import { getElementNames } from './lib/requests/getElementNames';
1414
import { getImportPathForFile } from './lib/requests/getImportPathForFile';
15-
import { isRefAtLocation } from './lib/requests/isRefAtLocation';
15+
import { isRefAtPosition } from './lib/requests/isRefAtPosition';
1616

1717
const windowsPathReg = /\\/g;
1818
const project2Service = new WeakMap<
@@ -23,14 +23,14 @@ const project2Service = new WeakMap<
2323
export = createLanguageServicePlugin(
2424
(ts, info) => {
2525
const vueOptions = getVueCompilerOptions();
26-
vue.writeGlobalTypes(vueOptions, ts.sys.writeFile);
2726
const languagePlugin = vue.createVueLanguagePlugin<string>(
2827
ts,
2928
info.languageServiceHost.getCompilationSettings(),
3029
vueOptions,
3130
id => id,
3231
);
3332

33+
vue.writeGlobalTypes(vueOptions, ts.sys.writeFile);
3434
addVueCommands();
3535

3636
return {
@@ -121,10 +121,10 @@ export = createLanguageServicePlugin(
121121
getImportPathForFile(ts, languageServiceHost, program, fileName, incomingFileName, preferences),
122122
);
123123
});
124-
session.addProtocolHandler('_vue:isRefAtLocation', request => {
125-
const [fileName, position]: Parameters<Requests['isRefAtLocation']> = request.arguments;
124+
session.addProtocolHandler('_vue:isRefAtPosition', request => {
125+
const [fileName, position]: Parameters<Requests['isRefAtPosition']> = request.arguments;
126126
const { language, program, sourceScript, virtualCode } = getLanguageServiceAndVirtualCode(fileName);
127-
return createResponse(isRefAtLocation(ts, language, program, sourceScript, virtualCode, position, true));
127+
return createResponse(isRefAtPosition(ts, language, program, sourceScript, virtualCode, position, true));
128128
});
129129
session.addProtocolHandler('_vue:getComponentDirectives', request => {
130130
const [fileName]: Parameters<Requests['getComponentDirectives']> = request.arguments;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ export interface Requests {
1212
incomingFileName: string,
1313
preferences: ts.UserPreferences,
1414
): Response<ReturnType<typeof import('./getImportPathForFile.js')['getImportPathForFile']>>;
15-
isRefAtLocation(
15+
isRefAtPosition(
1616
fileName: string,
1717
position: number,
1818
): Response<
19-
ReturnType<typeof import('./isRefAtLocation.js')['isRefAtLocation']>
19+
ReturnType<typeof import('./isRefAtPosition.js')['isRefAtPosition']>
2020
>;
2121
getComponentDirectives(fileName: string): Response<
2222
ReturnType<typeof import('./getComponentDirectives.js')['getComponentDirectives']>

packages/typescript-plugin/lib/requests/isRefAtLocation.ts renamed to packages/typescript-plugin/lib/requests/isRefAtPosition.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { isCompletionEnabled, type Language, type SourceScript, type VueVirtualCode } from '@vue/language-core';
44
import type * as ts from 'typescript';
55

6-
export function isRefAtLocation(
6+
export function isRefAtPosition(
77
ts: typeof import('typescript'),
88
language: Language,
99
program: ts.Program,

0 commit comments

Comments
 (0)