Improve verify.codeFixAvailable

Author: Andy Hanson

src/harness/fourslash.ts

@@ -2997,30 +2997,18 @@ Actual: ${stringify(fullActual)}`);
             }
         }
 
-        public verifyCodeFixAvailable(negative: boolean, info: FourSlashInterface.VerifyCodeFixAvailableOptions[] | undefined) {
+        public verifyCodeFixAvailable(info: FourSlashInterface.VerifyCodeFixAvailableOptions[]) {
             const codeFixes = this.getCodeFixes(this.activeFile.fileName);
-
-            if (negative) {
-                if (codeFixes.length) {
-                    this.raiseError(`verifyCodeFixAvailable failed - expected no fixes but found ${codeFixes.map(c => c.description)}.`);
+            assert.equal(info.length, codeFixes.length);
+            ts.zipWith(codeFixes, info, (fix, info) => {
+                assert.equal(fix.description, info.description);
+                this.assertObjectsEqual(fix.commands, info.commands);
+                for (const change of fix.changes) {
+                    for (const textChange of change.textChanges) {
+                        assert.deepEqual(Object.keys(textChange), ["span", "newText"], `Invalid textChange in codeFix: ${JSON.stringify(fix)}`);
+                    }
                 }
-                return;
-            }
-
-            if (!codeFixes.length) {
-                this.raiseError(`verifyCodeFixAvailable failed - expected code fixes but none found.`);
-            }
-            codeFixes.forEach(fix => fix.changes.forEach(change => {
-                assert.isObject(change, `Invalid change in code fix: ${JSON.stringify(fix)}`);
-                change.textChanges.forEach(textChange => assert.isObject(textChange, `Invalid textChange in codeFix: ${JSON.stringify(fix)}`));
-            }));
-            if (info) {
-                assert.equal(info.length, codeFixes.length);
-                ts.zipWith(codeFixes, info, (fix, info) => {
-                    assert.equal(fix.description, info.description);
-                    this.assertObjectsEqual(fix.commands, info.commands);
-                });
-            }
+            });
         }
 
         public verifyApplicableRefactorAvailableAtMarker(negative: boolean, markerName: string) {
@@ -4106,7 +4094,7 @@ namespace FourSlashInterface {
         }
 
         public codeFixAvailable(options?: VerifyCodeFixAvailableOptions[]) {
-            this.state.verifyCodeFixAvailable(this.negative, options);
+            this.state.verifyCodeFixAvailable(options);
         }
 
         public applicableRefactorAvailableAtMarker(markerName: string) {

tests/cases/fourslash/codeFixAddMissingMember8.ts

@@ -4,4 +4,4 @@
 ////declare var x: [1, 2];
 ////x.b;
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixAwaitInSyncFunction3.ts

@@ -9,4 +9,4 @@
 ////    },
 ////}
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixAwaitInSyncFunction4.ts

@@ -6,4 +6,4 @@
 ////    }
 ////}
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixAwaitShouldNotCrashIfNotInFunction.ts

@@ -2,4 +2,4 @@
 
 ////await a
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixCannotFindModule_notIfMissing.ts

@@ -8,4 +8,4 @@ test.setTypesRegistry({
 });
 
 // We only give the fix for an implicit-any module, not for a missing module.
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixClassExtendAbstractPrivateProperty.ts

@@ -12,4 +12,4 @@
 // 2) Make x private, and then insert.
 // 3) Make x not abstract.
 // So we offer no fixes.
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixClassImplementClassMemberAnonymousClass.ts

@@ -10,4 +10,4 @@
 //// }
 //// class C implements A {[| |]}
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixClassImplementInterfaceCallSignature.ts

@@ -5,6 +5,6 @@
 //// }
 //// class C implements I {[| |]}
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);
 
 

tests/cases/fourslash/codeFixClassImplementInterfaceConstructSignature.ts

@@ -5,6 +5,6 @@
 //// }
 //// class C implements I {[| |]}
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);
 
 

tests/cases/fourslash/codeFixClassImplementInterfaceDuplicateMember1.ts

@@ -9,4 +9,7 @@
 ////
 //// class C implements I1,I2 {[| |]}
 
-verify.codeFixAvailable();
+verify.codeFixAvailable([
+    { description: "Implement interface 'I1'" },
+    { description: "Implement interface 'I2'" },
+]);

tests/cases/fourslash/codeFixClassImplementInterfaceDuplicateMember2.ts

@@ -11,4 +11,4 @@
 ////     x: number;
 //// }
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixClassImplementInterfaceIndexSignaturesNoFix.ts

@@ -6,6 +6,6 @@
 ////
 //// class C implements I {[|  |]}
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);
 
 

tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements1.ts

@@ -15,4 +15,4 @@ verify.rangeAfterCodeFix(`
 x: number;
 `);
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements2.ts

@@ -15,4 +15,4 @@ verify.rangeAfterCodeFix(`
 y: "𣋝ઢȴ¬⏊";
 `);
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplementsIntersection1.ts

@@ -9,4 +9,7 @@
 ////
 //// class C implements I1,I2 {[| |]}
 
-verify.codeFixAvailable();
+verify.codeFixAvailable([
+    { description: "Implement interface 'I1'" },
+    { description: "Implement interface 'I2'" },
+]);

tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplementsIntersection2.ts

@@ -11,4 +11,4 @@
 ////     x: string;
 //// }
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixClassImplementInterfacePropertyFromParentConstructorFunction.ts

@@ -6,7 +6,7 @@
 ////
 //// class B implements A {[| |]}
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);
 
 // TODO: (arozga) Get this working.
 /*

tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiateError.ts

@@ -4,10 +4,9 @@
 ////    x: T;
 //// }
 ////
-//// class C implements I<number> { } 
-
-verify.codeFixAvailable();
+//// class C implements I<number> { }
 
 // TODO: (arozga) Don't know how to instantiate in codeFix
 // if instantiation is invalid.
-// verify.not.codeFixAvailable();
+// Should be verify.codeFixAvailable([]);
+verify.codeFixAvailable([{ description: "Implement interface 'I<number>'" }]);

tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiation.ts

@@ -4,6 +4,6 @@
 ////    x: T;
 //// }
 ////
-//// class C implements I { } 
+//// class C implements I { }
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixClassImplementInterfaceUndeclaredSymbol.ts

@@ -4,7 +4,7 @@
 ////    x: T;
 //// }
 ////
-//// class C implements I { } 
+//// class C implements I { }
 
 // T is not a declared symbol. There are a couple fixes:
 // 1) Declare T.
@@ -14,6 +14,6 @@
 // In the latter two cases, it is premature to copy `x:T` into C.
 // Since we can't guess the programmer's intent here, we do nothing.
 
-verify.codeFixAvailable();
 // TODO: (aozgaa) Acknowledge other errors on class/implemented interface/extended abstract class.
-// verify.not.codeFixAvailable();
+// Should be verify.codeFixAvailable([]);
+verify.codeFixAvailable([{ description: "Implement interface 'I'" }]);

tests/cases/fourslash/codeFixClassPropertyInitialization.ts

@@ -7,34 +7,54 @@
 //// class TT { constructor () {} }
 ////
 //// class AT extends A { a () {} }
-//// 
+////
 //// class Foo {}
 ////
 //// class T {
-//// 
+////
 ////     a: string;
-//// 
+////
 ////     static b: string;
-//// 
+////
 ////     private c: string;
-//// 
+////
 ////     d: number | undefined;
-//// 
+////
 ////     e: string | number;
-//// 
+////
 ////     f: 1;
-//// 
+////
 ////     g: "123" | "456";
-//// 
+////
 ////     h: boolean;
-//// 
+////
 ////     i: TT;
-//// 
+////
 ////     j: A;
-//// 
+////
 ////     k: AT;
-//// 
+////
 ////     l: Foo;
 //// }
 
-verify.codeFixAvailable()
+function fixes(name: string, type: string, options: { isPrivate?: boolean, noInitializer?: boolean } = {}) {
+    return [
+        `Add 'undefined' type to property '${name}'`,
+        `Add definite assignment assertion to property '${options.isPrivate ? "private " : ""}${name}: ${type};'`,
+        ...(options.noInitializer ? [] : [`Add initializer to property '${name}'`]),
+    ].map(description => ({ description }));
+}
+
+verify.codeFixAvailable([
+    ...fixes("a", "string"),
+    ...fixes("c", "string", { isPrivate: true }),
+    ...fixes("e", "string | number"),
+    ...fixes("f", "1"),
+    ...fixes("g", '"123" | "456"'),
+    ...fixes("h", "boolean"),
+    ...fixes("i", "TT"),
+    ...fixes("j", "A", { noInitializer: true }),
+    ...fixes("k", "AT"),
+    ...fixes("l", "Foo"),
+    { description: "Remove declaration for: 'c'" },
+]);

tests/cases/fourslash/codeFixClassSuperMustPrecedeThisAccess_callWithThisInside.ts

@@ -9,4 +9,4 @@
 ////    }
 ////}
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixForgottenThisPropertyAccess04.ts

@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts' />
 
-// @jsx: react
+// @jsx: react
 // @jsxFactory: factory
 
 // @Filename: /a.tsx
@@ -11,4 +11,4 @@
 ////}
 
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixInferFromUsageInaccessibleTypes.ts

@@ -17,4 +17,4 @@
 ////}
 ////
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixInferFromUsageSetterWithInaccessibleType.ts

@@ -13,4 +13,4 @@
 ////}
 
 goTo.file("/b.ts");
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixInferFromUsage_noCrashOnMissingParens.ts

@@ -9,4 +9,4 @@
 ////}
 
 // Just testing that we don't crash in `insertTypeAnnotation` from inferFromUsage
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixNegativeReplaceQualifiedNameWithIndexedAccessType01.ts

@@ -8,4 +8,4 @@
 //// }
 //// const x: [|Container.Foo.bar|] = ""
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/codeFixUndeclaredPropertyAccesses.ts

@@ -14,4 +14,4 @@
 //// let t: T<number>;
 //// t.x;
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/importNameCodeFixNewImportExportEqualsPrimitive.ts

@@ -6,4 +6,4 @@
 ////declare var x: number;
 ////export = x;
 
-verify.not.codeFixAvailable(); // See GH#20191
+verify.codeFixAvailable([]); // See GH#20191

tests/cases/fourslash/importNameCodeFixNewImportNodeModules5.ts

@@ -19,4 +19,4 @@
 //// }
 
 // No fix because this accesses a nested node_modules
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);

tests/cases/fourslash/incompleteFunctionCallCodefix.ts

@@ -6,5 +6,4 @@
 ////}
 ////f(
 
-verify.not.codeFixAvailable([]);
-
+verify.codeFixAvailable([]);

tests/cases/fourslash/incompleteFunctionCallCodefix3.ts

@@ -3,5 +3,5 @@
 // @noImplicitAny: true
 //// function ...q) {}} f(10);
 
-verify.not.codeFixAvailable([]);
+verify.codeFixAvailable([]);
 

tests/cases/fourslash/typeToStringCrashInCodeFix.ts

@@ -3,4 +3,4 @@
 // @noImplicitAny: true
 //// function f(y, z = { p: y[
 
-verify.not.codeFixAvailable();
+verify.codeFixAvailable([]);