From 7af5081dfc6fb901fc6524a676ec11d65c1f5d4b Mon Sep 17 00:00:00 2001
From: Tyler Wilding <xtvaser@gmail.com>
Date: Tue, 2 Aug 2022 13:56:52 -0400
Subject: [PATCH] dist: ensure node_modules are included with extension until
 it's bundled properly

---
 .github/workflows/release.yaml |  2 +-
 .vscodeignore                  |  1 +
 src/extension.ts               | 80 ++++++++++++++++++----------------
 3 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 58dd620..30fd3ff 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -41,4 +41,4 @@ jobs:
       - name: Create Release
         env:
           GITHUB_TOKEN: ${{ secrets.BOT_PAT }}
-        run: gh release create --generate-notes --repo open-goal/opengoal-vscode
+        run: gh release create --generate-notes --repo open-goal/opengoal-vscode ./*.vsix
diff --git a/.vscodeignore b/.vscodeignore
index 596a43f..5718127 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -15,3 +15,4 @@
 !README.md
 !LICENSE
 !src/vendor/**/LICENSE
+!node_modules/**
diff --git a/src/extension.ts b/src/extension.ts
index 3372f86..b576305 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -11,52 +11,58 @@ import { initContext } from "./context";
 import { IRFoldingRangeProvider } from "./languages/ir2-folder";
 import { activateTypeCastTools } from "./decomp/type-caster";
 
+const channel = vscode.window.createOutputChannel("OpenGOAL");
+
 export async function activate(context: vscode.ExtensionContext) {
-  // Init Context
-  initContext(context);
+  try {
+    // Init Context
+    initContext(context);
 
-  // Init settings that we unfortunately have to manually maintain
-  await setVSIconAssociations();
-  await setTextmateColors();
-
-  vscode.workspace.onDidChangeConfiguration(async (event) => {
+    // Init settings that we unfortunately have to manually maintain
+    await setVSIconAssociations();
     await setTextmateColors();
-  });
 
-  context.subscriptions.push(
-    vscode.commands.registerCommand("opengoal.switchFile", switchFile)
-  );
+    vscode.workspace.onDidChangeConfiguration(async (event) => {
+      await setTextmateColors();
+    });
 
-  activateDecompTools();
-  activateTypeCastTools();
+    context.subscriptions.push(
+      vscode.commands.registerCommand("opengoal.switchFile", switchFile)
+    );
 
-  // Customized PDF Viewer
-  const provider = new PdfCustomProvider(
-    vscode.Uri.file(context.extensionPath)
-  );
-  context.subscriptions.push(
-    vscode.window.registerCustomEditorProvider(
-      PdfCustomProvider.viewType,
-      provider,
-      {
-        webviewOptions: {
-          enableFindWidget: false, // default
-          retainContextWhenHidden: true,
-        },
-      }
-    )
-  );
+    activateDecompTools();
+    activateTypeCastTools();
 
-  // TODO - disposable stuff?
+    // Customized PDF Viewer
+    const provider = new PdfCustomProvider(
+      vscode.Uri.file(context.extensionPath)
+    );
+    context.subscriptions.push(
+      vscode.window.registerCustomEditorProvider(
+        PdfCustomProvider.viewType,
+        provider,
+        {
+          webviewOptions: {
+            enableFindWidget: false, // default
+            retainContextWhenHidden: true,
+          },
+        }
+      )
+    );
 
-  // Language Customizations
-  vscode.languages.registerFoldingRangeProvider(
-    { scheme: "file", language: "opengoal-ir" },
-    new IRFoldingRangeProvider()
-  );
+    // TODO - disposable stuff?
 
-  // Start the LSP
-  lsp.activate(context);
+    // Language Customizations
+    vscode.languages.registerFoldingRangeProvider(
+      { scheme: "file", language: "opengoal-ir" },
+      new IRFoldingRangeProvider()
+    );
+
+    // Start the LSP
+    lsp.activate(context);
+  } catch (err) {
+    channel.append(`Failed to activate extension - ${err}`);
+  }
 }
 
 export function deactivate(): Promise<void> | undefined {