rbs 0.11.0 → 0.12.0

data/lib/rbs/environment.rb

@@ -13,14 +13,15 @@ module RBS
       def context
         @context ||= begin
                        (outer + [decl]).each.with_object([Namespace.root]) do |decl, array|
-                         array.unshift(array.first + decl.name.to_namespace)
+                         first = array.first or raise 
+                         array.unshift(first + decl.name.to_namespace)
                        end
                      end
       end
     end
 
     class MultiEntry
-      D = Struct.new(:decl, :outer, keyword_init: true) do
+      D = _ = Struct.new(:decl, :outer, keyword_init: true) do
         include ContextUtil
       end
 
@@ -40,6 +41,8 @@ module RBS
       def validate_type_params
         unless decls.empty?
           hd_decl, *tl_decls = decls
+          raise unless hd_decl
+
           hd_params = hd_decl.decl.type_params
           hd_names = hd_params.params.map(&:name)
 
@@ -56,6 +59,10 @@ module RBS
       def type_params
         primary.decl.type_params
       end
+
+      def primary
+        raise "Not implemented"
+      end
     end
 
     class ModuleEntry < MultiEntry
@@ -68,7 +75,7 @@ module RBS
       def primary
         @primary ||= begin
                        validate_type_params
-                       decls.first
+                       decls.first or raise("decls cannot be empty")
                      end
       end
     end
@@ -77,7 +84,7 @@ module RBS
       def primary
         @primary ||= begin
                        validate_type_params
-                       decls.find {|d| d.decl.super_class } || decls.first
+                       decls.find {|d| d.decl.super_class } || decls.first or raise("decls cannot be empty")
                      end
       end
     end
@@ -154,15 +161,17 @@ module RBS
 
         case
         when decl.is_a?(AST::Declarations::Module) && existing_entry.is_a?(ModuleEntry)
-          # OK
+          # @type var existing_entry: ModuleEntry
+          # @type var decl: AST::Declarations::Module
+          existing_entry.insert(decl: decl, outer: outer)
         when decl.is_a?(AST::Declarations::Class) && existing_entry.is_a?(ClassEntry)
-          # OK
+          # @type var existing_entry: ClassEntry
+          # @type var decl: AST::Declarations::Class
+          existing_entry.insert(decl: decl, outer: outer)
         else
           raise DuplicatedDeclarationError.new(name, decl, existing_entry.primary.decl)
         end
 
-        existing_entry.insert(decl: decl, outer: outer)
-
         prefix = outer + [decl]
         ns = name.to_namespace
         decl.each_decl do |d|
@@ -211,6 +220,7 @@ module RBS
 
     def resolve_declaration(resolver, decl, outer:, prefix:)
       if decl.is_a?(AST::Declarations::Global)
+        # @type var decl: AST::Declarations::Global
         return AST::Declarations::Global.new(
           name: decl.name,
           type: absolute_type(resolver, decl.type, context: [Namespace.root]),
@@ -220,7 +230,8 @@ module RBS
       end
 
       context = (outer + [decl]).each.with_object([Namespace.root]) do |decl, array|
-        array.unshift(array.first + decl.name.to_namespace)
+        head = array.first or raise
+        array.unshift(head + decl.name.to_namespace)
       end
 
       case decl
@@ -310,6 +321,9 @@ module RBS
           location: decl.location,
           comment: decl.comment
         )
+
+      else
+        raise
       end
     end
 
@@ -409,7 +423,7 @@ module RBS
     end
 
     def absolute_type(resolver, type, context:)
-      type.map_type_name do |name|
+      type.map_type_name do |name, _, _|
         absolute_type_name(resolver, name, context: context)
       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,10 +73,6 @@ module RBS
       end
     end
 
-    def self.concat(*locations)
-      locations.inject {|l1, l2| l1 + l2 }
-    end
-
     def concat(*others)
       others.each { |other| self << other }
       self

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

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?
 
@@ -353,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/)
@@ -364,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
@@ -420,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?
 
@@ -500,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/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/type_name.rb

@@ -1,3 +1,4 @@
+
 module RBS
   class TypeName
     attr_reader :namespace
@@ -14,13 +15,15 @@ module RBS
                 :alias
               when "_"
                 :interface
+              else
+                raise
               end
     end
 
     def ==(other)
       other.is_a?(self.class) && other.namespace == namespace && other.name == name
     end
-
+    
     alias eql? ==
 
     def hash
@@ -68,3 +71,17 @@ module RBS
     end
   end
 end
+
+module Kernel
+  def TypeName(string)
+    absolute = string.start_with?("::")
+
+    *path, name = string.delete_prefix("::").split("::").map(&:to_sym)
+    raise unless name
+
+    RBS::TypeName.new(
+      name: name,
+      namespace: RBS::Namespace.new(path: path, absolute: absolute)
+    )
+  end
+end

data/lib/rbs/type_name_resolver.rb

@@ -1,6 +1,6 @@
 module RBS
   class TypeNameResolver
-    Query = Struct.new(:type_name, :context, keyword_init: true)
+    Query = _ = Struct.new(:type_name, :context, keyword_init: true)
 
     attr_reader :all_names
     attr_reader :cache
@@ -36,15 +36,22 @@ module RBS
       query = Query.new(type_name: type_name, context: context)
       try_cache(query) do
         path_head, *path_tail = type_name.to_namespace.path
+        raise unless path_head
+
         name_head = TypeName.new(name: path_head, namespace: Namespace.empty)
 
-        absolute_head = context.each.find do |namespace|
+        absolute_head = context.find do |namespace|
+          # @type break: TypeName
           full_name = name_head.with_prefix(namespace)
           has_name?(full_name) and break full_name
         end
 
-        if absolute_head
+        case absolute_head
+        when TypeName
           has_name?(Namespace.new(path: absolute_head.to_namespace.path.push(*path_tail), absolute: true).to_type_name)
+        when Namespace
+          # This cannot happen because the `context.find` doesn't return a Namespace.
+          raise
         end
       end
     end

data/lib/rbs/types.rb

@@ -1,3 +1,4 @@
+
 module RBS
   module Types
     module NoFreeVariables
@@ -77,7 +78,7 @@ module RBS
           when Types::Bases::Class
             'class'
           else
-            raise "Unexpected base type: #{type.inspect}"
+            raise "Unexpected base type: #{inspect}"
           end
         end
       end
@@ -138,8 +139,6 @@ module RBS
           new(name: v, location: nil)
         when Array
           v.map {|x| new(name: x, location: nil) }
-        else
-          raise
         end
       end
 
@@ -227,7 +226,7 @@ module RBS
       end
 
       def each_type(&block)
-        if block_given?
+        if block
           args.each(&block)
         else
           enum_for :each_type
@@ -380,7 +379,7 @@ module RBS
       end
 
       def each_type(&block)
-        if block_given?
+        if block
           types.each(&block)
         else
           enum_for :each_type
@@ -445,7 +444,7 @@ module RBS
       end
 
       def each_type(&block)
-        if block_given?
+        if block
           fields.each_value(&block)
         else
           enum_for :each_type
@@ -492,11 +491,15 @@ module RBS
       end
 
       def to_s(level = 0)
-        if type.is_a?(RBS::Types::Literal) && type.literal.is_a?(Symbol)
-          "#{type.to_s(1)} ?"
-        else
-          "#{type.to_s(1)}?"
+        case t = type
+        when RBS::Types::Literal
+          case t.literal
+          when Symbol
+            return "#{type.to_s(1)} ?"
+          end
         end
+
+        "#{type.to_s(1)}?"
       end
 
       def each_type
@@ -560,7 +563,7 @@ module RBS
       end
 
       def each_type(&block)
-        if block_given?
+        if block
           types.each(&block)
         else
           enum_for :each_type
@@ -568,7 +571,7 @@ module RBS
       end
 
       def map_type(&block)
-        if block_given?
+        if block
           Union.new(types: types.map(&block), location: location)
         else
           enum_for :map_type
@@ -629,7 +632,7 @@ module RBS
       end
 
       def each_type(&block)
-        if block_given?
+        if block
           types.each(&block)
         else
           enum_for :each_type
@@ -637,7 +640,7 @@ module RBS
       end
 
       def map_type(&block)
-        if block_given?
+        if block
           Intersection.new(types: types.map(&block), location: location)
         else
           enum_for :map_type
@@ -672,8 +675,8 @@ module RBS
           self.class.hash ^ type.hash ^ name.hash
         end
 
-        def map_type
-          if block_given?
+        def map_type(&block)
+          if block
             Param.new(name: name, type: yield(type))
           else
             enum_for :map_type
@@ -772,7 +775,7 @@ module RBS
       end
 
       def map_type(&block)
-        if block_given?
+        if block
           Function.new(
             required_positionals: required_positionals.map {|param| param.map_type(&block) },
             optional_positionals: optional_positionals.map {|param| param.map_type(&block) },
@@ -810,7 +813,7 @@ module RBS
       end
 
       def each_param(&block)
-        if block_given?
+        if block
           required_positionals.each(&block)
           optional_positionals.each(&block)
           rest_positionals&.yield_self(&block)
@@ -891,7 +894,9 @@ module RBS
       end
 
       def param_to_s
+        # @type var params: Array[String]
         params = []
+
         params.push(*required_positionals.map(&:to_s))
         params.push(*optional_positionals.map {|p| "?#{p}"})
         params.push("*#{rest_positionals}") if rest_positionals
@@ -927,8 +932,9 @@ module RBS
       def drop_tail
         case
         when !trailing_positionals.empty?
+          last = trailing_positionals.last or raise
           [
-            trailing_positionals.last,
+            last,
             update(trailing_positionals: trailing_positionals.take(trailing_positionals.size - 1))
           ]
         else
@@ -960,7 +966,7 @@ module RBS
         self.class.hash ^ type.hash
       end
 
-      def free_variables(set)
+      def free_variables(set = Set[])
         type.free_variables(set)
       end
 
@@ -977,7 +983,7 @@ module RBS
       end
 
       def each_type(&block)
-        if block_given?
+        if block
           type.each_type(&block)
         else
           enum_for :each_type