remove trivia

Arthur Ozga · Arthur Ozga · commit 43e01f282b51 · 2017-03-22T14:50:01.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -2208,13 +2208,13 @@ namespace ts {
             const parameterDeclaration = parameterSymbol.declarations[0] as ParameterDeclaration;
             const parameterType = getTypeOfSymbol(parameterSymbol);
             const parameterTypeNode = typeToTypeNode(parameterType, enclosingDeclaration);
-            // TODO: how should we clone members/modifiers?
             // TODO: check initializer accessibility correctly.
             const parameterNode = createParameter(
                 parameterDeclaration.decorators,
                 parameterDeclaration.modifiers,
                 parameterDeclaration.dotDotDotToken && createToken(SyntaxKind.DotDotDotToken),
-                parameterDeclaration.name,
+                // Clone name to remove trivia.
+                getSynthesizedClone(parameterDeclaration.name),
                 parameterDeclaration.questionToken && createToken(SyntaxKind.QuestionToken),
                 parameterTypeNode,
                 parameterDeclaration.initializer);
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
@@ -62,7 +62,8 @@ namespace ts.codefix {
         }
 
         const declaration = declarations[0] as Declaration;
-        const name = <PropertyName>declaration.name;
+        // Clone name to remove leading trivia.
+        const name = getSynthesizedClone(<PropertyName>declaration.name);
         const visibilityModifier = createVisibilityModifier(getModifierFlags(declaration));
         const modifiers = visibilityModifier ? createNodeArray([visibilityModifier]) : undefined;
         const type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration));
@@ -227,4 +228,12 @@ namespace ts.codefix {
         }
         return undefined;
     }
+
+    function stripComments(node: Node): Node {
+        if(node === undefined) {
+            return node;
+        }
+        const strippedChildren = visitEachChild(node, stripComments, nullTransformationContext);
+        return strippedChildren === node ? getSynthesizedClone(strippedChildren) : strippedChildren;
+    }
 }
diff --git a/tests/cases/fourslash/codeFixClassExtendAbstractMethodAnonymousClass.1.ts b/tests/cases/fourslash/codeFixClassExtendAbstractMethodAnonymousClass.1.ts
diff --git a/tests/cases/fourslash/codeFixClassImplementInterfaceComments.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceComments.ts
@@ -2,13 +2,26 @@
 
 // @lib: es2017
 
-//// /** interface prefix */
-//// interface /**interface name prefix */ I /**open-brace prefix*/{
-////     /** property prefix*/ x /**colon prefix*/: /**number prefix*/ number;
-////
+//// namespace N {
+////     /**enum prefix */
+////     export enum /**enum identifier prefix */ E /**open-brace prefix*/ {
+////     /* literal prefix */ a /** comma prefix */,
+////     /* literal prefix */ b /** comma prefix */,
+////     /* literal prefix */ c
+////     /** close brace prefix */ }
+////     /** interface prefix */
+////     export interface /**interface name prefix */ I /**open-brace prefix*/ {
+////     /** property prefix */ a /** colon prefix */: /** enum literal prefix 1*/ E /** dot prefix */. /** enum literal prefix 2*/a;
+////     /** property prefix */ b /** colon prefix */: /** enum prefix */ E;
+////     /**method signature prefix */foo /**open angle prefix */< /**type parameter name prefix */ X /** closing angle prefix */> /**open paren prefix */(/** parameter prefix */ a/** colon prefix */: /** parameter type prefix */ X /** close paren prefix */) /** colon prefix */: /** return type prefix */ string /** semicolon prefix */;
+////         /**close-brace prefix*/ }
 //// /**close-brace prefix*/ }
-//// class C implements I {[| |]}
+//// class C implements N.I {[| |]}
 
 verify.rangeAfterCodeFix(`
-    x: number;
+    a: N.E.a;
+    b: N.E;
+    foo<X>(a: X): string {
+        throw new Error("Method not implemented.");
+    }
 `);

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,8 @@ namespace ts.codefix {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`const declaration = declarations[0] as Declaration;`
`65`		`- const name = <PropertyName>declaration.name;`
	`65`	`+ // Clone name to remove leading trivia.`
	`66`	`+ const name = getSynthesizedClone(<PropertyName>declaration.name);`
`66`	`67`	`const visibilityModifier = createVisibilityModifier(getModifierFlags(declaration));`
`67`	`68`	`const modifiers = visibilityModifier ? createNodeArray([visibilityModifier]) : undefined;`
`68`	`69`	`const type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration));`
`@@ -227,4 +228,12 @@ namespace ts.codefix {`
`227`	`228`	`}`
`228`	`229`	`return undefined;`
`229`	`230`	`}`
	`231`	`+`
	`232`	`+ function stripComments(node: Node): Node {`
	`233`	`+ if(node === undefined) {`
	`234`	`+ return node;`
	`235`	`+ }`
	`236`	`+ const strippedChildren = visitEachChild(node, stripComments, nullTransformationContext);`
	`237`	`+ return strippedChildren === node ? getSynthesizedClone(strippedChildren) : strippedChildren;`
	`238`	`+ }`
`230`	`239`	`}`