Merge pull request #13 from RefactorSecurity/fix-comment-deletion

Fix comment deletion

Author: v8vito

src/extension.ts

@@ -108,6 +108,9 @@ export function activate(context: vscode.ExtensionContext) {
       'security-notes.deleteNote',
       (thread: vscode.CommentThread) => {
         thread.dispose();
+        if (thread.contextValue) {
+          noteMap.delete(thread.contextValue);
+        }
       },
     ),
   );

src/helpers.ts

@@ -109,6 +109,9 @@ export const mergeThread = (local: vscode.CommentThread, remote: any): boolean =
       (a.timestamp ? Number(a.timestamp) : 0) - (b.timestamp ? Number(b.timestamp) : 0),
   );
 
+  // mark all merged comments as deletable, except for the first one
+  mergedComments.slice(1).forEach((comment) => (comment.contextValue = 'canDelete'));
+
   // assigned unique and sorted comments to current thread
   local.comments = mergedComments;
   return merged;

src/models/noteComment.ts

@@ -24,5 +24,6 @@ export class NoteComment implements vscode.Comment {
     } else {
       this.timestamp = new Date();
     }
+    this.contextValue = contextValue;
   }
 }

src/persistence/serialization/deserializer.ts

@@ -35,7 +35,7 @@ export class Deserializer {
       { name: comment.author },
       parent,
       deserializedReactions,
-      undefined,
+      parent && parent.comments.length ? 'canDelete' : undefined,
       comment.timestamp,
     );
     return newComment;
@@ -61,6 +61,12 @@ export class Deserializer {
       deserializedComments.push(this.deserializeComment(comment, newThread));
     });
     newThread.comments = deserializedComments;
+
+    // mark all comments as deletable, except for the first one
+    newThread.comments
+      .slice(1)
+      .forEach((comment) => (comment.contextValue = 'canDelete'));
+
     return newThread;
   }