iro 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cefceb0c53b6c32f64eff6d7eb4109f2f7c209e49543de26ac9791cf3902c1cc
-  data.tar.gz: abfda5fbc672cc944a106c3b701d15a6e44ee5913c3e225bd808b1146891ca27
+  metadata.gz: 7e8919acfe7f9be5a6458e9a9be7ecb82dfa93519b36b037167631cdd60a7eba
+  data.tar.gz: 07cdfaa58a518b5498c289e0edac1b4a8b628311233f9ca1a32afb9fddfd77b8
 SHA512:
-  metadata.gz: 46c4a6a69ce46393b4668aff853b0bf08f11d22a250834f799184f2e069eb297bb418ef8fb10b7a5e9bbd8aa8babbcaef30f981f6f227e8b9f06b4adf72e6266
-  data.tar.gz: 5d8cc37ea53613809b4f67159483463fdb1e607c5f05a38e623ed6ba6f4d699e643d3cec1514f872562998be11d996a514bc39d8ad814945d10a2ac972b11fb6
+  metadata.gz: a4bea256724d0ab3f55ad5fdd0bb41cfd0ee869330ec1c83665b4d09e925e6b67f9647500836092822cda924d7ce7b0621e06ae07d7d93c0bfb13dcd7397b722
+  data.tar.gz: 0bc07ca76b25009571cb1d0c64e2ebd5218f6fb50840f1bb8d97af88fa450220b80e4f052107ecad642b81b50afa9207d1795bca26f2686e151e56a4d59f79b2

data/README.md

@@ -1,8 +1,6 @@
 # Iro
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/iro`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Iro is a library for syntax highlighting.
 
 ## Installation
 
@@ -22,7 +20,8 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+If you are a Vim user, you can use [Iro.vim](https://github.com/pocke/iro.vim).
+And we have a DEMO web page. http://ruby-highlight.herokuapp.com/
 
 ## Development
 

data/Rakefile

@@ -13,9 +13,11 @@ end
 task :smoke do
   sh 'bin/smoke', 'tric/trick2013'
   sh 'bin/smoke', 'tric/trick2015'
+  sh 'bin/smoke', 'tric/trick2018'
   sh 'bin/smoke', 'ruby/ruby', 'trunk'
   sh 'bin/smoke', 'gitlabhq/gitlabhq'
   sh 'bin/smoke', 'rails/rails'
+  sh 'bin/smoke', 'discourse/discourse'
 end
 
 namespace :bump do

data/lib/iro/ruby/parser.rb

@@ -46,6 +46,14 @@ module Iro
       def initialize(*)
         super
         @tokens = {}
+        @end_stack = []
+      end
+
+      def parse
+        super
+        @end_stack.each do |end_kw|
+          register_scanner_event 'Keyword', end_kw
+        end
       end
 
       def register_token(group, token)
@@ -59,6 +67,10 @@ module Iro
         register_token group, [pos[0], pos[1]+1, event.content.size]
       end
 
+      def highlight_end_as(group)
+        register_scanner_event group, @end_stack.pop
+      end
+
       def unhighlight!(scanner_event)
         t = scanner_event.type[1..-1].to_sym
         group = EVENT_NAME_TO_HIGHLIGT_NAME[t] ||
@@ -68,6 +80,7 @@ module Iro
         t = scanner_event.position + [scanner_event.content.size]
         t[1] += 1
         @tokens[group].reject! { |ev| ev == t }
+        @end_stack.reject!{|e| e == scanner_event} if scanner_event.kw_type? && scanner_event.content == 'end'
       end
 
       EVENT_NAME_TO_HIGHLIGT_NAME.each do |tok_type, group|
@@ -85,9 +98,14 @@ module Iro
       end
 
       def on_kw(str)
-        group = kw_group(str)
-        register_token group, [lineno, column+1, str.size]
-        super
+        super.tap do |result|
+          if str == 'end'
+            @end_stack << result
+          else
+            group = kw_group(str)
+            register_token group, [lineno, column+1, str.size]
+          end
+        end
       end
 
       # foo: bar
@@ -108,12 +126,14 @@ module Iro
       def on_def(name, params, body)
         unhighlight! name if name.kw_type?
         register_scanner_event 'rubyFunction', name
+        highlight_end_as 'rubyDefine'
         nil
       end
 
       def on_defs(recv, period, name, params, body)
         unhighlight! name if name.kw_type?
         register_scanner_event 'rubyFunction', name
+        highlight_end_as 'rubyDefine'
         nil
       end
 
@@ -153,6 +173,10 @@ module Iro
         highlight_keyword_like_method(ident)
       end
 
+      def on_vcall(ident)
+        highlight_keyword_like_method(ident)
+      end
+
       def on_command(ident, _)
         highlight_keyword_like_method(ident)
       end

data/lib/iro/version.rb

@@ -1,3 +1,3 @@
 module Iro
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iro
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler