iro 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cf3d2a33cbae3c5f943a89008a6c0369459e29c94edfc2ee3477f3538086e8b
-  data.tar.gz: 41e5c25e1f8efcc683f326c9e34e55c06c78eb823dd581dd79445e1ee9578b5f
+  metadata.gz: 950f9631fe660ced9bab43b8c6c00db4c11750f40df34033895b343115afa290
+  data.tar.gz: f982abec609f1525e3b03050274db054cf7e896f22b86fee5f9c145b2db4cfa5
 SHA512:
-  metadata.gz: 3ba860747e7560c4b2673bdc51cdfd2fa39778027dcb5f2da59b52c85ec9e427a525ce7f072478f562ca93b4909247898ec0e1b7fad6c3b6c2cd0e7c974b5489
-  data.tar.gz: 955ab2bfbc594f1c28ee1da1a59fde7e191a7c3ca55795a1fba9c33639cca5a4c2a3d469ec2f0a020f52213e22886eef29c024f94a888c8427f6a4616772db4d
+  metadata.gz: 8192ecae77f85f6699bfbf633c7afe1f799ff9487dcac4210c930836603e70f4f092ef3fe106ba03cd0d01aabfd70dee8ce061e46b553f5fa24b52d994ca47df
+  data.tar.gz: 5accbfa9b9d90fe9b3423bf520a329e133f031dca0f6deb3db99988a65100bfb5077081e4461d23e31e701e157b21e459e0a9390ca5a80645810002ac155ea14

data/.travis.yml

@@ -6,3 +6,11 @@ rvm:
 
 before_install:
   - gem update --system
+
+script:
+  - bundle exec rake test
+  - bundle exec rake smoke
+
+branches:
+  only:
+    - master

data/Rakefile

@@ -7,3 +7,12 @@ Rake::TestTask.new do |test|
   test.test_files = Dir['test/**/*_test.rb']
   test.verbose = true
 end
+
+task :smoke do
+  sh 'bin/smoke', 'tric/trick2013'
+  sh 'bin/smoke', 'tric/trick2015'
+  sh 'bin/smoke', 'tric/trick2015'
+  sh 'bin/smoke', 'ruby/ruby', 'trunk'
+  sh 'bin/smoke', 'gitlabhq/gitlabhq'
+  sh 'bin/smoke', 'rails/rails'
+end

data/bin/smoke

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+# Usage: bin/smoke user/repo [branch]
+
+require "bundler/setup"
+require 'open-uri'
+require 'tempfile'
+require 'tmpdir'
+require 'pathname'
+require 'iro'
+
+def sh!(*cmd)
+  puts cmd.join(' ')
+  system(*cmd)
+  unless $?.success?
+    raise "ERROR: #{cmd.join(' ')}"
+  end
+end
+
+def main(repo, branch = 'master')
+  url = "https://github.com/#{repo}/tarball/#{branch}"
+  chtmpdir do
+    Tempfile.create(['iro-smoke-test-', '.tar.gz']) do |tar|
+      open(url) do |f|
+        IO.copy_stream f, tar
+      end
+      sh! 'tar', 'xf', tar.path
+      Pathname.glob('**/*.rb').each do |f|
+        print "checking: #{f}"
+        Iro::Ruby::Parser.tokens(f.read)
+        puts "\t\tOK🎉"
+      end
+    end
+  end
+end
+
+def chtmpdir
+  Dir.mktmpdir do |dir|
+    Dir.chdir(dir) do
+      yield
+    end
+  end
+end
+
+main(*ARGV)

data/lib/iro/ruby/parser.rb

@@ -8,11 +8,13 @@ module Iro
         CHAR: 'Character',
         int: 'Number',
         float: 'Float',
+        label: 'rubySymbol',
         
         comment: 'Comment',
         embdoc: 'Comment',
         embdoc_beg: 'Comment',
         embdoc_end: 'Comment',
+
         const: 'Type',
         
         regexp_beg: 'Delimiter',
@@ -24,6 +26,12 @@ module Iro
         embexpr_beg: 'Delimiter',
         embexpr_end: 'Delimiter',
         backtick: 'Delimiter',
+
+        symbeg: 'rubySymbolDelimiter',
+
+        ivar: 'rubyInstanceVariable',
+        cvar: 'rubyClassVariable',
+        gvar: 'rubyGlobalVariable',
       }.freeze
 
       attr_reader :tokens
@@ -38,6 +46,23 @@ module Iro
         @tokens[group] << token
       end
 
+      # 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]
+      end
+
+      def unhighlight!(scanner_event)
+        t = scanner_event.type[1..-1].to_sym
+        group = EVENT_NAME_TO_HIGHLIGT_NAME[t] ||
+          (scanner_event.kw_type? && kw_group(scanner_event.content))
+        raise 'bug' unless group
+
+        t = scanner_event.position + [scanner_event.content.size]
+        t[1] += 1
+        @tokens[group].reject! { |ev| ev == t }
+      end
+
       EVENT_NAME_TO_HIGHLIGT_NAME.each do |tok_type, group|
         eval <<~RUBY
           def on_#{tok_type}(str)
@@ -66,46 +91,39 @@ module Iro
       end
 
       def on_def(name, params, body)
-        super.tap do |result|
-          pos = name.position
-          register_token 'rubyFunction', [pos[0], pos[1]+1, name.content.size]
+        super.tap do
+          register_scanner_event 'rubyFunction', name
         end
       end
 
       def on_defs(recv, period, name, params, body)
-        super.tap do |result|
-          pos = name.position
-          register_token 'rubyFunction', [pos[0], pos[1]+1, name.content.size]
+        super.tap do
+          register_scanner_event 'rubyFunction', name
         end
       end
 
-      def on_symbol(ident)
-        super.tap do |result|
-          pos = ident.position
-          register_token 'rubySymbol', [pos[0], pos[1]+1, ident.content.size]
-          register_token 'rubySymbolDelimiter', [pos[0], pos[1], 1]
+      def on_symbol(node)
+        super.tap do
+          unhighlight! node if node.gvar_type? || node.ivar_type? || node.cvar_type?
+          register_scanner_event 'rubySymbol', node
+        end
+      end
+
+      def on_var_ref(name)
+        super.tap do
+          if name.ident_type?
+            register_scanner_event 'rubyLocalVariable', name
+          end
         end
       end
 
       def traverse(node)
         if node.kw_type?
-          str = node.content
-          t = node.position + [str.size]
-          t[1] += 1
-          @tokens[kw_group(str)]&.reject! do |token|
-            token == t
-          end
+          unhighlight!(node)
         end
 
         return if node.scanner_event?
 
-        if node.var_ref_type?
-          ident = node.children.first
-          if ident.ident_type?
-            pos = ident.position
-            register_token 'rubyLocalVariable', [pos[0], pos[1]+1, ident.content.size]
-          end
-        end
         node.children.each do |child|
           traverse(child) if child.is_a?(Array)
         end

data/lib/iro/version.rb

@@ -1,3 +1,3 @@
 module Iro
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/iro.rb

@@ -1,5 +1,5 @@
 require 'ripper'
-require 'cgi/escape'
+require 'cgi/util'
 
 require "iro/version"
 require 'iro/ripper_wrapper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iro
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bin/smoke
 - iro.gemspec
 - lib/iro.rb
 - lib/iro/formatter/html_formatter.rb