Minor tweaks

sellmerfud · Jun 16, 2012 · 78163b6 · 78163b6
1 parent d615595
commit 78163b6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/Commands/Scala REPL: Preload file.tmCommand b/Commands/Scala REPL: Preload file.tmCommand
@@ -5,22 +5,33 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>export SHELL_NAME=${SHELL_NAME:="Textmate Scala REPL"}
-export CMD=${CMD:="scala -i $TM_FILEPATH"}
+	<string>#!/usr/bin/env bash
+[[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
+
+export SHELL_NAME=${SHELL_NAME:="Textmate Scala REPL"}
+export CMD=${CMD:="scala -Yrepl-sync -i $TM_FILEPATH"}
 "$TM_BUNDLE_SUPPORT/scala_repl.sh"
 
 </string>
 	<key>input</key>
 	<string>none</string>
+	<key>inputFormat</key>
+	<string>text</string>
 	<key>keyEquivalent</key>
 	<string>@r</string>
 	<key>name</key>
 	<string>Scala REPL: Preload file</string>
-	<key>output</key>
+	<key>outputCaret</key>
+	<string>afterOutput</string>
+	<key>outputFormat</key>
+	<string>text</string>
+	<key>outputLocation</key>
 	<string>discard</string>
 	<key>scope</key>
 	<string>source.scala</string>
 	<key>uuid</key>
 	<string>45A658D8-D64D-4810-B7DD-762AC3EFD8CF</string>
+	<key>version</key>
+	<integer>2</integer>
 </dict>
 </plist>
diff --git a/Commands/new javadoc line.tmCommand b/Commands/new javadoc line.tmCommand
@@ -20,20 +20,28 @@ start = chars.slice(0,startColumn)
 rest  = chars.slice(startColumn, endColumn)
 
 print start
-print "\n" + space + "*\t"+rest.to_s+ "$0"</string>
+print "\n" + space + "* "+rest.to_s+ "$0"</string>
 	<key>fallbackInput</key>
 	<string>line</string>
 	<key>input</key>
 	<string>selection</string>
+	<key>inputFormat</key>
+	<string>text</string>
 	<key>keyEquivalent</key>
 	<string>$</string>
 	<key>name</key>
 	<string>new javadoc line</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
+	<key>outputCaret</key>
+	<string>afterOutput</string>
+	<key>outputFormat</key>
+	<string>snippet</string>
+	<key>outputLocation</key>
+	<string>replaceInput</string>
 	<key>scope</key>
 	<string>comment.block.documentation.scala</string>
 	<key>uuid</key>
 	<string>701CC71E-0CB8-4C5C-922B-F363193B4AAF</string>
+	<key>version</key>
+	<integer>2</integer>
 </dict>
 </plist>