Added empty workspace message and file decorators.

Author: shinin-light

package.json

@@ -107,15 +107,20 @@
           "name": "DeepCode Extension",
           "when": "!deepcode:error && deepcode:loggedIn && !deepcode:uploadApproved"
         },
+        {
+          "id": "deepcode.views.empty",
+          "name": "DeepCode Extension",
+          "when": "!deepcode:error && deepcode:loggedIn && deepcode:uploadApproved && !deepcode:workspaceFound"
+        },
         {
           "id": "deepcode.views.progress",
           "name": "DeepCode Analysis",
-          "when": "!deepcode:error && deepcode:loggedIn && deepcode:uploadApproved && !deepcode:analysisCompleted"
+          "when": "!deepcode:error && deepcode:loggedIn && deepcode:uploadApproved && deepcode:workspaceFound && !deepcode:analysisCompleted"
         },
         {
           "id": "deepcode.views.analysis",
           "name": "DeepCode Analysis",
-          "when": "!deepcode:error && deepcode:loggedIn && deepcode:uploadApproved && deepcode:analysisCompleted"
+          "when": "!deepcode:error && deepcode:loggedIn && deepcode:uploadApproved && deepcode:workspaceFound && deepcode:analysisCompleted"
         },
         {
           "id": "deepcode.views.support",
@@ -142,6 +147,10 @@
         "view": "deepcode.views.tc",
         "contents": "Thanks for connecting with DeepCode. ✅\n 👉 You are almost set 🤗. DeepCode's proprietary AI model is analysing the code remotely on DeepCode's servers. Let's confirm you know this and start the remote analysis of this workspace - feel free to check out our [terms](https://www.deepcode.ai/tc?utm_source=vsc).\n[Accept and start analysing](command:deepcode.approve 'Upload code to DeepCode')\nYou can always change this later in the [configuration panel](command:deepcode.settings)."
       },
+      {
+        "view": "deepcode.views.empty",
+        "contents": "Open a workspace or a folder in Visual Studio Code to start the analysis."
+      },
       {
         "view": "deepcode.views.progress",
         "contents": "Analysis in progress"
@@ -165,10 +174,6 @@
         }
       ],
       "commandPalette": [
-        {
-          "command": "deepcode.approve",
-          "when": "false"
-        },
         {
           "command": "deepcode.login",
           "when": "!deepcode:loggedIn"
@@ -189,10 +194,6 @@
       {
         "command": "deepcode.login",
         "title": "DeepCode login"
-      },
-      {
-        "command": "deepcode.approve",
-        "title": "DeepCode approve upload and start analysis"
       }
     ]
   },

src/deepcode/DeepCodeExtension.ts

@@ -90,19 +90,10 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
       new IssueProvider(this)
     );
 
-    // context.subscriptions.push(
-    //   { dispose: this.startExtension() },
-    // );
-
     this.activateAll();
     this.startExtension();
   }
 
-  // public startExtension(): any {
-  //   this.activateAll();
-  //   this.activateExtensionAnalyzeActions();
-  // }
-
 }
 
 export default DeepCodeExtension;

src/deepcode/constants/commands.ts

@@ -1,5 +1,4 @@
 // vscode commands used in extension work
-// old "_extensions.manage" is deprecated;
 export const VSCODE_GO_TO_SETTINGS_COMMAND = "workbench.action.openSettings"; 
 export const VSCODE_ADD_COMMENT_COMMAND = "editor.action.addCommentLine";
 

src/deepcode/constants/views.ts

@@ -2,9 +2,12 @@ export const DEEPCODE_VIEW_SUPPORT = "deepcode.views.support";
 export const DEEPCODE_VIEW_PROGRESS = "deepcode.views.progress";
 export const DEEPCODE_VIEW_ANALYSIS = "deepcode.views.analysis";
 
+// Having multiple boolean contexts instead of a single context 
+// with multiple values helps us to avoid flickering UI.
 export const DEEPCODE_CONTEXT = {
   LOGGEDIN: "loggedIn",
   APPROVED: "uploadApproved",
+  ANALYZING: "workspaceFound",
   COMPLETED: "analysisCompleted",
   ERROR: "error",
 };

src/deepcode/http/requests.ts

@@ -1,8 +1,4 @@
-import {
-  ServiceAI,
-  AnalyseRequestDto
-} from "@deepcode/tsc";
-
+import { ServiceAI } from "@deepcode/tsc";
 import { IDE_NAME } from "../constants/general";
 
 const AI = new ServiceAI();

src/deepcode/lib/modules/BundlesModule.ts

@@ -9,6 +9,7 @@ import { BUNDLE_EVENTS } from "../../constants/events";
 import LoginModule from "../../lib/modules/LoginModule";
 import { setContext } from "../../utils/vscodeCommandsUtils";
 import { DEEPCODE_ANALYSIS_STATUS, DEEPCODE_CONTEXT } from "../../constants/views";
+import { errorsLogs } from "../../messages/errorsServerLogMessages";
 
 abstract class BundlesModule extends LoginModule
   implements DeepCode.BundlesModuleInterface {
@@ -141,25 +142,30 @@ abstract class BundlesModule extends LoginModule
   }
 
   public async performBundlesActions(path: string): Promise<void> {
+    setContext(DEEPCODE_CONTEXT.COMPLETED, false);
     if (!Object.keys(this.serverFilesFilterList).length) {
       await this.createFilesFilterList();
       this.filesWatcher.activate(this);
 
       if (!Object.keys(this.serverFilesFilterList).length) {
+        this.processError(new Error(errorsLogs.filtersFiles), {
+          message: errorsLogs.filtersFiles,
+          data: {
+            filters: this.serverFilesFilterList
+          }
+        });
         return;
       }
     }
 
-    setContext(DEEPCODE_CONTEXT.COMPLETED, false);
     if (!this.token || !this.uploadApproved) {
       await this.checkSession();
       await this.checkApproval();
       return;
     }
 
     this.files = await this.startCollectingFiles(path, this.serverFilesFilterList);
-    console.log("this.files",this.files);
-
+    
     this.serviceAI.on(BUNDLE_EVENTS.buildBundleProgress, (processed: number, total: number) => {
       this.onBuildBundleProgress(processed, total);
     });
@@ -268,21 +274,22 @@ abstract class BundlesModule extends LoginModule
     try {
       const workspaceFolders: readonly vscode.WorkspaceFolder[] | undefined = vscode.workspace.workspaceFolders;
       if (!workspaceFolders || !workspaceFolders.length) {
-        setContext(DEEPCODE_CONTEXT.COMPLETED, true);
+        setContext(DEEPCODE_CONTEXT.ANALYZING, false);
         return;
       }
 
       this.createWorkspacesList(workspaceFolders);
 
       if (this.workspacesPaths.length) {
+        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.COMPLETED, true);
+        setContext(DEEPCODE_CONTEXT.ANALYZING, false);
       }
     } catch(err) {
       await this.processError(err);

src/deepcode/utils/packageUtils.ts

@@ -9,20 +9,12 @@ import {
 import { DCIGNORE_FILENAME, GITIGNORE_FILENAME, EXCLUDED_NAMES } from "../constants/filesConstants";
 import { ALLOWED_PAYLOAD_SIZE } from "../constants/general";
 
-// let filesProgress = { processed: 0, total: 0 };
-
-// The file limit was hardcoded to 2mb but seems to be a function of ALLOWED_PAYLOAD_SIZE
-// TODO what exactly is transmitted eventually and what is a good exact limit?
-const SAFE_PAYLOAD_SIZE = ALLOWED_PAYLOAD_SIZE / 2; // safe size for requests0
+const SAFE_PAYLOAD_SIZE = ALLOWED_PAYLOAD_SIZE / 2;
 
 interface ProgressInterface {
   onProgress: (value: number) => void,
   percentDone?: number;
-  multiplier?: number,
-  // filesProcessed: number;
-  // totalFiles: number;
-  // percentDone: number;
-  // progressWindow: Progress<{ increment: number; message: string }>;
+  multiplier?: number;
 }
 
 interface CreateListOfFiles {

src/deepcode/utils/vscodeCommandsUtils.ts

@@ -16,6 +16,7 @@ export const startDeepCodeCommand = (): void => {
 };
 
 export function setContext(key: string, value: unknown) {
+  console.log("DeepCode context",key, value);
   vscode.commands.executeCommand('setContext', `${DEEPCODE_CONTEXT_PREFIX}${key}`, value);
 };
 

src/deepcode/view/IssueProvider.ts

@@ -1,4 +1,3 @@
-import DeepCode from "../../interfaces/DeepCodeInterfaces";
 import { Uri, Range, Diagnostic } from 'vscode';
 import { NodeProvider } from './NodeProvider'
 import { Node } from './Node'
@@ -10,15 +9,44 @@ interface ISeverityCounts {
 }
 
 export class IssueProvider extends NodeProvider {
+  getSymbolTextSpacing(): string {
+    return "   ";
+  }
+  
+  getSuperscriptNumber(n: number): string {
+    let res: string = "";
+    const nDigits = Math.round(n).toString().split('');
+    const digitMap: { [digit: string]: string } = {
+      '0': '⁰', '1': '¹', '2': '²', '3': '³', '4': '⁴',
+      '5': '⁵', '6': '⁶', '7': '⁷', '8': '⁸', '9': '⁹',
+    }
+    for (let d of nDigits) res += digitMap[d] || "";
+    return res;
+  }
+
+  getSeveritySymbol(severity: number): string {
+    return {
+      [DEEPCODE_SEVERITIES.error]: "❌",
+      [DEEPCODE_SEVERITIES.warning]: "⚠️",
+      [DEEPCODE_SEVERITIES.information]: "ℹ️",
+    }[severity] || "💡";
+  }
+
   getIssueText(text: string, severity: number): string {
-    return "(" + severity + ") " + text;
+    return `${this.getSeveritySymbol(severity)}${this.getSymbolTextSpacing()}${text}`;
   }
 
   getFileText(text: string, counts: ISeverityCounts ): string {
-    return "[" + counts[DEEPCODE_SEVERITIES.error]
-      + "|" + counts[DEEPCODE_SEVERITIES.warning]
-      + "|" + counts[DEEPCODE_SEVERITIES.information]
-      + "] " + text;
+    let res :string = "";
+    for (let s of [
+      DEEPCODE_SEVERITIES.error,
+      DEEPCODE_SEVERITIES.warning,
+      DEEPCODE_SEVERITIES.information,
+    ]) {
+      if (counts[s]) res += `${this.getSeveritySymbol(s)}${this.getSuperscriptNumber(counts[s])} `;
+    }
+    res += `${this.getSymbolTextSpacing()}${text}`;
+    return res;
   }
 
   getRootChildren(): Node[] {

src/deepcode/view/Node.ts

@@ -28,7 +28,7 @@ export class Node extends TreeItem {
     if (!desc && options.issue) {
       desc = options.issue.uri.path.split('/').pop() || "";
       if (options.issue.range) {
-        desc += "[" + (options.issue.range.start.line + 1) + ",";
+        desc += "[" + (options.issue.range.start.line + 1) + ", ";
         desc += (options.issue.range.start.character + 1) + "]";
       }
     }
@@ -42,7 +42,10 @@ export class Node extends TreeItem {
       title: '',
       arguments: [options.issue.uri, options.issue.range],
     });
-    this.resourceUri = (options.link && Uri.parse(options.link)) || (options.issue && options.issue.uri);
+    // Not using `options.issue.uri` to avoid default file decorators (see Explorer tab)
+    // However, as of August 2020, there is still no way to manually decorate tree items
+    // https://github.com/microsoft/vscode/issues/47502
+    this.resourceUri = options.link ? Uri.parse(options.link) : undefined;
     this.parent = options.parent;
     this.children = options.children;
   }