rubybuntu-gedit 11.09.14 → 11.09.19

data/data/language-specs/README.rdoc

@@ -5,7 +5,7 @@ Part of {RubyBuntuGedit}[https://github.com/janlelis/rubybuntu-gedit]
 == Features
 Contains various language specs needed by Ruby/Rails/Web developers and also tries to maintain them.
 
-* The Ruby language specification has been improved alot. It uses 1.9.2 as reference implementation, recognizes many Ruby-specific language constructs (that can be highlighted differently) and implements many language details. To see all these changes, you need a style that supports ("uses") the new specification, for example, {these styles}[https://github.com/janlelis/rubybuntu-editor-styles]. See below for a changelog summary.
+* The Ruby language specification has been improved a lot. It uses 1.9.2 as reference implementation, recognizes many Ruby-specific language constructs (that can be highlighted differently) and implements many language details. To see all these changes, you need a style that supports ("uses") the new specification, for example, {these styles}[https://github.com/janlelis/rubybuntu-editor-styles]. See below for a changelog summary.
 * ERB is not only usable with HTML, but also with JavaScript, YAML and XML...
 * Gemfile.lock highlighting
 
@@ -49,12 +49,12 @@ You should also use up-to-date {mime types}[https://github.com/janlelis/rubybunt
 * Based on https://github.com/gmate/gmate/blob/master/lang-specs/ruby_on_rails.lang
 
 == TODO
-=== ruby.lang - Advanced TODOs (or: build a "real" parser)
+=== ruby.lang - Advanced TODOs [or: build a "real" parser, not (easily) possible with gtksourceview]
 * Improve heredocs (e.g. nested ones)
 * Different colorizations for "end"s (e.g. def/begin, class/module, while/until, if/case, block), needs to detect modifier statements correctly
 * Detect (multi-line) yard doc tag values
 * Add escapable char for generic string delimiters
-* Advanced regex highlighting (maybe there is already something for pcre out there?)
+* Advanced regex highlighting + multi-line regexes
 * ruby.lang-extras/known-bugs.rb
 
 === Languages to add/import/update

data/data/language-specs/ruby.lang

@@ -78,7 +78,7 @@
     <style id="integer" _name="Integer number" map-to="def:decimal"/>
     <style id="base-n-integer" _name="Base-N number" map-to="def:base-n-integer"/>
 
-    <style id="error" _name="Erroneous syntax"      map-to="def:error"/>
+    <style id="error" _name="Erroneous syntax" map-to="def:error"/>
   </styles>
 
   <definitions>
@@ -152,140 +152,146 @@
     </context>
 
     <context id="important-methods" style-ref="important-method" extend-parent="false">
+      <keyword>Array(?=\()</keyword>
+      <keyword>Complex(?=\()</keyword>
+      <keyword>Float(?=\()</keyword>
+      <keyword>Integer(?=\()</keyword>
+      <keyword>Rational(?=\()</keyword>
+      <keyword>String(?=\()</keyword>
+      <keyword>__callee__</keyword>
+      <keyword>__id__</keyword>
+      <keyword>__method__</keyword>
+      <keyword>__send__</keyword>
+      <keyword>abort</keyword>
       <keyword>allocate</keyword>
-      <keyword>new</keyword>
-      <keyword>superclass</keyword>
-      <keyword>freeze</keyword>
-      <keyword>to_s</keyword>
-      <keyword>included_modules</keyword>
-      <keyword>include\?</keyword>
-      <keyword>name</keyword>
       <keyword>ancestors</keyword>
-      <keyword>instance_methods</keyword>
-      <keyword>public_instance_methods</keyword>
-      <keyword>protected_instance_methods</keyword>
-      <keyword>private_instance_methods</keyword>
-      <keyword>constants</keyword>
-      <keyword>const_get</keyword>
-      <keyword>const_set</keyword>
-      <keyword>const_defined\?</keyword>
-      <keyword>const_missing</keyword>
-      <keyword>class_variables</keyword>
-      <keyword>remove_class_variable</keyword>
-      <keyword>class_variable_get</keyword>
-      <keyword>class_variable_set</keyword>
-      <keyword>class_variable_defined\?</keyword>
-      <keyword>module_exec</keyword>
-      <keyword>class_exec</keyword>
-      <keyword>module_eval</keyword>
-      <keyword>class_eval</keyword>
-      <keyword>method_defined\?</keyword>
-      <keyword>public_method_defined\?</keyword>
-      <keyword>private_method_defined\?</keyword>
-      <keyword>protected_method_defined\?</keyword>
-      <keyword>public_class_method</keyword>
-      <keyword>private_class_method</keyword>
+      <keyword>at_exit</keyword>
       <keyword>autoload</keyword>
       <keyword>autoload\?</keyword>
-      <keyword>instance_method</keyword>
-      <keyword>public_instance_method</keyword>
-      <keyword>nil\?</keyword>
-      <keyword>eql\?</keyword>
-      <keyword>hash</keyword>
+      <keyword>binding</keyword>
+      <keyword>block_given\?</keyword>
+      <keyword>caller</keyword>
+      <keyword>catch</keyword>
       <keyword>class</keyword>
-      <keyword>singleton_class</keyword>
+      <keyword>class_eval</keyword>
+      <keyword>class_exec</keyword>
+      <keyword>class_variable_defined\?</keyword>
+      <keyword>class_variable_get</keyword>
+      <keyword>class_variable_set</keyword>
+      <keyword>class_variables</keyword>
       <keyword>clone</keyword>
+      <keyword>const_defined\?</keyword>
+      <keyword>const_get</keyword>
+      <keyword>const_missing</keyword>
+      <keyword>const_set</keyword>
+      <keyword>constants</keyword>
+      <keyword>define_singleton_method</keyword>
+      <keyword>display</keyword>
       <keyword>dup</keyword>
-      <keyword>initialize_dup</keyword>
-      <keyword>initialize_clone</keyword>
-      <keyword>taint</keyword>
-      <keyword>tainted\?</keyword>
-      <keyword>untaint</keyword>
-      <keyword>untrust</keyword>
-      <keyword>untrusted\?</keyword>
-      <keyword>trust</keyword>
+      <keyword>enum_for</keyword>
+      <keyword>eql\?</keyword>
+      <keyword>equal\?</keyword>
+      <keyword>eval</keyword>
+      <keyword>exec</keyword>
+      <keyword>exit!</keyword>
+      <keyword>exit</keyword>
+      <keyword>extend</keyword>
+      <keyword>fail</keyword>
+      <keyword>fork</keyword>
+      <keyword>format</keyword>
+      <keyword>freeze</keyword>
       <keyword>frozen\?</keyword>
+      <keyword>gets</keyword>
+      <keyword>global_variables</keyword>
+      <keyword>hash</keyword>
+      <keyword>include\?</keyword>
+      <keyword>included_modules</keyword>
+      <keyword>initialize_clone</keyword>
+      <keyword>initialize_dup</keyword>
       <keyword>inspect</keyword>
-      <keyword>methods</keyword>
-      <keyword>singleton_methods</keyword>
-      <keyword>protected_methods</keyword>
-      <keyword>private_methods</keyword>
-      <keyword>public_methods</keyword>
-      <keyword>instance_variables</keyword>
+      <keyword>instance_eval</keyword>
+      <keyword>instance_exec</keyword>
+      <keyword>instance_method</keyword>
+      <keyword>instance_methods</keyword>
+      <keyword>instance_of\?</keyword>
+      <keyword>instance_variable_defined\?</keyword>
       <keyword>instance_variable_get</keyword>
       <keyword>instance_variable_set</keyword>
-      <keyword>instance_variable_defined\?</keyword>
-      <keyword>instance_of\?</keyword>
-      <keyword>kind_of\?</keyword>
+      <keyword>instance_variables</keyword>
       <keyword>is_a\?</keyword>
-      <keyword>tap</keyword>
-      <keyword>send</keyword>
-      <keyword>public_send</keyword>
-      <keyword>respond_to\?</keyword>
-      <keyword>respond_to_missing\?</keyword>
-      <keyword>extend</keyword>
-      <keyword>display</keyword>
-      <keyword>method</keyword>
-      <keyword>public_method</keyword>
-      <keyword>define_singleton_method</keyword>
-      <keyword>__id__</keyword>
-      <keyword>object_id</keyword>
-      <keyword>to_enum</keyword>
-      <keyword>enum_for</keyword>
-      <keyword>equal\?</keyword>
-      <keyword>instance_eval</keyword>
-      <keyword>instance_exec</keyword>
-      <keyword>__send__</keyword>
-      <keyword>nesting</keyword>
-      <keyword>sprintf</keyword>
-      <keyword>format</keyword>
-      <keyword>warn</keyword>
-      <keyword>raise</keyword>
-      <keyword>fail</keyword>
-      <keyword>global_variables</keyword>
-      <keyword>__method__</keyword>
-      <keyword>__callee__</keyword>
-      <keyword>eval</keyword>
-      <keyword>local_variables</keyword>
       <keyword>iterator\?</keyword>
-      <keyword>block_given\?</keyword>
-      <keyword>catch</keyword>
-      <keyword>throw</keyword>
+      <keyword>kind_of\?</keyword>
+      <keyword>lambda</keyword>
+      <keyword>load</keyword>
+      <keyword>local_variables</keyword>
       <keyword>loop</keyword>
-      <keyword>caller</keyword>
-      <keyword>trace_var</keyword>
-      <keyword>untrace_var</keyword>
-      <keyword>at_exit</keyword>
-      <keyword>syscall</keyword>
+      <keyword>method</keyword>
+      <keyword>method_defined\?</keyword>
+      <keyword>methods</keyword>
+      <keyword>module_eval</keyword>
+      <keyword>module_exec</keyword>
+      <keyword>name</keyword>
+      <keyword>nesting</keyword>
+      <keyword>new</keyword>
+      <keyword>nil\?</keyword>
+      <keyword>object_id</keyword>
       <keyword>open</keyword>
-      <keyword>printf</keyword>
+      <keyword>p</keyword>
       <keyword>print</keyword>
+      <keyword>printf</keyword>
+      <keyword>private_class_method</keyword>
+      <keyword>private_instance_methods</keyword>
+      <keyword>private_method_defined\?</keyword>
+      <keyword>private_methods</keyword>
+      <keyword>proc</keyword>
+      <keyword>protected_instance_methods</keyword>
+      <keyword>protected_method_defined\?</keyword>
+      <keyword>protected_methods</keyword>
+      <keyword>public_class_method</keyword>
+      <keyword>public_instance_method</keyword>
+      <keyword>public_instance_methods</keyword>
+      <keyword>public_method</keyword>
+      <keyword>public_method_defined\?</keyword>
+      <keyword>public_methods</keyword>
+      <keyword>public_send</keyword>
       <keyword>putc</keyword>
       <keyword>puts</keyword>
-      <keyword>gets</keyword>
+      <keyword>raise</keyword>
+      <keyword>rand</keyword>
       <keyword>readline</keyword>
-      <keyword>select</keyword>
       <keyword>readlines</keyword>
-      <keyword>p</keyword>
-      <keyword>test</keyword>
-      <keyword>srand</keyword>
-      <keyword>rand</keyword>
-      <keyword>trap</keyword>
-      <keyword>exec</keyword>
-      <keyword>fork</keyword>
-      <keyword>exit!</keyword>
-      <keyword>system</keyword>
-      <keyword>spawn</keyword>
-      <keyword>sleep</keyword>
-      <keyword>exit</keyword>
-      <keyword>abort</keyword>
-      <keyword>load</keyword>
+      <keyword>remove_class_variable</keyword>
       <keyword>require</keyword>
       <keyword>require_relative</keyword>
-      <keyword>proc</keyword>
-      <keyword>lambda</keyword>
-      <keyword>binding</keyword>
+      <keyword>respond_to\?</keyword>
+      <keyword>respond_to_missing\?</keyword>
+      <keyword>select</keyword>
+      <keyword>send</keyword>
       <keyword>set_trace_func</keyword>
+      <keyword>singleton_class</keyword>
+      <keyword>singleton_methods</keyword>
+      <keyword>sleep</keyword>
+      <keyword>spawn</keyword>
+      <keyword>sprintf</keyword>
+      <keyword>srand</keyword>
+      <keyword>superclass</keyword>
+      <keyword>syscall</keyword>
+      <keyword>system</keyword>
+      <keyword>taint</keyword>
+      <keyword>tainted\?</keyword>
+      <keyword>tap</keyword>
+      <keyword>test</keyword>
+      <keyword>throw</keyword>
+      <keyword>to_enum</keyword>
+      <keyword>to_s</keyword>
+      <keyword>trace_var</keyword>
+      <keyword>trap</keyword>
+      <keyword>trust</keyword>
+      <keyword>untaint</keyword>
+      <keyword>untrace_var</keyword>
+      <keyword>untrust</keyword>
+      <keyword>untrusted\?</keyword>
+      <keyword>warn</keyword>
     </context>
 
     <context id="important-constants" style-ref="important-constant" extend-parent="false">
@@ -397,6 +403,8 @@
     <define-regex id="special-variables-1-char">[;@!~&amp;`'+=,/\\_&gt;&lt;.*?$:"0-9]</define-regex>
     <define-regex id="special-variables-2-chars">-[FK0iIvwWdpla]</define-regex>
 
+    <define-regex id="alnum">[^&amp;&gt;&lt;!?"'`@$%/()=\\{\[\]}*+~#|;,:.\-\^\s]</define-regex>
+
     <context id="special-variables" style-ref="special-variable">
       <match extended="true">
         \$( \%{special-variables-1-char}
@@ -412,14 +420,16 @@
           | stdin
           | stdout
           | stderr
-          | binding )
+          | binding ) (?!\%{alnum})
       </match>
     </context>
 
-    <define-regex id="alnum">[^&amp;&gt;&lt;!?"'`@$%/()=\\{\[\]}*+~#|;,:.\-\^\s]</define-regex>
-
     <context id="methods" style-ref="method" extend-parent="false">
-      <match>\%{alnum}(?&lt;![A-Z0-9:])\%{alnum}*[!?]?</match>
+      <match extended="true">
+        ( \%{alnum}(?&lt;![A-Z0-9:])\%{alnum}*[!?]?
+        | [A-Z]\%{alnum}*[!?]?(?=\()
+        )
+      </match>
     </context>
 
     <context id="global-variables" style-ref="global-variable">
@@ -1030,14 +1040,34 @@
      </context>
 
      <context id="symbol" style-ref="symbol">
+       <start extended="true">
+         (?&lt;!:)(:)
+         ( \$ \%{special-variables-1-char}
+         | \$ \%{special-variables-2-chars}
+         | (?:\%{alnum}|\$|@@?) (?&lt;![0-9]) \%{alnum}* [?!=]?
+         | &lt;=&gt; | &lt;= | &gt;= | &lt;&lt;? | &gt;&gt;? | != | [!=]~ | ===? | \[\]=? | \*\*? | [+-]@?
+         | [!|~\^&amp;]
+         )
+      </start>
+      <end></end>
+      <include>
+        <context where="start" sub-pattern="1" style-ref="symbol-delimiter"/>
+      </include>
+    </context>
+
+    <context id="ternary-operators">
+      <start>\?</start>
+      <end>:</end>
+      <include>
+        <context where="start" sub-pattern="0" style-ref="operator"/>
+        <context where="end"   sub-pattern="0" style-ref="operator"/>
+        <context ref="ruby:*"/>
+      </include>
+    </context>
+
+    <context id="hash-symbols" style-ref="symbol" extend-parent="false">
       <start extended="true">
-        (?&lt;!:)(:)
-        ( \$ \%{special-variables-1-char}
-        | \$ \%{special-variables-2-chars}
-        | (?:\%{alnum}|\$|@@?) (?&lt;![0-9]) \%{alnum}* [?!=]?
-        | &lt;=&gt; | &lt;= | &gt;= | &lt;&lt;? | &gt;&gt;? | != | [!=]~ | ===? | \[\]=? | \*\*? | [+-]@?
-        | [!|~\^&amp;]
-        )
+        (?=\%{alnum}+:) \%{alnum} (?&lt;![0-9]) \%{alnum}* [?!=]? (:) (?!:)
       </start>
       <end></end>
       <include>
@@ -1131,7 +1161,7 @@
     </context>
 
     <context id="operators" style-ref="operator" extend-parent="false">
-      <match>&lt;=&gt;|(?&lt;!%)=(?!&gt;)|~|&lt;|&amp;|(?&lt;!=)&gt;|\.|::|\*|/|\+|-|\||!|not|and|or|defined\?|\?|:</match>
+      <match>&lt;=&gt;|(?&lt;!%)=(?!&gt;)|~|&lt;|&amp;|(?&lt;!=)&gt;|\.|::|\*|/|\+|-|\||!|not|and|or|defined\?</match>
     </context>
 
     <context id="syntax-chars" style-ref="syntax-char" extend-parent="false">
@@ -1167,22 +1197,12 @@
       </include>
     </context>
 
-    <context id="hash-symbol" style-ref="symbol">
-      <match>[a-zA-Z0-9_]+(!|\?)?:(?!:)</match>
-    </context>
-
-    <context id="hash-strings" style-ref="string">
-      <match>(?&lt;![\s{>])\:(?!:)</match>
-    </context>
-
     <context id="hash">
       <start>(?&lt;!(?:.[\])\w]|->))\s*\{</start>
       <end>\}</end>
       <include>
         <context where="start" sub-pattern="0" style-ref="collection"/>
         <context where="end" sub-pattern="0" style-ref="collection"/>
-        <context ref="hash-symbol"/>
-        <context ref="hash-strings"/>
         <context ref="ruby:*"/>
       </include>
     </context>
@@ -1242,7 +1262,6 @@
         <context ref="single-quoted-symbol-angle"/>
         <context ref="single-quoted-symbol-generic"/>
 
-
         <context ref="double-quoted-string"/>
         <context ref="double-quoted-string-curly"/>
         <context ref="double-quoted-string-normal"/>
@@ -1285,15 +1304,17 @@
 
         <context ref="keywords"/>
         <context ref="special-values"/>
-        <context ref="important-methods"/>
-
-        <context ref="important-constants"/>
-        <context ref="constants"/>
 
         <context ref="special-variables"/>
         <context ref="global-variables"/>
+        <context ref="ternary-operators"/>
+        <context ref="hash-symbols"/>
+        <context ref="important-methods"/>
         <context ref="methods"/>
 
+        <context ref="important-constants"/>
+        <context ref="constants"/>
+
         <context ref="class-variables"/>
         <context ref="instance-variables"/>
 

data/data/language-specs/ruby.lang-extras/examples.rb

@@ -11,9 +11,6 @@ end
 def $*.important!
 end
 
-# 1.9 hash symbols
-{ strange: 'symbols' }
-
 # Highlights important methods
 normal_method
 require_relative
@@ -26,6 +23,21 @@ File
 $blubb
 $stdin
 
+# Hash symbols (1.9)
+some_method({ with_symbol_hash: 42,
+              another_one: 42 })
+some_method( with_symbol_hash: 42,
+             another_one: 42 )
+some_method with_symbol_hash: 42,
+            another_one: 42 ?
+            some_method: 42
+
+# Uppercased method names
+Array(42)
+
+# Colorful special values :D
+[true, false, nil]
+
 # Different heredoc matching (however, still far from perfect)
 here = "doc"
 %w[string array] <<here # no heredoc
@@ -34,10 +46,7 @@ variable = <<here
 this one is a heredoc °_°
 here
 
-# colorful special values :D
-[true, false, nil]
-
-# strange literals are mostly supported
+# Strange literals are mostly supported
 %x[ls]
 %r>[\>]>
 

data/data/language-specs/ruby.lang-extras/important-constants.rb

@@ -1,7 +1,6 @@
-puts ((Object.constants | Module.constants) + %w[
+puts (Object.constants + %w[
 DATA
 SCRIPT_LINES__
-  
 ]).map{ |e|
- "      <keyword>#{e}</keyword>"
+  "      <keyword>#{e}</keyword>"
 }.uniq

data/data/language-specs/ruby.lang-extras/important-methods.rb

@@ -1,3 +1,3 @@
-puts (Object.methods | Module.methods | Kernel.methods).select{|e| e =~ /^[a-z_][a-zA-Z0-9?!_]*$/}.map{ |e|
- "      <keyword>#{e.to_s.gsub /\?/,'\\?'}</keyword>"
-}.uniq
+puts (Object.methods | Module.methods | Kernel.methods).select{|e| e =~ /^[a-zA-Z_][a-zA-Z0-9?!_]*$/}.map{ |e|
+  "      <keyword>#{e.to_s.gsub /\?/,'\\?'}#{ '(?=\()' if e.to_s[0] =~ /[A-Z]/ }</keyword>"
+}.uniq.sort

data/data/language-specs/ruby.lang-extras/unicode.rb

@@ -12,6 +12,13 @@ a☆b
 :☆☆
 :☆
 
+# hash symbols
+{
+  a☆b: 1.9,
+  ☆☆: 1.9,
+  ☆: 1.9,
+}
+
 # variables
 @@a☆b
 @@☆☆

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubybuntu-gedit
 version: !ruby/object:Gem::Version
-  version: 11.09.14
+  version: 11.09.19
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-14 00:00:00.000000000Z
+date: 2011-09-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
-  requirement: &22906640 !ruby/object:Gem::Requirement
+  requirement: &15591760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22906640
+  version_requirements: *15591760
 description: Ruby/Rails/Web related gedit language definitions, mime types, styles
   and snippets.
 email: mail@janlelis.de