Merge branch 'master' into mini-dashboard-actions

# Conflicts:
#	src/deepcode/DeepCodeExtension.ts
#	src/deepcode/lib/modules/DeepCodeLib.ts

Author: Arvid Paeglit

package-lock.json

@@ -193,6 +193,10 @@
         {
           "command": "deepcode.login",
           "when": "!deepcode:loggedIn"
+        },
+        {
+          "command": "deepcode.dcignore",
+          "when": "!deepcode:error && deepcode:loggedIn && deepcode:uploadApproved && deepcode:workspaceFound"
         }
       ]
     },
@@ -209,7 +213,13 @@
       },
       {
         "command": "deepcode.login",
-        "title": "DeepCode login"
+        "title": "DeepCode login",
+        "icon": "$(log-in)"
+      },
+      {
+        "command": "deepcode.dcignore",
+        "title": "DeepCode create dcignore file",
+        "icon": "$(new-file)"
       }
     ]
   },
@@ -239,7 +249,8 @@
     "nock": "^12.0.3"
   },
   "dependencies": {
-    "@deepcode/tsc": "^1.3.0",
+    "@deepcode/tsc": "^1.3.1",
+    "@deepcode/dcignore": "^1.0.2",
     "@types/lodash": "^4.14.159",
     "@types/mz": "^2.7.1",
     "ignore": "^5.1.8",

package.json

@@ -8,12 +8,14 @@ import {
   DEEPCODE_START_COMMAND,
   DEEPCODE_SETMODE_COMMAND,
   DEEPCODE_SETTINGS_COMMAND,
+  DEEPCODE_DCIGNORE_COMMAND,
   DEEPCODE_LOGIN,
   DEEPCODE_APPROVE,
   DEEPCODE_OPEN_BROWSER,
   DEEPCODE_OPEN_LOCAL,
 } from "./constants/commands";
-import { openDeepcodeSettingsCommand } from "./utils/vscodeCommandsUtils";
+import { openDeepcodeSettingsCommand, createDCIgnoreCommand } from "./utils/vscodeCommandsUtils";
+import { errorsLogs } from "./messages/errorsServerLogMessages";
 
 import {
   DEEPCODE_VIEW_SUPPORT,
@@ -23,24 +25,42 @@ import { SupportProvider } from "./view/SupportProvider";
 import { IssueProvider } from "./view/IssueProvider";
 
 class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterface {
+  private async executeCommand(
+    name: string,
+    fn: (...args: any[]) => Promise<any>,
+    ...args: any[]
+  ): Promise<any> {
+    try {
+      await fn(...args);
+    } catch (error) {
+      this.processError(error, {
+        message: errorsLogs.command(name),
+      });
+    }
+  }
+  
   public activate(context: vscode.ExtensionContext): void {
     this.statusBarItem.show();
 
     context.subscriptions.push(
       vscode.commands.registerCommand(
         DEEPCODE_OPEN_BROWSER,
-        (url: string) => open(url)
+        this.executeCommand.bind(
+          this,
+          DEEPCODE_OPEN_BROWSER,
+          (url: string) => open(url)
+        )
       )
     );
 
     context.subscriptions.push(
       vscode.commands.registerCommand(
         DEEPCODE_OPEN_LOCAL,
         (path: vscode.Uri, range?: vscode.Range) => {
-          console.log("DEEPCODE_OPEN_LOCAL",path.toString());
           vscode.window.showTextDocument(path, { selection: range }).then(
-            (f) => console.log(f), 
-            (err) => console.error(err)
+            () => {}, (err) => this.processError(err, {
+              message: errorsLogs.command(DEEPCODE_OPEN_LOCAL),
+            })
           );
         }
       )
@@ -49,21 +69,33 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
     context.subscriptions.push(
       vscode.commands.registerCommand(
         DEEPCODE_LOGIN,
-        this.initiateLogin.bind(this)
+        this.executeCommand.bind(
+          this,
+          DEEPCODE_LOGIN,
+          this.initiateLogin.bind(this)
+        )
       )
     );
 
     context.subscriptions.push(
       vscode.commands.registerCommand(
         DEEPCODE_APPROVE,
-        this.approveUpload.bind(this)
+        this.executeCommand.bind(
+          this,
+          DEEPCODE_APPROVE,
+          this.approveUpload.bind(this)
+        )
       )
     );
 
     context.subscriptions.push(
       vscode.commands.registerCommand(
         DEEPCODE_START_COMMAND,
-        this.startExtension.bind(this, true)
+        this.executeCommand.bind(
+          this,
+          DEEPCODE_START_COMMAND,
+          this.startExtension.bind(this)
+        )
       )
     );
 
@@ -77,7 +109,18 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
     context.subscriptions.push(
       vscode.commands.registerCommand(
         DEEPCODE_SETTINGS_COMMAND,
-        openDeepcodeSettingsCommand
+        this.executeCommand.bind(
+          this,
+          DEEPCODE_SETTINGS_COMMAND,
+          openDeepcodeSettingsCommand
+        )
+      )
+    );
+
+    context.subscriptions.push(
+      vscode.commands.registerCommand(
+        DEEPCODE_DCIGNORE_COMMAND,
+        createDCIgnoreCommand
       )
     );
 
@@ -92,7 +135,9 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
     );
 
     this.activateAll();
-    this.startExtension();
+    this.startExtension().catch((err) => this.processError(err, {
+      message: errorsLogs.failedExecution,
+    }));
   }
 
 }

src/deepcode/DeepCodeExtension.ts

@@ -9,6 +9,7 @@ export const DEEPCODE_APPROVE = "deepcode.approve";
 export const DEEPCODE_SETMODE_COMMAND = "deepcode.setmode";
 export const DEEPCODE_SETTINGS_COMMAND = "deepcode.settings";
 export const DEEPCODE_IGNORE_ISSUES_COMMAND = "deepcode.ignoreissues";
+export const DEEPCODE_DCIGNORE_COMMAND = "deepcode.dcignore";
 export const DEEPCODE_OPEN_BROWSER = "deepcode.open";
 export const DEEPCODE_OPEN_LOCAL = "deepcode.show";
 

src/deepcode/constants/commands.ts

@@ -74,19 +74,19 @@ export default abstract class BaseDeepCodeModule implements DeepCode.BaseDeepCod
   }
 
   get uploadApproved(): boolean {
-    return this.staticUploadApproved || this.source !== IDE_NAME || !!(vscode.workspace.getConfiguration('deepcode').get('uploadApproved'));
+    return this.staticUploadApproved || this.source !== IDE_NAME || !!(vscode.workspace.getConfiguration('deepcode').get<boolean>('uploadApproved'));
   }
 
   async setUploadApproved(value = true): Promise<void> {
     await vscode.workspace.getConfiguration('deepcode').update('uploadApproved', value, true);
   }
 
   get shouldReportErrors(): boolean {
-    return !!vscode.workspace.getConfiguration('deepcode').get('yesCrashReport');
+    return !!vscode.workspace.getConfiguration('deepcode').get<boolean>('yesCrashReport');
   }
 
   get shouldReportEvents(): boolean {
-    return !!vscode.workspace.getConfiguration('deepcode').get('yesTelemetry');
+    return !!vscode.workspace.getConfiguration('deepcode').get<boolean>('yesTelemetry');
   }
 
   // Avoid refreshing context/views too often: