[Log Point] Fix log point context menu accelerator (firefox-devtools#8115)

Author: ravefalcon92

assets/panel/debugger.properties

@@ -243,11 +243,17 @@ functionSearch.key=CmdOrCtrl+Shift+O
 # key identifiers, not messages displayed to the user.
 toggleBreakpoint.key=CmdOrCtrl+B
 
-# LOCALIZATION NOTE (toggleCondPanel.key): A key shortcut to toggle
-# the conditional breakpoint panel.
+# LOCALIZATION NOTE (toggleCondPanel.breakpoint.key): A key shortcut to toggle
+# the conditional panel for breakpoints.
 # Do not localize "CmdOrCtrl+Shift+B", or change the format of the string. These are
 # key identifiers, not messages displayed to the user.
-toggleCondPanel.key=CmdOrCtrl+Shift+B
+toggleCondPanel.breakpoint.key=CmdOrCtrl+Shift+B
+
+# LOCALIZATION NOTE (toggleCondPanel.logPoint.key): A key shortcut to toggle
+# the conditional panel for log points.
+# Do not localize "CmdOrCtrl+Shift+Y", or change the format of the string. These are
+# key identifiers, not messages displayed to the user.
+toggleCondPanel.logPoint.key=CmdOrCtrl+Shift+Y
 
 # LOCALIZATION NOTE (stepOut.key): A key shortcut to
 # step out.
@@ -1028,9 +1034,13 @@ anonymousFunction=<anonymous>
 shortcuts.toggleBreakpoint=Toggle Breakpoint
 shortcuts.toggleBreakpoint.accesskey=B
 
-# LOCALIZATION NOTE (shortcuts.toggleCondPanel): text describing
-# keyboard shortcut action for toggling conditional panel keyboard
-shortcuts.toggleCondPanel=Toggle Conditional Panel
+# LOCALIZATION NOTE (shortcuts.toggleCondPanel.breakpoint): text describing
+# keyboard shortcut action for toggling conditional panel for breakpoints
+shortcuts.toggleCondPanel.breakpoint=Edit Conditional Breakpoint
+
+# LOCALIZATION NOTE (shortcuts.toggleCondPanel.logPoint): text describing
+# keyboard shortcut action for toggling conditional panel for log points
+shortcuts.toggleCondPanel.logPoint=Edit Log Point
 
 # LOCALIZATION NOTE (shortcuts.pauseOrResume): text describing
 # keyboard shortcut action for pause of resume

src/components/Editor/index.js

@@ -217,7 +217,11 @@ class Editor extends PureComponent<Props, State> {
 
     shortcuts.on(L10N.getStr("toggleBreakpoint.key"), this.onToggleBreakpoint);
     shortcuts.on(
-      L10N.getStr("toggleCondPanel.key"),
+      L10N.getStr("toggleCondPanel.breakpoint.key"),
+      this.onToggleConditionalPanel
+    );
+    shortcuts.on(
+      L10N.getStr("toggleCondPanel.logPoint.key"),
       this.onToggleConditionalPanel
     );
     shortcuts.on(L10N.getStr("sourceTabs.closeTab.key"), this.onClosePress);
@@ -249,7 +253,8 @@ class Editor extends PureComponent<Props, State> {
     const shortcuts = this.context.shortcuts;
     shortcuts.off(L10N.getStr("sourceTabs.closeTab.key"));
     shortcuts.off(L10N.getStr("toggleBreakpoint.key"));
-    shortcuts.off(L10N.getStr("toggleCondPanel.key"));
+    shortcuts.off(L10N.getStr("toggleCondPanel.breakpoint.key"));
+    shortcuts.off(L10N.getStr("toggleCondPanel.logPoint.key"));
     shortcuts.off(searchAgainPrevKey);
     shortcuts.off(searchAgainKey);
   }
@@ -301,11 +306,13 @@ class Editor extends PureComponent<Props, State> {
     e.stopPropagation();
     e.preventDefault();
     const line = this.getCurrentLine();
+
     if (typeof line !== "number") {
       return;
     }
 
-    this.toggleConditionalPanel(line);
+    const isLog = key === L10N.getStr("toggleCondPanel.logPoint.key");
+    this.toggleConditionalPanel(line, isLog);
   };
 
   onEditorScroll = throttle(this.props.updateViewport, 100);
@@ -454,7 +461,7 @@ class Editor extends PureComponent<Props, State> {
     }
   }
 
-  toggleConditionalPanel = line => {
+  toggleConditionalPanel = (line, log: boolean = false) => {
     const {
       conditionalPanelLocation,
       closeConditionalPanel,
@@ -470,11 +477,14 @@ class Editor extends PureComponent<Props, State> {
       return;
     }
 
-    return openConditionalPanel({
-      line: line,
-      sourceId: selectedSource.id,
-      sourceUrl: selectedSource.url
-    });
+    return openConditionalPanel(
+      {
+        line: line,
+        sourceId: selectedSource.id,
+        sourceUrl: selectedSource.url
+      },
+      log
+    );
   };
 
   shouldScrollToLocation(nextProps) {

src/components/Editor/menus/breakpoints.js

@@ -39,7 +39,7 @@ export const addConditionalBreakpointItem = (
 ) => ({
   id: "node-menu-add-conditional-breakpoint",
   label: L10N.getStr("editor.addConditionBreakpoint"),
-  accelerator: L10N.getStr("toggleCondPanel.key"),
+  accelerator: L10N.getStr("toggleCondPanel.breakpoint.key"),
   accesskey: L10N.getStr("editor.addConditionBreakpoint.accesskey"),
   disabled: false,
   click: () => breakpointActions.openConditionalPanel(location)
@@ -51,7 +51,7 @@ export const editConditionalBreakpointItem = (
 ) => ({
   id: "node-menu-edit-conditional-breakpoint",
   label: L10N.getStr("editor.editConditionBreakpoint"),
-  accelerator: L10N.getStr("toggleCondPanel.key"),
+  accelerator: L10N.getStr("toggleCondPanel.breakpoint.key"),
   accesskey: L10N.getStr("editor.addConditionBreakpoint.accesskey"),
   disabled: false,
   click: () => breakpointActions.openConditionalPanel(location)
@@ -79,7 +79,7 @@ export const addLogPointItem = (
   accesskey: L10N.getStr("editor.addLogPoint.accesskey"),
   disabled: false,
   click: () => breakpointActions.openConditionalPanel(location, true),
-  accelerator: L10N.getStr("toggleCondPanel.key")
+  accelerator: L10N.getStr("toggleCondPanel.logPoint.key")
 });
 
 export const editLogPointItem = (
@@ -91,7 +91,7 @@ export const editLogPointItem = (
   accesskey: L10N.getStr("editor.addLogPoint.accesskey"),
   disabled: false,
   click: () => breakpointActions.openConditionalPanel(location, true),
-  accelerator: L10N.getStr("toggleCondPanel.key")
+  accelerator: L10N.getStr("toggleCondPanel.logPoint.key")
 });
 
 export const logPointItem = (

src/components/SecondaryPanes/Breakpoints/BreakpointsContextMenu.js

@@ -205,7 +205,8 @@ export default function showContextMenu(props: Props) {
     click: () => {
       selectSpecificLocation(selectedLocation);
       openConditionalPanel(selectedLocation);
-    }
+    },
+    accelerator: L10N.getStr("toggleCondPanel.breakpoint.key")
   };
 
   const editConditionItem = {
@@ -215,7 +216,8 @@ export default function showContextMenu(props: Props) {
     click: () => {
       selectSpecificLocation(selectedLocation);
       openConditionalPanel(selectedLocation);
-    }
+    },
+    accelerator: L10N.getStr("toggleCondPanel.breakpoint.key")
   };
 
   const addLogPointItem = {
@@ -224,7 +226,7 @@ export default function showContextMenu(props: Props) {
     accesskey: L10N.getStr("editor.addLogPoint.accesskey"),
     disabled: false,
     click: () => openConditionalPanel(selectedLocation, true),
-    accelerator: L10N.getStr("toggleCondPanel.key")
+    accelerator: L10N.getStr("toggleCondPanel.logPoint.key")
   };
 
   const editLogPointItem = {
@@ -233,7 +235,7 @@ export default function showContextMenu(props: Props) {
     accesskey: L10N.getStr("editor.addLogPoint.accesskey"),
     disabled: false,
     click: () => openConditionalPanel(selectedLocation, true),
-    accelerator: L10N.getStr("toggleCondPanel.key")
+    accelerator: L10N.getStr("toggleCondPanel.logPoint.key")
   };
 
   const removeLogPointItem = {

src/components/ShortcutsModal.js

@@ -46,8 +46,12 @@ export class ShortcutsModal extends Component<Props> {
           formatKeyShortcut(L10N.getStr("toggleBreakpoint.key"))
         )}
         {this.renderShorcutItem(
-          L10N.getStr("shortcuts.toggleCondPanel"),
-          formatKeyShortcut(L10N.getStr("toggleCondPanel.key"))
+          L10N.getStr("shortcuts.toggleCondPanel.breakpoint"),
+          formatKeyShortcut(L10N.getStr("toggleCondPanel.breakpoint.key"))
+        )}
+        {this.renderShorcutItem(
+          L10N.getStr("shortcuts.toggleCondPanel.logPoint"),
+          formatKeyShortcut(L10N.getStr("toggleCondPanel.logPoint.key"))
         )}
       </ul>
     );

src/components/test/__snapshots__/ShortcutsModal.spec.js.snap

@@ -33,7 +33,7 @@ exports[`ShortcutsModal renders when enabled 1`] = `
         </li>
         <li>
           <span>
-            Toggle Conditional Panel
+            Edit Conditional Breakpoint
           </span>
           <span>
             <span
@@ -44,6 +44,19 @@ exports[`ShortcutsModal renders when enabled 1`] = `
             </span>
           </span>
         </li>
+        <li>
+          <span>
+            Edit Log Point
+          </span>
+          <span>
+            <span
+              className="keystroke"
+              key="Ctrl+Shift+Y"
+            >
+              Ctrl+Shift+Y
+            </span>
+          </span>
+        </li>
       </ul>
     </div>
     <div