Discover named js functions with "Object." prefixes, simplify symbol info extractors interface

Author: Noam Kfir

src/services/languages/javascript/methodExtractor.ts

@@ -93,12 +93,10 @@ export class JSMethodExtractor implements IMethodExtractor {
         for (const symbol of symbols) {
             const symbolPath = (parentSymbolPath ? parentSymbolPath + '.' : '') + symbol.name;
 
-            const symbolInfo: SymbolInfo | undefined = symbolInfoExtractors.reduce(
-                (info: SymbolInfo | undefined, extractor) => info || extractor.extract(symbol, codeObjectPath, symbol.name, document, symbolPath),
-                undefined,
-            );
-            if(symbolInfo) {
-                symbolInfos.push(symbolInfo);
+            for (const extractor of symbolInfoExtractors) {
+                symbolInfos.push(
+                    ...extractor.extract(symbol, codeObjectPath, symbol.name, document, symbolPath)
+                );
             }
 
             const hasChildren = symbol.children && symbol.children.length > 0;

src/services/languages/javascript/symbolInfoExtractors.ts

@@ -4,21 +4,31 @@ import { SymbolInfo } from '../extractors';
 import { Token } from '../tokens';
 
 export abstract class SymbolInfoExtractor {
-    extract(symbol: DocumentSymbol, codeObjectPath: string, name: string, document: vscode.TextDocument, symbolPath: string): SymbolInfo | undefined {
+    extract(
+        symbol: DocumentSymbol,
+        codeObjectPath: string,
+        names: string | string[],
+        document: vscode.TextDocument,
+        symbolPath: string
+    ): SymbolInfo[] {
         const range = new vscode.Range(
             new vscode.Position(symbol.range.start.line, symbol.range.start.character),
             new vscode.Position(symbol.range.end.line, symbol.range.end.character)
         );
-        const id = `${codeObjectPath}$_$${name}`;
 
-        return {
-            id,
-            name,
-            codeLocation: codeObjectPath,
-            displayName: symbolPath,
-            range,
-            documentUri: document.uri
-        };
+        names = Array.isArray(names) ? names : [names];
+        
+        return names.map(name => {
+            const id = `${codeObjectPath}$_$${name}`;
+            return {
+                id,
+                name,
+                codeLocation: codeObjectPath,
+                displayName: symbolPath,
+                range,
+                documentUri: document.uri
+            };
+        });
     }
 
     protected isOfKind(symbol: DocumentSymbol, kind: number): boolean {
@@ -27,28 +37,49 @@ export abstract class SymbolInfoExtractor {
 }
 
 export class MethodSymbolInfoExtractor extends SymbolInfoExtractor {
-    extract(symbol: DocumentSymbol, codeObjectPath: string, name: string, document: vscode.TextDocument, symbolPath: string): SymbolInfo | undefined {
+    extract(
+        symbol: DocumentSymbol,
+        codeObjectPath: string,
+        name: string,
+        document: vscode.TextDocument,
+        symbolPath: string
+    ): SymbolInfo[] {
         if(this.isOfKind(symbol, SymbolKind.Method)) {
             return super.extract(symbol, codeObjectPath, name, document, symbolPath);
         }
+        return [];
     }
 }
 
 export class NamedFunctionDeclarationSymbolInfoExtractor extends SymbolInfoExtractor {
-    extract(symbol: DocumentSymbol, codeObjectPath: string, name: string, document: vscode.TextDocument, symbolPath: string): SymbolInfo | undefined {
+    extract(
+        symbol: DocumentSymbol,
+        codeObjectPath: string,
+        name: string,
+        document: vscode.TextDocument,
+        symbolPath: string
+    ): SymbolInfo[] {
         if (this.isOfKind(symbol, SymbolKind.Function)) {
             const textLine = document.lineAt(symbol.range.start.line);
             const functionMatch = `\\s*function\\s*${symbol.name}`; //should handle only function declaration, and filter out function call like db.getAll()
             const match = textLine.text.match(functionMatch);
             if(match !== undefined && match !== null) {
-                return super.extract(symbol, codeObjectPath, name, document, symbolPath);
+                const names = [name, `Object.${name}`];
+                return super.extract(symbol, codeObjectPath, names, document, symbolPath);
             }
         }
+        return [];
     }
 }
 
 export class AnonymousExpressRequestHandlerSymbolInfoExtractor extends SymbolInfoExtractor {
-    extract(symbol: DocumentSymbol, codeObjectPath: string, name: string, document: vscode.TextDocument, symbolPath: string): SymbolInfo | undefined {
+    extract(
+        symbol: DocumentSymbol,
+        codeObjectPath: string,
+        name: string,
+        document: vscode.TextDocument,
+        symbolPath: string
+    ): SymbolInfo[] {
         if (this.isOfKind(symbol, SymbolKind.Function)) {
             const pattern = /.*(get|head|post|put|delete|connect|options|trace|patch)\s*\(\s*['"`](.*)['"`]\)\s*callback$/i;
             const match = name.match(pattern);
@@ -58,6 +89,7 @@ export class AnonymousExpressRequestHandlerSymbolInfoExtractor extends SymbolInf
                 return super.extract(symbol, codeObjectPath, name, document, symbolPath);
             }
         }
+        return [];
     }
 }
 
@@ -69,13 +101,20 @@ export class VariableFunctionSymbolInfoExtractor extends SymbolInfoExtractor {
         super();
     }
 
-    extract(symbol: DocumentSymbol, codeObjectPath: string, name: string, document: vscode.TextDocument, symbolPath: string): SymbolInfo | undefined {
+    extract(
+        symbol: DocumentSymbol,
+        codeObjectPath: string,
+        name: string,
+        document: vscode.TextDocument,
+        symbolPath: string
+    ): SymbolInfo[] {
         if (this.isOfKind(symbol, SymbolKind.Variable)) {
             const key = this.getKey(symbol.range.start.line, symbol.range.start.character);
             const functionToken = this.functionMap[key];
             if(functionToken !== undefined) {
                 return super.extract(symbol, codeObjectPath, name, document, symbolPath);
             }
         }
+        return [];
     }
 }