Add missing semicolons, fix ansi-regex causing failed activation

purduesigbots · Feb 1, 2022 · d002ca6 · d002ca6
1 parent 851f881
commit d002ca6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/LICENSE → LICENSE.txt b/LICENSE → LICENSE.txt
diff --git a/src/commands/cli-parsing.ts b/src/commands/cli-parsing.ts
@@ -1,6 +1,5 @@
 export const PREFIX = "Uc&42BWAaQ";
 import { output } from '../extension';
-const ansiRegex = require('ansi-regex');
 /**
  * Finds the logging message that contains the error message.
  *
@@ -25,7 +24,10 @@ export const parseMakeOutput = (stdout: any) => {
       for (let err of errorSplit) {
         if(err.substr(PREFIX.length).startsWith("{\"text")) {
           e = JSON.parse(err.substr(PREFIX.length)).text
-          output.appendLine(e.replace(ansiRegex(),''));
+          output.appendLine(e.replace([
+            '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
+            '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))'
+          ].join('|'),''));
           errors = true;
         }
       }

diff --git a/src/extension.ts b/src/extension.ts
@@ -32,7 +32,7 @@ export function makeTerminal() {
       if(tc) {
         term.dispose();
       }
-      tc = term
+      tc = term;
     }
   }
   if(!tc) {

diff --git a/src/one-click/install.ts b/src/one-click/install.ts
@@ -163,9 +163,9 @@ export async function paths(globalPath: string, system: string, context : vscode
     // (path.join(globalPath, "install", `pros-cli-${system}`));
     // Check if user has CLI installed through one-click or other means.
     let [version, oneClicked] = await getCurrentVersion(path.join(globalPath, "install", `pros-cli-${system}`, "pros"));
-    PATH_SEP = system==="windows" ? ";" : ":";
+    PATH_SEP = (system==="windows" ? ";" : ":");
     process.env["VSCODE FLAGS"] = (version>=324?"--no-sentry --no-analytics":"");
-    console.log("paths")
+    console.log(version);
     if (!oneClicked) {
         // Use system defaults if user does not have one-click CLI
         CLI_EXEC_PATH = "";
@@ -179,7 +179,7 @@ export async function paths(globalPath: string, system: string, context : vscode
         // Prepend CLI to path
         process.env['PATH'] = CLI_EXEC_PATH+PATH_SEP+process.env['PATH'];
         // Having `PROS_TOOLCHAIN` set to TOOLCHAIN breaks everything, so idk. Empty string works don't question it
-        process.env['PROS_TOOLCHAIN'] = TOOLCHAIN
+        process.env['PROS_TOOLCHAIN'] = TOOLCHAIN;
         process.env.LC_ALL = "en_US.utf-8";
         // Remake terminal with updated environment variables
         makeTerminal();

diff --git a/src/one-click/installed.ts b/src/one-click/installed.ts
@@ -15,7 +15,6 @@ export async function getCliVersion(url: string) {
 }
 
 export async function getCurrentVersion(oneClickPath: string) {
-    console.log("getCurrentVersion");
     var oc = false;
     var versionint = -1;
     try {
@@ -30,9 +29,11 @@ export async function getCurrentVersion(oneClickPath: string) {
                 `pros --version`
             );
             versionint = +(stdout.replace("pros, version ","").replace(/\./gi,""));
-        } catch{}
+        } catch(err) {
+            console.log(err);
+        }
     }
-    return [versionint, oc]
+    return [versionint, oc];
 }
 
 export async function getInstallPromptTitle(oneClickPath: string) {