bugfix: Blame decorations being recycled across files (#491)

`merge` is mutable, and was mutating the previous decoration record for a file
opista · Apr 2, 2024 · 763fd57 · 763fd57
1 parent 5aa65c1
commit 763fd57
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/blamer.ts b/src/blamer.ts
@@ -64,7 +64,7 @@ export class Blamer {
         const existingRecord = await this.getRecordForFile(fileName);
         return await this.storage.set<DecorationRecord>(
             fileName,
-            mapToDecorationRecord(merge(existingRecord, update)),
+            merge({}, existingRecord, update),
         );
     }
 
@@ -214,6 +214,9 @@ export class Blamer {
             }
 
             if (existingRecord) {
+                this.logger.debug("Blame already exists for file, re-applying decorations", {
+                    fileName,
+                });
                 this.decorationManager.reApplyDecorations(textEditor, existingRecord);
                 return;
             }

diff --git a/src/mapping/map-to-decoration-record.ts b/src/mapping/map-to-decoration-record.ts
@@ -10,4 +10,4 @@ const defaultRecord: DecorationRecord = {
 };
 
 export const mapToDecorationRecord = (record: Partial<DecorationRecord>): DecorationRecord =>
-    merge(defaultRecord, record);
+    merge({}, defaultRecord, record);