Skip to content

Commit 734e310

Browse files
committed
Change Compile and Run to ⌘B and Scala REPL to ⇧⌘R
This makes the Run related commands easier to use as they can be on different shortcuts.
1 parent 1887673 commit 734e310

4 files changed

+43
-10
lines changed

Commands/Compile and run.tmCommand

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ html_footer "Done."</string>
2929
<key>inputFormat</key>
3030
<string>text</string>
3131
<key>keyEquivalent</key>
32-
<string>@r</string>
32+
<string>@b</string>
3333
<key>name</key>
3434
<string>Compile and Run</string>
3535
<key>outputCaret</key>

Commands/Scala REPL.tmCommand

+14-3
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,31 @@
55
<key>beforeRunningCommand</key>
66
<string>nop</string>
77
<key>command</key>
8-
<string>export SHELL_NAME=${SHELL_NAME:="Textmate Scala REPL"}
8+
<string>#!/usr/bin/env bash
9+
[[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
10+
11+
export SHELL_NAME=${SHELL_NAME:="Textmate Scala REPL"}
912
export CMD=${CMD:="scala"}
1013
"$TM_BUNDLE_SUPPORT/scala_repl.sh"</string>
1114
<key>input</key>
1215
<string>none</string>
16+
<key>inputFormat</key>
17+
<string>text</string>
1318
<key>keyEquivalent</key>
14-
<string>@r</string>
19+
<string>@R</string>
1520
<key>name</key>
1621
<string>Scala REPL</string>
17-
<key>output</key>
22+
<key>outputCaret</key>
23+
<string>afterOutput</string>
24+
<key>outputFormat</key>
25+
<string>text</string>
26+
<key>outputLocation</key>
1827
<string>discard</string>
1928
<key>scope</key>
2029
<string>source.scala</string>
2130
<key>uuid</key>
2231
<string>BCAA9E11-45C8-43C7-8B43-E680AD7F6165</string>
32+
<key>version</key>
33+
<integer>2</integer>
2334
</dict>
2435
</plist>

Commands/Scala REPL: Paste selection.tmCommand

+14-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
<key>beforeRunningCommand</key>
66
<string>nop</string>
77
<key>command</key>
8-
<string>SHELL_NAME=${SHELL_NAME:="Textmate Scala REPL"}
8+
<string>#!/usr/bin/env bash
9+
[[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
10+
11+
SHELL_NAME=${SHELL_NAME:="Textmate Scala REPL"}
912
PASTE=$(echo "$TM_SELECTED_TEXT" | sed s/\"/\\\\\"/g)
1013
osascript &lt;&lt; END
1114
tell application "Terminal"
@@ -15,15 +18,23 @@ end tell
1518
END</string>
1619
<key>input</key>
1720
<string>none</string>
21+
<key>inputFormat</key>
22+
<string>text</string>
1823
<key>keyEquivalent</key>
19-
<string>@r</string>
24+
<string>@R</string>
2025
<key>name</key>
2126
<string>Scala REPL: Paste selection</string>
22-
<key>output</key>
27+
<key>outputCaret</key>
28+
<string>afterOutput</string>
29+
<key>outputFormat</key>
30+
<string>text</string>
31+
<key>outputLocation</key>
2332
<string>discard</string>
2433
<key>scope</key>
2534
<string>source.scala</string>
2635
<key>uuid</key>
2736
<string>7F176B4F-5D0E-459A-8042-A459B41051A8</string>
37+
<key>version</key>
38+
<integer>2</integer>
2839
</dict>
2940
</plist>

Commands/Scala REPL: Preload file.tmCommand

+14-3
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,33 @@
55
<key>beforeRunningCommand</key>
66
<string>nop</string>
77
<key>command</key>
8-
<string>export SHELL_NAME=${SHELL_NAME:="Textmate Scala REPL"}
8+
<string>#!/usr/bin/env bash
9+
[[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
10+
11+
export SHELL_NAME=${SHELL_NAME:="Textmate Scala REPL"}
912
export CMD=${CMD:="scala -i $TM_FILEPATH"}
1013
"$TM_BUNDLE_SUPPORT/scala_repl.sh"
1114
1215
</string>
1316
<key>input</key>
1417
<string>none</string>
18+
<key>inputFormat</key>
19+
<string>text</string>
1520
<key>keyEquivalent</key>
16-
<string>@r</string>
21+
<string>@R</string>
1722
<key>name</key>
1823
<string>Scala REPL: Preload file</string>
19-
<key>output</key>
24+
<key>outputCaret</key>
25+
<string>afterOutput</string>
26+
<key>outputFormat</key>
27+
<string>text</string>
28+
<key>outputLocation</key>
2029
<string>discard</string>
2130
<key>scope</key>
2231
<string>source.scala</string>
2332
<key>uuid</key>
2433
<string>45A658D8-D64D-4810-B7DD-762AC3EFD8CF</string>
34+
<key>version</key>
35+
<integer>2</integer>
2536
</dict>
2637
</plist>

0 commit comments

Comments
 (0)