fix: correctly pass all unknown params for new TS protocol features

zardoy · zardoy · commit 149119c8bf6b · 2024-05-03T16:54:34.000+03:00
fixes #209
diff --git a/typescript/src/codeFixes.ts b/typescript/src/codeFixes.ts
@@ -5,7 +5,7 @@ import { findChildContainingPosition, getCancellationToken, getIndentFromPos, is
 import namespaceAutoImports from './namespaceAutoImports'
 
 export default (proxy: ts.LanguageService, languageService: ts.LanguageService, languageServiceHost: ts.LanguageServiceHost, c: GetConfig) => {
-    proxy.getCodeFixesAtPosition = (fileName, start, end, errorCodes, formatOptions, preferences) => {
+    proxy.getCodeFixesAtPosition = (fileName, start, end, errorCodes, formatOptions, preferences, ...args) => {
         const sourceFile = languageService.getProgram()!.getSourceFile(fileName)!
         const node = findChildContainingPosition(ts, sourceFile, start)
 
@@ -72,7 +72,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
                 },
             )
             toUnpatch.push(unpatch)
-            prior = languageService.getCodeFixesAtPosition(fileName, start, end, errorCodes, formatOptions, preferences)
+            prior = languageService.getCodeFixesAtPosition(fileName, start, end, errorCodes, formatOptions, preferences, ...args)
             prior = [...addNamespaceImports, ...prior]
             prior = _.sortBy(prior, ({ fixName }) => {
                 if (fixName.startsWith(importFixName)) {
@@ -82,7 +82,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
             })
             prior = prior.filter(x => x.fixName !== 'IGNORE')
         } catch (err) {
-            prior = languageService.getCodeFixesAtPosition(fileName, start, end, errorCodes, formatOptions, preferences)
+            prior = languageService.getCodeFixesAtPosition(fileName, start, end, errorCodes, formatOptions, preferences, ...args)
             setTimeout(() => {
                 // make sure we still get code fixes, but error is still getting reported
                 console.error(err)
diff --git a/typescript/src/completionEntryDetails.ts b/typescript/src/completionEntryDetails.ts
@@ -16,7 +16,7 @@ export default function completionEntryDetails(
     c: GetConfig,
     { enableMethodCompletion, completionsSymbolMap }: PrevCompletionsAdditionalData,
 ): ts.CompletionEntryDetails | undefined {
-    const [fileName, position, entryName, formatOptions, source, preferences, data] = inputArgs
+    const [fileName, position, entryName, formatOptions, source, preferences, data, ...args] = inputArgs
     lastResolvedCompletion.value = { name: entryName, range: prevCompletionsMap[entryName]?.range }
     const program = languageService.getProgram()
     const sourceFile = program?.getSourceFile(fileName)
@@ -54,6 +54,7 @@ export default function completionEntryDetails(
         source,
         preferences,
         data,
+        ...args,
     )
     if (detailPrepend) {
         prior ??= {
diff --git a/typescript/src/completionsAtPosition.ts b/typescript/src/completionsAtPosition.ts
@@ -68,6 +68,7 @@ export const getCompletionsAtPosition = (
     scriptSnapshot: ts.IScriptSnapshot,
     formatOptions: ts.FormatCodeSettings | undefined,
     additionalData: { scriptKind: ts.ScriptKind; compilerOptions: ts.CompilerOptions },
+    ...args: any[]
 ): GetCompletionAtPositionReturnType | undefined => {
     const prevCompletionsMap: PrevCompletionMap = {}
     const program = languageService.getProgram()
@@ -94,6 +95,8 @@ export const getCompletionsAtPosition = (
                     includeSymbol: true,
                 },
                 formatOptions,
+                //@ts-expect-error
+                ...args,
             )
         } finally {
             unpatch?.()
diff --git a/typescript/src/decorateEditsForFileRename.ts b/typescript/src/decorateEditsForFileRename.ts
@@ -4,8 +4,8 @@ import { GetConfig } from './types'
 import { approveCast, findChildContainingExactPosition } from './utils'
 
 export default (proxy: ts.LanguageService, languageService: ts.LanguageService, c: GetConfig) => {
-    proxy.getEditsForFileRename = (oldFilePath, newFilePath, formatOptions, preferences) => {
-        let edits = languageService.getEditsForFileRename(oldFilePath, newFilePath, formatOptions, preferences)
+    proxy.getEditsForFileRename = (oldFilePath, newFilePath, formatOptions, preferences, ...args) => {
+        let edits = languageService.getEditsForFileRename(oldFilePath, newFilePath, formatOptions, preferences, ...args)
         if (c('renameImportNameOfFileRename')) {
             const predictedNameFromPath = (p: string) => {
                 const input = p.split(/[/\\]/g).pop()!.replace(/\..+/, '')
diff --git a/typescript/src/decorateLinkedEditing.ts b/typescript/src/decorateLinkedEditing.ts
@@ -10,7 +10,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
               result: ts.LinkedEditingInfo
           }
         | undefined
-    proxy.getLinkedEditingRangeAtPosition = (fileName, position) => {
+    proxy.getLinkedEditingRangeAtPosition = (fileName, position, ...props) => {
         const scriptSnapshot = languageServiceHost.getScriptSnapshot(fileName)!
         const fileContent = scriptSnapshot.getText(0, scriptSnapshot.getLength())
         const lastChar = fileContent[position - 1]
@@ -37,7 +37,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
         }
         lastLinkedEditingRangeRequest = undefined
 
-        const prior = languageService.getLinkedEditingRangeAtPosition(fileName, position)
+        const prior = languageService.getLinkedEditingRangeAtPosition(fileName, position, ...props)
         if (!prior) return
         lastLinkedEditingRangeRequest = {
             pos: position,
diff --git a/typescript/src/decorateProxy.ts b/typescript/src/decorateProxy.ts
@@ -12,7 +12,7 @@ import decorateDefinitions from './definitions'
 import decorateDocumentHighlights from './documentHighlights'
 import completionEntryDetails from './completionEntryDetails'
 import { GetConfig, PluginCreateArg } from './types'
-import decorateWorkspaceSymbolSearch from './workspaceSymbolSearch'
+import decorateWorkspaceSymbolSearch from './decorateWorkspaceSymbolSearch'
 import decorateFormatFeatures from './decorateFormatFeatures'
 import libDomPatching from './libDomPatching'
 import decorateSignatureHelp from './decorateSignatureHelp'
@@ -51,9 +51,9 @@ export const decorateLanguageService = (
     let prevCompletionsMap: PrevCompletionMap
     let prevCompletionsAdditionalData: PrevCompletionsAdditionalData
 
-    proxy.getCompletionsAtPosition = (fileName, position, options, formatOptions) => {
+    proxy.getCompletionsAtPosition = (fileName, position, options, formatOptions, ...args) => {
         if (options?.triggerCharacter && typeof options.triggerCharacter !== 'string') {
-            return languageService.getCompletionsAtPosition(fileName, position, options)
+            return languageService.getCompletionsAtPosition(fileName, position, options, formatOptions, ...args)
         }
         const updateConfigCommand = 'updateConfig'
         if (options?.triggerCharacter?.startsWith(updateConfigCommand)) {
@@ -87,10 +87,21 @@ export const decorateLanguageService = (
         if (!scriptSnapshot) return
         const compilerOptions = languageServiceHost.getCompilationSettings()
         try {
-            const result = getCompletionsAtPosition(fileName, position, options, c, languageService, languageServiceHost, scriptSnapshot, formatOptions, {
-                scriptKind,
-                compilerOptions,
-            })
+            const result = getCompletionsAtPosition(
+                fileName,
+                position,
+                options,
+                c,
+                languageService,
+                languageServiceHost,
+                scriptSnapshot,
+                formatOptions,
+                {
+                    scriptKind,
+                    compilerOptions,
+                },
+                ...args,
+            )
             if (!result) return
             prevCompletionsMap = result.prevCompletionsMap
             prevCompletionsAdditionalData = result.prevCompletionsAdditionalData
diff --git a/typescript/src/decorateSignatureHelp.ts b/typescript/src/decorateSignatureHelp.ts
@@ -3,7 +3,7 @@ import { GetConfig } from './types'
 import { findChildContainingExactPosition } from './utils'
 
 export default (proxy: ts.LanguageService, languageService: ts.LanguageService, languageServiceHost: ts.LanguageServiceHost, c: GetConfig) => {
-    proxy.getSignatureHelpItems = (fileName, position, options) => {
+    proxy.getSignatureHelpItems = (fileName, position, options, ...props) => {
         const program = languageService.getProgram()!
         const sourceFile = program.getSourceFile(fileName)!
         let node: ts.Node | undefined
@@ -40,7 +40,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
         }
 
         if (!c('signatureHelp.excludeBlockScope') || options?.triggerReason?.kind !== 'invoked') {
-            return languageService.getSignatureHelpItems(fileName, position, options)
+            return languageService.getSignatureHelpItems(fileName, position, options, ...props)
         }
 
         node ??= findChildContainingExactPosition(sourceFile, position)
@@ -59,6 +59,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
                           kind: 'retrigger',
                       },
                   },
+            ...props,
         )
     }
 }
diff --git a/typescript/src/decorateWorkspaceSymbolSearch.ts b/typescript/src/decorateWorkspaceSymbolSearch.ts
@@ -2,10 +2,10 @@ import { GetConfig } from './types'
 import { getCancellationToken } from './utils'
 
 export default (proxy: ts.LanguageService, languageService: ts.LanguageService, c: GetConfig, languageServiceHost: ts.LanguageServiceHost) => {
-    proxy.getNavigateToItems = (searchValue, maxResultCount, fileName, excludeDtsFiles) => {
+    proxy.getNavigateToItems = (searchValue, maxResultCount, fileName, excludeDtsFiles, ...args) => {
         const workspaceSymbolSearchExcludePatterns = c('workspaceSymbolSearchExcludePatterns')
         if (workspaceSymbolSearchExcludePatterns.length === 0) {
-            return languageService.getNavigateToItems(searchValue, maxResultCount, fileName, excludeDtsFiles)
+            return languageService.getNavigateToItems(searchValue, maxResultCount, fileName, excludeDtsFiles, ...args)
         }
 
         const program = languageService.getProgram()!
@@ -25,6 +25,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
             searchValue,
             maxResultCount,
             excludeDtsFiles ?? false,
+            ...args
         )
     }
 }
diff --git a/typescript/src/definitions.ts b/typescript/src/definitions.ts
@@ -3,8 +3,8 @@ import { GetConfig } from './types'
 import { findChildContainingExactPosition } from './utils'
 
 export default (proxy: ts.LanguageService, languageService: ts.LanguageService, languageServiceHost: ts.LanguageServiceHost, c: GetConfig) => {
-    proxy.getDefinitionAndBoundSpan = (fileName, position) => {
-        const prior = languageService.getDefinitionAndBoundSpan(fileName, position)
+    proxy.getDefinitionAndBoundSpan = (fileName, position, ...props) => {
+        const prior = languageService.getDefinitionAndBoundSpan(fileName, position, ...props)
 
         if (c('removeModuleFileDefinitions') && prior) {
             prior.definitions = prior.definitions?.filter(def => {
diff --git a/typescript/src/documentHighlights.ts b/typescript/src/documentHighlights.ts
@@ -2,8 +2,8 @@ import { GetConfig } from './types'
 import { findChildContainingPosition } from './utils'
 
 export default (proxy: ts.LanguageService, languageService: ts.LanguageService, c: GetConfig) => {
-    proxy.getDocumentHighlights = (fileName, position, filesToSearch) => {
-        const prior = languageService.getDocumentHighlights(fileName, position, filesToSearch)
+    proxy.getDocumentHighlights = (fileName, position, filesToSearch, ...props) => {
+        const prior = languageService.getDocumentHighlights(fileName, position, filesToSearch, ...props)
         if (!prior) return
         if (prior.length !== 1 || c('disableUselessHighlighting') === 'disable') return prior
         const node = findChildContainingPosition(ts, languageService.getProgram()!.getSourceFile(fileName)!, position)
diff --git a/typescript/src/references.ts b/typescript/src/references.ts
@@ -2,8 +2,8 @@ import { GetConfig } from './types'
 import { findChildContainingPositionMaxDepth, approveCast, findChildContainingExactPosition, matchParents } from './utils'
 
 export default (proxy: ts.LanguageService, languageService: ts.LanguageService, c: GetConfig) => {
-    proxy.findReferences = (fileName, position) => {
-        let prior = languageService.findReferences(fileName, position)
+    proxy.findReferences = (fileName, position, ...props) => {
+        let prior = languageService.findReferences(fileName, position, ...props)
         if (!prior) return
         const program = languageService.getProgram()!
         if (c('removeDefinitionFromReferences')) {
diff --git a/typescript/src/semanticDiagnostics.ts b/typescript/src/semanticDiagnostics.ts
@@ -1,8 +1,8 @@
 import { GetConfig } from './types'
 
 export default (proxy: ts.LanguageService, languageService: ts.LanguageService, languageServiceHost: ts.LanguageServiceHost, c: GetConfig) => {
-    proxy.getSemanticDiagnostics = fileName => {
-        let prior = languageService.getSemanticDiagnostics(fileName)
+    proxy.getSemanticDiagnostics = (fileName, ...props) => {
+        let prior = languageService.getSemanticDiagnostics(fileName, ...props)
         if (c('supportTsDiagnosticDisableComment')) {
             const scriptSnapshot = languageServiceHost.getScriptSnapshot(fileName)!
             const firstLine = scriptSnapshot.getText(0, scriptSnapshot.getLength()).split(/\r?\n/)[0]!

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { GetConfig } from './types'`
`3`	`3`	`import { findChildContainingExactPosition } from './utils'`
`4`	`4`
`5`	`5`	`export default (proxy: ts.LanguageService, languageService: ts.LanguageService, languageServiceHost: ts.LanguageServiceHost, c: GetConfig) => {`
`6`		`- proxy.getSignatureHelpItems = (fileName, position, options) => {`
	`6`	`+ proxy.getSignatureHelpItems = (fileName, position, options, ...props) => {`
`7`	`7`	`const program = languageService.getProgram()!`
`8`	`8`	`const sourceFile = program.getSourceFile(fileName)!`
`9`	`9`	`let node: ts.Node \| undefined`
`@@ -40,7 +40,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`if (!c('signatureHelp.excludeBlockScope') \|\| options?.triggerReason?.kind !== 'invoked') {`
`43`		`- return languageService.getSignatureHelpItems(fileName, position, options)`
	`43`	`+ return languageService.getSignatureHelpItems(fileName, position, options, ...props)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`node ??= findChildContainingExactPosition(sourceFile, position)`
`@@ -59,6 +59,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,`
`59`	`59`	`kind: 'retrigger',`
`60`	`60`	`},`
`61`	`61`	`},`
	`62`	`+ ...props,`
`62`	`63`	`)`
`63`	`64`	`}`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@ import { GetConfig } from './types'`
`2`	`2`	`import { getCancellationToken } from './utils'`
`3`	`3`
`4`	`4`	`export default (proxy: ts.LanguageService, languageService: ts.LanguageService, c: GetConfig, languageServiceHost: ts.LanguageServiceHost) => {`
`5`		`- proxy.getNavigateToItems = (searchValue, maxResultCount, fileName, excludeDtsFiles) => {`
	`5`	`+ proxy.getNavigateToItems = (searchValue, maxResultCount, fileName, excludeDtsFiles, ...args) => {`
`6`	`6`	`const workspaceSymbolSearchExcludePatterns = c('workspaceSymbolSearchExcludePatterns')`
`7`	`7`	`if (workspaceSymbolSearchExcludePatterns.length === 0) {`
`8`		`- return languageService.getNavigateToItems(searchValue, maxResultCount, fileName, excludeDtsFiles)`
	`8`	`+ return languageService.getNavigateToItems(searchValue, maxResultCount, fileName, excludeDtsFiles, ...args)`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`const program = languageService.getProgram()!`
`@@ -25,6 +25,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,`
`25`	`25`	`searchValue,`
`26`	`26`	`maxResultCount,`
`27`	`27`	`excludeDtsFiles ?? false,`
	`28`	`+ ...args`
`28`	`29`	`)`
`29`	`30`	`}`
`30`	`31`	`}`