Merge pull request microsoft#7309 from RyanCavanaugh/fix6878

RyanCavanaugh · RyanCavanaugh · commit 311f8dd7d31c · 2016-03-03T15:50:15.000-08:00
Support JSDoc on class / obj. literal getters
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -2958,12 +2958,22 @@ namespace ts {
         function getTypeOfAccessors(symbol: Symbol): Type {
             const links = getSymbolLinks(symbol);
             if (!links.type) {
+                const getter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.GetAccessor);
+                const setter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.SetAccessor);
+
+                if (getter && getter.flags & NodeFlags.JavaScriptFile) {
+                    const jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter);
+                    if (jsDocType) {
+                        return links.type = jsDocType;
+                    }
+                }
+
                 if (!pushTypeResolution(symbol, TypeSystemPropertyName.Type)) {
                     return unknownType;
                 }
-                const getter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.GetAccessor);
-                const setter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.SetAccessor);
+
                 let type: Type;
+
                 // First try to see if the user specified a return type on the get-accessor.
                 const getterReturnType = getAnnotatedAccessorType(getter);
                 if (getterReturnType) {
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -3932,7 +3932,7 @@ namespace ts {
 
         function tryParseAccessorDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): AccessorDeclaration {
             if (parseContextualModifier(SyntaxKind.GetKeyword)) {
-                return parseAccessorDeclaration(SyntaxKind.GetAccessor, fullStart, decorators, modifiers);
+                return addJSDocComment(parseAccessorDeclaration(SyntaxKind.GetAccessor, fullStart, decorators, modifiers));
             }
             else if (parseContextualModifier(SyntaxKind.SetKeyword)) {
                 return parseAccessorDeclaration(SyntaxKind.SetAccessor, fullStart, decorators, modifiers);
diff --git a/tests/cases/fourslash/getJavaScriptQuickInfo8.ts b/tests/cases/fourslash/getJavaScriptQuickInfo8.ts
@@ -0,0 +1,29 @@
+/// <reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: file.js
+//// let x = {
+//// 	/** @type {number} */
+//// 	get m() {
+//// 		return undefined;
+//// 	}
+//// }
+//// x.m/*1*/;
+////
+//// class Foo {
+//// 	/** @type {string} */
+//// 	get b() {
+//// 		return undefined;
+//// 	}
+//// }
+//// var y = new Foo();
+//// y.b/*2*/;
+
+goTo.marker('1');
+edit.insert('.');
+verify.memberListContains('toFixed', undefined, undefined, 'method');
+edit.backspace();
+
+goTo.marker('2');
+edit.insert('.');
+verify.memberListContains('substr', undefined, undefined, 'method');

Original file line number	Diff line number	Diff line change
`@@ -3932,7 +3932,7 @@ namespace ts {`
`3932`	`3932`
`3933`	`3933`	`function tryParseAccessorDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): AccessorDeclaration {`
`3934`	`3934`	`if (parseContextualModifier(SyntaxKind.GetKeyword)) {`
`3935`		`- return parseAccessorDeclaration(SyntaxKind.GetAccessor, fullStart, decorators, modifiers);`
	`3935`	`+ return addJSDocComment(parseAccessorDeclaration(SyntaxKind.GetAccessor, fullStart, decorators, modifiers));`
`3936`	`3936`	`}`
`3937`	`3937`	`else if (parseContextualModifier(SyntaxKind.SetKeyword)) {`
`3938`	`3938`	`return parseAccessorDeclaration(SyntaxKind.SetAccessor, fullStart, decorators, modifiers);`