Merge branch 'master' into suggestion-view-merge

# Conflicts:
#	src/deepcode/DeepCodeExtension.ts

Author: shinin-light

src/deepcode/DeepCodeExtension.ts

@@ -2,11 +2,11 @@ import * as vscode from 'vscode';
 import * as _ from "lodash";
 import open from 'open';
 
+import { emitter, ISupportedFiles } from '@deepcode/tsc';
 import { ExtensionInterface } from '../interfaces/DeepCodeInterfaces';
 import DeepCodeLib from './lib/modules/DeepCodeLib';
 import createFileWatcher from './lib/watchers/FilesWatcher';
 import { COMMAND_DEBOUNCE_INTERVAL } from "./constants/general";
-import { emitter, ISupportedFiles } from '@deepcode/tsc';
 import {
   DEEPCODE_START_COMMAND,
   DEEPCODE_SETMODE_COMMAND,
@@ -170,7 +170,7 @@ class DeepCodeExtension extends DeepCodeLib implements ExtensionInterface {
   }
 
   onSupportedFilesLoaded(data: ISupportedFiles | null) {
-    const msg = !!data ? 'Ignore rules loading' : 'Loading';
+    const msg = data ? 'Ignore rules loading' : 'Loading';
 
     this.updateStatus(DEEPCODE_ANALYSIS_STATUS.FILTERS, msg);
 

src/deepcode/lib/modules/BundlesModule.ts

@@ -11,6 +11,10 @@ import { analyzeFolders, extendAnalysis } from '@deepcode/tsc';
 abstract class BundlesModule extends LoginModule implements BundlesModuleInterface {
   runningAnalysis = false;
 
+  private lastAnalysisStartingTimestamp = Date.now();
+  lastAnalysisDuration = 0;
+  lastAnalysisTimestamp = Date.now();
+
   files: string[] = [];
 
   updateStatus(status: string, progress: string) {
@@ -57,6 +61,7 @@ abstract class BundlesModule extends LoginModule implements BundlesModuleInterfa
           return;
         }
         this.runningAnalysis = true;
+        this.lastAnalysisStartingTimestamp = Date.now();
 
         let result;
         if (this.changedFiles.size && this.remoteBundle) {
@@ -85,6 +90,8 @@ abstract class BundlesModule extends LoginModule implements BundlesModuleInterfa
       });
     } finally {
       this.runningAnalysis = false;
+      this.lastAnalysisTimestamp = Date.now();
+      this.lastAnalysisDuration = this.lastAnalysisTimestamp - this.lastAnalysisStartingTimestamp;
     }
   }
 }

src/deepcode/lib/modules/LoginModule.ts

@@ -14,6 +14,7 @@ const sleep = (duration: number) => new Promise(resolve => setTimeout(resolve, d
 
 abstract class LoginModule extends ReportModule implements LoginModuleInterface {
   private pendingLogin: boolean = false;
+  private pendingToken = '';
 
   async initiateLogin(): Promise<void> {
     await this.setContext(DEEPCODE_CONTEXT.LOGGEDIN, false);
@@ -26,8 +27,22 @@ abstract class LoginModule extends ReportModule implements LoginModuleInterface
     try {
       const checkCurrentToken = await this.checkSession();
       if (checkCurrentToken) return;
+
+      // In case we already created a draft token earlier, check if it's confirmed already
+      if (this.pendingToken) {
+        try {
+          const confirmedPendingToken = await this.checkSession(this.pendingToken);
+          if (confirmedPendingToken) {
+            await this.setToken(this.pendingToken);
+            return;
+          }
+        } finally {
+          this.pendingToken = '';
+        }
+      }
+
       const response = await startSession({ baseURL: this.baseURL, source: this.source });
-      if (response.type == 'error') {
+      if (response.type === 'error') {
         throw new Error(errorsLogs.login);
       }
 
@@ -37,6 +52,8 @@ abstract class LoginModule extends ReportModule implements LoginModuleInterface
       const confirmed = await this.waitLoginConfirmation(sessionToken);
       if (confirmed) {
         await this.setToken(sessionToken);
+      } else {
+        this.pendingToken = sessionToken;
       }
     } catch (err) {
       await this.processError(err, {
@@ -51,10 +68,15 @@ abstract class LoginModule extends ReportModule implements LoginModuleInterface
     let validSession = false;
     if (token || this.token) {
       try {
-        validSession = !!(await checkSession({
+        const sessionResponse = await checkSession({
           baseURL: this.baseURL,
           sessionToken: token || this.token,
-        }));
+        });
+        if (sessionResponse.type === 'error') {
+          validSession = false;
+        } else {
+          validSession = sessionResponse.value;
+        }
       } catch (err) {
         await this.processError(err, {
           message: errorsLogs.loginStatus,

src/deepcode/view/IssueProvider.ts

@@ -128,11 +128,16 @@ export class IssueProvider extends NodeProvider {
         }),
       );
     } else {
-      review.unshift(
-        new Node({
-          text: `DeepCode found ${!nIssues ? 'no issue! ✅' : `${nIssues} issue${nIssues === 1 ? '' : 's'}`}`,
-        }),
-      );
+      review.unshift(new Node({
+        text: `DeepCode found ${!nIssues ? 'no issues! ✅' : `${nIssues} issue${nIssues === 1 ? '' : 's'}`}`,
+      }));
+      const sDuration = Math.round((this.extension.lastAnalysisDuration / 1000 + Number.EPSILON) * 100) / 100;
+      const ts = new Date(this.extension.lastAnalysisTimestamp);
+      const time = ts.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
+      const day = ts.toLocaleDateString([], { year: "2-digit", month: "2-digit", day: "2-digit" });
+      review.unshift(new Node({
+        text: `Analysis took ${sDuration}s, finished at ${time}, ${day}`,
+      }));
     }
     return review;
   }

src/interfaces/DeepCodeInterfaces.ts

@@ -56,6 +56,8 @@ export interface LoginModuleInterface {
 
 export interface BundlesModuleInterface {
   readonly runningAnalysis: boolean;
+  readonly lastAnalysisDuration: number;
+  readonly lastAnalysisTimestamp: number;
   startAnalysis(): Promise<void>;
 }
 

src/test/runTest.ts

@@ -4,7 +4,6 @@ import { runTests } from 'vscode-test';
 
 async function main() {
   try {
-
     console.log('STARTING TESTS');
 
     // The folder containing the Extension Manifest package.json