Merge pull request #301 from intersystems-community/theia

Theia support

Author: gjsjohnmurray

.vscode/tasks.json

@@ -12,7 +12,7 @@
   "tasks": [
     {
       "type": "npm",
-      "script": "watch",
+      "script": "webpack-dev",
       "presentation": {
         "reveal": "never"
       },

.vscodeignore

@@ -1,14 +1,9 @@
-.github/**
-.vscode/**
-.vscode-test/**
-out/
-src/
-**/*.ts
-**/*.map
-**/*.cls
-.gitignore
-tsconfig*.json
-**/tslint.json
-**/.eslintrc.json
-node_modules/
-webpack.config.js
+**
+!dist/
+!snippets/
+!images/
+!syntaxes/
+!README.md
+!CHANGELOG.md
+!*.json
+!*.jsonc

package-lock.json

@@ -942,6 +942,7 @@
   },
   "dependencies": {
     "await-notify": "^1.0.1",
+    "core-js": "^3.6.5",
     "glob": "^7.1.6",
     "iconv-lite": "^0.6.0",
     "mkdirp": "^1.0.4",

package.json

@@ -328,6 +328,12 @@ async function serverManager(): Promise<any> {
     if (ignore) {
       return;
     }
+    try {
+      await vscode.commands.executeCommand("extension.open", extId);
+    } catch (ex) {
+      // Such command do not exists, suppose we are under Theia, it's not possible to install this extension this way
+      return;
+    }
     await vscode.window
       .showInformationMessage(
         "The InterSystems® Server Manager extension is recommended to help you define connections and store passwords securely in your keychain.",
@@ -338,8 +344,7 @@ async function serverManager(): Promise<any> {
       .then(async (action) => {
         switch (action) {
           case "Install":
-            await vscode.commands.executeCommand("workbench.extensions.search", `@tag:"intersystems"`);
-            await vscode.commands.executeCommand("extension.open", extId);
+            await vscode.commands.executeCommand("workbench.extensions.search", `@tag:"intersystems"`).then(null, null);
             await vscode.commands.executeCommand("workbench.extensions.installExtension", extId);
             extension = vscode.extensions.getExtension(extId);
             break;
@@ -361,13 +366,22 @@ async function serverManager(): Promise<any> {
 
 export async function activate(context: vscode.ExtensionContext): Promise<any> {
   if (!packageJson.version.includes("SNAPSHOT")) {
-    reporter = new TelemetryReporter(extensionId, extensionVersion, aiKey);
+    try {
+      reporter = new TelemetryReporter(extensionId, extensionVersion, aiKey);
+    } catch (_error) {
+      reporter = null;
+    }
   }
 
   const languages = packageJson.contributes.languages.map((lang) => lang.id);
-  workspaceState = context.workspaceState;
+  // workaround for Theia, issue https://github.com/eclipse-theia/theia/issues/8435
+  workspaceState = {
+    get: <T>(key: string, defaultValue?: T): T | undefined =>
+      context.workspaceState.get(key, defaultValue) || defaultValue,
+    update: (key: string, value: any): Thenable<void> => context.workspaceState.update(key, value),
+  };
   extensionContext = context;
-  workspaceState.update("workspaceFolder", "");
+  workspaceState.update("workspaceFolder", undefined);
 
   // Get api for servermanager extension, perhaps offering to install it
   serverManagerApi = await serverManager();
@@ -436,7 +450,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
   vscode.window.onDidChangeActiveTextEditor((textEditor: vscode.TextEditor) => {
     checkConnection();
     posPanel.text = "";
-    if (textEditor.document.fileName.endsWith(".xml") && config("autoPreviewXML")) {
+    if (textEditor?.document.fileName.endsWith(".xml") && config("autoPreviewXML")) {
       return xml2doc(context, textEditor);
     }
   });

src/extension.ts

@@ -7,6 +7,8 @@ import { File } from "./File";
 import { fireOtherStudioAction, OtherStudioAction } from "../../commands/studio";
 import { StudioOpenDialog } from "../../queries";
 
+declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
+
 export type Entry = File | Directory;
 
 export class FileSystemProvider implements vscode.FileSystemProvider {
@@ -40,6 +42,9 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
   public async readDirectory(uri: vscode.Uri): Promise<[string, vscode.FileType][]> {
     const parent = await this._lookupAsDirectory(uri);
     const api = new AtelierAPI(uri);
+    if (!api.active) {
+      return;
+    }
     const sql = `CALL %Library.RoutineMgr_StudioOpenDialog(?,?,?,?,?,?,?)`;
     const { query } = url.parse(decodeURIComponent(uri.toString()), true);
     const type = query.type && query.type != "" ? query.type.toString() : "all";
@@ -80,7 +85,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
         })
       )
       .catch((error) => {
-        console.error(error);
+        error && console.error(error);
       });
   }
 

src/providers/FileSystemPovider/FileSystemProvider.ts

@@ -4,7 +4,7 @@ const path = require("path");
 const config = {
   target: "node", // vscode extensions run in a Node.js-context 📖 -> https://webpack.js.org/configuration/node/
 
-  entry: "./src/extension.ts", // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
+  entry: ["core-js/features/array/flat-map", "./src/extension.ts"], // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
   output: {
     // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/
     path: path.resolve(__dirname, "dist"),