fix: prioritize diff revert arrow over breakpoints (microsoft#198895)

* fix: prioritize diff revert arrow over breakpoints * fix: revert icon shouldn't disable gutter context menu
anyscale · Nov 22, 2023 · ef71b03 · ef71b03
1 parent d80f451
commit ef71b03
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/vs/editor/browser/widget/diffEditor/diffEditorDecorations.ts b/src/vs/editor/browser/widget/diffEditor/diffEditorDecorations.ts
@@ -218,8 +218,11 @@ class RevertButton implements IGlyphMarginWidget {
  private readonly _selection: boolean,
  ) {
  this._domNode.onmousedown = e => {
- e.stopPropagation();
- e.preventDefault();
+ // don't prevent context menu from showing up
+ if (e.button !== 2) {
+ e.stopPropagation();
+ e.preventDefault();
+ }
  };
  this._domNode.onmouseup = e => {
  e.stopPropagation();
@@ -251,7 +254,7 @@ class RevertButton implements IGlyphMarginWidget {
  endColumn: 1,
  endLineNumber: this._lineNumber,
  },
- zIndex: 0,
+ zIndex: 10001,
  };
  }
 }