rubybuntu-gedit 11.08.21 → 11.08.23

data/data/language-specs/html-erb.lang

@@ -33,7 +33,7 @@
       </include>
     </context>
 
-    <replace id="html:embedded-lang-hook" ref="erb:block"/><!-- allow erb tags in strings -->
+    <replace id="html:embedded-lang-hook" ref="erb:erb"/><!-- allow erb tags in strings -->
 
     <context id="html-erb">
       <include>

data/data/language-specs/ruby.lang

@@ -114,9 +114,11 @@
       <match case-sensitive="false">\s*#.*coding.*</match>
     </context>
 
+    <define-regex id="no_method_prefix">(?&lt;![\w\.\:])</define-regex>
+
     <context id="keywords" style-ref="keyword">
       <!-- do not highlight methods like .class -->
-      <prefix>(?&lt;![\w\.\:])</prefix>
+      <prefix>\%{no_method_prefix}</prefix>
       <!-- only put here if not already used at another place -->
       <keyword>BEGIN</keyword>
       <keyword>END</keyword>
@@ -432,7 +434,7 @@
       <match>@\%{variable}</match>
     </context>
 
-    <context id="constants" style-ref="constant">
+    <context id="constants" style-ref="constant" extend-parent="false">
       <match>\b[A-Z][A-Za-z0-9_]*\b</match>
     </context>
 
@@ -463,22 +465,27 @@
     <context id="special-values">
       <include>
         <context id="self" style-ref="self">
+          <prefix>\%{no_method_prefix}</prefix>
           <keyword>self</keyword>
         </context>
 
         <context id="false" style-ref="false">
+          <prefix>\%{no_method_prefix}</prefix>
           <keyword>false</keyword>
         </context>
 
         <context id="true" style-ref="true">
+          <prefix>\%{no_method_prefix}</prefix>
           <keyword>true</keyword>
         </context>
 
         <context id="nil" style-ref="nil">
+          <prefix>\%{no_method_prefix}</prefix>
           <keyword>nil</keyword>
         </context>
 
         <context id="special-values-words" style-ref="special-value">
+          <prefix>\%{no_method_prefix}</prefix>
           <keyword>__ENCODING__</keyword>
           <keyword>__FILE__</keyword>
           <keyword>__LINE__</keyword>
@@ -502,6 +509,8 @@
 
         <context ref="class-variables"/>
         <context ref="instance-variables"/>
+
+        <context ref="syntax-chars"/>
       </include>
     </context>
 
@@ -1030,7 +1039,7 @@
      </include>
      </context>
 
-     <context id="symbols" style-ref="symbol">
+     <context id="symbol" style-ref="symbol">
       <start extended="true">
         (?&lt;!:)(:)(
           \$ \%{special-variables-1-char}
@@ -1046,23 +1055,77 @@
       </include>
     </context>
 
-    <context id="symbols-single-quoted" style-ref="symbol">
+    <context id="single-quoted-symbol" style-ref="symbol">
       <start>:'</start>
       <end>'</end>
       <include>
         <context style-ref="special-char"><match>\\[\'\\]</match></context>
         <context where="start" sub-pattern="0" style-ref="symbol-delimiter"/>
-        <context where="end" sub-pattern="0" style-ref="symbol-delimiter"/>
+        <context where="end"   sub-pattern="0" style-ref="symbol-delimiter"/>
       </include>
     </context>
 
-    <context id="symbols-double-quoted" style-ref="symbol">
+    <context id="double-quoted-symbol" style-ref="symbol">
       <start>:"</start>
       <end>"</end>
       <include>
         <context style-ref="special-char"><match>\\[\"\\]</match></context>
         <context ref="double-quoted"/>
         <context where="start" sub-pattern="0" style-ref="symbol-delimiter"/>
+        <context where="end"   sub-pattern="0" style-ref="symbol-delimiter"/>
+      </include>
+    </context>
+    
+        <!-- %s{Hello world} -->
+    <context id="single-quoted-symbol-curly" style-ref="symbol">
+      <start>%s\{</start>
+      <end>\}</end>
+      <include>
+        <context style-ref="special-char"><match>\\[}\\]</match></context>
+        <context where="start" sub-pattern="0" style-ref="symbol-delimiter"/>
+        <context where="end" sub-pattern="0" style-ref="symbol-delimiter"/>
+      </include>
+    </context>
+
+    <!-- %s(Hello world) -->
+    <context id="single-quoted-symbol-normal" style-ref="symbol">
+      <start>%s\(</start>
+      <end>\)</end>
+      <include>
+        <context style-ref="special-char"><match>\\[)\\]</match></context>
+        <context where="start" sub-pattern="0" style-ref="symbol-delimiter"/>
+        <context where="end" sub-pattern="0" style-ref="symbol-delimiter"/>
+      </include>
+    </context>
+
+    <!-- %s[Hello world] -->
+    <context id="single-quoted-symbol-square" style-ref="symbol">
+      <start>%s\[</start>
+      <end>\]</end>
+      <include><context style-ref="special-char"><match>\\[\]\\]</match></context>
+        <context where="start" sub-pattern="0" style-ref="symbol-delimiter"/>
+        <context where="end" sub-pattern="0" style-ref="symbol-delimiter"/>
+      </include>
+    </context>
+
+    <!-- %s<Hello world> -->
+    <context id="single-quoted-symbol-angle" style-ref="symbol">
+      <start>%s&lt;</start>
+      <end>&gt;</end>
+      <include>
+        <context style-ref="special-char"><match>\\[%gt;\\]</match></context>
+        <context where="start" sub-pattern="0" style-ref="symbol-delimiter"/>
+        <context where="end" sub-pattern="0" style-ref="symbol-delimiter"/>
+      </include>
+    </context>
+    
+    <!-- %s-Hello world- %s+Hello world+ %s*Hello world* and so on... -->
+    <context id="single-quoted-symbol-generic" style-ref="symbol">
+      <start>%s([[:print:]])(?&lt;![[:alnum:]])</start>
+      <end>\%{1@start}</end>
+      <include>
+        <!--context style-ref="special-char"><match>\\[\%{1@start}\\]</match></context-->
+        <context where="start" sub-pattern="0" style-ref="symbol-delimiter"/>
         <context where="end" sub-pattern="0" style-ref="symbol-delimiter"/>
       </include>
     </context>
@@ -1104,7 +1167,7 @@
           </include>
         </context>
         <context id="curly-brackets">
-          <start>(?&lt;=[\])\w])\s*(\{)</start><end>\}</end>
+          <start>(?&lt;=(?:.[\])\w]|->))\s*(\{)</start><end>\}</end>
           <include>
           <context where="start" sub-pattern="1" style-ref="syntax-char"/>
           <context where="end"   sub-pattern="0" style-ref="syntax-char"/>
@@ -1114,7 +1177,7 @@
       </include>
     </context>
 
-    <context id="hash-symbols" style-ref="symbol">
+    <context id="hash-symbol" style-ref="symbol">
       <match>[a-zA-Z0-9_]+(!|\?)?:(?!:)</match>
     </context>
 
@@ -1123,12 +1186,12 @@
     </context>
 
     <context id="hash" extend-parent="false">
-      <start>(?&lt;![\])\w])\s*\{</start>
+      <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-symbols"/>
+        <context ref="hash-symbol"/>
         <context ref="hash-strings"/>
         <context ref="ruby:*"/>
       </include>
@@ -1178,12 +1241,18 @@
         <context ref="heredoc-double-quoted-indented-string"/>
         <context ref="heredoc-backtick-quoted-indented-string"/>
 
-        <context ref="symbols"/>
-        <context ref="symbols-single-quoted"/>
-        <context ref="symbols-double-quoted"/>
-
         <context ref="question-mark-string"/>
 
+        <context ref="symbol"/>
+        <context ref="single-quoted-symbol"/>
+        <context ref="double-quoted-symbol"/>
+        <context ref="single-quoted-symbol-curly"/>
+        <context ref="single-quoted-symbol-normal"/>
+        <context ref="single-quoted-symbol-square"/>
+        <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"/>

data/data/styles/rubybuntu1.xml

@@ -102,8 +102,10 @@
   <!-- other ruby stuff-->
   <style name="erb:tag"                foreground="#ff592c"/>
   <style name="erb:output"             foreground="#ff342c"/>
-  
-  <style name="ruby-bundler-gemfile-lock:gem_name" foreground="#d8843f"/>
+
+  <style name="ruby-bundler-gemfile-lock:gem_name" foreground="#d8843f"/>  
+  <style name="ruby-bundler-gemfile-lock:gem_dependency_type" foreground="#edc268" bold="true"/>
+  <style name="ruby-bundler-gemfile-lock:gem_dependency_version" foreground="#edc268"/>
 
   <!-- non ruby -->
   <style name="xml:element-name"          foreground="#edc268"/><!-- html:tag -->

data/rubybuntu-gedit.gemspec

@@ -3,7 +3,7 @@ require 'rubygems' unless defined? Gem
  
 Gem::Specification.new do |s|
   s.name        = "rubybuntu-gedit"
-  s.version     = '11.08.21'#Time.now.strftime("%y.%m.%d")
+  s.version     = Time.now.strftime("%y.%m.%d")
   s.authors     = ["Jan Lelis", "Snippets by Christoph Olszowka", "Please see individual files for author and license"]
   s.email       = "mail@janlelis.de"
   s.homepage    = "https://github.com/janlelis/rubybuntu-gedit"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubybuntu-gedit
 version: !ruby/object:Gem::Version
-  version: 11.08.21
+  version: 11.08.23
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-20 00:00:00.000000000Z
+date: 2011-08-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
-  requirement: &11317860 !ruby/object:Gem::Requirement
+  requirement: &24285300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11317860
+  version_requirements: *24285300
 description: Ruby/Rails/Web related gedit language definitions, mime types, styles
   and snippets.
 email: mail@janlelis.de
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Ruby/Web devoloper's gedit