Skip to content

fix(typescript-plugin): always pass rest parameters for future compatibility #5859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnsoncodehk merged 3 commits into from
Dec 12, 2025
Merged

fix(typescript-plugin): always pass rest parameters for future compatibility #5859

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f0ab41
fix(typescript-plugin): always pass rest parameters for future compat…
KazariEX Dec 12, 2025
771a989
Merge remote-tracking branch 'upstream/master' into fix/issue-5858
KazariEX Dec 12, 2025
fbb78dd
fix: update
KazariEX Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions packages/typescript-plugin/lib/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ export function preprocessLanguageService(
getCodeFixesAtPosition,
} = languageService;

languageService.getQuickInfoAtPosition = (fileName, position, maximumLength) => {
const result = getQuickInfoAtPosition(fileName, position, maximumLength);
languageService.getQuickInfoAtPosition = (fileName, position, ...rests) => {
const result = getQuickInfoAtPosition(fileName, position, ...rests);
if (!result) {
return result;
}
Expand Down Expand Up @@ -52,7 +52,7 @@ export function preprocessLanguageService(
(data: VueCodeInformation) => !!data.__importCompletion,
);
if (generatedOffset2 !== undefined) {
const extraInfo = getQuickInfoAtPosition(fileName, generatedOffset2, maximumLength);
const extraInfo = getQuickInfoAtPosition(fileName, generatedOffset2, ...rests);
if (extraInfo) {
result.tags ??= [];
result.tags.push(...extraInfo.tags ?? []);
Expand All @@ -61,8 +61,8 @@ export function preprocessLanguageService(
}
return result;
};
languageService.getSuggestionDiagnostics = fileName => {
const result = getSuggestionDiagnostics(fileName);
languageService.getSuggestionDiagnostics = (fileName, ...rests) => {
const result = getSuggestionDiagnostics(fileName, ...rests);
const language = getLanguage();
if (!language) {
return result;
Expand Down Expand Up @@ -100,8 +100,8 @@ export function preprocessLanguageService(
}
return result;
};
languageService.getCompletionsAtPosition = (fileName, position, preferences, formatOptions) => {
const result = getCompletionsAtPosition(fileName, position, preferences, formatOptions);
languageService.getCompletionsAtPosition = (fileName, position, ...rests) => {
const result = getCompletionsAtPosition(fileName, position, ...rests);
if (!result) {
return result;
}
Expand Down Expand Up @@ -130,7 +130,7 @@ export function preprocessLanguageService(
(data: VueCodeInformation) => !!data.__importCompletion,
);
if (generatedOffset2 !== undefined) {
const completion2 = getCompletionsAtPosition(fileName, generatedOffset2, preferences, formatOptions);
const completion2 = getCompletionsAtPosition(fileName, generatedOffset2, ...rests);
if (completion2) {
const nameToIndex = new Map(result.entries.map((entry, index) => [entry.name, index]));
for (const entry of completion2.entries) {
Expand All @@ -153,8 +153,8 @@ export function preprocessLanguageService(
}
return result;
};
languageService.getCodeFixesAtPosition = (fileName, start, end, errorCodes, formatOptions, preferences) => {
let result = getCodeFixesAtPosition(fileName, start, end, errorCodes, formatOptions, preferences);
languageService.getCodeFixesAtPosition = (fileName, start, end, errorCodes, ...rests) => {
let result = getCodeFixesAtPosition(fileName, start, end, errorCodes, ...rests);
// Property 'xxx' does not exist on type 'yyy'.ts(2339)
if (!errorCodes.includes(2339)) {
return result;
Expand Down Expand Up @@ -192,8 +192,7 @@ export function preprocessLanguageService(
generateRange2[0],
generateRange2[1],
[2304], // Cannot find name 'xxx'.ts(2304)
formatOptions,
preferences,
...rests,
);
importFixes = importFixes.filter(fix => fix.fixName === 'import');
result = result.concat(importFixes);
Expand Down Expand Up @@ -283,9 +282,9 @@ export function postprocessLanguageService<T>(
function getCompletionsAtPosition(
getCompletionsAtPosition: ts.LanguageService['getCompletionsAtPosition'],
): ts.LanguageService['getCompletionsAtPosition'] {
return (filePath, position, options, formattingSettings) => {
return (filePath, position, ...rests) => {
const fileName = filePath.replace(windowsPathReg, '/');
const result = getCompletionsAtPosition(fileName, position, options, formattingSettings);
const result = getCompletionsAtPosition(fileName, position, ...rests);
if (result) {
resolveCompletionResult(
ts,
Expand Down Expand Up @@ -327,8 +326,8 @@ export function postprocessLanguageService<T>(
function getDefinitionAndBoundSpan(
getDefinitionAndBoundSpan: ts.LanguageService['getDefinitionAndBoundSpan'],
): ts.LanguageService['getDefinitionAndBoundSpan'] {
return (fileName, position) => {
const result = getDefinitionAndBoundSpan(fileName, position);
return (fileName, position, ...rests) => {
const result = getDefinitionAndBoundSpan(fileName, position, ...rests);

const program = languageService.getProgram()!;
const sourceScript = language.scripts.get(asScriptId(fileName));
Expand Down Expand Up @@ -421,7 +420,7 @@ export function postprocessLanguageService<T>(
}

const pos = type.indexType.getStart(sourceFile);
const res = getDefinitionAndBoundSpan(fileName, pos);
const res = getDefinitionAndBoundSpan(fileName, pos, ...rests);
if (res?.definitions?.length) {
for (const definition of res.definitions) {
definitions.add(definition);
Expand Down