Skip to content

Commit 559beec

Browse files
mads-hartmannmads-hartmann
authored
Merge pull request #57 from infininight/master
General Cleanup
2 parents b15ed05 + 734e310 commit 559beec

26 files changed

+268
-251
lines changed

Diff for: ‎Commands/Align Assignments.tmCommand

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>bundleUUID</key>
88
<string>452017E8-0065-49EF-AB9D-7849B27D9367</string>
99
<key>command</key>
10-
<string>#!/usr/bin/env ruby
10+
<string>#!/usr/bin/env ruby18
1111
#
1212
# ----------------------------------------------------------------
1313
# MODIFIED BY MADS HARTMANN JENSEN TO MATCH THE NEEDS OF THE SCALA

Diff for: ‎Commands/Compile and run.tmCommand

+43-7
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,69 @@
55
<key>beforeRunningCommand</key>
66
<string>nop</string>
77
<key>command</key>
8-
<string>. "$TM_SUPPORT_PATH/lib/webpreview.sh"
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+
. "$TM_SUPPORT_PATH/lib/webpreview.sh"
912
1013
html_header "Compile and run ${TM_FILENAME}"
1114
1215
cd "$TM_DIRECTORY"
1316
14-
$SCALA_HOME/bin/${SCALA_COMPILER:-scalac} -unchecked -deprecation "$TM_FILENAME" &amp;&gt; &gt;("${TM_RUBY:-ruby}" -rtm_parser -eTextMate.parse_errors)
17+
"$TM_SCALAC" -unchecked -deprecation "$TM_FILENAME" &amp;&gt; &gt;("ruby18" -rtm_parser -eTextMate.parse_errors)
1518
if (($? &gt;= 1)); then exit; fi
1619
1720
main=`basename "$TM_FILENAME" .scala`
1821
1922
echo "&lt;pre&gt;"
20-
$SCALA_HOME/bin/scala "${main}"
23+
"$TM_SCALA" "${main}"
2124
echo "&lt;/pre&gt;"
2225
2326
html_footer "Done."</string>
2427
<key>input</key>
2528
<string>none</string>
29+
<key>inputFormat</key>
30+
<string>text</string>
2631
<key>keyEquivalent</key>
27-
<string>@r</string>
32+
<string>@b</string>
2833
<key>name</key>
29-
<string>Compile and run</string>
30-
<key>output</key>
31-
<string>showAsHTML</string>
34+
<string>Compile and Run</string>
35+
<key>outputCaret</key>
36+
<string>afterOutput</string>
37+
<key>outputFormat</key>
38+
<string>html</string>
39+
<key>outputLocation</key>
40+
<string>newWindow</string>
41+
<key>requiredCommands</key>
42+
<array>
43+
<dict>
44+
<key>command</key>
45+
<string>scala</string>
46+
<key>locations</key>
47+
<array>
48+
<string>/usr/local/bin/scala</string>
49+
<string>/opt/local/bin/scala</string>
50+
</array>
51+
<key>variable</key>
52+
<string>TM_SCALA</string>
53+
</dict>
54+
<dict>
55+
<key>command</key>
56+
<string>scalac</string>
57+
<key>locations</key>
58+
<array>
59+
<string>/usr/local/bin/scalac</string>
60+
<string>/opt/local/bin/scalac</string>
61+
</array>
62+
<key>variable</key>
63+
<string>TM_SCALAC</string>
64+
</dict>
65+
</array>
3266
<key>scope</key>
3367
<string>source.scala</string>
3468
<key>uuid</key>
3569
<string>8C82E10C-A830-4647-B98F-957018D47C9C</string>
70+
<key>version</key>
71+
<integer>2</integer>
3672
</dict>
3773
</plist>

Diff for: ‎Commands/Double quoute to triple quote.tmCommand

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<key>beforeRunningCommand</key>
66
<string>nop</string>
77
<key>command</key>
8-
<string>#!/usr/bin/env ruby -wKU
8+
<string>#!/usr/bin/env ruby18 -wKU
99
1010
print '"""${0}"""'</string>
1111
<key>fallbackInput</key>

Diff for: ‎Commands/Javadoc for line.tmCommand

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>bundleUUID</key>
88
<string>452017E8-0065-49EF-AB9D-7849B27D9367</string>
99
<key>command</key>
10-
<string>#!/usr/bin/env ruby -wKU
10+
<string>#!/usr/bin/env ruby18 -wKU
1111
1212
require 'stringio'
1313
require ENV['TM_SUPPORT_PATH'] + '/lib/ui.rb'

Diff for: ‎Commands/Package for file.tmCommand

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>bundleUUID</key>
88
<string>452017E8-0065-49EF-AB9D-7849B27D9367</string>
99
<key>command</key>
10-
<string>#!/usr/bin/env ruby -wKU
10+
<string>#!/usr/bin/env ruby18 -wKU
1111
1212
project = ENV['TM_PROJECT_DIRECTORY']
1313
name = ENV['TM_FILENAME']

Diff for: ‎Commands/Run as script.tmCommand

+31-24
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,49 @@
33
<plist version="1.0">
44
<dict>
55
<key>beforeRunningCommand</key>
6-
<string>nop</string>
6+
<string>saveModifiedFiles</string>
77
<key>command</key>
8-
<string>#!/usr/bin/env ruby -wKU
9-
10-
require ENV['TM_SUPPORT_PATH'] + '/lib/textmate.rb'
11-
require ENV["TM_SUPPORT_PATH"] + "/lib/tm/htmloutput"
12-
13-
TextMate.require_env_var("SCALA_HOME", "Please set the SCALA_HOME shell variable to the root of your scala installation. For me this is /Users/Mads/dev/programming_languages/scala-2.8.0.final")
14-
15-
if ENV['TM_FILEPATH'] != nil
16-
TextMate::HTMLOutput.show(
17-
:title =&gt; "Running: #{ENV['TM_FILEPATH']}",
18-
:sub_title =&gt; "") do |io|
19-
cmd = ENV['SCALA_HOME'] + "/bin/scala -nocompdaemon -howtorun:script " + "'" + ENV['TM_FILEPATH'] + "'"
20-
io &lt;&lt; "&lt;pre&gt;&lt;code&gt;"
21-
io &lt;&lt; `#{cmd}`
22-
io &lt;&lt; "&lt;/code&gt;&lt;/pre&gt;"
23-
end
24-
else
25-
puts "Please save your file first"
26-
end
27-
8+
<string>#!/usr/bin/env ruby18
289
10+
require "#{ENV['TM_SUPPORT_PATH']}/lib/tm/executor"
11+
require "#{ENV['TM_SUPPORT_PATH']}/lib/tm/save_current_document"
2912
13+
TextMate.save_if_untitled('scala')
14+
TextMate::Executor.run(ENV['TM_SCALA'], '-nocompdaemon', '-howtorun:script', ENV['TM_FILEPATH'], :version_args =&gt; ["-version"], :version_regex =&gt; /\AScala code runner version ([^\s]*).*/m)
3015
</string>
3116
<key>input</key>
3217
<string>document</string>
18+
<key>inputFormat</key>
19+
<string>text</string>
3320
<key>keyEquivalent</key>
3421
<string>@r</string>
3522
<key>name</key>
36-
<string>Run as script</string>
37-
<key>output</key>
38-
<string>showAsHTML</string>
23+
<string>Run</string>
24+
<key>outputCaret</key>
25+
<string>afterOutput</string>
26+
<key>outputFormat</key>
27+
<string>html</string>
28+
<key>outputLocation</key>
29+
<string>newWindow</string>
30+
<key>requiredCommands</key>
31+
<array>
32+
<dict>
33+
<key>command</key>
34+
<string>scala</string>
35+
<key>locations</key>
36+
<array>
37+
<string>/usr/local/bin/scala</string>
38+
<string>/opt/local/bin/scala</string>
39+
</array>
40+
<key>variable</key>
41+
<string>TM_SCALA</string>
42+
</dict>
43+
</array>
3944
<key>scope</key>
4045
<string>source.scala</string>
4146
<key>uuid</key>
4247
<string>DDFBBCF9-D333-4077-8D4F-EF6F2CA62220</string>
48+
<key>version</key>
49+
<integer>2</integer>
4350
</dict>
4451
</plist>

Diff for: ‎Commands/SBT Code Completion.tmCommand

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<key>beforeRunningCommand</key>
66
<string>nop</string>
77
<key>command</key>
8-
<string>#!/usr/bin/env ruby -wKU
8+
<string>#!/usr/bin/env ruby18 -wKU
99
require ENV['TM_SUPPORT_PATH'] + '/lib/ui.rb'
1010
1111
choices = [{ "display" =&gt; 'logLevel', },

Diff for: ‎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>

Diff for: ‎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>

Diff for: ‎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>

Diff for: ‎Commands/new javadoc line.tmCommand

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>bundleUUID</key>
88
<string>452017E8-0065-49EF-AB9D-7849B27D9367</string>
99
<key>command</key>
10-
<string>#!/usr/bin/env ruby -wKU
10+
<string>#!/usr/bin/env ruby18 -wKU
1111
1212
cline = ENV['TM_CURRENT_LINE']
1313
space = cline.scan(/^\s*/).to_s

Diff for: ‎Preferences/Simple Build Tool Symbol List.tmPreferences

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<key>name</key>
66
<string>Simple Build Tool Symbol List</string>
77
<key>scope</key>
8-
<string>source.sbt entity.name.setting.sbt</string>
8+
<string>source.sbt constant.other.setting.sbt</string>
99
<key>settings</key>
1010
<dict>
1111
<key>showInSymbolList</key>

Diff for: ‎Preferences/Standard completions.tmPreferences

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<dict>
55
<key>name</key>
66
<string>Standard completions</string>
7+
<key>scope</key>
8+
<string>source.scala</string>
79
<key>settings</key>
810
<dict>
911
<key>completions</key>

Diff for: ‎Preferences/Symbol List.tmPreferences

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<key>name</key>
66
<string>Symbol List</string>
77
<key>scope</key>
8-
<string>entity.name.function.declaration, entity.name.class.declaration, entity.name.val.declaration, entity.name.type.declaration</string>
8+
<string>entity.name.function.declaration.scala, entity.name.type.class.declaration.scala, entity.name.type.val.declaration.scala, entity.name.type.type.declaration.scala</string>
99
<key>settings</key>
1010
<dict>
1111
<key>showInSymbolList</key>

Diff for: ‎Snippets/Special: Return Inside parentheses.tmSnippet

-18
This file was deleted.

Diff for: ‎Snippets/case class scaffolding.tmSnippet

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<dict>
55
<key>content</key>
66
<string>class ${1:Class}(${2/(\S+\s*:)/val $1/g}) {
7-
override def hashCode = 0 ${2/(\S+)\s*:[^,]+(,?)/+ $1.##/g}
8-
override def equals(other: Any) = $1.unapply(this) == $1.unapply(other)
9-
override def canEqual(other: Any) = other.isInstanceOf[$1]
7+
override def hashCode = 0 ${2/(\S+)\s*:[^,]+(,?)/+ $1.##/g}
8+
override def equals(other: Any) = $1.unapply(this) == $1.unapply(other)
9+
override def canEqual(other: Any) = other.isInstanceOf[$1]
1010
}
1111
1212
object $1 {
13-
def apply(${2:arguments}): $1 = new $1(${2/(\S+)\s*:[^,]+/$1/g})
14-
def unapply(other: Any) = other match {
15-
case x: $1 =&gt; import x._ ; Some(${2/(\S+)\s*:[^,]+/$1/g})
16-
case _ =&gt; None
17-
}
13+
def apply(${2:arguments}): $1 = new $1(${2/(\S+)\s*:[^,]+/$1/g})
14+
def unapply(other: Any) = other match {
15+
case x: $1 =&gt; import x._ ; Some(${2/(\S+)\s*:[^,]+/$1/g})
16+
case _ =&gt; None
17+
}
1818
}
1919
</string>
2020
<key>name</key>

Diff for: ‎Snippets/case class.tmSnippet

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<dict>
55
<key>content</key>
66
<string>case class ${1:${TM_FILENAME/(.*)\.scala/$1/}}${2:($3)} ${4:extends ${5:Any} }${6:{
7-
$7
7+
$7
88
\}}$0</string>
99
<key>name</key>
1010
<string>case class</string>

0 commit comments

Comments
 (0)