Merge pull request #44 from DeepCodeAI/fixed_report_and_update_positions

Fixed reporting and update positions

Author: Arvi3d

src/deepcode/lib/analyzer/DeepCodeAnalyzer.ts

@@ -207,13 +207,14 @@ class DeepCodeAnalyzer implements DeepCode.AnalyzerInterface {
         this.analysisResultsCollection,
         updatedFile
       );
-      this.analysisResultsCollection[updatedFile.workspace].files[
-        updatedFile.filePathInWorkspace
-      ] = { ...fileIssuesList };
+      // Opening a project directory instead of a workspace leads to empty updatedFile.workspace field
+      const workspace = updatedFile.workspace || Object.keys(this.analysisResultsCollection)[0];
+      const filepath = updatedFile.filePathInWorkspace || updatedFile.fullPath.replace(workspace, "");
+      this.analysisResultsCollection[workspace].files[filepath] = { ...fileIssuesList };
       if (this.deepcodeReview) {
         const issues = this.createIssuesList({
           fileIssuesList,
-          suggestions: this.analysisResultsCollection[updatedFile.workspace].suggestions,
+          suggestions: this.analysisResultsCollection[workspace].suggestions,
           fileUri: vscode.Uri.file(updatedFile.fullPath)
         });
         this.deepcodeReview.set(vscode.Uri.file(updatedFile.fullPath), [
@@ -224,7 +225,7 @@ class DeepCodeAnalyzer implements DeepCode.AnalyzerInterface {
     } catch (err) {
       extension.errorHandler.processError(extension, err, {
         message: errorsLogs.updateReviewPositions,
-        bundleId: extension.remoteBundles[updatedFile.workspace].bundleId,
+        bundleId: (extension.remoteBundles[updatedFile.workspace] || {}).bundleId,
         data: {
           [updatedFile.filePathInWorkspace]: updatedFile.contentChanges
         }

src/deepcode/lib/modules/ReportModule.ts

@@ -8,7 +8,7 @@ class ReportModule extends BaseDeepCodeModule implements DeepCode.ReportModuleIn
     // return true;
 
     // disabling request sending in dev mode or to self-managed instances.
-    return process.env.NODE_ENV === "production" && this.baseURL === this.defaultBaseURL;
+    return this.baseURL === this.defaultBaseURL;
   }
 
   public async sendError(options: {[key: string]: any}): Promise<void> {

src/deepcode/utils/analysisUtils.ts

@@ -94,12 +94,12 @@ export const updateFileReviewResultsPositions = (
   const offsetedline = changesRange.start.line + 1;
   const charOffset = 1;
 
+  // Opening a project directory instead of a workspace leads to empty updatedFile.workspace field
+  const workspace = updatedFile.workspace || Object.keys(analysisResultsCollection)[0];
+  const filepath = updatedFile.filePathInWorkspace || updatedFile.fullPath.replace(workspace, "");
   const fileIssuesList = {
-    ...analysisResultsCollection[updatedFile.workspace].files[
-      updatedFile.filePathInWorkspace
-    ]
+    ...analysisResultsCollection[workspace].files[filepath]
   };
-
   for (const issue in fileIssuesList) {
     for (const [index, position] of fileIssuesList[issue].entries()) {
       const currentLineIsOnEdgeOfIssueRange =