Merge pull request microsoft#11829 from Microsoft/arozga/RemoveNavBarWhiteSpace

aozgaa · web-flow · commit 48f947f50d4a · 2016-10-25T11:44:29.000-07:00
remove whitespace in nav bar completions
diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
@@ -403,6 +403,9 @@ namespace ts.NavigationBar {
                 if (getModifierFlags(node) & ModifierFlags.Default) {
                     return "default";
                 }
+                // We may get a string with newlines or other whitespace in the case of an object dereference
+                // (eg: "app\n.onactivated"), so we should remove the whitespace for readabiltiy in the
+                // navigation bar.
                 return getFunctionOrClassName(<ArrowFunction | FunctionExpression | ClassExpression>node);
             case SyntaxKind.Constructor:
                 return "constructor";
@@ -602,7 +605,7 @@ namespace ts.NavigationBar {
         // See if it is of the form "<expr> = function(){...}". If so, use the text from the left-hand side.
         else if (node.parent.kind === SyntaxKind.BinaryExpression &&
             (node.parent as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken) {
-            return nodeText((node.parent as BinaryExpression).left);
+            return nodeText((node.parent as BinaryExpression).left).replace(whiteSpaceRegex, "");
         }
         // See if it is a property assignment, and if so use the property name
         else if (node.parent.kind === SyntaxKind.PropertyAssignment && (node.parent as PropertyAssignment).name) {
@@ -620,4 +623,19 @@ namespace ts.NavigationBar {
     function isFunctionOrClassExpression(node: Node): boolean {
         return node.kind === SyntaxKind.FunctionExpression || node.kind === SyntaxKind.ArrowFunction || node.kind === SyntaxKind.ClassExpression;
     }
+
+    /**
+     * Matches all whitespace characters in a string. Eg:
+     * 
+     * "app.
+     * 
+     * onactivated"
+     * 
+     * matches because of the newline, whereas
+     * 
+     * "app.onactivated"
+     * 
+     * does not match.
+     */
+    const whiteSpaceRegex = /\s+/g;
 }
diff --git a/tests/cases/fourslash/indentationWithBaseIndent.ts b/tests/cases/fourslash/indentationWithBaseIndent.ts
@@ -205,7 +205,6 @@
 ////          function unterminatedListIndentation(a,
 ////{| "indent": 14 , "baseIndentSize": 10 |}
 
-debugger;
 test.markers().forEach(marker => {
     verify.indentationAtPositionIs(marker.fileName, marker.position, marker.data.indent, ts.IndentStyle.Smart, marker.data.baseIndentSize);
 });
diff --git a/tests/cases/fourslash/navigationBarItemsFunctionProperties.ts b/tests/cases/fourslash/navigationBarItemsFunctionProperties.ts
@@ -0,0 +1,33 @@
+/// <reference path="fourslash.ts"/>
+
+//// (function(){
+//// var A;
+//// A/*1*/
+//// .a = function() { };
+//// })();
+
+function navExact(name: string, kind: string) {
+	return;
+}
+
+verify.navigationTree(
+{
+  "text": "<global>",
+  "kind": "script",
+  "childItems": [
+    {
+      "text": "<function>",
+      "kind": "function",
+      "childItems": [
+        {
+          "text": "A",
+          "kind": "var"
+        },
+        {
+          "text": "A.a",
+          "kind": "function"
+        }
+      ]
+    }
+  ]
+});
