Alt+- inserts <-

rstudio · Mar 15, 2011 · 24b5116 · 24b5116
1 parent 2136f7e
commit 24b5116
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/console/shell/Shell.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/console/shell/Shell.java
@@ -20,6 +20,7 @@
 import com.google.gwt.user.client.DeferredCommand;
 import com.google.inject.Inject;
 import org.rstudio.core.client.BrowseCap;
+import org.rstudio.core.client.Debug;
 import org.rstudio.core.client.command.CommandBinder;
 import org.rstudio.core.client.command.Handler;
 import org.rstudio.core.client.command.KeyboardShortcut;
@@ -456,6 +457,17 @@ else if (mod == KeyboardShortcut.META)
                      break;
                }
             }
+            else if (mod == KeyboardShortcut.ALT)
+            {
+               switch (keyCode)
+               {
+                  case 189: // hyphen
+                     event.preventDefault();
+                     event.stopPropagation();
+                     input_.replaceSelection(" <- ", true);
+                     break;
+               }
+            }
          }
       }
 

diff --git a/.../src/org/rstudio/studio/client/workbench/views/source/editors/text/TextEditingTarget.java b/.../src/org/rstudio/studio/client/workbench/views/source/editors/text/TextEditingTarget.java
@@ -35,6 +35,7 @@
 import org.rstudio.core.client.command.AppCommand;
 import org.rstudio.core.client.command.CommandBinder;
 import org.rstudio.core.client.command.Handler;
+import org.rstudio.core.client.command.KeyboardShortcut;
 import org.rstudio.core.client.dom.DomUtils;
 import org.rstudio.core.client.events.EnsureVisibleHandler;
 import org.rstudio.core.client.events.HasEnsureVisibleHandlers;
@@ -217,15 +218,21 @@ public TextEditingTarget(Commands commands,
          public void onKeyDown(KeyDownEvent event)
          {
             NativeEvent ne = event.getNativeEvent();
-            if ((ne.getMetaKey() ^ ne.getCtrlKey())
-                && !ne.getAltKey()
-                && !ne.getShiftKey()
+            int mod = KeyboardShortcut.getModifierValue(ne);
+            if ((mod == KeyboardShortcut.META || mod == KeyboardShortcut.CTRL)
                 && ne.getKeyCode() == 'F')
             {
                event.preventDefault();
                event.stopPropagation();
                commands_.findReplace().execute();
             }
+            else if (mod == KeyboardShortcut.ALT
+                     && ne.getKeyCode() == 189) // hyphen
+            {
+               event.preventDefault();
+               event.stopPropagation();
+               docDisplay_.insertCode(" <- ", false);
+            }
          }
       });
    }