Update fourslash

Author: jakebailey

tests/baselines/reference/typeErrorAfterStringCompletionsInNestedCall2.baseline

@@ -113,7 +113,7 @@ Semantic Diagnostics for file '/tests/cases/fourslash/typeErrorAfterStringComple
 !!! error TS2322:           Type '{ type: "BARx"; }' is not assignable to type '{ type: "BAR"; }'.
 !!! error TS2322:             Types of property 'type' are incompatible.
 !!! error TS2322:               Type '"BARx"' is not assignable to type '"BAR"'.
-!!! related TS6500 /tests/cases/fourslash/typeErrorAfterStringCompletionsInNestedCall2.ts:14:7: The expected type comes from property 'FOO' which is declared here on type '{ FOO?: ActionFunction<{ type: "FOO"; }, { type: "FOO"; } | { type: "BAR"; }> | undefined; BAR?: ActionFunction<{ type: "BAR"; }, { type: "FOO"; } | { type: "BAR"; }> | undefined; }'
+!!! related TS6500 /tests/cases/fourslash/typeErrorAfterStringCompletionsInNestedCall2.ts:14:7: The expected type comes from property 'FOO' which is declared here on type '{ BAR?: ActionFunction<{ type: "BAR"; }, { type: "FOO"; } | { type: "BAR"; }> | undefined; FOO?: ActionFunction<{ type: "FOO"; }, { type: "FOO"; } | { type: "BAR"; }> | undefined; }'
           return {
             type: "BAR" as const,
           };

tests/cases/fourslash/bestCommonTypeObjectLiterals.ts

@@ -33,5 +33,5 @@ verify.quickInfos({
     age: number;
     dob: Date;
 })[]`,
-    4: "var c3: {\n    name: string;\n    age: number;\n}[]"
+    4: "var c3: I[]"
 });

tests/cases/fourslash/codeFixAddMissingAttributes8.ts

@@ -16,5 +16,5 @@
 verify.codeFix({
     index: 0,
     description: ts.Diagnostics.Add_missing_attributes.message,
-    newRangeContent: `<A ad={"ad"} ac={"ac"} bd={"bd"} bc={"bc"}></A>`
+    newRangeContent: `<A ac={"ac"} ad={"ad"} bc={"bc"} bd={"bd"}></A>`
 });

tests/cases/fourslash/codeFixAddMissingAttributes9.ts

@@ -16,5 +16,5 @@
 verify.codeFix({
     index: 0,
     description: ts.Diagnostics.Add_missing_attributes.message,
-    newRangeContent: `<A a-d={"a-d"} a-c={"a-c"} b-d={"b-d"} b-c={"b-c"}></A>`
+    newRangeContent: `<A a-c={"a-c"} a-d={"a-d"} b-c={"b-c"} b-d={"b-d"}></A>`
 });

tests/cases/fourslash/codeFixAddMissingProperties16.ts

@@ -12,155 +12,155 @@ verify.codeFix({
     description: ts.Diagnostics.Add_missing_properties.message,
     newRangeContent:
 `const names: { [K in D]: K } = {
-    "aA1@": "aA1@",
     "aA1!": "aA1!",
-    "aA2@": "aA2@",
+    "aA1@": "aA1@",
     "aA2!": "aA2!",
-    "aA3@": "aA3@",
+    "aA2@": "aA2@",
     "aA3!": "aA3!",
-    "aB1@": "aB1@",
+    "aA3@": "aA3@",
     "aB1!": "aB1!",
-    "aB2@": "aB2@",
+    "aB1@": "aB1@",
     "aB2!": "aB2!",
-    "aB3@": "aB3@",
+    "aB2@": "aB2@",
     "aB3!": "aB3!",
-    "aC1@": "aC1@",
+    "aB3@": "aB3@",
     "aC1!": "aC1!",
-    "aC2@": "aC2@",
+    "aC1@": "aC1@",
     "aC2!": "aC2!",
-    "aC3@": "aC3@",
+    "aC2@": "aC2@",
     "aC3!": "aC3!",
-    "aD1@": "aD1@",
+    "aC3@": "aC3@",
     "aD1!": "aD1!",
-    "aD2@": "aD2@",
+    "aD1@": "aD1@",
     "aD2!": "aD2!",
-    "aD3@": "aD3@",
+    "aD2@": "aD2@",
     "aD3!": "aD3!",
-    "aE1@": "aE1@",
+    "aD3@": "aD3@",
     "aE1!": "aE1!",
-    "aE2@": "aE2@",
+    "aE1@": "aE1@",
     "aE2!": "aE2!",
-    "aE3@": "aE3@",
+    "aE2@": "aE2@",
     "aE3!": "aE3!",
-    "bA1@": "bA1@",
+    "aE3@": "aE3@",
     "bA1!": "bA1!",
-    "bA2@": "bA2@",
+    "bA1@": "bA1@",
     "bA2!": "bA2!",
-    "bA3@": "bA3@",
+    "bA2@": "bA2@",
     "bA3!": "bA3!",
-    "bB1@": "bB1@",
+    "bA3@": "bA3@",
     "bB1!": "bB1!",
-    "bB2@": "bB2@",
+    "bB1@": "bB1@",
     "bB2!": "bB2!",
-    "bB3@": "bB3@",
+    "bB2@": "bB2@",
     "bB3!": "bB3!",
-    "bC1@": "bC1@",
+    "bB3@": "bB3@",
     "bC1!": "bC1!",
-    "bC2@": "bC2@",
+    "bC1@": "bC1@",
     "bC2!": "bC2!",
-    "bC3@": "bC3@",
+    "bC2@": "bC2@",
     "bC3!": "bC3!",
-    "bD1@": "bD1@",
+    "bC3@": "bC3@",
     "bD1!": "bD1!",
-    "bD2@": "bD2@",
+    "bD1@": "bD1@",
     "bD2!": "bD2!",
-    "bD3@": "bD3@",
+    "bD2@": "bD2@",
     "bD3!": "bD3!",
-    "bE1@": "bE1@",
+    "bD3@": "bD3@",
     "bE1!": "bE1!",
-    "bE2@": "bE2@",
+    "bE1@": "bE1@",
     "bE2!": "bE2!",
-    "bE3@": "bE3@",
+    "bE2@": "bE2@",
     "bE3!": "bE3!",
-    "cA1@": "cA1@",
+    "bE3@": "bE3@",
     "cA1!": "cA1!",
-    "cA2@": "cA2@",
+    "cA1@": "cA1@",
     "cA2!": "cA2!",
-    "cA3@": "cA3@",
+    "cA2@": "cA2@",
     "cA3!": "cA3!",
-    "cB1@": "cB1@",
+    "cA3@": "cA3@",
     "cB1!": "cB1!",
-    "cB2@": "cB2@",
+    "cB1@": "cB1@",
     "cB2!": "cB2!",
-    "cB3@": "cB3@",
+    "cB2@": "cB2@",
     "cB3!": "cB3!",
-    "cC1@": "cC1@",
+    "cB3@": "cB3@",
     "cC1!": "cC1!",
-    "cC2@": "cC2@",
+    "cC1@": "cC1@",
     "cC2!": "cC2!",
-    "cC3@": "cC3@",
+    "cC2@": "cC2@",
     "cC3!": "cC3!",
-    "cD1@": "cD1@",
+    "cC3@": "cC3@",
     "cD1!": "cD1!",
-    "cD2@": "cD2@",
+    "cD1@": "cD1@",
     "cD2!": "cD2!",
-    "cD3@": "cD3@",
+    "cD2@": "cD2@",
     "cD3!": "cD3!",
-    "cE1@": "cE1@",
+    "cD3@": "cD3@",
     "cE1!": "cE1!",
-    "cE2@": "cE2@",
+    "cE1@": "cE1@",
     "cE2!": "cE2!",
-    "cE3@": "cE3@",
+    "cE2@": "cE2@",
     "cE3!": "cE3!",
-    "dA1@": "dA1@",
+    "cE3@": "cE3@",
     "dA1!": "dA1!",
-    "dA2@": "dA2@",
+    "dA1@": "dA1@",
     "dA2!": "dA2!",
-    "dA3@": "dA3@",
+    "dA2@": "dA2@",
     "dA3!": "dA3!",
-    "dB1@": "dB1@",
+    "dA3@": "dA3@",
     "dB1!": "dB1!",
-    "dB2@": "dB2@",
+    "dB1@": "dB1@",
     "dB2!": "dB2!",
-    "dB3@": "dB3@",
+    "dB2@": "dB2@",
     "dB3!": "dB3!",
-    "dC1@": "dC1@",
+    "dB3@": "dB3@",
     "dC1!": "dC1!",
-    "dC2@": "dC2@",
+    "dC1@": "dC1@",
     "dC2!": "dC2!",
-    "dC3@": "dC3@",
+    "dC2@": "dC2@",
     "dC3!": "dC3!",
-    "dD1@": "dD1@",
+    "dC3@": "dC3@",
     "dD1!": "dD1!",
-    "dD2@": "dD2@",
+    "dD1@": "dD1@",
     "dD2!": "dD2!",
-    "dD3@": "dD3@",
+    "dD2@": "dD2@",
     "dD3!": "dD3!",
-    "dE1@": "dE1@",
+    "dD3@": "dD3@",
     "dE1!": "dE1!",
-    "dE2@": "dE2@",
+    "dE1@": "dE1@",
     "dE2!": "dE2!",
-    "dE3@": "dE3@",
+    "dE2@": "dE2@",
     "dE3!": "dE3!",
-    "eA1@": "eA1@",
+    "dE3@": "dE3@",
     "eA1!": "eA1!",
-    "eA2@": "eA2@",
+    "eA1@": "eA1@",
     "eA2!": "eA2!",
-    "eA3@": "eA3@",
+    "eA2@": "eA2@",
     "eA3!": "eA3!",
-    "eB1@": "eB1@",
+    "eA3@": "eA3@",
     "eB1!": "eB1!",
-    "eB2@": "eB2@",
+    "eB1@": "eB1@",
     "eB2!": "eB2!",
-    "eB3@": "eB3@",
+    "eB2@": "eB2@",
     "eB3!": "eB3!",
-    "eC1@": "eC1@",
+    "eB3@": "eB3@",
     "eC1!": "eC1!",
-    "eC2@": "eC2@",
+    "eC1@": "eC1@",
     "eC2!": "eC2!",
-    "eC3@": "eC3@",
+    "eC2@": "eC2@",
     "eC3!": "eC3!",
-    "eD1@": "eD1@",
+    "eC3@": "eC3@",
     "eD1!": "eD1!",
-    "eD2@": "eD2@",
+    "eD1@": "eD1@",
     "eD2!": "eD2!",
-    "eD3@": "eD3@",
+    "eD2@": "eD2@",
     "eD3!": "eD3!",
-    "eE1@": "eE1@",
+    "eD3@": "eD3@",
     "eE1!": "eE1!",
-    "eE2@": "eE2@",
+    "eE1@": "eE1@",
     "eE2!": "eE2!",
-    "eE3@": "eE3@",
-    "eE3!": "eE3!"
+    "eE2@": "eE2@",
+    "eE3!": "eE3!",
+    "eE3@": "eE3@"
 };`
 });

tests/cases/fourslash/codeFixClassExtendAbstractMethod.ts

@@ -27,7 +27,7 @@ class C extends A {
     override f(a: number, b: string): this;
     override f(a: string, b: number): Function;
     override f(a: string): Function;
-    override f(a: unknown, b?: unknown): boolean | Function | this {
+    override f(a: unknown, b?: unknown): boolean | this | Function {
         throw new Error("Method not implemented.");
     }
     override foo(): number {

tests/cases/fourslash/codeFixClassImplementInterfaceNoTruncation.ts

@@ -6,4 +6,4 @@
 //// }
 
 // https://github.com/Microsoft/TypeScript/issues/29330
-verify.rangeAfterCodeFix("arr: { other: (arg0: (a: number, b: number) => 1 | -1) => void; }");
+verify.rangeAfterCodeFix("arr: { other: (arg0: (a: number, b: number) => -1 | 1) => void; }");

tests/cases/fourslash/codeFixInferFromFunctionUsage.ts

@@ -17,5 +17,5 @@ verify.codeFix({
 const dest = foo();
 export const x: 1 = dest.x;
 const temp = dest.y;
-export const y: 1 | 0 = temp === undefined ? 0 : dest.y;`
+export const y: 0 | 1 = temp === undefined ? 0 : dest.y;`
 });

tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports15.ts

@@ -4,7 +4,7 @@
 ////let a: As;
 ////if ('[|/**/|]' != a
 
-verify.completions({ marker: "", exact: ["arf", "abacus", "abaddon"].map(name => ({
+verify.completions({ marker: "", exact: ["abacus", "abaddon", "arf"].map(name => ({
     name,
     replacementSpan: test.ranges()[0]
 })) });

tests/cases/fourslash/completionForStringLiteral10.ts

@@ -6,4 +6,4 @@
 ////    case '[|/**/|]
 ////}
 
-verify.completions({ marker: "", exact: ["arf", "abacus", "abaddon" ] });
+verify.completions({ marker: "", exact: ["abacus", "abaddon", "arf"] });

tests/cases/fourslash/completionForStringLiteral11.ts

@@ -8,4 +8,4 @@
 ////function f<K extends keyof Foo>(a: K) { };
 ////f("/*1*/
 
-verify.completions({ marker: "1", exact: ["foo", "bar"] });
+verify.completions({ marker: "1", exact: ["bar", "foo"] });

tests/cases/fourslash/completionForStringLiteral5.ts

@@ -6,7 +6,7 @@
 ////f("[|/*1*/|]", "[|/*2*/|]", "[|/*3*/|]");
 
 verify.completions(
-    { marker: "1", exact: ["foo", "bar"].map(name => ({
+    { marker: "1", exact: ["bar", "foo"].map(name => ({
         name, replacementSpan: test.ranges()[0]
     })) },
     { marker: "2", exact: ["oof", "rab"].map(name => ({

tests/cases/fourslash/completionForStringLiteral7.ts

@@ -4,4 +4,4 @@
 ////let a: As;
 ////if (a === '/**/
 
-verify.completions({ marker: "", exact: ["arf", "abacus", "abaddon"] });
+verify.completions({ marker: "", exact: ["abacus", "abaddon", "arf"] });

tests/cases/fourslash/completionForStringLiteral8.ts

@@ -15,5 +15,5 @@
 
 verify.completions({
     marker: ["1", "2"],
-    exact: ["foo", "bar", "baz"]
+    exact: ["bar", "baz", "foo"]
 });

tests/cases/fourslash/completionListAtThisType.ts

@@ -21,5 +21,5 @@
 ////   },
 //// });
 
-verify.completions({ marker: ["ts"], exact: ["foo", "bar"] });
+verify.completions({ marker: ["ts"], exact: ["bar", "foo"] });
 verify.completions({ marker: ["ts2"], includes: ['"foo"', '"bar"'], isNewIdentifierLocation: false });

tests/cases/fourslash/completionsLiteralFromInferenceWithinInferredType1.ts

@@ -20,5 +20,5 @@
 ////   },
 //// });
 
-verify.completions({ marker: ["ts"], exact: ["foo", "bar"] });
+verify.completions({ marker: ["ts"], exact: ["bar", "foo"] });
 verify.completions({ marker: ["ts2"], includes: ['"foo"', '"bar"'], isNewIdentifierLocation: true });

tests/cases/fourslash/completionsLiteralFromInferenceWithinInferredType3.ts

@@ -4,6 +4,6 @@
 ////type T = Pick<Foo, "[|/**/|]">;
 
 verify.completions({ marker: "", exact: [
+    { name: "bar", replacementSpan: test.ranges()[0] },
     { name: "foo", replacementSpan: test.ranges()[0] },
-    { name: "bar", replacementSpan: test.ranges()[0] }
 ] });

tests/cases/fourslash/completionsStringLiteral_fromTypeConstraint.ts

@@ -9,8 +9,8 @@ for (let i = 0 ; i < 3; ++i) {
     verify.completions({
         marker: `${i + 1}`,
         exact: [
-            { name: "foo", replacementSpan: test.ranges()[i] },
             { name: "bar", replacementSpan: test.ranges()[i] },
+            { name: "foo", replacementSpan: test.ranges()[i] },
         ]
     });
-}
+}