some fixes

Author: daimor

Diff for: providers/ObjectScriptDefinitionProvider.ts

@@ -18,11 +18,21 @@ export class ObjectScriptDefinitionProvider implements vscode.DefinitionProvider
       return fromClassRef;
     }
 
-    let selfRef = document.getWordRangeAtPosition(position, /\.\.%?[a-zA-Z][a-zA-Z0-9]+(?:\.[a-zA-Z][a-zA-Z0-9]+)*/);
+    let selfRef = document.getWordRangeAtPosition(position, /\.\.#?%?[a-zA-Z][a-zA-Z0-9]+(?:\.[a-zA-Z][a-zA-Z0-9]+)*/);
     if (selfRef) {
       let selfEntity = document.getText(selfRef).substr(2);
+      let range = new vscode.Range(position.line, selfRef.start.character + 2, position.line, selfRef.end.character);
       let classDefinition = new ClassDefinition(file.name);
-      return classDefinition.getPosition(selfEntity, document);
+      return classDefinition.getMemberLocations(selfEntity).then(
+        (locations): vscode.DefinitionLink[] =>
+          locations.map(
+            (location): vscode.DefinitionLink => ({
+              originSelectionRange: range,
+              targetUri: location.uri,
+              targetRange: location.range
+            })
+          )
+      );
     }
 
     let macroRange = document.getWordRangeAtPosition(position);
@@ -117,7 +127,7 @@ export class ObjectScriptDefinitionProvider implements vscode.DefinitionProvider
         ];
       } else {
         let classDefinition = new ClassDefinition(className);
-        return classDefinition.getPosition(entity);
+        return classDefinition.getMemberLocations(entity);
       }
     }
 

Diff for: providers/WorkspaceSymbolProvider.ts

@@ -1,6 +1,5 @@
 import * as vscode from 'vscode';
 import { AtelierAPI } from '../api';
-import { DocumentContentProvider } from './DocumentContentProvider';
 import { ClassDefinition } from '../utils/classDefinition';
 
 export class WorkspaceSymbolProvider implements vscode.WorkspaceSymbolProvider {
@@ -11,41 +10,53 @@ export class WorkspaceSymbolProvider implements vscode.WorkspaceSymbolProvider {
     if (query.length < 3) {
       return null;
     }
+    return Promise.all([this.byClasses(query), this.byMethods(query)]).then(([classes, methods]) => [
+      ...classes,
+      ...methods
+    ]);
+  }
+
+  async byClasses(query: string): Promise<vscode.SymbolInformation[]> {
     query = query.toUpperCase();
     query = `*${query}*`;
     let library = query.replace(/%(\b\w+\b(?!\.))/, '%LIBRARY.$1');
     let sql = `
-    SELECT TOP 10 ID FROM %Dictionary.ClassDefinition WHERE %SQLUPPER Name %MATCHES ? OR %SQLUPPER Name %MATCHES ?
-    UNION
-    SELECT TOP 10 ID FROM %Dictionary.MethodDefinition WHERE %SQLUPPER Name %MATCHES ?
-    `;
+    SELECT TOP 10 Name ClassName FROM %Dictionary.ClassDefinition WHERE %SQLUPPER Name %MATCHES ? OR %SQLUPPER Name %MATCHES ?`;
+    let api = new AtelierAPI();
+    const data = await api.actionQuery(sql, [library, query]);
+    return data.result.content.map(({ ClassName }) => ({
+      name: ClassName,
+      kind: vscode.SymbolKind.Class,
+      location: {
+        uri: new ClassDefinition(ClassName).uri
+      }
+    }));
+  }
+
+  async byMethods(query: string): Promise<vscode.SymbolInformation[]> {
+    query = query.toUpperCase();
+    query = `*${query}*`;
+    const getLocation = async (className, name) => {
+      let classDef = new ClassDefinition(className);
+      return classDef.getMemberLocation(name);
+    };
+    let sql = `
+      SELECT TOP 10 Parent ClassName, Name FROM %Dictionary.MethodDefinition WHERE %SQLUPPER Name %MATCHES ?`;
     let api = new AtelierAPI();
-    return api.actionQuery(sql, [library, query, query]).then(data => {
-      let result = data.result.content;
-      return result.map(el => {
-        let item;
-        let [className, method] = el.ID.split('||');
-        let uri = DocumentContentProvider.getUri(ClassDefinition.normalizeClassName(className, true));
-        if (method) {
-          item = {
-            name: method,
-            container: className,
-            kind: vscode.SymbolKind.Method,
-            location: {
-              uri
-            }
-          };
-        } else {
-          item = {
-            name: el.ID,
-            kind: vscode.SymbolKind.Class,
-            location: {
-              uri
-            }
-          };
-        }
-        return item;
-      });
-    });
+    return api
+      .actionQuery(sql, [query])
+      .then(
+        (data): Promise<vscode.SymbolInformation>[] =>
+          data.result.content.map(
+            async ({ ClassName, Name }): Promise<vscode.SymbolInformation> =>
+              new vscode.SymbolInformation(
+                Name,
+                vscode.SymbolKind.Method,
+                ClassName,
+                await getLocation(ClassName, Name)
+              )
+          )
+      )
+      .then(data => Promise.all(data));
   }
 }

Diff for: utils/classDefinition.ts

@@ -7,6 +7,7 @@ import { workspaceState } from '../extension';
 export class ClassDefinition {
   private _className: string;
   private _classFileName: string;
+
   public static normalizeClassName(className, withExtension = false): string {
     return className.replace(/^%(\b\w+\b)$/, '%Library.$1') + (withExtension ? '.cls' : '');
   }
@@ -19,6 +20,14 @@ export class ClassDefinition {
     this._classFileName = ClassDefinition.normalizeClassName(className, true);
   }
 
+  get uri(): vscode.Uri {
+    return DocumentContentProvider.getUri(this._classFileName);
+  }
+
+  async getDocument(): Promise<vscode.TextDocument> {
+    return vscode.workspace.openTextDocument(this.uri);
+  }
+
   store(kind: string, data: any): any {
     workspaceState.update(`${this._classFileName}|${kind}`, data);
     return data;
@@ -106,11 +115,13 @@ export class ClassDefinition {
       .actionQuery(sql, [this._className])
       .then(
         data =>
-          data.result.content.reduce(
-            (list: string[], el: { PrimarySuper: string }) =>
-              list.concat(el.PrimarySuper.split('~').filter(el => el.length)),
-            []
-          )
+          data.result.content
+            .reduce(
+              (list: string[], el: { PrimarySuper: string }) =>
+                list.concat(el.PrimarySuper.split('~').filter(el => el.length)),
+              []
+            )
+            .filter((name: string) => name !== this._className)
         // .filter(name => !['%Library.Base', '%Library.SystemBase'].includes(name))
       )
       .then(data => this.store('super', data));
@@ -136,53 +147,32 @@ export class ClassDefinition {
       .then(data => this.store('includeCode', data));
   }
 
-  async getPosition(name: string, document?: vscode.TextDocument): Promise<vscode.Location[]> {
+  async getMemberLocation(name: string): Promise<vscode.Location> {
     let pattern;
     if (name.startsWith('#')) {
       pattern = `(Parameter) ${name.substr(1)}(?!\w)`;
     } else {
       pattern = `((Class)?Method|Property|RelationShip) ${name}(?!\w)`;
     }
-    let foundLine;
-    if (document) {
+    return this.getDocument().then(document => {
       for (let i = 0; i < document.lineCount; i++) {
         let line = document.lineAt(i);
         if (line.text.match(pattern)) {
-          foundLine = i;
-          break;
+          return new vscode.Location(this.uri, new vscode.Position(i, 0));
         }
       }
-    }
-    let result: vscode.Location[] = [];
-    if (foundLine) {
-      result.push({
-        uri: DocumentContentProvider.getUri(this._classFileName),
-        range: new vscode.Range(foundLine, 0, foundLine, 0)
-      });
-    }
-    let extendList = await this.super();
-    let api = new AtelierAPI();
-    let docs = [];
-    extendList.forEach(async docName => {
-      docName = ClassDefinition.normalizeClassName(docName, true);
-      docs.push(api.getDoc(docName));
-    });
-    return Promise.all(docs).then((docs: any[]) => {
-      for (let doc of docs) {
-        if (doc && doc.result.content) {
-          let docName = doc.result.name;
-          let content = doc.result.content;
-          for (let line of content.keys()) {
-            if (content[line].match(pattern)) {
-              result.push({
-                uri: DocumentContentProvider.getUri(docName),
-                range: new vscode.Range(line, 0, line, 0)
-              });
-            }
-          }
-        }
-      }
-      return result;
+      return;
     });
   }
+
+  async getMemberLocations(name: string): Promise<vscode.Location[]> {
+    let extendList = await this.super();
+    return Promise.all([
+      await this.getMemberLocation(name),
+      ...extendList.map(async docName => {
+        let classDef = new ClassDefinition(docName);
+        return classDef.getMemberLocation(name);
+      })
+    ]).then(data => data.filter(el => el != null));
+  }
 }