Merge branch 'feat/display-ai-fix' of https://github.com/snyk/vscode-…

…extension into feat/display-ai-fix
snyk · Mar 15, 2024 · 0a81323 · 0a81323
2 parents bdbf03a + b086043
commit 0a81323
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/snyk/snykCode/views/suggestion/codeSuggestionWebviewProvider.ts b/src/snyk/snykCode/views/suggestion/codeSuggestionWebviewProvider.ts
@@ -165,23 +165,21 @@ export class CodeSuggestionWebviewProvider
     // get the workspace folders
     // look at the filepath and identify the folder that contains the filepath
     let workspaceFolder = ""
-    for (let i = 0; i < this.workspace.getWorkspaceFolders.length; i++) {
-      const element = this.workspace.getWorkspaceFolders[i];
+    for (const element of this.workspace.getWorkspaceFolders()) {
       if (issue.filePath.startsWith(element)){
         workspaceFolder = element;
         break
       }
     }
-    this.workspace.getWorkspaceFolders
     return {
       id: issue.id,
       title: issue.title,
-      uri: issue.filePath,
+      uri: issue.filePath.replace(workspaceFolder + "/", ""),
       severity: _.capitalize(issue.severity),
       ...issue.additionalData,
       text: parsedDetails,
       hasAIFix: issue.additionalData.hasAIFix,
-      folderPath: workspaceFolder
+      folderPath: workspaceFolder,
     };
   }
 
@@ -229,7 +227,6 @@ export class CodeSuggestionWebviewProvider
         }
         case 'getAutofixDiffs': {
           const suggestion = args.suggestion as Suggestion
-          // const vscodeUri = vscode.Uri.file(uri);
           console.log('getAutofixDiffs', suggestion.folderPath, suggestion.uri, this.openIssueId); // TODO remove
           const diffs: AutofixUnifiedDiffSuggestion = await vscode.commands.executeCommand(
             SNYK_CODE_FIX_DIFFS_COMMAND,
@@ -238,7 +235,7 @@ export class CodeSuggestionWebviewProvider
             this.openIssueId,
           );
           console.log('posting diffs', diffs); // TODO remove
-          void this.panel?.webview.postMessage({ type: 'setAutofixDiff', args: diffs });
+          void this.panel?.webview.postMessage({ type: 'setAutofixDiffs', args: diffs });
           break;
         }
         default: {

diff --git a/src/snyk/snykCode/views/suggestion/codeSuggestionWebviewScript.ts b/src/snyk/snykCode/views/suggestion/codeSuggestionWebviewScript.ts
@@ -552,7 +552,7 @@ declare const acquireVsCodeApi: any;
       }
       sendMessage(message)
       toggleLoading("hide");
-    }, 1500);
+    }, 15000);
   }
 
   function sendMessage(message: {