Merge pull request #357 from gjsjohnmurray/fix-355

fix #355 fix some commands that were broken for isfs files

Author: gjsjohnmurray

src/commands/subclass.ts

@@ -10,7 +10,7 @@ export async function subclass(): Promise<void> {
     return;
   }
   const className = file.name.split(".").slice(0, -1).join(".");
-  const api = new AtelierAPI();
+  const api = new AtelierAPI(file.uri);
   if (!api.active) {
     return;
   }
@@ -27,9 +27,14 @@ export async function subclass(): Promise<void> {
       if (!list.length) {
         return;
       }
-      vscode.window.showQuickPick(list.map((el) => el.Name)).then((item) => {
-        open(item);
-      });
+      vscode.window
+        .showQuickPick(
+          list.map((el) => el.Name),
+          { placeHolder: "Pick a subclass" }
+        )
+        .then((item) => {
+          open(item);
+        });
     })
     .catch((err) => console.error(err));
 }

src/commands/superclass.ts

@@ -5,10 +5,10 @@ import { currentFile } from "../utils";
 import { ClassDefinition } from "../utils/classDefinition";
 
 export async function superclass(): Promise<void> {
-  if (!config("conn").active) {
+  const file = currentFile();
+  if (file.uri.scheme === "file" && !config("conn").active) {
     return;
   }
-  const file = currentFile();
   if (!file || !file.name.toLowerCase().endsWith(".cls")) {
     return;
   }
@@ -26,7 +26,7 @@ export async function superclass(): Promise<void> {
       if (!list.length) {
         return;
       }
-      vscode.window.showQuickPick(list).then((item) => {
+      vscode.window.showQuickPick(list, { placeHolder: "Pick a superclass" }).then((item) => {
         open(item);
       });
     })

src/commands/viewOthers.ts

@@ -9,7 +9,7 @@ export async function viewOthers(): Promise<void> {
   if (!file) {
     return;
   }
-  if (!config("conn").active) {
+  if (file.uri.scheme === "file" && !config("conn").active) {
     return;
   }
 

src/utils/classDefinition.ts

@@ -44,7 +44,7 @@ export class ClassDefinition {
       return Promise.resolve(methods);
     }
     const filterScope = (method) => scope === "any" || method.scope === scope;
-    const api = new AtelierAPI();
+    const api = new AtelierAPI(this.uri);
     const getMethods = (content) => {
       const extend = [];
       content.forEach((el) => {
@@ -64,7 +64,7 @@ export class ClassDefinition {
     if (properties.length) {
       return Promise.resolve(properties);
     }
-    const api = new AtelierAPI();
+    const api = new AtelierAPI(this.uri);
     const getProperties = (content) => {
       const extend = [];
       content.forEach((el) => {
@@ -84,7 +84,7 @@ export class ClassDefinition {
     if (parameters.length) {
       return Promise.resolve(parameters);
     }
-    const api = new AtelierAPI();
+    const api = new AtelierAPI(this.uri);
     const getParameters = (content) => {
       const extend = [];
       content.forEach((el) => {
@@ -104,7 +104,7 @@ export class ClassDefinition {
     if (superList) {
       return Promise.resolve(superList);
     }
-    const api = new AtelierAPI();
+    const api = new AtelierAPI(this.uri);
     const sql = `SELECT PrimarySuper FROM %Dictionary.CompiledClass
     WHERE Name %inlist (SELECT $LISTFROMSTRING(Super, ',') FROM %Dictionary.CompiledClass WHERE Name = ?)`;
     return api
@@ -128,7 +128,7 @@ export class ClassDefinition {
     if (includeCode) {
       return Promise.resolve(includeCode);
     }
-    const api = new AtelierAPI();
+    const api = new AtelierAPI(this.uri);
     const sql = `SELECT LIST(IncludeCode) List FROM %Dictionary.CompiledClass WHERE Name %INLIST (
       SELECT $LISTFROMSTRING(PrimarySuper, '~') FROM %Dictionary.CompiledClass WHERE Name = ?)`;
     const defaultIncludes = ["%occInclude", "%occErrors"];