Revert change to verify.not.codeFixAvailable(), and use assertObjectsEqual for better errors

Author: Andy Hanson

src/harness/fourslash.ts

@@ -2997,18 +2997,11 @@ Actual: ${stringify(fullActual)}`);
             }
         }
 
-        public verifyCodeFixAvailable(info: FourSlashInterface.VerifyCodeFixAvailableOptions[]) {
+        public verifyCodeFixAvailable(negative: boolean, expected: FourSlashInterface.VerifyCodeFixAvailableOptions[]): void {
+            assert(!negative || !expected);
             const codeFixes = this.getCodeFixes(this.activeFile.fileName);
-            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)}`);
-                    }
-                }
-            });
+            const actuals = codeFixes.map((fix): FourSlashInterface.VerifyCodeFixAvailableOptions => ({ description: fix.description, commands: fix.commands }))
+            this.assertObjectsEqual(actuals, negative ? ts.emptyArray : expected);
         }
 
         public verifyApplicableRefactorAvailableAtMarker(negative: boolean, markerName: string) {
@@ -4094,7 +4087,7 @@ namespace FourSlashInterface {
         }
 
         public codeFixAvailable(options?: VerifyCodeFixAvailableOptions[]) {
-            this.state.verifyCodeFixAvailable(options);
+            this.state.verifyCodeFixAvailable(this.negative, options);
         }
 
         public applicableRefactorAvailableAtMarker(markerName: string) {

tests/cases/fourslash/codeFixAddMissingMember8.ts

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

tests/cases/fourslash/codeFixAwaitInSyncFunction3.ts

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

tests/cases/fourslash/codeFixAwaitInSyncFunction4.ts

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

tests/cases/fourslash/codeFixAwaitShouldNotCrashIfNotInFunction.ts

@@ -2,4 +2,4 @@
 
 ////await a
 
-verify.codeFixAvailable([]);
+verify.not.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.codeFixAvailable([]);
+verify.not.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.codeFixAvailable([]);
+verify.not.codeFixAvailable();

tests/cases/fourslash/codeFixClassImplementClassMemberAnonymousClass.ts

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

tests/cases/fourslash/codeFixClassImplementInterfaceCallSignature.ts

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

tests/cases/fourslash/codeFixClassImplementInterfaceConstructSignature.ts

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

tests/cases/fourslash/codeFixClassImplementInterfaceDuplicateMember2.ts

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

tests/cases/fourslash/codeFixClassImplementInterfaceIndexSignaturesNoFix.ts

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

tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements1.ts

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

tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements2.ts

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

tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplementsIntersection2.ts

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

tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiation.ts

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

tests/cases/fourslash/codeFixClassSuperMustPrecedeThisAccess_callWithThisInside.ts

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

tests/cases/fourslash/codeFixForgottenThisPropertyAccess04.ts

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

tests/cases/fourslash/codeFixInferFromUsageInaccessibleTypes.ts

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

tests/cases/fourslash/codeFixInferFromUsageSetterWithInaccessibleType.ts

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

tests/cases/fourslash/codeFixInferFromUsage_noCrashOnMissingParens.ts

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

tests/cases/fourslash/codeFixNegativeReplaceQualifiedNameWithIndexedAccessType01.ts

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

tests/cases/fourslash/codeFixUndeclaredPropertyAccesses.ts

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

tests/cases/fourslash/importNameCodeFixNewImportExportEqualsPrimitive.ts

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

tests/cases/fourslash/importNameCodeFixNewImportNodeModules5.ts

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

tests/cases/fourslash/incompleteFunctionCallCodefix.ts

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

tests/cases/fourslash/incompleteFunctionCallCodefix3.ts

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

tests/cases/fourslash/typeToStringCrashInCodeFix.ts

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