🤖 Pick PR #62641 (Fix fourslash tests) into tsgo-port (#62642)

Co-authored-by: Andrew Branch <andrewbranch@users.noreply.github.com>
Co-authored-by: Andrew Branch <andrew@wheream.io>

src/harness/fourslashInterfaceImpl.ts

@@ -279,6 +279,9 @@ export class Verify extends VerifyNegatable {
             return this.state.verifyCompletions(optionsArray[0]);
         }
         for (const options of optionsArray) {
+            if (options.preferences && Object.keys(options).length === 1 && optionsArray.length > 1 && optionsArray.indexOf(options) > 0) {
+                throw new Error("Did you mean to put 'preferences' in the previous 'verify.completions' object argument instead of their own object?");
+            }
             this.state.verifyCompletions(options);
         }
         return {

tests/baselines/reference/jsxClassAttributeResolution.errors.txt

@@ -12,7 +12,7 @@ file.tsx(2,19): error TS2741: Property 'ref' is missing in type '{}' but require
         "name": "@types/react",
         "version": "0.0.1",
         "main": "",
-        "types": "index.d.ts",
+        "types": "index.d.ts"
     }
 ==== node_modules/@types/react/index.d.ts (0 errors) ====
     interface IntrinsicClassAttributesAlias<T> {

tests/baselines/reference/jsxClassAttributeResolution.js

@@ -8,7 +8,7 @@ export const a = <App></App>;
     "name": "@types/react",
     "version": "0.0.1",
     "main": "",
-    "types": "index.d.ts",
+    "types": "index.d.ts"
 }
 //// [index.d.ts]
 interface IntrinsicClassAttributesAlias<T> {

tests/cases/compiler/jsxClassAttributeResolution.tsx

@@ -8,7 +8,7 @@ export const a = <App></App>;
     "name": "@types/react",
     "version": "0.0.1",
     "main": "",
-    "types": "index.d.ts",
+    "types": "index.d.ts"
 }
 // @filename: node_modules/@types/react/index.d.ts
 interface IntrinsicClassAttributesAlias<T> {

tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports47.ts

@@ -9,7 +9,7 @@
 // @filename: node_modules/react/package.json
 ////{
 ////    "name": "react",
-////    "types": "index.d.ts",
+////    "types": "index.d.ts"
 ////}
 
 // @filename: node_modules/react/index.d.ts

tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports48.ts

@@ -9,7 +9,7 @@
 // @filename: node_modules/react/package.json
 ////{
 ////    "name": "react",
-////    "types": "index.d.ts",
+////    "types": "index.d.ts"
 ////}
 
 // @filename: node_modules/react/index.d.ts

tests/cases/fourslash/completionsThisProperties_globalType.ts

@@ -23,8 +23,7 @@ test.markerNames().forEach(marker => {
       kind: "var",
       kindModifiers: "declare",
       sortText: completion.SortText.GlobalsOrKeywords
-    }]
-  }, {
+    }],
     preferences: {
       includeInsertTextCompletions: true
     }

tests/cases/fourslash/completionsWithDeprecatedTag9.ts

@@ -11,19 +11,24 @@
 ////class Foo {
 ////    foo: number;
 ////    m() {
-////        foo/**/
+////        [|foo|]/**/
 ////    }
 ////}
 
 verify.completions({
     marker: "",
     includes: [{
+        name: "foo",
+        insertText: "this.foo",
+        kind: "property",
+        source: completion.CompletionSource.ThisProperty,
+        sortText: completion.SortText.SuggestedClassMembers,
+    }, {
         name: "foo",
         kind: "var",
         kindModifiers: "deprecated,declare",
         sortText: completion.SortText.Deprecated(completion.SortText.GlobalsOrKeywords),
-    }]
-}, {
+    }],
     preferences: {
         includeInsertTextCompletions: true
     }

tests/cases/fourslash/organizeImportsReactJsx.ts

@@ -13,7 +13,7 @@
 // @filename: node_modules/react/package.json
 ////{
 ////    "name": "react",
-////    "types": "index.d.ts",
+////    "types": "index.d.ts"
 ////}
 
 // @filename: node_modules/react/index.d.ts

tests/cases/fourslash/organizeImportsReactJsxDev.ts

@@ -13,7 +13,7 @@
 // @filename: node_modules/react/package.json
 ////{
 ////    "name": "react",
-////    "types": "index.d.ts",
+////    "types": "index.d.ts"
 ////}
 
 // @filename: node_modules/react/index.d.ts