rbs 1.1.1 → 1.2.0

data/lib/rbs/test/hook.rb

@@ -25,7 +25,11 @@ module RBS
         :! => "not",
         :<< => "lshift",
         :>> => "rshift",
-        :~ => "tilda"
+        :~ => "tilda",
+        :=~ => "eqtilda",
+        :% => "percent",
+        :+@ => "unary_plus",
+        :-@ => "unary_minus"
       }
       def self.alias_names(target, random)
         suffix = "#{RBS::Test.suffix}_#{random}"
@@ -71,7 +75,9 @@ module RBS
         with_name, without_name = alias_names(method_name, random)
         full_method_name = "#{prefix}#{method_name}"
 
-        param_source = params.take_while {|param| param[0] == :req }.map(&:last) + ["*rest_args__#{random}"]
+        param_source = params.take_while {|param| param[0] == :req }
+                             .map.with_index {|pair, index| pair[1] || "__req__#{random}__#{index}" }
+        param_source.push("*rest_args__#{random}")
         block_param = "block__#{random}"
 
         RBS.logger.debug {

data/lib/rbs/type_name.rb

@@ -1,4 +1,3 @@
-
 module RBS
   class TypeName
     attr_reader :namespace
@@ -35,8 +34,8 @@ module RBS
       "#{namespace.to_s}#{name}"
     end
 
-    def to_json(*a)
-      to_s.to_json(*a)
+    def to_json(state = _ = nil)
+      to_s.to_json(state)
     end
 
     def to_namespace

data/lib/rbs/type_name_resolver.rb

@@ -39,7 +39,7 @@ module RBS
         raise unless path_head
 
         name_head = TypeName.new(name: path_head, namespace: Namespace.empty)
-
+ 
         absolute_head = context.find do |namespace|
           # @type break: TypeName
           full_name = name_head.with_prefix(namespace)

data/lib/rbs/types.rb

@@ -52,9 +52,9 @@ module RBS
         include EmptyEachType
         include NoTypeName
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           klass = to_s.to_sym
-          { class: klass, location: location }.to_json(*a)
+          { class: klass, location: location }.to_json(state)
         end
 
         def to_s(level = 0)
@@ -125,8 +125,8 @@ module RBS
         end
       end
 
-      def to_json(*a)
-        { class: :variable, name: name, location: location }.to_json(*a)
+      def to_json(state = _ = nil)
+        { class: :variable, name: name, location: location }.to_json(state)
       end
 
       def sub(s)
@@ -177,8 +177,8 @@ module RBS
       include NoFreeVariables
       include NoSubst
 
-      def to_json(*a)
-        { class: :class_singleton, name: name, location: location }.to_json(*a)
+      def to_json(state = _ = nil)
+        { class: :class_singleton, name: name, location: location }.to_json(state)
       end
 
       def to_s(level = 0)
@@ -245,8 +245,8 @@ module RBS
         @location = location
       end
 
-      def to_json(*a)
-        { class: :interface, name: name, args: args, location: location }.to_json(*a)
+      def to_json(state = _ = nil)
+        { class: :interface, name: name, args: args, location: location }.to_json(state)
       end
 
       def sub(s)
@@ -275,8 +275,8 @@ module RBS
         @location = location
       end
 
-      def to_json(*a)
-        { class: :class_instance, name: name, args: args, location: location }.to_json(*a)
+      def to_json(state = _ = nil)
+        { class: :class_instance, name: name, args: args, location: location }.to_json(state)
       end
 
       def sub(s)
@@ -316,8 +316,8 @@ module RBS
       include NoFreeVariables
       include NoSubst
 
-      def to_json(*a)
-        { class: :alias, name: name, location: location }.to_json(*a)
+      def to_json(state = _ = nil)
+        { class: :alias, name: name, location: location }.to_json(state)
       end
 
       def to_s(level = 0)
@@ -361,8 +361,8 @@ module RBS
         end
       end
 
-      def to_json(*a)
-        { class: :tuple, types: types, location: location }.to_json(*a)
+      def to_json(state = _ = nil)
+        { class: :tuple, types: types, location: location }.to_json(state)
       end
 
       def sub(s)
@@ -421,8 +421,8 @@ module RBS
         end
       end
 
-      def to_json(*a)
-        { class: :record, fields: fields, location: location }.to_json(*a)
+      def to_json(state = _ = nil)
+        { class: :record, fields: fields, location: location }.to_json(state)
       end
 
       def sub(s)
@@ -482,8 +482,8 @@ module RBS
         type.free_variables(set)
       end
 
-      def to_json(*a)
-        { class: :optional, type: type, location: location }.to_json(*a)
+      def to_json(state = _ = nil)
+        { class: :optional, type: type, location: location }.to_json(state)
       end
 
       def sub(s)
@@ -545,8 +545,8 @@ module RBS
         end
       end
 
-      def to_json(*a)
-        { class: :union, types: types, location: location }.to_json(*a)
+      def to_json(state = _ = nil)
+        { class: :union, types: types, location: location }.to_json(state)
       end
 
       def sub(s)
@@ -613,8 +613,8 @@ module RBS
         end
       end
 
-      def to_json(*a)
-        { class: :intersection, types: types, location: location }.to_json(*a)
+      def to_json(state = _ = nil)
+        { class: :intersection, types: types, location: location }.to_json(state)
       end
 
       def sub(s)
@@ -659,10 +659,12 @@ module RBS
       class Param
         attr_reader :type
         attr_reader :name
+        attr_reader :location
 
-        def initialize(type:, name:)
+        def initialize(type:, name:, location: nil)
           @type = type
           @name = name
+          @location = location
         end
 
         def ==(other)
@@ -677,14 +679,14 @@ module RBS
 
         def map_type(&block)
           if block
-            Param.new(name: name, type: yield(type))
+            Param.new(name: name, type: yield(type), location: location)
           else
             enum_for :map_type
           end
         end
 
-        def to_json(*a)
-          { type: type, name: name }.to_json(*a)
+        def to_json(state = _ = nil)
+          { type: type, name: name }.to_json(state)
         end
 
         def to_s
@@ -826,7 +828,7 @@ module RBS
         end
       end
 
-      def to_json(*a)
+      def to_json(state = _ = nil)
         {
           required_positionals: required_positionals,
           optional_positionals: optional_positionals,
@@ -836,7 +838,7 @@ module RBS
           optional_keywords: optional_keywords,
           rest_keywords: rest_keywords,
           return_type: return_type
-        }.to_json(*a)
+        }.to_json(state)
       end
 
       def sub(s)
@@ -966,11 +968,11 @@ module RBS
           other.required == required
       end
 
-      def to_json(*a)
+      def to_json(state = _ = nil)
         {
           type: type,
           required: required
-        }.to_json(*a)
+        }.to_json(state)
       end
 
       def sub(s)
@@ -1015,13 +1017,13 @@ module RBS
         set
       end
 
-      def to_json(*a)
+      def to_json(state = _ = nil)
         {
           class: :proc,
           type: type,
           block: block,
           location: location
-        }.to_json(*a)
+        }.to_json(state)
       end
 
       def sub(s)
@@ -1083,8 +1085,8 @@ module RBS
       include EmptyEachType
       include NoTypeName
 
-      def to_json(*a)
-        { class: :literal, literal: literal.inspect, location: location }.to_json(*a)
+      def to_json(state = _ = nil)
+        { class: :literal, literal: literal.inspect, location: location }.to_json(state)
       end
 
       def to_s(level = 0)

data/lib/rbs/version.rb

@@ -1,3 +1,3 @@
 module RBS
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/rbs/writer.rb

@@ -267,8 +267,10 @@ module RBS
       end
 
       if member.overload
-        string << padding
-        string << "|"
+        if member.types.size > 0
+          string << padding
+          string << "|"
+        end
         string << " ...\n"
       end
 

data/sig/annotation.rbs

@@ -20,7 +20,7 @@ module RBS
 
       def hash: () -> Integer
 
-      def to_json: (*untyped) -> String
+      include _ToJson
     end
   end
 end

data/sig/cli.rbs

@@ -8,51 +8,61 @@ module RBS
       attr_reader repos: Array[String]
 
       def initialize: () -> void
-                    
+
       def loader: () -> EnvironmentLoader
+
+      def setup_library_options: (OptionParser) -> OptionParser
+    end
+
+    interface _IO
+      def puts: (*untyped) -> void
+
+      def print: (*untyped) -> void
+
+      def flush: () -> void
     end
 
-    attr_reader stdout: IO
-    attr_reader stderr: IO
+    attr_reader stdout: _IO
+    attr_reader stderr: _IO
 
     def initialize: (stdout: IO, stderr: IO) -> void
-                  
+
     COMMANDS: Array[Symbol]
 
     def library_parse: (OptionParser, options: LibraryOptions) -> void
-                     
+
     def parse_logging_options: (OptionParser) -> void
-                             
+
     def has_parser?: () -> bool
-                   
+
     def run: (Array[String] args) -> void
-           
+
     def run_ast: (Array[String], LibraryOptions) -> void
-               
+
     def run_list: (Array[String], LibraryOptions) -> void
-                
+
     def run_ancestors: (Array[String], LibraryOptions) -> void
-                     
+
     def run_methods: (Array[String], LibraryOptions) -> void
-                   
+
     def run_method: (Array[String], LibraryOptions) -> void
-                  
+
     def run_validate: (Array[String], LibraryOptions) -> void
-                    
+
     def run_constant: (Array[String], LibraryOptions) -> void
-                    
+
     def run_paths: (Array[String], LibraryOptions) -> void
-                 
+
     def run_prototype: (Array[String], LibraryOptions) -> void
-                     
+
     def run_prototype_file: (String format, Array[String]) -> void
-                          
+
     def run_vendor: (Array[String], LibraryOptions) -> void
-                  
+
     def run_parse: (Array[String], LibraryOptions) -> void
-                 
+
     def run_test: (Array[String], LibraryOptions) -> void
-                
+
     def test_opt: (LibraryOptions) -> String?
   end
 end

data/sig/comment.rbs

@@ -18,7 +18,7 @@ module RBS
 
       def hash: () -> Integer
 
-      def to_json: (*untyped) -> String
+      include _ToJson
 
       def concat: (string: String, location: Location?) -> self
     end

data/sig/declarations.rbs

@@ -10,11 +10,21 @@ module RBS
 
       class ModuleTypeParams
         class TypeParam
+          # Key
+          # ^^^ name
+          #
+          # unchecked out Elem
+          # ^^^^^^^^^          unchecked
+          #           ^^^      variance
+          #               ^^^^ name
+          type loc = Location::WithChildren[:name, :variance | :unchecked]
+
           attr_reader name: Symbol
           attr_reader variance: variance
           attr_reader skip_validation: bool
+          attr_reader location: loc?
 
-          def initialize: (name: Symbol, variance: variance, skip_validation: boolish) -> void
+          def initialize: (name: Symbol, variance: variance, skip_validation: boolish, location: loc?) -> void
 
           include _ToJson
         end
@@ -68,19 +78,42 @@ module RBS
       end
 
       class Class < Base
-        type member = Members::t | t
-
         class Super
+          # String
+          # ^^^^^^  name
+          #
+          # Array[String]
+          # ^^^^^         name
+          #      ^^^^^^^^ args
+          #
+          type loc = Location::WithChildren[:name, :args]
+
           attr_reader name: TypeName
           attr_reader args: Array[Types::t]
-          attr_reader location: Location?
+          attr_reader location: loc?
 
-          def initialize: (name: TypeName, args: Array[Types::t], location: Location?) -> void
+          def initialize: (name: TypeName, args: Array[Types::t], location: loc?) -> void
 
           include _HashEqual
           include _ToJson
         end
 
+        type member = Members::t | t
+
+        # class Foo end
+        # ^^^^^         keyword
+        #       ^^^     name
+        #           ^^^ end
+        #
+        # class Foo[A] < String end
+        # ^^^^^                     keyword
+        #       ^^^                 name
+        #          ^^^              type_params
+        #              ^            lt
+        #                       ^^^ end
+        #
+        type loc = Location::WithChildren[:keyword | :name | :end, :type_params | :lt]
+
         include NestedDeclarationHelper
         include MixinHelper
 
@@ -89,24 +122,28 @@ module RBS
         attr_reader members: Array[member]
         attr_reader super_class: Super?
         attr_reader annotations: Array[Annotation]
-        attr_reader location: Location?
+        attr_reader location: loc?
         attr_reader comment: Comment?
 
-        def initialize: (name: TypeName, type_params: ModuleTypeParams, members: Array[member], super_class: Super?, annotations: Array[Annotation], location: Location?, comment: Comment?) -> void
+        def initialize: (name: TypeName, type_params: ModuleTypeParams, members: Array[member], super_class: Super?, annotations: Array[Annotation], location: loc?, comment: Comment?) -> void
 
         include _HashEqual
         include _ToJson
       end
 
       class Module < Base
-        type member = Members::t | t
-
         class Self
+          # _Each[String]
+          # ^^^^^         name
+          #      ^^^^^^^^ args
+          #
+          type loc = Location::WithChildren[:name, :args]
+
           attr_reader name: TypeName
           attr_reader args: Array[Types::t]
-          attr_reader location: Location?
+          attr_reader location: loc?
 
-          def initialize: (name: TypeName, args: Array[Types::t], location: Location?) -> void
+          def initialize: (name: TypeName, args: Array[Types::t], location: loc?) -> void
 
           include _HashEqual
           include _ToJson
@@ -114,18 +151,35 @@ module RBS
           def to_s: () -> String
         end
 
+        type member = Members::t | t
+
+        # module Foo end
+        # ^^^^^^         keyword
+        #        ^^^     name
+        #            ^^^ end
+        #
+        # module Foo[A] : BasicObject end
+        # ^^^^^^                          keyword
+        #        ^^^                      name
+        #           ^^^                   type_params
+        #               ^                 colon
+        #                 ^^^^^^^^^^^     self_types
+        #                             ^^^ end
+        #
+        type loc = Location::WithChildren[:keyword | :name | :end, :type_params | :colon | :self_types]
+
         include NestedDeclarationHelper
         include MixinHelper
 
         attr_reader name: TypeName
         attr_reader type_params: ModuleTypeParams
         attr_reader members: Array[member]
-        attr_reader location: Location?
+        attr_reader location: loc?
         attr_reader annotations: Array[Annotation]
         attr_reader self_types: Array[Self]
         attr_reader comment: Comment?
 
-        def initialize: (name: TypeName, type_params: ModuleTypeParams, members: Array[member], location: Location?, annotations: Array[Annotation], self_types: Array[Self], comment: Comment?) -> void
+        def initialize: (name: TypeName, type_params: ModuleTypeParams, members: Array[member], location: loc?, annotations: Array[Annotation], self_types: Array[Self], comment: Comment?) -> void
 
         include _HashEqual
         include _ToJson
@@ -134,14 +188,27 @@ module RBS
       class Interface
         type member = Members::t
 
+        # interface _Foo end
+        # ^^^^^^^^^          keyword
+        #           ^^^^     name
+        #                ^^^ end
+        #
+        # interface _Bar[A, B] end
+        # ^^^^^^^^^                keyword
+        #           ^^^^           name
+        #               ^^^^^^     type_params
+        #                      ^^^ end
+        #
+        type loc = Location::WithChildren[:name | :keyword | :end, :type_params]
+
         attr_reader name: TypeName
         attr_reader type_params: ModuleTypeParams
         attr_reader members: Array[member]
         attr_reader annotations: Array[Annotation]
-        attr_reader location: Location?
+        attr_reader location: loc?
         attr_reader comment: Comment?
 
-        def initialize: (name: TypeName, type_params: ModuleTypeParams, members: Array[member], annotations: Array[Annotation], location: Location?, comment: Comment?) -> void
+        def initialize: (name: TypeName, type_params: ModuleTypeParams, members: Array[member], annotations: Array[Annotation], location: loc?, comment: Comment?) -> void
 
         include MixinHelper
 
@@ -150,37 +217,55 @@ module RBS
       end
 
       class Alias < Base
+        # type loc = Location
+        # ^^^^                keyword
+        #      ^^^            name
+        #          ^          eq
+        type loc = Location::WithChildren[:keyword | :name | :eq, bot]
+
         attr_reader name: TypeName
         attr_reader type: Types::t
         attr_reader annotations: Array[Annotation]
-        attr_reader location: Location?
+        attr_reader location: loc?
         attr_reader comment: Comment?
 
-        def initialize: (name: TypeName, type: Types::t, annotations: Array[Annotation], location: Location?, comment: Comment?) -> void
+        def initialize: (name: TypeName, type: Types::t, annotations: Array[Annotation], location: loc?, comment: Comment?) -> void
 
         include _HashEqual
         include _ToJson
       end
 
       class Constant < Base
+        # VERSION: String
+        # ^^^^^^^         name
+        #        ^        colon
+        #
+        type loc = Location::WithChildren[:name | :colon, bot]
+
         attr_reader name: TypeName
         attr_reader type: Types::t
-        attr_reader location: Location?
+        attr_reader location: loc?
         attr_reader comment: Comment?
 
-        def initialize: (name: TypeName, type: Types::t, location: Location?, comment: Comment?) -> void
+        def initialize: (name: TypeName, type: Types::t, location: loc?, comment: Comment?) -> void
 
         include _HashEqual
         include _ToJson
       end
 
       class Global < Base
+        # $SIZE: String
+        # ^^^^^         name
+        #      ^        colon
+        #
+        type loc = Location::WithChildren[:name | :colon, bot]
+
         attr_reader name: Symbol
         attr_reader type: Types::t
-        attr_reader location: Location?
+        attr_reader location: loc?
         attr_reader comment: Comment?
 
-        def initialize: (name: Symbol, type: Types::t, location: Location?, comment: Comment?) -> void
+        def initialize: (name: Symbol, type: Types::t, location: loc?, comment: Comment?) -> void
 
         include _HashEqual
         include _ToJson