Merge pull request #688 from krassowski/fix-pickers

Fix wrong picker marker (a typo during lab 4.0 migration)
jupyter · Sep 27, 2023 · 2db03bc · 2db03bc
2 parents f835a8b + 0a7954e
commit 2db03bc
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/packages/nbdime/src/common/mergeview.ts b/packages/nbdime/src/common/mergeview.ts
@@ -691,7 +691,7 @@ Add a gap DOM element between 2 editors
                 !hasEntries(s.decision.localDiff) &&
                 !hasEntries(s.decision.remoteDiff)
               ) {
-                // We have a custom decision, add picker on base only!*/
+                // We have a custom decision, add picker on base only!
                 effects = effects.concat(
                   this.createGutterEffects(
                     editor,
@@ -727,6 +727,7 @@ Add a gap DOM element between 2 editors
         }
       }
       if (chunkFirstLine === chunkLastLine) {
+        // When the chunk is empty, make sure a horizontal line shows up
         const startingOffset = posToOffset(editor.state.doc, {
           line: chunkFirstLine,
           column: 0,
@@ -750,13 +751,14 @@ Add a gap DOM element between 2 editors
             ),
           );
         } else if (conflict) {
+          // Add conflict markers on editor, if conflicted
           effects = effects.concat(
             this.createGutterEffects(
               editor,
               chunk,
               startingOffset,
               true,
-              'picker',
+              'conflict',
             ),
           );
         }