iro 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e8919acfe7f9be5a6458e9a9be7ecb82dfa93519b36b037167631cdd60a7eba
-  data.tar.gz: 07cdfaa58a518b5498c289e0edac1b4a8b628311233f9ca1a32afb9fddfd77b8
+  metadata.gz: 4b399230a80d0496dd2acece235f43228b8f131ecc6feb3a2755a769e6f1c29a
+  data.tar.gz: 510f1be3916920fc0127685769a829499e45d3eb61e6881dbfd24ba0a0b7e16d
 SHA512:
-  metadata.gz: a4bea256724d0ab3f55ad5fdd0bb41cfd0ee869330ec1c83665b4d09e925e6b67f9647500836092822cda924d7ce7b0621e06ae07d7d93c0bfb13dcd7397b722
-  data.tar.gz: 0bc07ca76b25009571cb1d0c64e2ebd5218f6fb50840f1bb8d97af88fa450220b80e4f052107ecad642b81b50afa9207d1795bca26f2686e151e56a4d59f79b2
+  metadata.gz: 9141a6e8d4a5d9e3b0139e0bf98bf24c927c5bb6d26a9d2efce4fe04f4b915479392b9602bb609ba5a470f059d4380ff7ba001e3a770fdfdd0e8ad449e3b2db3
+  data.tar.gz: 1e26da497804de73c765bcd20636eb86a4a9d5a0b91e235606759385764b655a1d96bb30789706d0f35f240da102b97e787a5ca502eedb75b83a09e78fa945be

data/bin/smoke

@@ -24,6 +24,7 @@ def main(repo, branch = 'master')
       open(url) do |f|
         IO.copy_stream f, tar
       end
+      tar.close
       sh! 'tar', 'xf', tar.path
       Pathname.glob('**/*.rb').each do |f|
         print "checking: #{f}"

data/lib/iro/ruby/parser.rb

@@ -30,6 +30,8 @@ module Iro
         heredoc_end: 'Delimiter',
         tstring_beg: 'Delimiter',
         tstring_end: 'Delimiter',
+        qwords_beg: 'Delimiter', # For `**%w[**foo]`
+        words_sep: 'Delimiter', # For `%w[foo**]**` in Ruby 2.4 or older
         embexpr_beg: 'Delimiter',
         embexpr_end: 'Delimiter',
         backtick: 'Delimiter',
@@ -64,7 +66,7 @@ module Iro
       # TODO: Maybe multiline support is needed.
       def register_scanner_event(group, event)
         pos = event.position
-        register_token group, [pos[0], pos[1]+1, event.content.size]
+        register_token group, [pos[0], pos[1]+1, event.content.bytesize]
       end
 
       def highlight_end_as(group)
@@ -77,7 +79,7 @@ module Iro
           (scanner_event.kw_type? && kw_group(scanner_event.content))
         raise 'bug' unless group
 
-        t = scanner_event.position + [scanner_event.content.size]
+        t = scanner_event.position + [scanner_event.content.bytesize]
         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'
@@ -90,7 +92,7 @@ module Iro
               register_token #{group.inspect}, [
                 lineno + idx,
                 idx == 0 ? column+1 : 1,
-                s.size]
+                s.bytesize]
             end
             super
           end
@@ -103,7 +105,7 @@ module Iro
             @end_stack << result
           else
             group = kw_group(str)
-            register_token group, [lineno, column+1, str.size]
+            register_token group, [lineno, column+1, str.bytesize]
           end
         end
       end
@@ -112,7 +114,7 @@ module Iro
       # ^^^ rubySymbol
       #    ^ no highlight
       def on_label(str)
-        register_token 'rubySymbol', [lineno, column+1, str.size-1]
+        register_token 'rubySymbol', [lineno, column+1, str.bytesize-1]
         super
       end
 
@@ -158,16 +160,13 @@ module Iro
         nil
       end
 
-      def on_top_const_ref(name)
-        register_scanner_event 'Type', name
-        nil
-      end
-      alias on_const_ref on_top_const_ref
-
-      def on_const_path_ref(_base, name)
+      def on_top_const_ref(*, name)
         register_scanner_event 'Type', name
         nil
       end
+      alias on_const_ref        on_top_const_ref
+      alias on_const_path_ref   on_top_const_ref
+      alias on_const_path_field on_top_const_ref
 
       def on_fcall(ident)
         highlight_keyword_like_method(ident)

data/lib/iro/version.rb

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

metadata

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