Skip to content

Improve forward compatibility with TypeScript Compiler API #230

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
mizdra merged 1 commit into from
Aug 8, 2025
Merged

Improve forward compatibility with TypeScript Compiler API #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions packages/ts-plugin/src/language-service/feature/code-fix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export function getCodeFixesAtPosition(
resolver: Resolver,
config: CMKConfig,
): ts.LanguageService['getCodeFixesAtPosition'] {
// eslint-disable-next-line max-params
return (fileName, start, end, errorCodes, formatOptions, preferences) => {
return (...args) => {
const [fileName, start, end, errorCodes, formatOptions, preferences, ...rest] = args;
const prior = Array.from(
languageService.getCodeFixesAtPosition(
fileName,
Expand All @@ -25,6 +25,7 @@ export function getCodeFixesAtPosition(
errorCodes,
formatOptions,
createPreferencesForCompletion(preferences, config),
...rest,
),
);

Expand Down
19 changes: 6 additions & 13 deletions packages/ts-plugin/src/language-service/feature/completion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ export function getCompletionsAtPosition(
languageService: ts.LanguageService,
config: CMKConfig,
): ts.LanguageService['getCompletionsAtPosition'] {
return (fileName, position, options, formattingSettings) => {
return (...args) => {
const [fileName, position, options, ...rest] = args;
const prior = languageService.getCompletionsAtPosition(
fileName,
position,
createPreferencesForCompletion(options ?? {}, config),
Copy link

Copilot AI Aug 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] The destructuring pattern extracts options but then doesn't use it in the getCompletionsAtPosition call on line 12-17. Instead, options is processed through createPreferencesForCompletion and the rest parameters are spread. Consider making this more explicit by extracting only what's needed.

Suggested change
createPreferencesForCompletion(options ?? {}, config),
const [fileName, position, , ...rest] = args;
const prior = languageService.getCompletionsAtPosition(
fileName,
position,
createPreferencesForCompletion(args[2] ?? {}, config),

Copilot uses AI. Check for mistakes.
formattingSettings,
...rest,
);

if (!prior) return;
Expand Down Expand Up @@ -93,17 +94,9 @@ export function getCompletionEntryDetails(
resolver: Resolver,
config: CMKConfig,
): ts.LanguageService['getCompletionEntryDetails'] {
// eslint-disable-next-line max-params
return (fileName, position, entryName, formatOptions, source, preferences, data) => {
const details = languageService.getCompletionEntryDetails(
fileName,
position,
entryName,
formatOptions,
source,
preferences,
data,
);
return (...args) => {
const [fileName] = args;
const details = languageService.getCompletionEntryDetails(...args);
if (!details) return undefined;

if (config.namedExports && !config.prioritizeNamedImports && details.codeActions) {
Expand Down
13 changes: 3 additions & 10 deletions packages/ts-plugin/src/language-service/feature/refactor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,9 @@ export function getApplicableRefactors(
}

export function getEditsForRefactor(languageService: ts.LanguageService): ts.LanguageService['getEditsForRefactor'] {
// eslint-disable-next-line max-params
return (fileName, formatOptions, positionOrRange, refactorName, actionName, preferences) => {
const prior = languageService.getEditsForRefactor(
fileName,
formatOptions,
positionOrRange,
refactorName,
actionName,
preferences,
) ?? { edits: [] };
return (...args) => {
const [fileName, , , refactorName] = args;
const prior = languageService.getEditsForRefactor(...args) ?? { edits: [] };
if (isComponentFileName(fileName)) {
if (refactorName === createCssModuleFileRefactor.name) {
prior.edits.push(createNewCssModuleFileChange(getCssModuleFileName(fileName)));
Expand Down
5 changes: 3 additions & 2 deletions packages/ts-plugin/src/language-service/feature/semantic-diagnostic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ export function getSemanticDiagnostics(
getCSSModule: (path: string) => CSSModule | undefined,
config: CMKConfig,
): ts.LanguageService['getSemanticDiagnostics'] {
return (fileName: string) => {
const prior = languageService.getSemanticDiagnostics(fileName);
return (...args) => {
const [fileName] = args;
const prior = languageService.getSemanticDiagnostics(...args);
const script = language.scripts.get(fileName);
if (isCSSModuleScript(script)) {
const virtualCode = script.generated.root;
Expand Down
5 changes: 3 additions & 2 deletions packages/ts-plugin/src/language-service/feature/syntactic-diagnostic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ export function getSyntacticDiagnostics(
language: Language<string>,
languageService: ts.LanguageService,
): ts.LanguageService['getSyntacticDiagnostics'] {
return (fileName: string) => {
const prior = languageService.getSyntacticDiagnostics(fileName);
return (...args) => {
const [fileName] = args;
const prior = languageService.getSyntacticDiagnostics(...args);
const script = language.scripts.get(fileName);
if (isCSSModuleScript(script)) {
const virtualCode = script.generated.root;
Expand Down