search definitions in master script

search references from master in other scripts
GRAPHISOFT · Oct 15, 2022 · 317be45 · 317be45
1 parent 00fd1ef
commit 317be45
Show file tree

Hide file tree

Showing 9 changed files with 154 additions and 80 deletions.
diff --git a/out/calltree.js b/out/calltree.js
diff --git a/out/calltree.js.map b/out/calltree.js.map
diff --git a/out/extension.js b/out/extension.js
diff --git a/out/extension.js.map b/out/extension.js.map
diff --git a/out/parsexmlgdl.js b/out/parsexmlgdl.js
diff --git a/out/parsexmlgdl.js.map b/out/parsexmlgdl.js.map
diff --git a/src/calltree.ts b/src/calltree.ts
@@ -155,16 +155,6 @@ export class CallTree implements vscode.CallHierarchyProvider {
         });
     }
 
-    static getScriptsToSearch(searchMode : Parser.ScriptType) : Parser.ScriptType[] {
-        if (searchMode === Parser.ScriptType.D) {
-            // master script mode should search all scripts
-            return Parser.Scripts;
-        } else {
-            // otherwise search mode and master
-            return [Parser.ScriptType.D, searchMode];
-        }
-    }
-
     async getUrisToSearch(item : vscode.CallHierarchyItem, searchScripts : Parser.ScriptType[], cancel : vscode.CancellationToken) : Promise<vscode.Uri[]>{
         let uris : Array<vscode.Uri>;
 
@@ -192,7 +182,7 @@ export class CallTree implements vscode.CallHierarchyProvider {
 
     async getCallHierarchyOutgoingCalls(item : vscode.CallHierarchyItem, cancel : vscode.CancellationToken) : Promise<vscode.CallHierarchyOutgoingCall[]> {
         const searchMode = CallTree.getContext(item.detail);
-        const searchScripts = CallTree.getScriptsToSearch(searchMode);
+        const searchScripts = Parser.getRelatedScripts(searchMode);
         let calls : Promise<vscode.CallHierarchyOutgoingCall[]>[];
         if (searchMode === Parser.ScriptType.D) {
             // add all subscripts if looking at master script
@@ -233,7 +223,7 @@ export class CallTree implements vscode.CallHierarchyProvider {
         }
 
         const searchMode = CallTree.getIncomingMode(item.uri, CallTree.getContext(item.detail));
-        const searchScripts = CallTree.getScriptsToSearch(searchMode);
+        const searchScripts = Parser.getRelatedScripts(searchMode);
 
         const libparts = await this.wsSymbols.values(cancel);
         const calldata = libparts.map(async (libpart) => {