WIP

Author: shinin-light

package-lock.json

@@ -61,7 +61,7 @@
           "deepcode.uploadApproved": {
             "type": "boolean",
             "default": false,
-            "markdownDescription": "User consent for code upload to `#deepcode.url#`",
+            "markdownDescription": "User consent for code upload to `#deepcode.url#` in agreement with our [terms and conditions](https://www.deepcode.ai/tc?utm_source=vsc)",
             "scope": "window"
           },
           "deepcode.yesCrashReport": {
@@ -131,7 +131,7 @@
       },
       {
         "view": "deepcode.views.error",
-        "contents": "DeepCode has encountered a problem. Please restart the extension: \n[Restart](command:deepcode.start 'Restart DeepCode')\nIf the error persists, please check your [settings](command:deepcode.settings) and [contact us](https://www.deepcode.ai/feedback?select=2)!",
+        "contents": "DeepCode has encountered a problem. Please restart the extension: \n[Restart](command:deepcode.start 'Restart DeepCode')\nIf the error persists, please check your [settings](command:deepcode.settings) and [contact us](https://www.deepcode.ai/feedback?select=2?utm_source=vsc)!",
         "when": "deepcode:error != 'transient'"
       },
       {
@@ -140,24 +140,18 @@
       },
       {
         "view": "deepcode.views.tc",
-        "contents": "Thanks for connecting with DeepCode. ✅\n 👉 You are almost set 🤗, let's confirm and start the remote analysis - feel free to check out our [terms and conditions](https://www.deepcode.ai/tc?utm_source=vsc) if you are into this.\n[Accept code upload](command:deepcode.approveUpload 'Upload code to DeepCode')\nYou can always change it later in the [settings](command:deepcode.settings)!"
+        "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.progress",
         "contents": "Analysis in progress"
       },
       {
         "view": "deepcode.views.analysis",
-        "contents": "DeepCode analyzed your code and found no issue!"
+        "contents": "DeepCode analyzed your code and found no issue! 🎉"
       }
     ],
     "menus": {
-      "commandPalette": [
-        {
-          "command": "deepcode.start",
-          "when": "deepcode:loggedIn"
-        }
-      ],
       "view/title": [
         {
           "command": "deepcode.settings",
@@ -169,6 +163,16 @@
           "when": "view == deepcode.views.analysis",
           "group": "navigation"
         }
+      ],
+      "commandPalette": [
+        {
+          "command": "deepcode.approve",
+          "when": "false"
+        },
+        {
+          "command": "deepcode.login",
+          "when": "!deepcode:loggedIn"
+        }
       ]
     },
     "commands": [
@@ -188,7 +192,7 @@
       },
       {
         "command": "deepcode.approve",
-        "title": "DeepCode approve upload and remote analysis"
+        "title": "DeepCode approve upload and start analysis"
       }
     ]
   },
@@ -218,10 +222,12 @@
     "nock": "^12.0.3"
   },
   "dependencies": {
+    "@deepcode/tsc": "^1.3.0",
+    "@types/lodash": "^4.14.159",
     "@types/mz": "^2.7.1",
     "ignore": "^5.1.8",
+    "lodash": "^4.17.19",
     "mz": "^2.7.0",
-    "open": "^7.0.4",
-    "@deepcode/tsc": "^1.3.0"
+    "open": "^7.0.4"
   }
 }

package.json

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

src/deepcode/constants/commands.ts

@@ -1,5 +1,6 @@
 // Changing this requires changing display name in package.json.
 export const DEEPCODE_NAME = "DeepCode";
+export const DEEPCODE_EXTENSION_NAME = "deepcode";
 export const ALLOWED_PAYLOAD_SIZE = 1024 * 1024 * 4; // max payload size of 4MB in bytes
 export const MAX_CONNECTION_RETRIES = 5; // max number of automatic retries before showing an error
 export const IDE_NAME = "vscode";

src/deepcode/constants/general.ts

@@ -12,7 +12,6 @@ import {
 import { DEEPCODE_NAME } from "../../constants/general";
 import { TELEMETRY_EVENTS } from "../../constants/telemetry";
 import { ISSUES_MARKERS_DECORATION_TYPE } from "../../constants/analysis";
-import { deepCodeMessages } from "../../messages/deepCodeMessages";
 import { errorsLogs } from "../../messages/errorsServerLogMessages";
 
 import { DisposableCodeActionsProvider } from "../deepCodeProviders/codeActionsProvider/DeepCodeIssuesActionsProvider";
@@ -23,17 +22,14 @@ class DeepCodeAnalyzer implements DeepCode.AnalyzerInterface {
     [key: number]: { name: vscode.DiagnosticSeverity; show: boolean };
   };
   private extension: DeepCode.ExtensionInterface | undefined;
-  private analysisProgressValue: number = 1; // default value for progress to make it visible from start
-  private progress = vscode.window.withProgress;
-  private analysisInProgress: boolean = false;
   private issueHoverProvider: vscode.Disposable | undefined;
   private ignoreActionsProvider: vscode.Disposable | undefined;
-  private analysisQueueCount: number = 0;
   private issuesMarkersdecorationType:
     | vscode.TextEditorDecorationType
     | undefined;
   public deepcodeReview: vscode.DiagnosticCollection | undefined;
   public analysisResultsCollection: DeepCode.AnalysisResultsCollectionInterface;
+  
   public constructor() {
     this.SEVERITIES = createDeepCodeSeveritiesMap();
     this.deepcodeReview = vscode.languages.createDiagnosticCollection(DEEPCODE_NAME);
@@ -233,39 +229,6 @@ class DeepCodeAnalyzer implements DeepCode.AnalyzerInterface {
     }
   }
 
-  // private async processFailedReviewCodeResults(
-  //   extension: DeepCode.ExtensionInterface,
-  //   path: string
-  // ): Promise<void> {
-  //   const { bundleId } = extension.remoteBundles[path];
-  //   extension.processError(new Error(), {
-  //     message: errorsLogs.failedStatusOfAnalysis,
-  //     bundleId
-  //   });
-  //   const workspace = vscode.workspace.workspaceFolders
-  //     ? vscode.workspace.workspaceFolders.find(folder => {
-  //         return folder.uri.fsPath === path;
-  //       })
-  //     : { name: "" };
-  //   const workspaceName = workspace ? workspace.name : "";
-  //   const {
-  //     msg: analysisErrorMsg,
-  //     button: analysisErrorBtn
-  //   } = deepCodeMessages.codeReviewFailed;
-  //   const analysisErrorButton:
-  //     | string
-  //     | undefined = await vscode.window.showErrorMessage(
-  //     analysisErrorMsg(workspaceName),
-  //     analysisErrorBtn
-  //   );
-  //   if (analysisErrorButton === analysisErrorBtn) {
-  //     // if analysis status === FAILED,
-  //     // we create new bundle, send it, check it and trigger new review
-  //     await extension.updateHashesBundles(path);
-  //     await extension.performBundlesActions(path);
-  //   }
-  // }
-
   public async removeReviewResults(workspacePath: string): Promise<void> {
     await delete this.analysisResultsCollection[workspacePath];
     await this.createReviewResults();