From ce85ee511586f753da3cf3f816e4311271dedf30 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Fri, 2 Nov 2018 15:39:27 -0700
Subject: [PATCH] Move infer-from-usage earlier in codefix list (#28318)

This makes it appear before the ts-ignore codefix, specifically.
---
 src/services/tsconfig.json                                      | 2 +-
 .../fourslash/codeFixInferFromUsageCommentAfterParameter.ts     | 2 +-
 tests/cases/fourslash/codeFixInferFromUsageJS.ts                | 2 +-
 tests/cases/fourslash/codeFixInferFromUsageMember2JS.ts         | 2 +-
 .../fourslash/codeFixInferFromUsageMultipleParametersJS.ts      | 2 +-
 .../fourslash/codeFixInferFromUsageNumberIndexSignatureJS.ts    | 2 +-
 tests/cases/fourslash/codeFixInferFromUsageOptionalParamJS.ts   | 2 +-
 .../fourslash/codeFixInferFromUsagePartialParameterListJS.ts    | 2 +-
 tests/cases/fourslash/codeFixInferFromUsagePropertyAccessJS.ts  | 2 +-
 tests/cases/fourslash/codeFixInferFromUsageRestParam2JS.ts      | 2 +-
 tests/cases/fourslash/codeFixInferFromUsageRestParam3JS.ts      | 2 +-
 tests/cases/fourslash/codeFixInferFromUsageRestParamJS.ts       | 2 +-
 tests/cases/fourslash/codeFixInferFromUsageSetterJS.ts          | 2 +-
 .../codeFixInferFromUsageSetterWithInaccessibleTypeJS.ts        | 2 +-
 tests/cases/fourslash/codeFixInferFromUsageSingleLineClassJS.ts | 2 +-
 .../fourslash/codeFixInferFromUsageStringIndexSignatureJS.ts    | 2 +-
 tests/cases/fourslash/codeFixInferFromUsageVariable2JS.ts       | 2 +-
 tests/cases/fourslash/codeFixInferFromUsageVariableJS.ts        | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
index 66b1977ddc5..690bad237ab 100644
--- a/src/services/tsconfig.json
+++ b/src/services/tsconfig.json
@@ -45,6 +45,7 @@
         "refactorProvider.ts",
         "codefixes/addMissingInvocationForDecorator.ts",
         "codefixes/annotateWithTypeFromJSDoc.ts",
+        "codefixes/inferFromUsage.ts",
         "codefixes/convertFunctionToEs6Class.ts",
         "codefixes/convertToAsyncFunction.ts",
         "codefixes/convertToEs6Module.ts",
@@ -66,7 +67,6 @@
         "codefixes/fixAwaitInSyncFunction.ts",
         "codefixes/disableJsDiagnostics.ts",
         "codefixes/helpers.ts",
-        "codefixes/inferFromUsage.ts",
         "codefixes/fixInvalidImportSyntax.ts",
         "codefixes/fixStrictClassInitialization.ts",
         "codefixes/generateTypes.ts",
diff --git a/tests/cases/fourslash/codeFixInferFromUsageCommentAfterParameter.ts b/tests/cases/fourslash/codeFixInferFromUsageCommentAfterParameter.ts
index b46600d927f..bdefd2b5dea 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageCommentAfterParameter.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageCommentAfterParameter.ts
@@ -13,7 +13,7 @@
 
 verify.codeFix({
     description: "Infer parameter types from usage",
-    index: 2,
+    index: 0,
     newFileContent:
 `/**
  * @param {(arg0: any) => void} callback
diff --git a/tests/cases/fourslash/codeFixInferFromUsageJS.ts b/tests/cases/fourslash/codeFixInferFromUsageJS.ts
index 62c9d1bf90b..be36fec5825 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageJS.ts
@@ -9,4 +9,4 @@
 ////    foo += 2;
 ////}
 
-verify.rangeAfterCodeFix("/** @type {number} */\nvar foo;",/*includeWhiteSpace*/ undefined, /*errorCode*/ undefined, 2);
+verify.rangeAfterCodeFix("/** @type {number} */\nvar foo;",/*includeWhiteSpace*/ undefined, /*errorCode*/ undefined, 0);
diff --git a/tests/cases/fourslash/codeFixInferFromUsageMember2JS.ts b/tests/cases/fourslash/codeFixInferFromUsageMember2JS.ts
index dc52286a906..c561510cfc7 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageMember2JS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageMember2JS.ts
@@ -11,4 +11,4 @@
 ////i.p = 0;
 
 
-verify.rangeAfterCodeFix("p: number", undefined, undefined, 1);
+verify.rangeAfterCodeFix("p: number", undefined, undefined, 0);
diff --git a/tests/cases/fourslash/codeFixInferFromUsageMultipleParametersJS.ts b/tests/cases/fourslash/codeFixInferFromUsageMultipleParametersJS.ts
index d57f3292375..d82700c1709 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageMultipleParametersJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageMultipleParametersJS.ts
@@ -11,7 +11,7 @@
 
 verify.codeFix({
     description: "Infer parameter types from usage",
-    index: 6,
+    index: 4,
     newFileContent:
 `/**
  * @param {number} a
diff --git a/tests/cases/fourslash/codeFixInferFromUsageNumberIndexSignatureJS.ts b/tests/cases/fourslash/codeFixInferFromUsageNumberIndexSignatureJS.ts
index d494d1dbb7b..22b8e62bc76 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageNumberIndexSignatureJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageNumberIndexSignatureJS.ts
@@ -10,7 +10,7 @@
 
 verify.codeFix({
     description: "Infer parameter types from usage",
-    index: 2,
+    index: 0,
     newFileContent:
 `/**
  * @param {number[]} a
diff --git a/tests/cases/fourslash/codeFixInferFromUsageOptionalParamJS.ts b/tests/cases/fourslash/codeFixInferFromUsageOptionalParamJS.ts
index 7003950b7ff..dbf29fe2f5d 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageOptionalParamJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageOptionalParamJS.ts
@@ -12,7 +12,7 @@
 
 verify.codeFix({
     description: "Infer parameter types from usage",
-    index: 2,
+    index: 0,
     newFileContent:
 `/**
  * @param {number} [a]
diff --git a/tests/cases/fourslash/codeFixInferFromUsagePartialParameterListJS.ts b/tests/cases/fourslash/codeFixInferFromUsagePartialParameterListJS.ts
index 034fe7d0411..9b4e4d8442b 100644
--- a/tests/cases/fourslash/codeFixInferFromUsagePartialParameterListJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsagePartialParameterListJS.ts
@@ -15,7 +15,7 @@
 
 verify.codeFix({
     description: "Infer parameter types from usage",
-    index: 2,
+    index: 0,
     newFileContent:
 `/**
  * @param {*} y
diff --git a/tests/cases/fourslash/codeFixInferFromUsagePropertyAccessJS.ts b/tests/cases/fourslash/codeFixInferFromUsagePropertyAccessJS.ts
index 322d51a79ab..ed9d4b33b37 100644
--- a/tests/cases/fourslash/codeFixInferFromUsagePropertyAccessJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsagePropertyAccessJS.ts
@@ -18,7 +18,7 @@
 
 verify.codeFix({
     description: "Infer parameter types from usage",
-    index: 2,
+    index: 0,
     newFileContent:
 `/**
  * @param {{ b: { c: any; }; }} a
diff --git a/tests/cases/fourslash/codeFixInferFromUsageRestParam2JS.ts b/tests/cases/fourslash/codeFixInferFromUsageRestParam2JS.ts
index 609ab76b787..d5c1fd54bb5 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageRestParam2JS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageRestParam2JS.ts
@@ -15,7 +15,7 @@
 
 verify.codeFix({
     description: "Infer parameter types from usage",
-    index: 2,
+    index: 0,
     newFileContent:
 `/**
  * @param {number} a
diff --git a/tests/cases/fourslash/codeFixInferFromUsageRestParam3JS.ts b/tests/cases/fourslash/codeFixInferFromUsageRestParam3JS.ts
index 2c6da348852..dec7f8e7674 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageRestParam3JS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageRestParam3JS.ts
@@ -12,7 +12,7 @@
 
 verify.codeFix({
     description: "Infer parameter types from usage",
-    index: 2,
+    index: 0,
     newFileContent:
 `/**
  * @param {number} a
diff --git a/tests/cases/fourslash/codeFixInferFromUsageRestParamJS.ts b/tests/cases/fourslash/codeFixInferFromUsageRestParamJS.ts
index 7e87bc3d256..4b7f046ca18 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageRestParamJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageRestParamJS.ts
@@ -15,7 +15,7 @@
 
 verify.codeFix({
     description: "Infer parameter types from usage",
-    index: 4,
+    index: 2,
     newFileContent:
 `/**
  * @param {number} a
diff --git a/tests/cases/fourslash/codeFixInferFromUsageSetterJS.ts b/tests/cases/fourslash/codeFixInferFromUsageSetterJS.ts
index c9c0c719de4..54350bb493f 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageSetterJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageSetterJS.ts
@@ -13,7 +13,7 @@
 
 verify.codeFix({
     description: "Infer type of \'x\' from usage",
-    index: 2,
+    index: 0,
     newFileContent:
 `class C {
     /**
diff --git a/tests/cases/fourslash/codeFixInferFromUsageSetterWithInaccessibleTypeJS.ts b/tests/cases/fourslash/codeFixInferFromUsageSetterWithInaccessibleTypeJS.ts
index 7620b969234..c5fc937a9b8 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageSetterWithInaccessibleTypeJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageSetterWithInaccessibleTypeJS.ts
@@ -22,7 +22,7 @@
 
 goTo.file("/b.js");
 verify.codeFix({
-    index: 2,
+    index: 0,
     description: "Infer type of 'x' from usage",
     newFileContent:
 `export class C {
diff --git a/tests/cases/fourslash/codeFixInferFromUsageSingleLineClassJS.ts b/tests/cases/fourslash/codeFixInferFromUsageSingleLineClassJS.ts
index 42f5481f143..dec76892cb2 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageSingleLineClassJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageSingleLineClassJS.ts
@@ -11,7 +11,7 @@
 
 verify.codeFix({
     description: "Infer parameter types from usage",
-    index: 2,
+    index: 0,
     newFileContent:
 `class C {/**
  * @param {number} x
diff --git a/tests/cases/fourslash/codeFixInferFromUsageStringIndexSignatureJS.ts b/tests/cases/fourslash/codeFixInferFromUsageStringIndexSignatureJS.ts
index 5182e80969e..c3305988dec 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageStringIndexSignatureJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageStringIndexSignatureJS.ts
@@ -11,7 +11,7 @@
 ////}
 
 verify.codeFix({
-    index: 2,
+    index: 0,
     description: "Infer parameter types from usage",
     newFileContent:
 `/**
diff --git a/tests/cases/fourslash/codeFixInferFromUsageVariable2JS.ts b/tests/cases/fourslash/codeFixInferFromUsageVariable2JS.ts
index 0e88a30b96b..27482acf377 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageVariable2JS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageVariable2JS.ts
@@ -15,4 +15,4 @@ var x;
 function f() {
     x++;
 }
-`, /*includeWhiteSpace*/ undefined, /*errorCode*/ undefined, 2);
+`, /*includeWhiteSpace*/ undefined, /*errorCode*/ undefined, 0);
diff --git a/tests/cases/fourslash/codeFixInferFromUsageVariableJS.ts b/tests/cases/fourslash/codeFixInferFromUsageVariableJS.ts
index 8e96fd08916..bbd5409a25c 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageVariableJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageVariableJS.ts
@@ -11,4 +11,4 @@
 ////    x++;
 ////}
 
-verify.rangeAfterCodeFix("/** @type {number } */\nvar x;", /*includeWhiteSpace*/ undefined, /*errorCode*/ undefined, 2);
+verify.rangeAfterCodeFix("/** @type {number } */\nvar x;", /*includeWhiteSpace*/ undefined, /*errorCode*/ undefined, 0);