Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

• improved language grammar for classes

• re-enabled drag actions
• fixed hopefully bug in tmR.rb for reading large stuff or long running stuff at io
  • Loading branch information...
commit 6b04ff3424f3f1cdfe64a9cfb71d8765959be250 1 parent 1ece73c
Hans-Jörg Bibiko Bibiko authored infininight committed
8 DragCommands/read_spss (*_sav).tmDragCommand
View
@@ -7,7 +7,10 @@
<key>bundleUUID</key>
<string>B29D7850-6E70-11D9-A369-000D93B3A10E</string>
<key>command</key>
- <string>
+ <string>#!/usr/bin/env bash
+[[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
+
+
if [ "${TM_SCOPE:0:17}" == "source.rd.console" ]; then
echo -n "read.spss(file=\"$TM_DROPPED_FILEPATH\", use.value.labels=\${1:TRUE}, to.data.frame=\${2:TRUE}, max.value.labels=\${3:Inf}, trim.factor.names=\${4:FALSE})"
@@ -17,8 +20,7 @@ else
else
echo "read.spss(file=\"$TM_DROPPED_FILE\", use.value.labels=\${1:TRUE}, to.data.frame=\${2:TRUE}, max.value.labels=\${3:Inf}, trim.factor.names=\${4:FALSE})"
fi
-fi
-exit_show_tool_tip</string>
+fi</string>
<key>draggedFileExtensions</key>
<array>
<string>sav</string>
10 DragCommands/read_table (*_tab).tmDragCommand
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>beforeRunningCommand</key>
@@ -7,7 +7,10 @@
<key>bundleUUID</key>
<string>B29D7850-6E70-11D9-A369-000D93B3A10E</string>
<key>command</key>
- <string>
+ <string>#!/usr/bin/env bash
+[[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
+
+
if [ "${TM_SCOPE:0:17}" == "source.rd.console" ]; then
echo -n "read.table(file = \"$TM_DROPPED_FILEPATH\", sep = \"\${1:\\t}\", header = \${2:TRUE}, stringsAsFactors = \${3:FALSE})"
else
@@ -16,8 +19,7 @@ else
else
echo "read.table(file = \"$TM_DROPPED_FILE\", sep = \"\${1:\\t}\", header = \${2:TRUE}, stringsAsFactors = \${3:FALSE})"
fi
-fi
-exit_show_tool_tip</string>
+fi</string>
<key>draggedFileExtensions</key>
<array>
<string>tab</string>
2  Preferences/Folding - R.tmPreferences
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>name</key>
6 Preferences/Methods.tmPreferences
View
@@ -5,13 +5,15 @@
<key>name</key>
<string>Symbol List: Method</string>
<key>scope</key>
- <string>entity.name.function entity.name.tag</string>
+ <string>keyword.name.function, meta.method.declaration.r</string>
<key>settings</key>
<dict>
<key>showInSymbolList</key>
<integer>1</integer>
<key>symbolTransformation</key>
- <string>s/\s*(.+?)\s*\(\s*("|\x27)(.*?)\s*\2/$1 "$3"/;</string>
+ <string>s/^.*?\(\s*([\w\d]+\s*=\s*)?(["\x{27}])(.*?)\2[^"\x{27}]+?(["\x{27}])(.*?)\4.*/- $3 ($5)/;
+ s/^\s*(\S+?)\s*\(\s*([\w\d]+\s*=\s*)?(["\x{27}])([^\3]+?)\3.*/- $1:$4/;
+ </string>
</dict>
<key>uuid</key>
<string>0AE8C5E0-C202-4965-B877-4CD0B9420A7D</string>
6 Support/tmR.rb
View
@@ -138,7 +138,8 @@ def recursive_delete(path)
stdin.close
}
-STDOUT.sync = true
+STDOUT.sync = false
+STDERR.sync = false
descriptors = [stdout, stderr]
descriptors.each { |fd| fd.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK) }
@@ -147,6 +148,9 @@ def recursive_delete(path)
begin
str = io.readline
rescue
+ descriptors.delete io
+ io.close
+ break
end
if str.nil? or str.empty?
descriptors.delete io
6 Syntaxes/R.plist
View
@@ -226,14 +226,14 @@
<key>name</key>
<string>entity.name.tag.r</string>
</dict>
- <key>3</key>
+ <key>4</key>
<dict>
<key>name</key>
<string>entity.name.type.r</string>
</dict>
</dict>
<key>match</key>
- <string>(setMethod|setGeneric|setGroupGeneric|setClass)\s*\(\s*("|\x{27})([a-zA-Z._\[\$@][a-zA-Z0-9._\[]*?)\2</string>
+ <string>(setMethod|setReplaceMethod|setGeneric|setGroupGeneric|setClass)\s*\(\s*([[:alpha:]\d]+\s*=\s*)?("|\x{27})([a-zA-Z._\[\$@][a-zA-Z0-9._\[]*?)\3.*</string>
<key>name</key>
<string>meta.method.declaration.r</string>
</dict>
@@ -268,7 +268,7 @@
<key>match</key>
<string>\b([[:alnum:]_]+)(?=::)</string>
<key>name</key>
- <string>entity.name.type.namespace.r</string>
+ <string>entity.namespace.r</string>
</dict>
<dict>
<key>match</key>
Please sign in to comment.
Something went wrong with that request. Please try again.