added error handling for 401 status code;

fixed showing results;
fixed parsing of rules for interfile;

Author: Arvid Paeglit

src/deepcode/constants/analysis.ts

@@ -23,5 +23,3 @@ export const ISSUES_MARKERS_DECORATION_TYPE: { [key: string]: string } = {
   borderColor: "green",
   borderStyle: "none none dashed none"
 };
-
-export const ISSUE_ID_SPLITTER = "%2Fdc%2F";

src/deepcode/lib/analyzer/DeepCodeAnalyzer.ts

@@ -12,8 +12,8 @@ import {
   createIssueRelatedInformation,
   createDeepCodeSeveritiesMap,
   getDeepCodeSeverity,
-  extractSuggestionIdFromSuggestionsMap
-} from "../../utils/analysisUtils";
+  findSuggestionByMessage,
+} from '../../utils/analysisUtils';
 import { DEEPCODE_NAME } from "../../constants/general";
 import { TELEMETRY_EVENTS } from "../../constants/telemetry";
 import { ISSUES_MARKERS_DECORATION_TYPE } from "../../constants/analysis";
@@ -38,7 +38,7 @@ class DeepCodeAnalyzer implements AnalyzerInterface {
     this.deepcodeReview = vscode.languages.createDiagnosticCollection(DEEPCODE_NAME);
 
     new DisposableCodeActionsProvider(this.deepcodeReview, {
-      findSuggestionId: this.findSuggestionId.bind(this),
+      findSuggestion: this.findSuggestion.bind(this),
       trackIgnoreSuggestion: this.trackIgnoreSuggestion.bind(this),
     });
     new DisposableHoverProvider(this.deepcodeReview);
@@ -48,8 +48,8 @@ class DeepCodeAnalyzer implements AnalyzerInterface {
     this.extension = extension;
   }
 
-  public findSuggestionId(suggestionName: string): string {
-    return extractSuggestionIdFromSuggestionsMap(this.analysisResults, suggestionName);
+  public findSuggestion(suggestionName: string): ISuggestion | undefined {
+    return findSuggestionByMessage(this.analysisResults, suggestionName);
   }
 
   public trackIgnoreSuggestion(vscodeSeverity: number, options: { [key: string]: any }): void {
@@ -61,7 +61,11 @@ class DeepCodeAnalyzer implements AnalyzerInterface {
     this.extension.processEvent(TELEMETRY_EVENTS.ignoreSuggestion, options);
   }
 
-  private createIssueDiagnosticInfo({ issuePositions, suggestion, fileUri }: {
+  private createIssueDiagnosticInfo({
+    issuePositions,
+    suggestion,
+    fileUri,
+  }: {
     issuePositions: IFileSuggestion;
     suggestion: ISuggestion;
     fileUri: vscode.Uri;
@@ -166,10 +170,7 @@ class DeepCodeAnalyzer implements AnalyzerInterface {
       ) {
         return;
       }
-      const fileIssuesList: IFilePath = await updateFileReviewResultsPositions(
-        this.analysisResults,
-        updatedFile,
-      );
+      const fileIssuesList: IFilePath = await updateFileReviewResultsPositions(this.analysisResults, updatedFile);
       // Opening a project directory instead of a workspace leads to empty updatedFile.workspace field
       const workspace = updatedFile.workspace;
       const filepath = updatedFile.filePathInWorkspace || updatedFile.fullPath.replace(workspace, '');

src/deepcode/lib/deepCodeProviders/codeActionsProvider/DeepCodeIssuesActionsProvider.ts

@@ -1,9 +1,5 @@
 import * as vscode from "vscode";
-import {
-  findIssueWithRange,
-  ignoreIssueCommentText,
-  extractIssueNameOutOfId
-} from "../../../utils/analysisUtils";
+import { findIssueWithRange, ignoreIssueCommentText } from '../../../utils/analysisUtils';
 import {
   IGNORE_ISSUE_ACTION_NAME,
   FILE_IGNORE_ACTION_NAME,
@@ -18,13 +14,13 @@ export class DeepCodeIssuesActionProvider implements vscode.CodeActionProvider {
   public static readonly providedCodeActionKinds = [vscode.CodeActionKind.QuickFix];
 
   private issuesList: vscode.DiagnosticCollection | undefined;
-  private findSuggestionId: Function;
+  private findSuggestion: Function;
   private trackIgnoreSuggestion: Function;
 
   constructor(issuesList: vscode.DiagnosticCollection | undefined, callbacks: { [key: string]: Function }) {
     this.issuesList = issuesList;
     this.registerIgnoreIssuesCommand();
-    this.findSuggestionId = callbacks.findSuggestionId;
+    this.findSuggestion = callbacks.findSuggestion;
     this.trackIgnoreSuggestion = callbacks.trackIgnoreSuggestion;
   }
 
@@ -111,8 +107,10 @@ export class DeepCodeIssuesActionProvider implements vscode.CodeActionProvider {
       DeepCodeIssuesActionProvider.providedCodeActionKinds[0],
     );
 
-    const issueFullId: string = this.findSuggestionId(matchedIssue.message);
-    const issueNameForComment: string = extractIssueNameOutOfId(issueFullId);
+    const suggestion = this.findSuggestion(matchedIssue.message);
+
+    const issueFullId: string = suggestion?.id;
+    const issueNameForComment: string = suggestion?.rule;
     const issueText: string = ignoreIssueCommentText(issueNameForComment, isFileIgnore);
     ignoreIssueAction.command = {
       command: DEEPCODE_IGNORE_ISSUE_COMMAND,

src/deepcode/lib/modules/BundlesModule.ts

@@ -6,8 +6,9 @@ import { BundlesModuleInterface } from "../../../interfaces/DeepCodeInterfaces";
 import LoginModule from "../../lib/modules/LoginModule";
 import { DEEPCODE_ANALYSIS_STATUS, DEEPCODE_CONTEXT } from "../../constants/views";
 import { errorsLogs } from "../../messages/errorsServerLogMessages";
+import { statusCodes } from '../../constants/statusCodes';
 
-import { analyzeFolders } from '@deepcode/tsc';
+import { analyzeFolders, extendAnalysis } from '@deepcode/tsc';
 
 abstract class BundlesModule extends LoginModule implements BundlesModuleInterface {
   runningAnalysis = false;
@@ -54,18 +55,26 @@ abstract class BundlesModule extends LoginModule implements BundlesModuleInterfa
       if (paths.length) {
         await this.setContext(DEEPCODE_CONTEXT.WORKSPACE_FOUND, true);
 
-        if (this.runningAnalysis) return;
+        if (this.runningAnalysis) {
+          return;
+        }
         this.runningAnalysis = true;
 
-        const result = await analyzeFolders(this.baseURL, this.token, false, 1, paths);
+        let result;
+        if (this.changedFiles.size && this.remoteBundle) {
+          const changedFiles = [...this.changedFiles];
+          this.changedFiles.clear();
+          result = await extendAnalysis(this.remoteBundle, changedFiles);
+        } else {
+          result = await analyzeFolders(this.baseURL, this.token, false, 1, paths);
+        }
 
         if (result) {
           this.remoteBundle = result;
 
           this.analyzer.analysisResults = result.analysisResults;
           this.analyzer.createReviewResults();
 
-          this.runningAnalysis = false;
           this.refreshViews();
         }
       } else {
@@ -75,6 +84,8 @@ abstract class BundlesModule extends LoginModule implements BundlesModuleInterfa
       await this.processError(err, {
         message: errorsLogs.failedAnalysis,
       });
+    } finally {
+      this.runningAnalysis = false;
     }
   }
 }

src/deepcode/lib/modules/LoginModule.ts

@@ -16,7 +16,6 @@ abstract class LoginModule extends ReportModule implements LoginModuleInterface
   private pendingLogin: boolean = false;
 
   async initiateLogin(): Promise<void> {
-
     await this.setContext(DEEPCODE_CONTEXT.LOGGEDIN, false);
 
     if (this.pendingLogin) {
@@ -34,29 +33,31 @@ abstract class LoginModule extends ReportModule implements LoginModuleInterface
 
       const { sessionToken, loginURL } = response.value;
 
-      await this.setToken(sessionToken);
       await viewInBrowser(loginURL);
-      await this.waitLoginConfirmation();
+      const confirmed = await this.waitLoginConfirmation(sessionToken);
+      if (confirmed) {
+        await this.setToken(sessionToken);
+      }
     } catch (err) {
       await this.processError(err, {
-        message: errorsLogs.login
+        message: errorsLogs.login,
       });
     } finally {
       this.pendingLogin = false;
     }
   }
 
-  async checkSession(): Promise<boolean> {
+  async checkSession(token = ''): Promise<boolean> {
     let validSession = false;
-    if (this.token) {
+    if (token || this.token) {
       try {
         validSession = !!(await checkSession({
           baseURL: this.baseURL,
-          sessionToken: this.token,
+          sessionToken: token || this.token,
         }));
       } catch (err) {
         await this.processError(err, {
-          message: errorsLogs.loginStatus
+          message: errorsLogs.loginStatus,
         });
       }
     }
@@ -65,17 +66,17 @@ abstract class LoginModule extends ReportModule implements LoginModuleInterface
     return validSession;
   }
 
-  private async waitLoginConfirmation(): Promise<void> {
-    if (!this.token) return;
+  private async waitLoginConfirmation(token: string): Promise<boolean> {
     // 20 attempts to wait for user's login & consent
     for (let i = 0; i < 20; i++) {
       await sleep(1000);
 
-      const confirmed = await this.checkSession();
+      const confirmed = await this.checkSession(token);
       if (confirmed) {
-        return;
+        return true;
       }
     }
+    return false;
   }
 
   async checkApproval(): Promise<boolean> {
@@ -96,7 +97,7 @@ abstract class LoginModule extends ReportModule implements LoginModuleInterface
       this.processEvent(TELEMETRY_EVENTS.viewWelcomeNotification);
       let pressedButton = await vscode.window.showInformationMessage(
         deepCodeMessages.welcome.msg,
-        deepCodeMessages.welcome.button
+        deepCodeMessages.welcome.button,
       );
       if (pressedButton === deepCodeMessages.welcome.button) {
         await openDeepcodeViewContainer();