rbs 0.8.0 → 0.12.0

data/lib/rbs/environment_loader.rb

@@ -75,29 +75,16 @@ module RBS
       self.class.gem_sig_path(name, version)
     end
 
-    def each_signature(path = nil, immediate: true, &block)
+    def each_signature(path, immediate: true, &block)
       if block_given?
-        if path
-          case
-          when path.file?
-            if path.extname == ".rbs" || immediate
-              yield path
-            end
-          when path.directory?
-            path.children.each do |child|
-              each_signature child, immediate: false, &block
-            end
+        case
+        when path.file?
+          if path.extname == ".rbs" || immediate
+            yield path
           end
-        else
-          paths.each do |path|
-            case path
-            when Pathname
-              each_signature path, immediate: immediate, &block
-            when LibraryPath
-              each_signature path.path, immediate: immediate, &block
-            when GemPath
-              each_signature path.path, immediate: immediate, &block
-            end
+        when path.directory?
+          path.children.each do |child|
+            each_signature child, immediate: false, &block
           end
         end
       else
@@ -105,32 +92,65 @@ module RBS
       end
     end
 
-    def no_builtin!
-      @no_builtin = true
+    def each_library_path
+      paths.each do |path|
+        case path
+        when Pathname
+          yield path, path
+        when LibraryPath
+          yield path, path.path
+        when GemPath
+          yield path, path.path
+        end
+      end
+    end
+
+    def no_builtin!(skip = true)
+      @no_builtin = skip
+      self
     end
 
     def no_builtin?
       @no_builtin
     end
 
-    def load(env:)
-      signature_files = []
+    def each_decl
+      if block_given?
+        signature_files = []
 
-      unless no_builtin?
-        signature_files.push(*each_signature(stdlib_root + "builtin"))
-      end
+        unless no_builtin?
+          each_signature(stdlib_root + "builtin") do |path|
+            signature_files << [:stdlib, path]
+          end
+        end
 
-      each_signature do |path|
-        signature_files.push path
+        each_library_path do |library_path, pathname|
+          each_signature(pathname) do |path|
+            signature_files << [library_path, path]
+          end
+        end
+
+        signature_files.each do |lib_path, file_path|
+          buffer = Buffer.new(name: file_path.to_s, content: file_path.read)
+          Parser.parse_signature(buffer).each do |decl|
+            yield decl, buffer, file_path, lib_path
+          end
+        end
+      else
+        enum_for :each_decl
       end
+    end
+
+    def load(env:)
+      loadeds = []
 
-      signature_files.each do |file|
-        buffer = Buffer.new(name: file.to_s, content: file.read)
+      each_decl do |decl, buffer, file_path, lib_path|
         env.buffers.push(buffer)
-        Parser.parse_signature(buffer).each do |decl|
-          env << decl
-        end
+        env << decl
+        loadeds << [decl, file_path, lib_path]
       end
+
+      loadeds
     end
   end
 end

data/lib/rbs/location.rb

@@ -43,7 +43,7 @@ module RBS
     end
 
     def source
-      @source ||= buffer.content[start_pos...end_pos]
+      @source ||= buffer.content[start_pos...end_pos] or raise
     end
 
     def to_s
@@ -73,8 +73,19 @@ module RBS
       end
     end
 
-    def self.concat(*locations)
-      locations.inject {|l1, l2| l1 + l2 }
+    def concat(*others)
+      others.each { |other| self << other }
+      self
+    end
+
+    def <<(other)
+      if other
+        raise "Invalid concat: buffer=#{buffer.name}, other.buffer=#{other.buffer.name}" unless other.buffer == buffer
+        @end_pos = other.end_pos
+        @source = nil
+        @end_loc = nil
+      end
+      self
     end
 
     def pred?(loc)

data/lib/rbs/method_type.rb

@@ -93,7 +93,7 @@ module RBS
     end
 
     def each_type(&block)
-      if block_given?
+      if block
         type.each_type(&block)
         self.block&.yield_self do |b|
           b.type.each_type(&block)
@@ -105,10 +105,10 @@ module RBS
 
     def to_s
       s = case
-          when block && block.required
-            "(#{type.param_to_s}) { (#{block.type.param_to_s}) -> #{block.type.return_to_s} } -> #{type.return_to_s}"
-          when block
-            "(#{type.param_to_s}) ?{ (#{block.type.param_to_s}) -> #{block.type.return_to_s} } -> #{type.return_to_s}"
+          when (b = block) && b.required
+            "(#{type.param_to_s}) { (#{b.type.param_to_s}) -> #{b.type.return_to_s} } -> #{type.return_to_s}"
+          when b = block
+            "(#{type.param_to_s}) ?{ (#{b.type.param_to_s}) -> #{b.type.return_to_s} } -> #{type.return_to_s}"
           else
             "(#{type.param_to_s}) -> #{type.return_to_s}"
           end

data/lib/rbs/namespace.rb

@@ -63,7 +63,9 @@ module RBS
     end
 
     def split
-      [parent, path.last]
+      last = path.last or return
+      parent = self.parent
+      [parent, last]
     end
 
     def to_s
@@ -77,6 +79,10 @@ module RBS
 
     def to_type_name
       parent, name = split
+
+      raise unless name
+      raise unless parent
+
       TypeName.new(name: name, namespace: parent)
     end
 
@@ -88,14 +94,13 @@ module RBS
       end
     end
 
-
     def ascend
       if block_given?
         current = self
 
         until current.empty?
           yield current
-          current = current.parent
+          current = _ = current.parent 
         end
 
         yield current
@@ -107,3 +112,9 @@ module RBS
     end
   end
 end
+
+module Kernel
+  def Namespace(name)
+    RBS::Namespace.parse(name)
+  end
+end

data/lib/rbs/parser.y

@@ -435,14 +435,6 @@ rule
   method_member:
       annotations attributes overload kDEF method_kind def_name method_types {
         location = val[3].location + val[6].last.location
-        types = val[6].map do |type|
-          case type
-          when LocatedValue
-            type.value
-          else
-            type
-          end
-        end
 
         last_type = val[6].last
         if last_type.is_a?(LocatedValue) && last_type.value == :dot3
@@ -458,16 +450,14 @@ rule
           types: val[6],
           annotations: val[0],
           location: location,
-          comment: leading_comment(val[0].first&.location || val[1].first&.location || val[2]&.location || val[3].location),
-          attributes: val[1].map(&:value),
+          comment: leading_comment(val[0].first&.location || val[2]&.location || val[3].location),
           overload: overload || !!val[2]
         )
       }
 
   attributes:
-      { result = [] }
     | attributes kINCOMPATIBLE {
-        result = val[0].push(val[1])
+        RBS.logger.warn "`incompatible` method attribute is deprecated and ignored."
       }
 
   method_kind:
@@ -1164,15 +1154,13 @@ def leading_comment(location)
 end
 
 def push_comment(string, location)
-  new_comment = AST::Comment.new(string: string+"\n", location: location)
-
-  if (prev_comment = leading_comment(location)) && prev_comment.location.start_column == location.start_column
-    @comments.delete prev_comment.location.end_line
-    new_comment = AST::Comment.new(string: prev_comment.string + new_comment.string,
-                                   location: prev_comment.location + new_comment.location)
+  if (comment = leading_comment(location)) && comment.location.start_column == location.start_column
+    comment.concat(string: "#{string}\n", location: location)
+    @comments[comment.location.end_line] = comment
+  else
+    new_comment = AST::Comment.new(string: "#{string}\n", location: location)
+    @comments[new_comment.location.end_line] = new_comment
   end
-
-  @comments[new_comment.location.end_line] = new_comment
 end
 
 def new_token(type, value = input.matched)

data/lib/rbs/prototype/rb.rb

@@ -36,7 +36,7 @@ module RBS
           tokens.each.with_object({}) do |token, hash|
             if token[1] == :on_comment
               line = token[0][0]
-              body = token[2][2..]
+              body = token[2][2..-1]
 
               body = "\n" if body.empty?
 
@@ -130,7 +130,6 @@ module RBS
               types: types,
               kind: kind,
               comment: comments[node.first_lineno - 1],
-              attributes: [],
               overload: false
             )
 
@@ -354,7 +353,6 @@ module RBS
           Types::Bases::Nil.new(location: nil)
         when :LIT
           lit = node.children[0]
-          name = lit.class.name
           case lit
           when Symbol
             if lit.match?(/\A[ -~]+\z/)
@@ -365,7 +363,7 @@ module RBS
           when Integer
             Types::Literal.new(literal: lit, location: nil)
           else
-            type_name = TypeName.new(name: name, namespace: Namespace.root)
+            type_name = TypeName.new(name: lit.class.name.to_sym, namespace: Namespace.root)
             Types::ClassInstance.new(name: type_name, args: [], location: nil)
           end
         when :ZLIST, :ZARRAY
@@ -421,7 +419,7 @@ module RBS
 
         types = types.map do |t|
           if t.is_a?(Types::Literal)
-            type_name = TypeName.new(name: t.literal.class.name, namespace: Namespace.root)
+            type_name = TypeName.new(name: t.literal.class.name.to_sym, namespace: Namespace.root)
             Types::ClassInstance.new(name: type_name, args: [], location: nil)
           else
             t

data/lib/rbs/prototype/rbi.rb

@@ -16,7 +16,7 @@ module RBS
           tokens.each.with_object({}) do |token, hash|
             if token[1] == :on_comment
               line = token[0][0]
-              body = token[2][2..]
+              body = token[2][2..-1]
 
               body = "\n" if body.empty?
 
@@ -173,7 +173,6 @@ module RBS
               types: types,
               kind: :singleton,
               comment: comment,
-              attributes: [],
               overload: false
             )
           end
@@ -194,7 +193,6 @@ module RBS
               types: types,
               kind: :instance,
               comment: comment,
-              attributes: [],
               overload: false
             )
           end
@@ -502,7 +500,6 @@ module RBS
         else
           type_node.type == :CALL && proc_type?(type_node.children[0])
         end
-
       end
 
       def call_node?(node, name:, receiver: -> (node) { node.type == :CONST && node.children[0] == :T }, args: -> (node) { true })

data/lib/rbs/prototype/runtime.rb

@@ -154,7 +154,6 @@ module RBS
                 location: nil,
                 comment: method.comments[0],
                 annotations: method.annotations,
-                attributes: method.attributes,
                 overload: false
               )
               return
@@ -193,7 +192,6 @@ module RBS
                 location: nil,
                 comment: nil,
                 annotations: [],
-                attributes: [],
                 overload: false
               )
             end
@@ -227,7 +225,6 @@ module RBS
                   location: nil,
                   comment: nil,
                   annotations: [],
-                  attributes: [],
                   overload: false
                 )
               end
@@ -262,7 +259,6 @@ module RBS
                   location: nil,
                   comment: nil,
                   annotations: [],
-                  attributes: [],
                   overload: false
                 )
               end

data/lib/rbs/substitution.rb

@@ -31,10 +31,11 @@ module RBS
     def apply(ty)
       case ty
       when Types::Variable
+        # @type var ty: Types::Variable
         mapping[ty.name] || ty
       when Types::Bases::Instance
-        if instance_type
-          instance_type
+        if t = instance_type
+          t
         else
           ty
         end
@@ -44,7 +45,7 @@ module RBS
     end
 
     def without(*vars)
-      self.class.new.tap do |subst|
+      Substitution.new.tap do |subst|
         subst.mapping.merge!(mapping)
         vars.each do |var|
           subst.mapping.delete(var)

data/lib/rbs/test/hook.rb

@@ -7,6 +7,7 @@ module RBS
       OPERATORS = {
         :== => "eqeq",
         :=== => "eqeqeq",
+        :!= => "noteq",
         :+ => "plus",
         :- => "minus",
         :* => "star",

data/lib/rbs/test/setup.rb

@@ -9,21 +9,26 @@ logger = Logger.new(STDERR)
 
 begin
   opts = Shellwords.shellsplit(ENV["RBS_TEST_OPT"] || "-I sig")
-  filter = ENV.fetch('RBS_TEST_TARGET').split(',').map! { |e| e.strip }
+  filter = ENV.fetch('RBS_TEST_TARGET', "").split(',').map! { |e| e.strip }
   skips = (ENV['RBS_TEST_SKIP'] || '').split(',').map! { |e| e.strip }
   RBS.logger_level = (ENV["RBS_TEST_LOGLEVEL"] || "info")
   sample_size = get_sample_size(ENV['RBS_TEST_SAMPLE_SIZE'] || '')
+  double_class = to_double_class(ENV['RBS_TEST_DOUBLE_SUITE'])
+  unchecked_classes = (ENV['RBS_TEST_UNCHECKED_CLASSES'] || '').split(',').map! { |unchecked_class| unchecked_class.strip }.push(*double_class)
 rescue InvalidSampleSizeError => exception
   RBS.logger.error exception.message
   exit 1
-rescue Exception => e
-  raise e.message
+end
+
+if filter.empty?
   STDERR.puts "rbs/test/setup handles the following environment variables:"
   STDERR.puts "  [REQUIRED] RBS_TEST_TARGET: test target class name, `Foo::Bar,Foo::Baz` for each class or `Foo::*` for all classes under `Foo`"
   STDERR.puts "  [OPTIONAL] RBS_TEST_SKIP: skip testing classes"
   STDERR.puts "  [OPTIONAL] RBS_TEST_OPT: options for signatures (`-r` for libraries or `-I` for signatures)"
   STDERR.puts "  [OPTIONAL] RBS_TEST_LOGLEVEL: one of debug|info|warn|error|fatal (defaults to info)"
   STDERR.puts "  [OPTIONAL] RBS_TEST_SAMPLE_SIZE: sets the amount of values in a collection to be type-checked (Set to `ALL` to type check all the values)"
+  STDERR.puts "  [OPTIONAL] RBS_TEST_DOUBLE_SUITE: sets the double suite in use (currently supported: minitest | rspec)"
+  STDERR.puts "  [OPTIONAL] RBS_TEST_UNCHECKED_CLASSES: sets the classes that would not be checked"
   exit 1
 end
 
@@ -50,16 +55,16 @@ end
 
 tester = RBS::Test::Tester.new(env: env)
 
+module_name = Module.instance_method(:name)
+
 TracePoint.trace :end do |tp|
-  class_name = tp.self.name&.yield_self {|name| to_absolute_typename name }
+  class_name = module_name.bind(tp.self).call&.yield_self {|name| to_absolute_typename name }
 
   if class_name
     if filter.any? {|f| match(to_absolute_typename(f).to_s, class_name.to_s) } && skips.none? {|f| match(f, class_name.to_s) }
-      if tester.checkers.none? {|hook| hook.klass == tp.self }
-        if env.class_decls.key?(class_name)
-          logger.info "Setting up hooks for #{class_name}"
-          tester.install!(tp.self, sample_size: sample_size)
-        end
+      if env.class_decls.key?(class_name)
+        logger.info "Setting up hooks for #{class_name}"
+        tester.install!(tp.self, sample_size: sample_size, unchecked_classes: unchecked_classes)
       end
     end
   end
@@ -67,8 +72,8 @@ end
 
 at_exit do
   if $!.nil? || $!.is_a?(SystemExit) && $!.success?
-    logger.warn "No type checker was installed! " if tester.checkers.empty?
+    if tester.targets.empty?
+      logger.debug { "No type checker was installed!" }
+    end
   end
 end
-
-