From 2343507604968bb88aa2634c172cd6c2c500db94 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Wed, 12 Nov 2014 18:46:08 +0300 Subject: [PATCH] fixed PY-14342 IPython Notebook run cell shortcuts don't work when the cell is in edit mode --- .../ipnb/editor/panels/code/IpnbCodeSourcePanel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbCodeSourcePanel.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbCodeSourcePanel.java index 129471f6878c..a5eeafd96f40 100644 --- a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbCodeSourcePanel.java +++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbCodeSourcePanel.java @@ -16,6 +16,7 @@ package org.jetbrains.plugins.ipnb.editor.panels.code; import com.intellij.openapi.Disposable; +import com.intellij.openapi.actionSystem.CustomShortcutSet; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.project.Project; @@ -24,7 +25,9 @@ import com.intellij.ui.Gray; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.ipnb.editor.IpnbEditorUtil; +import org.jetbrains.plugins.ipnb.editor.actions.IpnbRunCellAction; import org.jetbrains.plugins.ipnb.editor.actions.IpnbRunCellBaseAction; +import org.jetbrains.plugins.ipnb.editor.actions.IpnbRunCellInplaceAction; import org.jetbrains.plugins.ipnb.editor.panels.IpnbEditorPanel; import org.jetbrains.plugins.ipnb.editor.panels.IpnbFilePanel; import org.jetbrains.plugins.ipnb.editor.panels.IpnbPanel; @@ -83,6 +86,9 @@ public class IpnbCodeSourcePanel extends IpnbPanel imp final JComponent component = myEditor.getComponent(); final JComponent contentComponent = myEditor.getContentComponent(); + new IpnbRunCellAction().registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke("shift ENTER")), contentComponent); + new IpnbRunCellInplaceAction().registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke("ctrl ENTER")), contentComponent); + contentComponent.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) {