Merge pull request microsoft#6680 from RyanCavanaugh/fix6646

RyanCavanaugh · RyanCavanaugh · commit 2d7a2f4d303d · 2016-02-02T10:48:29.000-08:00
Parse JSDoc comments for ES6 class constructors and methods
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -4746,7 +4746,7 @@ namespace ts {
             parseExpected(SyntaxKind.ConstructorKeyword);
             fillSignature(SyntaxKind.ColonToken, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
             node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false, Diagnostics.or_expected);
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
 
         function parseMethodDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, asteriskToken: Node, name: PropertyName, questionToken: Node, diagnosticMessage?: DiagnosticMessage): MethodDeclaration {
@@ -4760,7 +4760,7 @@ namespace ts {
             const isAsync = !!(method.flags & NodeFlags.Async);
             fillSignature(SyntaxKind.ColonToken, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, method);
             method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage);
-            return finishNode(method);
+            return addJSDocComment(finishNode(method));
         }
 
         function parsePropertyDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, name: PropertyName, questionToken: Node): ClassElement {
diff --git a/tests/cases/fourslash/getJavaScriptCompletions16.ts b/tests/cases/fourslash/getJavaScriptCompletions16.ts
@@ -0,0 +1,35 @@
+/// <reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: file.js
+//// "use strict";
+//// 
+//// class Something {
+//// 
+////     /**
+////      * @param {number} a
+////      */
+////     constructor(a, b) {
+////         a/*body*/
+////     }
+////     
+////     /**
+////      * @param {number} a
+////      */
+////     method(a) {
+////         a/*method*/
+////     }
+//// }
+//// let x = new Something(/*sig*/);
+
+goTo.marker('body');
+edit.insert('.');
+verify.completionListContains('toFixed', undefined, undefined, 'method');
+edit.backspace();
+
+goTo.marker('sig');
+verify.currentSignatureHelpIs('Something(a: number, b: any): Something');
+
+goTo.marker('method');
+edit.insert('.');
+verify.completionListContains('toFixed', undefined, undefined, 'method');
