Fix firefox-devtools#4397 - Don't allow context menu when a line is e…

…mpty
jasonLaster · Oct 18, 2017 · acea219 · acea219
1 parent 495339a
commit acea219
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/components/Editor/GutterMenu.js b/src/components/Editor/GutterMenu.js
@@ -5,6 +5,7 @@ import { connect } from "react-redux";
 import { lineAtHeight } from "../../utils/editor";
 import {
   getContextMenu,
+  getEmptyLines,
   getSelectedLocation,
   getSelectedSource,
   getVisibleBreakpoints,
@@ -143,6 +144,10 @@ class GutterContextMenuComponent extends PureComponent {
       bp => bp.location.line === line
     );
 
+    if (props.emptyLines.includes(line)) {
+      return;
+    }
+
     gutterMenu({ event, sourceId, line, breakpoint, ...props });
   }
 
@@ -153,12 +158,16 @@ class GutterContextMenuComponent extends PureComponent {
 
 export default connect(
   state => {
+    const selectedSource = getSelectedSource(state);
     return {
       selectedLocation: getSelectedLocation(state),
-      selectedSource: getSelectedSource(state),
+      selectedSource: selectedSource,
       breakpoints: getVisibleBreakpoints(state),
       pauseData: getPause(state),
-      contextMenu: getContextMenu(state)
+      contextMenu: getContextMenu(state),
+      emptyLines: selectedSource
+        ? getEmptyLines(state, selectedSource.toJS())
+        : []
     };
   },
   dispatch => bindActionCreators(actions, dispatch)