Merge branch 'master' into use-analysis-progress

Author: Arvid Paeglit

package-lock.json

@@ -168,6 +168,10 @@
         {
           "command": "deepcode.login",
           "when": "!deepcode:loggedIn"
+        },
+        {
+          "command": "deepcode.dcignore",
+          "when": "!deepcode:error && deepcode:loggedIn && deepcode:uploadApproved && deepcode:workspaceFound"
         }
       ]
     },
@@ -184,7 +188,13 @@
       },
       {
         "command": "deepcode.login",
-        "title": "DeepCode login"
+        "title": "DeepCode login",
+        "icon": "$(log-in)"
+      },
+      {
+        "command": "deepcode.dcignore",
+        "title": "DeepCode create dcignore file",
+        "icon": "$(new-file)"
       }
     ]
   },
@@ -215,6 +225,7 @@
   },
   "dependencies": {
     "@deepcode/tsc": "^1.3.0",
+    "@deepcode/dcignore": "^1.0.2",
     "@types/lodash": "^4.14.159",
     "@types/mz": "^2.7.1",
     "ignore": "^5.1.8",

package.json

@@ -7,12 +7,14 @@ import DeepCodeLib from "./lib/modules/DeepCodeLib";
 import {
   DEEPCODE_START_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,
@@ -22,24 +24,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),
+            })
           );
         }
       )
@@ -48,28 +68,51 @@ 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)
+        this.executeCommand.bind(
+          this,
+          DEEPCODE_START_COMMAND,
+          this.startExtension.bind(this)
+        )
       )
     );
 
     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
       )
     );
 
@@ -84,7 +127,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

@@ -8,6 +8,7 @@ export const DEEPCODE_LOGIN = "deepcode.login";
 export const DEEPCODE_APPROVE = "deepcode.approve";
 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:

src/deepcode/lib/modules/BaseDeepCodeModule.ts

@@ -102,7 +102,9 @@ abstract class BundlesModule extends LoginModule
 
   onError(error: Error) {
     this.terminateAnalysis();
-    this.processError(error);
+    this.processError(error, {
+      message: errorsLogs.failedServiceAI,
+    });
   }
 
   // processing workspaces
@@ -132,7 +134,13 @@ abstract class BundlesModule extends LoginModule
 
   // procesing filter list of files, acceptable for server
   public async createFilesFilterList(): Promise<void> {
-    this.serverFilesFilterList = await http.getFilters(this.baseURL, this.token);
+    try {
+      this.serverFilesFilterList = await http.getFilters(this.baseURL, this.token);
+    } catch (err) {
+      this.processError(err, {
+        message: errorsLogs.filtersFiles
+      })
+    }
   }
 
   private terminateAnalysis(): void {
@@ -193,7 +201,11 @@ abstract class BundlesModule extends LoginModule
       this.onError(error);
     });
 
-    http.analyse(this.baseURL, this.token, path, this.files, removedFiles).catch((error) => this.onError(error));
+    http.analyse(this.baseURL, this.token, path, this.files, removedFiles).catch(
+      (error) => this.processError(error, {
+        message: errorsLogs.analyse
+      })
+    );
   }
 
   private async startCollectingFiles(
@@ -274,25 +286,27 @@ abstract class BundlesModule extends LoginModule
     try {
       const workspaceFolders: readonly vscode.WorkspaceFolder[] | undefined = vscode.workspace.workspaceFolders;
       if (!workspaceFolders || !workspaceFolders.length) {
-        setContext(DEEPCODE_CONTEXT.ANALYZING, false);
+        await setContext(DEEPCODE_CONTEXT.ANALYZING, false);
         return;
       }
 
       this.createWorkspacesList(workspaceFolders);
 
       if (this.workspacesPaths.length) {
-        setContext(DEEPCODE_CONTEXT.ANALYZING, true);
+        await setContext(DEEPCODE_CONTEXT.ANALYZING, true);
         this.updateCurrentWorkspacePath(this.workspacesPaths[0]);
 
         await this.updateHashesBundles();
         for await (const path of this.workspacesPaths) {
           await this.performBundlesActions(path);
         }
       } else {
-        setContext(DEEPCODE_CONTEXT.ANALYZING, false);
+        await setContext(DEEPCODE_CONTEXT.ANALYZING, false);
       }
     } catch(err) {
-      await this.processError(err);
+      await this.processError(err, {
+        message: errorsLogs.failedAnalysis,
+      });
     }
   }
 }

src/deepcode/lib/modules/BundlesModule.ts

@@ -4,10 +4,9 @@ import BundlesModule from "./BundlesModule";
 import { setContext } from "../../utils/vscodeCommandsUtils";
 import { DEEPCODE_CONTEXT } from "../../constants/views";
 import { EXECUTION_DEBOUNCE_INTERVAL } from "../../constants/general";
+import { errorsLogs } from "../../messages/errorsServerLogMessages";
 
 export default class DeepCodeLib extends BundlesModule implements DeepCode.DeepCodeLibInterface {
-  private executing = false;
-  
   activateAll(): void {
     // this.filesWatcher.activate(this);
     this.workspacesWatcher.activate(this);
@@ -18,7 +17,7 @@ export default class DeepCodeLib extends BundlesModule implements DeepCode.DeepC
 
   private async executeExtensionPipeline(): Promise<void> {
     console.log("DeepCode: starting execution pipeline");
-    setContext(DEEPCODE_CONTEXT.ERROR, false);
+    await setContext(DEEPCODE_CONTEXT.ERROR, false);
 
     const loggedIn = await this.checkSession();
     if (!loggedIn) return;
@@ -36,7 +35,9 @@ export default class DeepCodeLib extends BundlesModule implements DeepCode.DeepC
       try {
         await this.executeExtensionPipeline();
       } catch (err) {
-        this.processError(err);
+        this.processError(err, {
+          message: errorsLogs.failedExecutionDebounce,
+        });
       }
     },
     EXECUTION_DEBOUNCE_INTERVAL,

src/deepcode/lib/modules/DeepCodeLib.ts

@@ -17,7 +17,7 @@ abstract class LoginModule extends ReportModule implements DeepCode.LoginModuleI
 
     this.pendingLogin = true;
     try {
-      setContext(DEEPCODE_CONTEXT.LOGGEDIN, false);
+      await setContext(DEEPCODE_CONTEXT.LOGGEDIN, false);
       const result = await http.login(this.baseURL, this.source);
       const { sessionToken, loginURL } = result;
       if (!sessionToken || !loginURL) {
@@ -27,7 +27,9 @@ abstract class LoginModule extends ReportModule implements DeepCode.LoginModuleI
       await viewInBrowser(loginURL);
       await this.waitLoginConfirmation();
     } catch (err) {
-      await this.processError(err, { message: errorsLogs.login });
+      await this.processError(err, {
+        message: errorsLogs.login
+      });
     } finally {
       this.pendingLogin = false;
     }
@@ -36,9 +38,15 @@ abstract class LoginModule extends ReportModule implements DeepCode.LoginModuleI
   async checkSession(): Promise<boolean> {
     let validSession = false;
     if (this.token) {
-      validSession = !!(await http.checkSession(this.baseURL, this.token));
+      try {
+        validSession = !!(await http.checkSession(this.baseURL, this.token));
+      } catch (err) {
+        this.processError(err, {
+          message: errorsLogs.loginStatus
+        });
+      }
     }
-    setContext(DEEPCODE_CONTEXT.LOGGEDIN, validSession);
+    await setContext(DEEPCODE_CONTEXT.LOGGEDIN, validSession);
     return validSession;
   }
 
@@ -57,13 +65,13 @@ abstract class LoginModule extends ReportModule implements DeepCode.LoginModuleI
 
   async checkApproval(): Promise<boolean> {
     const approved = this.uploadApproved;
-    setContext(DEEPCODE_CONTEXT.APPROVED, approved);
+    await setContext(DEEPCODE_CONTEXT.APPROVED, approved);
     return approved;
   }
 
   async approveUpload(): Promise<void> {
-    this.setUploadApproved(true);
-    this.checkApproval();
+    await this.setUploadApproved(true);
+    await this.checkApproval();
   } 
 
 }