fix: custom declare missing propertly code fix was always displayed even when it couldn't be applied

Author: zardoy

src/codeActionProvider.ts

@@ -42,7 +42,7 @@ export default () => {
             }
 
             if (context.triggerKind !== vscode.CodeActionTriggerKind.Invoke) return
-            const result = await getPossibleTwoStepRefactorings(range)
+            const result = await getPossibleTwoStepRefactorings(range, document, context.diagnostics)
             if (!result) return
             const { turnArrayIntoObject, extendedCodeActions } = result
             const codeActions: vscode.CodeAction[] = []
@@ -147,12 +147,13 @@ export default () => {
         await vscode.workspace.applyEdit(edit)
     })
 
-    async function getPossibleTwoStepRefactorings(range: vscode.Range, document = vscode.window.activeTextEditor!.document) {
+    async function getPossibleTwoStepRefactorings(range: vscode.Range, document: vscode.TextDocument, diagnostics: Readonly<vscode.Diagnostic[]>) {
         return sendCommand('getTwoStepCodeActions', {
             document,
             position: range.start,
             inputOptions: {
                 range: vscodeRangeToTs(document, range),
+                diagnostics: diagnostics.filter(({ source }) => source === 'ts').map(({ code }) => (typeof code === 'object' ? +code.value : +code!)),
             },
         })
     }

typescript/src/codeActions/getCodeActions.ts

@@ -80,6 +80,7 @@ export const getExtendedCodeActions = <T extends string | undefined>(
     // languageServiceHost: ts.LanguageServiceHost,
     formatOptions: ts.FormatCodeSettings | undefined,
     applyCodeActionTitle: T,
+    filterErrorCodes?: number[],
 ): T extends undefined ? ExtendedCodeAction[] : ApplyExtendedCodeActionResult => {
     const range = typeof positionOrRange !== 'number' && positionOrRange.pos !== positionOrRange.end ? positionOrRange : undefined
     const position = typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos
@@ -99,8 +100,14 @@ export const getExtendedCodeActions = <T extends string | undefined>(
     }
     return compact(
         extendedCodeActions.map(codeAction => {
-            if (!codeAction.codes && !codeAction.tryToApply(tryToApplyOptions)) return
-            return codeAction
+            if (
+                !filterErrorCodes ||
+                !codeAction.codes ||
+                (codeAction.codes.some(c => filterErrorCodes.includes(c)) && codeAction.tryToApply(tryToApplyOptions))
+            ) {
+                return codeAction
+            }
+            return
         }),
     ) as T extends undefined ? ExtendedCodeAction[] : never
 }

typescript/src/ipcTypes.ts

@@ -51,6 +51,7 @@ export type RequestInputTypes = {
     }
     getTwoStepCodeActions: {
         range: [number, number]
+        diagnostics: number[]
     }
     twoStepCodeActionSecondStep: {
         range: [number, number]

typescript/src/specialCommands/handle.ts

@@ -40,7 +40,7 @@ export default (
         const node = findChildContainingPosition(ts, sourceFile, position)
         const posEnd = { pos: specialCommandArg.range[0], end: specialCommandArg.range[1] }
 
-        const extendedCodeActions = getExtendedCodeActions(sourceFile, posEnd, languageService, undefined, undefined)
+        const extendedCodeActions = getExtendedCodeActions(sourceFile, posEnd, languageService, undefined, undefined, specialCommandArg.diagnostics)
         return {
             turnArrayIntoObject: objectIntoArrayConverters(posEnd, node, undefined),
             extendedCodeActions,