Merge pull request rstudio#150 from rstudio/bugfix/magrittr-pipe-shortcut

jjallaire · jjallaire · commit 2b1eadbfe14d · 2014-08-15T17:12:13.000-04:00
Remap magrittr keyboard shortcut
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml
@@ -407,7 +407,7 @@ well as menu structures (for main menu and popup menus).
          <shortcut value="Ctrl+Y" title="Insert Yanked Text" />
          <shortcut value="Ctrl+T" title="Transpose Letters" if="org.rstudio.core.client.BrowseCap.isMacintosh()"/>
          <shortcut value="Alt+-" title="Insert Assignment Operator"/>
-         <shortcut value="Shift+Alt+." title="Insert Pipe Operator" />
+         <shortcut value="Cmd+Shift+M" title="Insert Pipe Operator" />
       </shortcutgroup>
       <shortcutgroup name="Source Navigation">
          <shortcut refid="sourceNavigateBack" value="Cmd+F9"/>
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
@@ -22,6 +22,8 @@
 import com.google.gwt.event.dom.client.*;
 import com.google.gwt.user.client.Command;
 import com.google.inject.Inject;
+
+import org.rstudio.core.client.BrowseCap;
 import org.rstudio.core.client.CommandWithArg;
 import org.rstudio.core.client.StringUtil;
 import org.rstudio.core.client.command.CommandBinder;
@@ -531,13 +533,19 @@ else if (mod == KeyboardShortcut.ALT)
                      break;
                }
             }
-            else if (mod == (KeyboardShortcut.ALT + KeyboardShortcut.SHIFT))
+            else if (
+                  BrowseCap.hasMetaKey() && 
+                  (mod == (KeyboardShortcut.META + KeyboardShortcut.SHIFT)) ||
+                  !BrowseCap.hasMetaKey() && 
+                  (mod == (KeyboardShortcut.CTRL + KeyboardShortcut.SHIFT)))
             {
-               if (keyCode == 190)
+               switch (keyCode)
                {
-                  event.preventDefault();
-                  event.stopPropagation();
-                  input_.replaceSelection(" %>% ", true);
+                  case KeyCodes.KEY_M:
+                     event.preventDefault();
+                     event.stopPropagation();
+                     input_.replaceSelection(" %>% ", true);
+                     break;
                }
             }
          }
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/TextEditingTarget.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/TextEditingTarget.java
@@ -386,6 +386,7 @@ public void onKeyDown(KeyDownEvent event)
          {
             NativeEvent ne = event.getNativeEvent();
             int mod = KeyboardShortcut.getModifierValue(ne);
+            
             if ((mod == KeyboardShortcut.META || (mod == KeyboardShortcut.CTRL && !BrowseCap.hasMetaKey()))
                 && ne.getKeyCode() == 'F')
             {
@@ -431,9 +432,11 @@ else if ((ne.getKeyCode() == KeyCodes.KEY_ESCAPE) &&
                event.stopPropagation();
                commands_.interruptR().execute();
             }
-            
-            else if (mod == (KeyboardShortcut.ALT + KeyboardShortcut.SHIFT)
-                  && ne.getKeyCode() == 190) // period
+            else if (ne.getKeyCode() == KeyCodes.KEY_M &&
+                  (BrowseCap.hasMetaKey() &&
+                   mod == (KeyboardShortcut.META + KeyboardShortcut.SHIFT)) ||
+                  (!BrowseCap.hasMetaKey() &&
+                   mod == (KeyboardShortcut.CTRL + KeyboardShortcut.SHIFT)))
             {
                event.preventDefault();
                event.stopPropagation();
diff --git a/src/gwt/www/docs/keyboard.htm b/src/gwt/www/docs/keyboard.htm
@@ -493,8 +493,8 @@ <h2>Keyboard Shortcuts</h2>
   </tr>
   <tr>
     <td>Insert pipe operator</td>
-    <td>Shift+Alt+.</td>
-    <td>Option+Alt+.</td>
+    <td>Ctrl+Shift+M</td>
+    <td>Cmd+Shift+M</td>
   </tr>
   <tr>
     <td>Show help for function at cursor</td>

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	`import com.google.gwt.event.dom.client.*;`
`23`	`23`	`import com.google.gwt.user.client.Command;`
`24`	`24`	`import com.google.inject.Inject;`
	`25`	`+`
	`26`	`+import org.rstudio.core.client.BrowseCap;`
`25`	`27`	`import org.rstudio.core.client.CommandWithArg;`
`26`	`28`	`import org.rstudio.core.client.StringUtil;`
`27`	`29`	`import org.rstudio.core.client.command.CommandBinder;`
`@@ -531,13 +533,19 @@ else if (mod == KeyboardShortcut.ALT)`
`531`	`533`	`break;`
`532`	`534`	`}`
`533`	`535`	`}`
`534`		`- else if (mod == (KeyboardShortcut.ALT + KeyboardShortcut.SHIFT))`
	`536`	`+ else if (`
	`537`	`+ BrowseCap.hasMetaKey() &&`
	`538`	`+ (mod == (KeyboardShortcut.META + KeyboardShortcut.SHIFT)) \|\|`
	`539`	`+ !BrowseCap.hasMetaKey() &&`
	`540`	`+ (mod == (KeyboardShortcut.CTRL + KeyboardShortcut.SHIFT)))`
`535`	`541`	`{`
`536`		`- if (keyCode == 190)`
	`542`	`+ switch (keyCode)`
`537`	`543`	`{`
`538`		`- event.preventDefault();`
`539`		`- event.stopPropagation();`
`540`		`- input_.replaceSelection(" %>% ", true);`
	`544`	`+ case KeyCodes.KEY_M:`
	`545`	`+ event.preventDefault();`
	`546`	`+ event.stopPropagation();`
	`547`	`+ input_.replaceSelection(" %>% ", true);`
	`548`	`+ break;`
`541`	`549`	`}`
`542`	`550`	`}`
`543`	`551`	`}`
Original file line number	Diff line number	Diff line change
`@@ -386,6 +386,7 @@ public void onKeyDown(KeyDownEvent event)`
`386`	`386`	`{`
`387`	`387`	`NativeEvent ne = event.getNativeEvent();`
`388`	`388`	`int mod = KeyboardShortcut.getModifierValue(ne);`
	`389`	`+`
`389`	`390`	`if ((mod == KeyboardShortcut.META \|\| (mod == KeyboardShortcut.CTRL && !BrowseCap.hasMetaKey()))`
`390`	`391`	`&& ne.getKeyCode() == 'F')`
`391`	`392`	`{`
`@@ -431,9 +432,11 @@ else if ((ne.getKeyCode() == KeyCodes.KEY_ESCAPE) &&`
`431`	`432`	`event.stopPropagation();`
`432`	`433`	`commands_.interruptR().execute();`
`433`	`434`	`}`
`434`		`-`
`435`		`- else if (mod == (KeyboardShortcut.ALT + KeyboardShortcut.SHIFT)`
`436`		`- && ne.getKeyCode() == 190) // period`
	`435`	`+ else if (ne.getKeyCode() == KeyCodes.KEY_M &&`
	`436`	`+ (BrowseCap.hasMetaKey() &&`
	`437`	`+ mod == (KeyboardShortcut.META + KeyboardShortcut.SHIFT)) \|\|`
	`438`	`+ (!BrowseCap.hasMetaKey() &&`
	`439`	`+ mod == (KeyboardShortcut.CTRL + KeyboardShortcut.SHIFT)))`
`437`	`440`	`{`
`438`	`441`	`event.preventDefault();`
`439`	`442`	`event.stopPropagation();`