Support navTo for special assignment kinds (microsoft#18154)

Andy · web-flow · commit 7541c705bfe9 · 2017-09-07T07:45:11.000-07:00
* Support navTo for special assignment kinds

* Return ScriptElementKind.unknown
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -2628,4 +2628,6 @@ namespace ts {
     export function and<T>(f: (arg: T) => boolean, g: (arg: T) => boolean) {
         return (arg: T) => f(arg) && g(arg);
     }
+
+    export function assertTypeIsNever(_: never): void {}
 }
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -722,6 +722,12 @@ namespace ts {
                         }
                         break;
 
+                    case SyntaxKind.BinaryExpression:
+                        if (getSpecialPropertyAssignmentKind(node as BinaryExpression) !== SpecialPropertyAssignmentKind.None) {
+                           addDeclaration(node as BinaryExpression);
+                        }
+                        // falls through
+
                     default:
                         forEachChild(node, visit);
                 }
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -343,6 +343,28 @@ namespace ts {
                 return ScriptElementKind.alias;
             case SyntaxKind.JSDocTypedefTag:
                 return ScriptElementKind.typeElement;
+            case SyntaxKind.BinaryExpression:
+                const kind = getSpecialPropertyAssignmentKind(node as BinaryExpression);
+                const { right } = node as BinaryExpression;
+                switch (kind) {
+                    case SpecialPropertyAssignmentKind.None:
+                        return ScriptElementKind.unknown;
+                    case SpecialPropertyAssignmentKind.ExportsProperty:
+                    case SpecialPropertyAssignmentKind.ModuleExports:
+                        const rightKind = getNodeKind(right);
+                        return rightKind === ScriptElementKind.unknown ? ScriptElementKind.constElement : rightKind;
+                    case SpecialPropertyAssignmentKind.PrototypeProperty:
+                        return ScriptElementKind.memberFunctionElement; // instance method
+                    case SpecialPropertyAssignmentKind.ThisProperty:
+                        return ScriptElementKind.memberVariableElement; // property
+                    case SpecialPropertyAssignmentKind.Property:
+                        // static method / property
+                        return isFunctionExpression(right) ? ScriptElementKind.memberFunctionElement : ScriptElementKind.memberVariableElement;
+                    default: {
+                        assertTypeIsNever(kind);
+                        return ScriptElementKind.unknown;
+                    }
+                }
             default:
                 return ScriptElementKind.unknown;
         }
diff --git a/tests/cases/fourslash/navigationItemsSpecialPropertyAssignment.ts b/tests/cases/fourslash/navigationItemsSpecialPropertyAssignment.ts
@@ -0,0 +1,20 @@
+/// <reference path="fourslash.ts"/>
+
+// @allowJs: true
+// @Filename: /a.js
+////exports.{| "name": "x", "kind": "const" |}x = 0;
+////exports.{| "name": "y", "kind": "function" |}y = function() {};
+////function Cls() {
+////    this.{| "name": "prop", "kind": "property" |}prop = 0;
+////}
+////Cls.{| "name": "staticMethod", "kind": "method" |}staticMethod = function() {};
+////Cls.{| "name": "staticProperty", "kind": "property" |}staticProperty = 0;
+////Cls.prototype.{| "name": "instance", "kind": "method" |}instance = function() {};
+
+for (const marker of test.markers()) {
+    verify.navigationItemsListContains(
+        marker.data.name,
+        marker.data.kind,
+        marker.data.name,
+        "exact");
+}

Original file line number	Diff line number	Diff line change
`@@ -2628,4 +2628,6 @@ namespace ts {`
`2628`	`2628`	`export function and<T>(f: (arg: T) => boolean, g: (arg: T) => boolean) {`
`2629`	`2629`	`return (arg: T) => f(arg) && g(arg);`
`2630`	`2630`	`}`
	`2631`	`+`
	`2632`	`+ export function assertTypeIsNever(_: never): void {}`
`2631`	`2633`	`}`
Original file line number	Diff line number	Diff line change
`@@ -722,6 +722,12 @@ namespace ts {`
`722`	`722`	`}`
`723`	`723`	`break;`
`724`	`724`
	`725`	`+ case SyntaxKind.BinaryExpression:`
	`726`	`+ if (getSpecialPropertyAssignmentKind(node as BinaryExpression) !== SpecialPropertyAssignmentKind.None) {`
	`727`	`+ addDeclaration(node as BinaryExpression);`
	`728`	`+ }`
	`729`	`+ // falls through`
	`730`	`+`
`725`	`731`	`default:`
`726`	`732`	`forEachChild(node, visit);`
`727`	`733`	`}`