Merge pull request #374 from gjsjohnmurray/fix-373

Make WorkspaceSymbolProvider work with isfs

Author: gjsjohnmurray

src/providers/WorkspaceSymbolProvider.ts

@@ -19,28 +19,34 @@ export class WorkspaceSymbolProvider implements vscode.WorkspaceSymbolProvider {
     ]).then(([classes, routines, methods]) => [...classes, ...routines, ...methods]);
   }
 
-  public async byClasses(query: string): Promise<vscode.SymbolInformation[]> {
+  private getApi(): AtelierAPI {
+    const currentFileUri = vscode.window.activeTextEditor?.document.uri;
+    const firstFolder = vscode.workspace.workspaceFolders?.length ? vscode.workspace.workspaceFolders[0] : undefined;
+    return new AtelierAPI(currentFileUri || firstFolder?.uri || "");
+  }
+
+  private async byClasses(query: string): Promise<vscode.SymbolInformation[]> {
     query = query.toUpperCase();
     query = `*${query}*`;
     const library = query.replace(/%(\b\w+\b(?!\.))/, "%LIBRARY.$1");
     const sql = `
     SELECT TOP 10 Name ClassName FROM %Dictionary.ClassDefinition
     WHERE %SQLUPPER Name %MATCHES ? OR %SQLUPPER Name %MATCHES ?`;
-    const api = new AtelierAPI();
+    const api = this.getApi();
     const data = await api.actionQuery(sql, [library, query]);
     return data.result.content.map(({ ClassName }) => ({
       kind: vscode.SymbolKind.Class,
       location: {
-        uri: new ClassDefinition(ClassName).uri,
+        uri: new ClassDefinition(ClassName, undefined, api.ns).uri,
       },
       name: ClassName,
     }));
   }
 
-  public async byRoutines(query: string): Promise<vscode.SymbolInformation[]> {
+  private async byRoutines(query: string): Promise<vscode.SymbolInformation[]> {
     query = `*${query}*.mac,*${query}*.int`;
     const sql = `CALL %Library.RoutineMgr_StudioOpenDialog(?,?,?,?,?,?,?)`;
-    const api = new AtelierAPI();
+    const api = this.getApi();
     const direction = "1";
     const orderBy = "1";
     const systemFiles = "0";
@@ -52,22 +58,22 @@ export class WorkspaceSymbolProvider implements vscode.WorkspaceSymbolProvider {
     return data.result.content.map(({ Name }: StudioOpenDialog) => ({
       kind: vscode.SymbolKind.File,
       location: {
-        uri: DocumentContentProvider.getUri(Name),
+        uri: DocumentContentProvider.getUri(Name, undefined, api.ns),
       },
       name: Name,
     }));
   }
 
-  public async byMethods(query: string): Promise<vscode.SymbolInformation[]> {
+  private async byMethods(query: string): Promise<vscode.SymbolInformation[]> {
+    const api = this.getApi();
     query = query.toUpperCase();
     query = `*${query}*`;
     const getLocation = async (className, name) => {
-      const classDef = new ClassDefinition(className);
+      const classDef = new ClassDefinition(className, undefined, api.ns);
       return classDef.getMemberLocation(name);
     };
     const sql = `
       SELECT TOP 10 Parent ClassName, Name FROM %Dictionary.MethodDefinition WHERE %SQLUPPER Name %MATCHES ?`;
-    const api = new AtelierAPI();
     return api
       .actionQuery(sql, [query])
       .then((data): Promise<vscode.SymbolInformation>[] =>

src/utils/classDefinition.ts

@@ -7,7 +7,7 @@ import { DocumentContentProvider } from "../providers/DocumentContentProvider";
 
 export class ClassDefinition {
   public get uri(): vscode.Uri {
-    return DocumentContentProvider.getUri(this._classFileName);
+    return DocumentContentProvider.getUri(this._classFileName, this._workspaceFolder, this._namespace);
   }
 
   public static normalizeClassName(className: string, withExtension = false): string {
@@ -16,8 +16,12 @@ export class ClassDefinition {
   private _className: string;
   private _classFileName: string;
   private _cache;
+  private _workspaceFolder: string;
+  private _namespace: string;
 
-  public constructor(className: string) {
+  public constructor(className: string, workspaceFolder?: string, namespace?: string) {
+    this._workspaceFolder = workspaceFolder;
+    this._namespace = namespace;
     if (className.endsWith(".cls")) {
       className = className.replace(/\.cls$/i, "");
     }
@@ -30,6 +34,7 @@ export class ClassDefinition {
     return vscode.workspace.openTextDocument(this.uri);
   }
 
+  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
   public store(kind: string, data: any): any {
     return this._cache.put(kind, data, 36000).then(() => data);
   }