Update fromCodeFixContext (#18290)

Andy · web-flow · commit 53b5abe5bbb8 · 2017-09-07T07:19:00.000-07:00
diff --git a/src/services/codefixes/correctQualifiedNameToIndexedAccessType.ts b/src/services/codefixes/correctQualifiedNameToIndexedAccessType.ts
@@ -15,7 +15,7 @@ namespace ts.codefix {
             const replacement = createIndexedAccessTypeNode(
                 createTypeReferenceNode(qualifiedName.left, /*typeArguments*/ undefined),
                 createLiteralTypeNode(createLiteral(rightText)));
-            const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+            const changeTracker = textChanges.ChangeTracker.fromContext(context);
             changeTracker.replaceNode(sourceFile, qualifiedName, replacement);
 
             return [{
diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts
@@ -87,7 +87,7 @@ namespace ts.codefix {
                     createPropertyAccess(createIdentifier(className), tokenName),
                     createIdentifier("undefined")));
 
-                const staticInitializationChangeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+                const staticInitializationChangeTracker = textChanges.ChangeTracker.fromContext(context);
                 staticInitializationChangeTracker.insertNodeAfter(
                     classDeclarationSourceFile,
                     classDeclaration,
@@ -111,7 +111,7 @@ namespace ts.codefix {
                     createPropertyAccess(createThis(), tokenName),
                     createIdentifier("undefined")));
 
-                const propertyInitializationChangeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+                const propertyInitializationChangeTracker = textChanges.ChangeTracker.fromContext(context);
                 propertyInitializationChangeTracker.insertNodeAt(
                     classDeclarationSourceFile,
                     classConstructor.body.getEnd() - 1,
@@ -153,7 +153,7 @@ namespace ts.codefix {
                 /*questionToken*/ undefined,
                 typeNode,
                 /*initializer*/ undefined);
-            const propertyChangeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+            const propertyChangeTracker = textChanges.ChangeTracker.fromContext(context);
             propertyChangeTracker.insertNodeAfter(classDeclarationSourceFile, classOpenBrace, property, { suffix: context.newLineCharacter });
 
             (actions || (actions = [])).push({
@@ -178,7 +178,7 @@ namespace ts.codefix {
                     [indexingParameter],
                     typeNode);
 
-                const indexSignatureChangeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+                const indexSignatureChangeTracker = textChanges.ChangeTracker.fromContext(context);
                 indexSignatureChangeTracker.insertNodeAfter(classDeclarationSourceFile, classOpenBrace, indexSignature, { suffix: context.newLineCharacter });
 
                 actions.push({
@@ -195,7 +195,7 @@ namespace ts.codefix {
                 const callExpression = <CallExpression>token.parent.parent;
                 const methodDeclaration = createMethodFromCallExpression(callExpression, tokenName, includeTypeScriptSyntax, makeStatic);
 
-                const methodDeclarationChangeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+                const methodDeclarationChangeTracker = textChanges.ChangeTracker.fromContext(context);
                 methodDeclarationChangeTracker.insertNodeAfter(classDeclarationSourceFile, classOpenBrace, methodDeclaration, { suffix: context.newLineCharacter });
                 return {
                     description: formatStringFromArgs(getLocaleSpecificMessage(makeStatic ?
diff --git a/src/services/codefixes/fixClassSuperMustPrecedeThisAccess.ts b/src/services/codefixes/fixClassSuperMustPrecedeThisAccess.ts
@@ -26,7 +26,7 @@ namespace ts.codefix {
                     }
                 }
             }
-            const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+            const changeTracker = textChanges.ChangeTracker.fromContext(context);
             changeTracker.insertNodeAfter(sourceFile, getOpenBrace(<ConstructorDeclaration>constructor, sourceFile), superCall, { suffix: context.newLineCharacter });
             changeTracker.deleteNode(sourceFile, superCall);
 
diff --git a/src/services/codefixes/fixConstructorForDerivedNeedSuperCall.ts b/src/services/codefixes/fixConstructorForDerivedNeedSuperCall.ts
@@ -10,7 +10,7 @@ namespace ts.codefix {
                 return undefined;
             }
 
-            const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+            const changeTracker = textChanges.ChangeTracker.fromContext(context);
             const superCall = createStatement(createCall(createSuper(), /*typeArguments*/ undefined, /*argumentsArray*/ emptyArray));
             changeTracker.insertNodeAfter(sourceFile, getOpenBrace(<ConstructorDeclaration>token.parent, sourceFile), superCall, { suffix: context.newLineCharacter });
 
diff --git a/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts b/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts
@@ -21,7 +21,7 @@ namespace ts.codefix {
                 return undefined;
             }
 
-            const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+            const changeTracker = textChanges.ChangeTracker.fromContext(context);
             changeTracker.replaceNode(sourceFile, extendsToken, createToken(SyntaxKind.ImplementsKeyword));
 
             // We replace existing keywords with commas.
diff --git a/src/services/codefixes/fixForgottenThisPropertyAccess.ts b/src/services/codefixes/fixForgottenThisPropertyAccess.ts
@@ -8,7 +8,7 @@ namespace ts.codefix {
             if (token.kind !== SyntaxKind.Identifier) {
                 return undefined;
             }
-            const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+            const changeTracker = textChanges.ChangeTracker.fromContext(context);
             changeTracker.replaceNode(sourceFile, token, createPropertyAccess(createThis(), <Identifier>token));
 
             return [{
diff --git a/src/services/codefixes/fixUnusedIdentifier.ts b/src/services/codefixes/fixUnusedIdentifier.ts
@@ -175,23 +175,23 @@ namespace ts.codefix {
             }
 
             function deleteNode(n: Node) {
-                return makeChange(textChanges.ChangeTracker.fromCodeFixContext(context).deleteNode(sourceFile, n));
+                return makeChange(textChanges.ChangeTracker.fromContext(context).deleteNode(sourceFile, n));
             }
 
             function deleteRange(range: TextRange) {
-                return makeChange(textChanges.ChangeTracker.fromCodeFixContext(context).deleteRange(sourceFile, range));
+                return makeChange(textChanges.ChangeTracker.fromContext(context).deleteRange(sourceFile, range));
             }
 
             function deleteNodeInList(n: Node) {
-                return makeChange(textChanges.ChangeTracker.fromCodeFixContext(context).deleteNodeInList(sourceFile, n));
+                return makeChange(textChanges.ChangeTracker.fromContext(context).deleteNodeInList(sourceFile, n));
             }
 
             function deleteNodeRange(start: Node, end: Node) {
-                return makeChange(textChanges.ChangeTracker.fromCodeFixContext(context).deleteNodeRange(sourceFile, start, end));
+                return makeChange(textChanges.ChangeTracker.fromContext(context).deleteNodeRange(sourceFile, start, end));
             }
 
             function replaceNode(n: Node, newNode: Node) {
-                return makeChange(textChanges.ChangeTracker.fromCodeFixContext(context).replaceNode(sourceFile, n, newNode));
+                return makeChange(textChanges.ChangeTracker.fromContext(context).replaceNode(sourceFile, n, newNode));
             }
 
             function makeChange(changeTracker: textChanges.ChangeTracker): CodeAction {
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
@@ -4,7 +4,7 @@ namespace ts.codefix {
     export function newNodesToChanges(newNodes: Node[], insertAfter: Node, context: CodeFixContext) {
         const sourceFile = context.sourceFile;
 
-        const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+        const changeTracker = textChanges.ChangeTracker.fromContext(context);
 
         for (const newNode of newNodes) {
             changeTracker.insertNodeAfter(sourceFile, insertAfter, newNode, { suffix: context.newLineCharacter });
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
@@ -692,7 +692,7 @@ namespace ts.codefix {
         }
 
         function createChangeTracker() {
-            return textChanges.ChangeTracker.fromCodeFixContext(context);
+            return textChanges.ChangeTracker.fromContext(context);
         }
 
         function createCodeAction(
diff --git a/src/services/refactors/convertFunctionToEs6Class.ts b/src/services/refactors/convertFunctionToEs6Class.ts
@@ -63,7 +63,7 @@ namespace ts.refactor.convertFunctionToES6Class {
         }
 
         const ctorDeclaration = ctorSymbol.valueDeclaration;
-        const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context as { newLineCharacter: string, rulesProvider: formatting.RulesProvider });
+        const changeTracker = textChanges.ChangeTracker.fromContext(context);
 
         let precedingNode: Node;
         let newClassDeclaration: ClassDeclaration;
diff --git a/src/services/refactors/extractMethod.ts b/src/services/refactors/extractMethod.ts
@@ -708,7 +708,7 @@ namespace ts.refactor.extractMethod {
             );
         }
 
-        const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+        const changeTracker = textChanges.ChangeTracker.fromContext(context);
         // insert function at the end of the scope
         changeTracker.insertNodeBefore(context.file, scope.getLastToken(), newFunction, { prefix: context.newLineCharacter, suffix: context.newLineCharacter });
 
diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts
@@ -186,7 +186,7 @@ namespace ts.textChanges {
         private changes: Change[] = [];
         private readonly newLineCharacter: string;
 
-        public static fromCodeFixContext(context: { newLineCharacter: string, rulesProvider?: formatting.RulesProvider }) {
+        public static fromContext(context: RefactorContext | CodeFixContext) {
             return new ChangeTracker(getNewlineKind(context), context.rulesProvider);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace ts.codefix {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
`29`		`- const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);`
	`29`	`+ const changeTracker = textChanges.ChangeTracker.fromContext(context);`
`30`	`30`	`changeTracker.insertNodeAfter(sourceFile, getOpenBrace(<ConstructorDeclaration>constructor, sourceFile), superCall, { suffix: context.newLineCharacter });`
`31`	`31`	`changeTracker.deleteNode(sourceFile, superCall);`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace ts.codefix {`
`10`	`10`	`return undefined;`
`11`	`11`	`}`
`12`	`12`
`13`		`- const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);`
	`13`	`+ const changeTracker = textChanges.ChangeTracker.fromContext(context);`
`14`	`14`	`const superCall = createStatement(createCall(createSuper(), /typeArguments/ undefined, /argumentsArray/ emptyArray));`
`15`	`15`	`changeTracker.insertNodeAfter(sourceFile, getOpenBrace(<ConstructorDeclaration>token.parent, sourceFile), superCall, { suffix: context.newLineCharacter });`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace ts.codefix {`
`21`	`21`	`return undefined;`
`22`	`22`	`}`
`23`	`23`
`24`		`- const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);`
	`24`	`+ const changeTracker = textChanges.ChangeTracker.fromContext(context);`
`25`	`25`	`changeTracker.replaceNode(sourceFile, extendsToken, createToken(SyntaxKind.ImplementsKeyword));`
`26`	`26`
`27`	`27`	`// We replace existing keywords with commas.`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace ts.codefix {`
`8`	`8`	`if (token.kind !== SyntaxKind.Identifier) {`
`9`	`9`	`return undefined;`
`10`	`10`	`}`
`11`		`- const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);`
	`11`	`+ const changeTracker = textChanges.ChangeTracker.fromContext(context);`
`12`	`12`	`changeTracker.replaceNode(sourceFile, token, createPropertyAccess(createThis(), <Identifier>token));`
`13`	`13`
`14`	`14`	`return [{`
Original file line number	Diff line number	Diff line change
`@@ -175,23 +175,23 @@ namespace ts.codefix {`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`function deleteNode(n: Node) {`
`178`		`- return makeChange(textChanges.ChangeTracker.fromCodeFixContext(context).deleteNode(sourceFile, n));`
	`178`	`+ return makeChange(textChanges.ChangeTracker.fromContext(context).deleteNode(sourceFile, n));`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`function deleteRange(range: TextRange) {`
`182`		`- return makeChange(textChanges.ChangeTracker.fromCodeFixContext(context).deleteRange(sourceFile, range));`
	`182`	`+ return makeChange(textChanges.ChangeTracker.fromContext(context).deleteRange(sourceFile, range));`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`function deleteNodeInList(n: Node) {`
`186`		`- return makeChange(textChanges.ChangeTracker.fromCodeFixContext(context).deleteNodeInList(sourceFile, n));`
	`186`	`+ return makeChange(textChanges.ChangeTracker.fromContext(context).deleteNodeInList(sourceFile, n));`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`function deleteNodeRange(start: Node, end: Node) {`
`190`		`- return makeChange(textChanges.ChangeTracker.fromCodeFixContext(context).deleteNodeRange(sourceFile, start, end));`
	`190`	`+ return makeChange(textChanges.ChangeTracker.fromContext(context).deleteNodeRange(sourceFile, start, end));`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`function replaceNode(n: Node, newNode: Node) {`
`194`		`- return makeChange(textChanges.ChangeTracker.fromCodeFixContext(context).replaceNode(sourceFile, n, newNode));`
	`194`	`+ return makeChange(textChanges.ChangeTracker.fromContext(context).replaceNode(sourceFile, n, newNode));`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`function makeChange(changeTracker: textChanges.ChangeTracker): CodeAction {`
Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,7 @@ namespace ts.codefix {`
`692`	`692`	`}`
`693`	`693`
`694`	`694`	`function createChangeTracker() {`
`695`		`- return textChanges.ChangeTracker.fromCodeFixContext(context);`
	`695`	`+ return textChanges.ChangeTracker.fromContext(context);`
`696`	`696`	`}`
`697`	`697`
`698`	`698`	`function createCodeAction(`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ namespace ts.refactor.convertFunctionToES6Class {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`const ctorDeclaration = ctorSymbol.valueDeclaration;`
`66`		`- const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context as { newLineCharacter: string, rulesProvider: formatting.RulesProvider });`
	`66`	`+ const changeTracker = textChanges.ChangeTracker.fromContext(context);`
`67`	`67`
`68`	`68`	`let precedingNode: Node;`
`69`	`69`	`let newClassDeclaration: ClassDeclaration;`