karottenreibe-vim-syntax 0.0.3 → 0.1.0

data/HISTORY.markdown

@@ -1,3 +1,11 @@
+0.1.0
+=====
+
+*   fixed some flawes with some tokens
+*   removed special function token
+*   fixed a bug with full line comments
+*   renamed __param__ token to __word__
+
 0.0.3
 =====
 

data/README.markdown

@@ -19,3 +19,15 @@ Then:
     convertor = Syntax::Convertors::HTML.for_syntax "vim"
     puts convertor.convert( "let mapleader=','" )
 
+What are the classes of the html elements it produces?
+======================================================
+
+*   comment
+*   string
+*   key
+*   number
+*   punct
+*   command
+*   word
+*   whitespace
+

data/Rakefile

@@ -3,7 +3,7 @@ require 'jeweler'
 task :release do
     sh "vim HISTORY.markdown"
     sh "vim README.markdown"
-    sh "git commit -a -m 'prerelease adjustments' || 1"
+    sh "git commit -a -m 'prerelease adjustments'; true"
 end
 
 Jeweler::Tasks.new do |gem|

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/lib/vim-syntax.rb

@@ -1,29 +1,36 @@
 
 require 'syntax'
 
+#
+# Syntax highlighting for vim script code.
+#
+# Produces the following tokens:
+# - comment
+# - string
+# - number
+# - key
+# - punct
+# - whitespace
+# - command
+# - word
+#
 class VimTokenizer < Syntax::Tokenizer
 
     def step
         @got_command ||= false
 
         if comment = scan(%r{\n".*?$}) # full line comment
-            start_group(:whitespace, "\n")
             start_group(:comment, comment)
         elsif comment = scan(%r{"[^"]*?$}) # end of line comment
             start_group(:comment, comment)
         elsif string = scan(%r{"[^"]*?"|'[^']*?'})
             start_group(:string, string)
-        elsif scan(%r{(function!?) (\w+)\(\)(.*?)endfunction}m)
-            start_group(:command, subgroup(1))
-            start_group(:functionname, subgroup(2))
-            start_group(:functionbody, subgroup(3))
-            start_group(:command, 'endfunction')
         elsif number = scan(%r{\d+})
             start_group(:number, number)
         elsif key = scan(%r{<[^<]+>})
             start_group(:key, key)
 
-        elsif punct = scan(%r{[^\w\s]})
+        elsif punct = scan(%r{[^\w\süöäß]})
             start_group(:punct, punct)
         elsif space = scan(%r{\s})
             @got_command = false if space == "\n"
@@ -32,8 +39,10 @@ class VimTokenizer < Syntax::Tokenizer
         elsif not @got_command and command = scan(%r{\w+})
             @got_command =  true
             start_group(:command, command)
+        elsif @got_command and word = scan(%r{\w+})
+            start_group(:word, word)
         else
-            start_group(:param, scan(%r{.}))
+            start_group(:word, scan(%r{.}))
         end
     end
 

data/vim-syntax.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vim-syntax}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fabian Streitel"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: karottenreibe-vim-syntax
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Fabian Streitel