Added suggestion closing when fixed.

Author: shinin-light

package-lock.json

@@ -14,6 +14,7 @@ import {
   createDeepCodeSeveritiesMap,
   getDeepCodeSeverity,
   findCompleteSuggestion,
+  checkCompleteSuggestion,
   findSuggestionByMessage,
 } from '../../utils/analysisUtils';
 import { DEEPCODE_NAME } from "../../constants/general";
@@ -58,6 +59,10 @@ class DeepCodeAnalyzer implements AnalyzerInterface {
     return findCompleteSuggestion(this.analysisResults, suggestionId, uri, position);
   }
 
+  public checkFullSuggestion(suggestion: completeFileSuggestionType): boolean {
+    return checkCompleteSuggestion(this.analysisResults, suggestion);
+  }
+
   public findSuggestion(suggestionName: string): ISuggestion | undefined {
     return findSuggestionByMessage(this.analysisResults, suggestionName);
   }

src/deepcode/lib/analyzer/DeepCodeAnalyzer.ts

@@ -74,6 +74,7 @@ abstract class BundlesModule extends LoginModule implements BundlesModuleInterfa
           this.analyzer.createReviewResults();
 
           this.refreshViews();
+          this.suggestionProvider.checkCurrentSuggestion();
         }
       } else {
         await this.setContext(DEEPCODE_CONTEXT.WORKSPACE_FOUND, false);

src/deepcode/lib/modules/BundlesModule.ts

@@ -240,6 +240,33 @@ export const findCompleteSuggestion = (
   };
 };
 
+export const checkCompleteSuggestion = (
+  analysisResults: IAnalysisResult,
+  suggestion: completeFileSuggestionType,
+): boolean => {
+  let filePath = vscode.Uri.parse(suggestion.uri).fsPath;
+  if (!analysisResults.files[filePath]) return false;
+  const file: IFilePath = analysisResults.files[filePath];
+  let suggestionIndex: string | undefined = Object.keys(file).find((i) => {
+    const index = parseInt(i, 10);
+    if (
+      analysisResults.suggestions[index].id !== suggestion.id ||
+      analysisResults.suggestions[index].message !== suggestion.message
+    ) return false;
+    const found = file[index].find((fs) => {
+      let equal = true;
+      for(let dir of ['cols','rows']) {
+        for(let index of [0, 1]) {
+          equal = equal && fs[dir][index] === suggestion[dir][index];
+        }
+      }
+      return equal;
+    });
+    return !!found;
+  });
+  return !!suggestionIndex;
+}
+
 export const findSuggestionByMessage = (
   analysisResults: IAnalysisResult,
   suggestionName: string,

src/deepcode/utils/analysisUtils.ts

@@ -506,6 +506,9 @@ function getWebviewContent(images: Record<string,string>) { return `
 export class SuggestionProvider implements SuggestionProviderInterface {
   private extension: ExtensionInterface | undefined;
   private panel: vscode.WebviewPanel | undefined;
+  // For consistency reasons, the single source of truth for the current suggestion is the
+  // panel state. The following field is only used in 
+  private suggestion: completeFileSuggestionType | undefined;
 
   activate(extension: ExtensionInterface) {
     this.extension = extension;
@@ -515,12 +518,22 @@ export class SuggestionProvider implements SuggestionProviderInterface {
   }
 
   show(suggestionId: string, uri: vscode.Uri, position: vscode.Range): void {
-    if (!this.extension) return;
+    if (!this.extension) return this.checkPanelAndDispose();
     const suggestion = this.extension.analyzer.getFullSuggestion(suggestionId, uri, position);
-    if (!suggestion) return;
+    if (!suggestion) return this.checkPanelAndDispose();
     this.showPanel(suggestion);
   }
 
+  checkCurrentSuggestion(): void {
+    if (!this.panel || !this.suggestion || !this.extension) return;
+    const found = this.extension.analyzer.checkFullSuggestion(this.suggestion);
+    if (!found) return this.checkPanelAndDispose();
+  }
+
+  private checkPanelAndDispose() {
+    if (this.panel) this.panel.dispose();
+  }
+
   private disposePanel() {
     this.panel = undefined;
   }
@@ -600,6 +613,7 @@ export class SuggestionProvider implements SuggestionProviderInterface {
         undefined,
         this.extension?.context?.subscriptions
       );
+      this.suggestion = suggestion;
     } catch (e) {
       if (!this.extension) return;
       this.extension.processError(e, {

src/deepcode/view/SuggestionProvider.ts

@@ -80,6 +80,7 @@ export interface DeepCodeWatcherInterface {
 export interface SuggestionProviderInterface {
   activate(extension: ExtensionInterface): void;
   show(suggestionId: string, uri: vscode.Uri, position: vscode.Range): void;
+  checkCurrentSuggestion(): void;
 }
 
 export type userStateItemType = string | number | boolean | undefined;
@@ -142,6 +143,7 @@ export interface AnalyzerInterface {
   analysisResults: IAnalysisResult;
   findSuggestion(suggestionName: string): ISuggestion | undefined;
   getFullSuggestion(suggestionId: string, uri: vscode.Uri, position: vscode.Range): completeFileSuggestionType | undefined;
+  checkFullSuggestion(suggestion: completeFileSuggestionType): boolean;
   createReviewResults(): Promise<void>;
   updateReviewResultsPositions(extension: ExtensionInterface, updatedFile: openedTextEditorType): Promise<void>;
   setIssuesMarkersDecoration(editor: TextEditor | undefined): void;