Look for declaration expressions in nested expressions

Author: Andy Hanson

src/services/services.ts

@@ -946,22 +946,9 @@ namespace ts {
                     case SyntaxKind.SetAccessor:
                     case SyntaxKind.TypeLiteral:
                         addDeclaration(<Declaration>node);
-                    // fall through
-                    case SyntaxKind.Constructor:
-                    case SyntaxKind.VariableStatement:
-                    case SyntaxKind.VariableDeclarationList:
-                    case SyntaxKind.ObjectBindingPattern:
-                    case SyntaxKind.ArrayBindingPattern:
-                    case SyntaxKind.ModuleBlock:
                         forEachChild(node, visit);
                         break;
 
-                    case SyntaxKind.Block:
-                        if (isFunctionBlock(node)) {
-                            forEachChild(node, visit);
-                        }
-                        break;
-
                     case SyntaxKind.Parameter:
                         // Only consider parameter properties
                         if (!(node.flags & NodeFlags.ParameterPropertyModifier)) {
@@ -1014,6 +1001,9 @@ namespace ts {
                             }
                         }
                         break;
+
+                    default:
+                        forEachChild(node, visit);
                 }
             }
         }

tests/cases/fourslash/declarationExpressions.ts

@@ -6,6 +6,8 @@
 ////};
 ////function D() {}
 ////const E = function F() {}
+////console.log(function inner() {})
+
 
 // Search for properties defined in the constructor, but not other constructor paramters
 var searchValue = "search";
@@ -17,3 +19,5 @@ verify.navigationItemsListContains("x", "property", "x", "exact");
 verify.navigationItemsListContains("D", "function", "D", "exact");
 verify.navigationItemsListContains("E", "const", "E", "exact");
 verify.navigationItemsListContains("F", "function", "F", "exact")
+
+verify.navigationItemsListContains("inner", "function", "inner", "exact");