steep 0.24.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc0de639f659b9b59f83ca0f8968550e7230ee1dbb6ae8e0d005325267ab46e
-  data.tar.gz: a1f73b521a222fa1313c2f58b1e0d3fb2a07149aba42c17e91c8df495e3319de
+  metadata.gz: b5293cbc87834cee36e50cb66bab84e466a5182c1e868732b7bd3e685b2bd954
+  data.tar.gz: 7794e42573b5ac04c74780824213cfbe1ca255f1feaa4465a1066377d2647e0b
 SHA512:
-  metadata.gz: bcedd630c3b51bc4d3a24549c6bcde88156af410be2b64ec51d813c238f3cb5d5f9f85b980302cae3cacd007e478ae51f99019ed10f3b6a31df84723bd43f35b
-  data.tar.gz: da09a3c3e7f762ec48b378533b6c624c1b9590a0cfd58ffc7aed87212fde2c67897bc1aa745eaa8f4baeaa19b1e6c7b0a4826e7fb6e582a6ef6798ee3b4a47a4
+  metadata.gz: e723bf77a7452e0696c38d6d1797e71f246fb97d1b1f18082ba21b8eadb8174d6bcc4deda872898b5f39d162b91173c413cacfa28175018517170f8f2568bd70
+  data.tar.gz: 38dbe78df43706fe33d5350ad04524c25606955bcba5397ad18690717a60c59d361485ad2d5d3077787336d23902bd91ba9fa5b31e1933a93d1fe32747837688

data/CHANGELOG.md

@@ -2,6 +2,54 @@
 
 ## master
 
+## 0.30.0 (2020-10-03)
+
+* Let top-level defs be methods of Object ([#227](https://github.com/soutaro/steep/pull/227))
+* Fix error caused by attribute definitions ([#228](https://github.com/soutaro/steep/pull/228))
+* LSP worker improvements ([#222](https://github.com/soutaro/steep/pull/222), [#223](https://github.com/soutaro/steep/pull/223), [#226](https://github.com/soutaro/steep/pull/226), [#229](https://github.com/soutaro/steep/pull/229))
+
+## 0.29.0 (2020-09-28)
+
+* Implement reasoning on `is_a?`, `nil?`, and `===` methods. ([#218](https://github.com/soutaro/steep/pull/218))
+* Better completion based on interface ([#215](https://github.com/soutaro/steep/pull/215))
+* Fix begin-rescue typing ([#221](https://github.com/soutaro/steep/pull/221))
+
+## 0.28.0 (2020-09-17)
+
+* Fix typing case-when with empty body ([#200](https://github.com/soutaro/steep/pull/200))
+* Fix lvasgn typing with `void` type hint ([#200](https://github.com/soutaro/steep/pull/200))
+* Fix subtype checking between type variables and union types ([#200](https://github.com/soutaro/steep/pull/200))
+* Support endless range ([#200](https://github.com/soutaro/steep/pull/200))
+* Fix optarg, kwoptarg typing ([#202](https://github.com/soutaro/steep/pull/202))
+* Better union/intersection types ([#204](https://github.com/soutaro/steep/pull/204))
+* Fix generic method instantiation ([#205](https://github.com/soutaro/steep/pull/205))
+* Fix module typing ([#206](https://github.com/soutaro/steep/pull/206))
+* Fix shutdown problem ([#209](https://github.com/soutaro/steep/pull/209))
+* Update RBS to 0.12.0 ([#210](https://github.com/soutaro/steep/pull/210))
+* Improve processing singleton class decls without RBS ([#211](https://github.com/soutaro/steep/pull/211))
+* Improve processing block parameter with masgn ([#212](https://github.com/soutaro/steep/pull/212))
+
+## 0.27.0 (2020-08-31)
+
+* Make tuple types _covariant_ ([#195](https://github.com/soutaro/steep/pull/195))
+* Support `or_asgn`/`and_asgn` with `send` node lhs ([#194](https://github.com/soutaro/steep/pull/194))
+* Performance improvement ([#193](https://github.com/soutaro/steep/pull/193))
+* Add specialized versions of `#first` and `#last` on tuples ([#191](https://github.com/soutaro/steep/pull/191))
+* Typing bug fix on `[]` (empty array) ([#190](https://github.com/soutaro/steep/pull/190))
+* Earlier shutdown with interruption while `steep watch` ([#173](https://github.com/soutaro/steep/pull/173))
+
+## 0.26.0
+
+* Skipped
+
+## 0.25.0 (2020-08-18)
+
+* Improve `op_send` typing ([#186](https://github.com/soutaro/steep/pull/186))
+* Improve `op_asgn` typing ([#189](https://github.com/soutaro/steep/pull/189))
+* Better multi-assignment support ([#183](https://github.com/soutaro/steep/pull/183), [#184](https://github.com/soutaro/steep/pull/184))
+* Support for loop and class variables ([#182](https://github.com/soutaro/steep/pull/182))
+* Fix tuple typing ([#181](https://github.com/soutaro/steep/pull/181))
+
 ## 0.24.0 (2020-08-11)
 
 * Update RBS to 0.10 ([#180](https://github.com/soutaro/steep/pull/180))

data/bin/smoke_runner.rb

@@ -19,8 +19,6 @@ Expectation = Struct.new(:line, :message, :path, :starts) do
   attr_accessor :prefix_test
 end
 
-allowed_paths = []
-
 failed = false
 
 ARGV.each do |arg|
@@ -29,12 +27,13 @@ ARGV.each do |arg|
 
   rb_files = []
   expectations = []
-
+  allowed_paths = []
+  
   dir.children.each do |file|
     if file.extname == ".rb"
       buffer = ::Parser::Source::Buffer.new(file.to_s)
       buffer.source = file.read
-      parser = ::Parser::Ruby25.new
+      parser = ::Parser::Ruby27.new
 
       _, comments, _ = parser.tokenize(buffer)
       comments.each do |comment|

data/lib/steep.rb

@@ -1,7 +1,7 @@
 require "steep/version"
 
 require "pathname"
-require "parser/ruby25"
+require "parser/ruby27"
 require "ast_utils"
 require "active_support/core_ext/object/try"
 require "logger"
@@ -16,8 +16,6 @@ require 'uri'
 
 require "rbs"
 
-require "steep/ast/namespace"
-require "steep/names"
 require "steep/ast/location"
 require "steep/ast/types/helper"
 require "steep/ast/types/any"
@@ -37,6 +35,7 @@ require "steep/ast/types/boolean"
 require "steep/ast/types/tuple"
 require "steep/ast/types/proc"
 require "steep/ast/types/record"
+require "steep/ast/types/logic"
 require "steep/ast/type_params"
 require "steep/ast/annotation"
 require "steep/ast/annotation/collection"
@@ -62,6 +61,7 @@ require "steep/source"
 require "steep/annotation_parser"
 require "steep/typing"
 require "steep/errors"
+require "steep/module_helper"
 require "steep/type_construction"
 require "steep/type_inference/context"
 require "steep/type_inference/context_array"
@@ -71,6 +71,7 @@ require "steep/type_inference/constant_env"
 require "steep/type_inference/type_env"
 require "steep/type_inference/local_variable_type_env"
 require "steep/type_inference/logic"
+require "steep/type_inference/logic_type_interpreter"
 require "steep/ast/types"
 
 require "steep/server/utils"
@@ -82,7 +83,8 @@ require "steep/server/interaction_worker"
 require "steep/server/master"
 
 require "steep/project"
-require "steep/project/file"
+require "steep/project/signature_file"
+require "steep/project/source_file"
 require "steep/project/options"
 require "steep/project/target"
 require "steep/project/dsl"

data/lib/steep/annotation_parser.rb

@@ -80,9 +80,7 @@ module Steep
           name = match[:name]
           type = parse_type(match[:type])
 
-          AST::Annotation::ConstType.new(name: Names::Module.parse(name),
-                                         type: type,
-                                         location: location)
+          AST::Annotation::ConstType.new(name: TypeName(name), type: type, location: location)
         end
 
       when keyword_subject_type("ivar", IVAR_NAME)
@@ -152,7 +150,7 @@ module Steep
 
       when /@implements\s+(?<name>#{CONST_NAME})#{TYPE_PARAMS}$/
         Regexp.last_match.yield_self do |match|
-          type_name = Names::Module.parse(match[:name])
+          type_name = TypeName(match[:name])
           params = match[:params]&.yield_self {|params| params.split(/,/).map {|param| param.strip.to_sym } } || []
 
           name = AST::Annotation::Implements::Module.new(name: type_name, args: params)

data/lib/steep/ast/builtin.rb

@@ -6,7 +6,7 @@ module Steep
         attr_reader :arity
 
         def initialize(module_name, arity: 0)
-          @module_name = Names::Module.parse(module_name)
+          @module_name = TypeName(module_name)
           @arity = arity
         end
 
@@ -15,12 +15,8 @@ module Steep
           Types::Name::Instance.new(name: module_name, args: args)
         end
 
-        def class_type(constructor: nil)
-          Types::Name::Class.new(name: module_name, constructor: constructor)
-        end
-
         def module_type
-          Types::Name::Module.new(name: module_name)
+          Types::Name::Singleton.new(name: module_name)
         end
 
         def instance_type?(type, args: nil)
@@ -36,22 +32,8 @@ module Steep
           end
         end
 
-        NONE = ::Object.new
-
-        def class_type?(type, constructor: NONE)
-          if type.is_a?(Types::Name::Class)
-            unless constructor.equal?(NONE)
-              type.name == module_name && type.name.constructor == constructor
-            else
-              type.name == module_name
-            end
-          else
-            false
-          end
-        end
-
         def module_type?(type)
-          if type.is_a?(Types::Name::Module)
+          if type.is_a?(Types::Name::Singleton)
             type.name == module_name
           else
             false
@@ -99,6 +81,14 @@ module Steep
       def self.optional(type)
         AST::Types::Union.build(types: [type, nil_type])
       end
+
+      def self.true_type
+        AST::Types::Literal.new(value: true)
+      end
+
+      def self.false_type
+        AST::Types::Literal.new(value: false)
+      end
     end
   end
 end

data/lib/steep/ast/types.rb

@@ -35,9 +35,11 @@ module Steep
           "masked(#{type}|#{mask})"
         end
 
-        def free_variables(set = Set.new)
-          type.free_variables(set)
-          mask.free_variables(set)
+        def free_variables
+          @fvs ||= Set.new.tap do |set|
+            set.merge(type.free_variables)
+            set.merge(mask.free_variables)
+          end
         end
 
         def each_type(&block)

data/lib/steep/ast/types/any.rb

@@ -26,9 +26,7 @@ module Steep
           "untyped"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [1]

data/lib/steep/ast/types/boolean.rb

@@ -26,9 +26,7 @@ module Steep
           "bool"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [0]

data/lib/steep/ast/types/bot.rb

@@ -26,9 +26,7 @@ module Steep
           "⟘"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [2]

data/lib/steep/ast/types/class.rb

@@ -22,8 +22,8 @@ module Steep
           s.module_type or raise "Unexpected substitution: #{inspect}"
         end
 
-        def free_variables
-          Set.new
+        def free_variables()
+          @fvs = Set.new([self])
         end
 
         def level

data/lib/steep/ast/types/factory.rb

@@ -4,8 +4,14 @@ module Steep
       class Factory
         attr_reader :definition_builder
 
+        attr_reader :type_name_cache
+        attr_reader :type_cache
+
         def initialize(builder:)
           @definition_builder = builder
+
+          @type_name_cache = {}
+          @type_cache = {}
         end
 
         def type_name_resolver
@@ -13,7 +19,9 @@ module Steep
         end
 
         def type(type)
-          case type
+          ty = type_cache[type] and return ty
+
+          type_cache[type] = case type
           when RBS::Types::Bases::Any
             Any.new(location: nil)
           when RBS::Types::Bases::Class
@@ -35,18 +43,18 @@ module Steep
           when RBS::Types::Variable
             Var.new(name: type.name, location: nil)
           when RBS::Types::ClassSingleton
-            type_name = type_name(type.name)
-            Name::Class.new(name: type_name, location: nil, constructor: nil)
+            type_name = type.name
+            Name::Singleton.new(name: type_name, location: nil)
           when RBS::Types::ClassInstance
-            type_name = type_name(type.name)
+            type_name = type.name
             args = type.args.map {|arg| type(arg) }
             Name::Instance.new(name: type_name, args: args, location: nil)
           when RBS::Types::Interface
-            type_name = type_name(type.name)
+            type_name = type.name
             args = type.args.map {|arg| type(arg) }
             Name::Interface.new(name: type_name, args: args, location: nil)
           when RBS::Types::Alias
-            type_name = type_name(type.name)
+            type_name = type.name
             Name::Alias.new(name: type_name, args: [], location: nil)
           when RBS::Types::Union
             Union.build(types: type.types.map {|ty| type(ty) }, location: nil)
@@ -94,23 +102,23 @@ module Steep
             RBS::Types::Bases::Nil.new(location: nil)
           when Var
             RBS::Types::Variable.new(name: type.name, location: nil)
-          when Name::Class, Name::Module
-            RBS::Types::ClassSingleton.new(name: type_name_1(type.name), location: nil)
+          when Name::Singleton
+            RBS::Types::ClassSingleton.new(name: type.name, location: nil)
           when Name::Instance
             RBS::Types::ClassInstance.new(
-              name: type_name_1(type.name),
+              name: type.name,
               args: type.args.map {|arg| type_1(arg) },
               location: nil
             )
           when Name::Interface
             RBS::Types::Interface.new(
-              name: type_name_1(type.name),
+              name: type.name,
               args: type.args.map {|arg| type_1(arg) },
               location: nil
             )
           when Name::Alias
             type.args.empty? or raise "alias type with args is not supported"
-            RBS::Types::Alias.new(name: type_name_1(type.name), location: nil)
+            RBS::Types::Alias.new(name: type.name, location: nil)
           when Union
             RBS::Types::Union.new(
               types: type.types.map {|ty| type_1(ty) },
@@ -143,29 +151,6 @@ module Steep
           end
         end
 
-        def type_name(name)
-          case
-          when name.class?
-            Names::Module.new(name: name.name, namespace: namespace(name.namespace), location: nil)
-          when name.interface?
-            Names::Interface.new(name: name.name, namespace: namespace(name.namespace), location: nil)
-          when name.alias?
-            Names::Alias.new(name: name.name, namespace: namespace(name.namespace), location: nil)
-          end
-        end
-
-        def type_name_1(name)
-          RBS::TypeName.new(name: name.name, namespace: namespace_1(name.namespace))
-        end
-
-        def namespace(namespace)
-          Namespace.parse(namespace.to_s)
-        end
-
-        def namespace_1(namespace)
-          RBS::Namespace.parse(namespace.to_s)
-        end
-
         def function_1(params, return_type)
           RBS::Types::Function.new(
             required_positionals: params.required.map {|type| RBS::Types::Function::Param.new(name: nil, type: type_1(type)) },
@@ -190,7 +175,7 @@ module Steep
           )
         end
 
-        def method_type(method_type, self_type:)
+        def method_type(method_type, self_type:, subst2: nil, method_def: nil)
           fvs = self_type.free_variables()
 
           type_params = []
@@ -208,19 +193,21 @@ module Steep
             end
           end
           subst = Interface::Substitution.build(alpha_vars, alpha_types)
+          subst.merge!(subst2, overwrite: true) if subst2
 
           type = Interface::MethodType.new(
             type_params: type_params,
             return_type: type(method_type.type.return_type).subst(subst),
             params: params(method_type.type).subst(subst),
-            location: nil,
             block: method_type.block&.yield_self do |block|
               Interface::Block.new(
                 optional: !block.required,
                 type: Proc.new(params: params(block.type).subst(subst),
                                return_type: type(block.type.return_type).subst(subst), location: nil)
               )
-            end
+            end,
+            method_def: method_def,
+            location: method_def&.member&.location
           )
 
           if block_given?
@@ -280,7 +267,7 @@ module Steep
         end
 
         def unfold(type_name)
-          type_name_1(type_name).yield_self do |type_name|
+          type_name.yield_self do |type_name|
             type(definition_builder.expand_alias(type_name))
           end
         end
@@ -300,7 +287,109 @@ module Steep
           end
         end
 
+        def deep_expand_alias(type, recursive: Set.new, &block)
+          raise "Recursive type definition: #{type}" if recursive.member?(type)
+
+          ty = case type
+               when AST::Types::Name::Alias
+                 deep_expand_alias(expand_alias(type), recursive: recursive.union([type]))
+               when AST::Types::Union
+                 AST::Types::Union.build(
+                   types: type.types.map {|ty| deep_expand_alias(ty, recursive: recursive, &block) },
+                   location: type.location
+                 )
+               else
+                 type
+               end
+
+          if block_given?
+            yield ty
+          else
+            ty
+          end
+        end
+
+        def flatten_union(type, acc = [])
+          case type
+          when AST::Types::Union
+            type.types.each {|ty| flatten_union(ty, acc) }
+          else
+            acc << type
+          end
+
+          acc
+        end
+
+        def unwrap_optional(type)
+          case type
+          when AST::Types::Union
+            falsy_types, truthy_types = type.types.partition do |type|
+              (type.is_a?(AST::Types::Literal) && type.value == false) ||
+                type.is_a?(AST::Types::Nil)
+            end
+
+            [
+              AST::Types::Union.build(types: truthy_types),
+              AST::Types::Union.build(types: falsy_types)
+            ]
+          when AST::Types::Name::Alias
+            unwrap_optional(expand_alias(type))
+          else
+            [type, nil]
+          end
+        end
+
+        def setup_primitives(method_name, method_type)
+          if method_def = method_type.method_def
+            defined_in = method_def.defined_in
+            member = method_def.member
+
+            if member.is_a?(RBS::AST::Members::MethodDefinition)
+              case
+              when defined_in == RBS::BuiltinNames::Object.name && member.instance?
+                case method_name
+                when :is_a?, :kind_of?, :instance_of?
+                  return method_type.with(
+                    return_type: AST::Types::Logic::ReceiverIsArg.new(location: method_type.return_type.location)
+                  )
+                when :nil?
+                  return method_type.with(
+                    return_type: AST::Types::Logic::ReceiverIsNil.new(location: method_type.return_type.location)
+                  )
+                end
+
+              when defined_in == AST::Builtin::NilClass.module_name && member.instance?
+                case method_name
+                when :nil?
+                  return method_type.with(
+                    return_type: AST::Types::Logic::ReceiverIsNil.new(location: method_type.return_type.location)
+                  )
+                end
+
+              when defined_in == RBS::BuiltinNames::BasicObject.name && member.instance?
+                case method_name
+                when :!
+                  return method_type.with(
+                    return_type: AST::Types::Logic::Not.new(location: method_type.return_type.location)
+                  )
+                end
+
+              when defined_in == RBS::BuiltinNames::Module.name && member.instance?
+                case method_name
+                when :===
+                  return method_type.with(
+                    return_type: AST::Types::Logic::ArgIsReceiver.new(location: method_type.return_type.location)
+                  )
+                end
+              end
+            end
+          end
+
+          method_type
+        end
+
         def interface(type, private:, self_type: type)
+          Steep.logger.debug { "Factory#interface: #{type}, private=#{private}, self_type=#{self_type}" }
           type = expand_alias(type)
 
           case type
@@ -312,7 +401,7 @@ module Steep
             end
           when Name::Instance
             Interface::Interface.new(type: self_type, private: private).tap do |interface|
-              definition = definition_builder.build_instance(type_name_1(type.name))
+              definition = definition_builder.build_instance(type.name)
 
               instance_type = Name::Instance.new(name: type.name,
                                                  args: type.args.map { Any.new(location: nil) },
@@ -328,20 +417,27 @@ module Steep
               )
 
               definition.methods.each do |name, method|
-                next if method.private? && !private
-
-                interface.methods[name] = Interface::Interface::Combination.overload(
-                  method.method_types.map do |type|
-                    method_type(type, self_type: self_type) {|ty| ty.subst(subst) }
-                  end,
-                  incompatible: name == :initialize || name == :new
-                )
+                Steep.logger.tagged "method = #{name}" do
+                  next if method.private? && !private
+
+                  interface.methods[name] = Interface::Interface::Entry.new(
+                    method_types: method.defs.map do |type_def|
+                      setup_primitives(
+                        name,
+                        method_type(type_def.type,
+                                    method_def: type_def,
+                                    self_type: self_type,
+                                    subst2: subst)
+                      )
+                    end
+                  )
+                end
               end
             end
 
           when Name::Interface
             Interface::Interface.new(type: self_type, private: private).tap do |interface|
-              type_name = type_name_1(type.name)
+              type_name = type.name
               definition = definition_builder.build_interface(type_name)
 
               subst = Interface::Substitution.build(
@@ -351,18 +447,17 @@ module Steep
               )
 
               definition.methods.each do |name, method|
-                interface.methods[name] = Interface::Interface::Combination.overload(
-                  method.method_types.map do |type|
-                    method_type(type, self_type: self_type) {|type| type.subst(subst) }
-                  end,
-                  incompatible: method.attributes.include?(:incompatible)
+                interface.methods[name] = Interface::Interface::Entry.new(
+                  method_types: method.defs.map do |type_def|
+                    method_type(type_def.type, method_def: type_def, self_type: self_type, subst2: subst)
+                  end
                 )
               end
             end
 
-          when Name::Class, Name::Module
+          when Name::Singleton
             Interface::Interface.new(type: self_type, private: private).tap do |interface|
-              definition = definition_builder.build_singleton(type_name_1(type.name))
+              definition = definition_builder.build_singleton(type.name)
 
               instance_type = Name::Instance.new(name: type.name,
                                                  args: definition.type_params.map {Any.new(location: nil)},
@@ -377,11 +472,16 @@ module Steep
               definition.methods.each do |name, method|
                 next if !private && method.private?
 
-                interface.methods[name] = Interface::Interface::Combination.overload(
-                  method.method_types.map do |type|
-                    method_type(type, self_type: self_type) {|type| type.subst(subst) }
-                  end,
-                  incompatible: method.attributes.include?(:incompatible)
+                interface.methods[name] = Interface::Interface::Entry.new(
+                  method_types: method.defs.map do |type_def|
+                    setup_primitives(
+                      name,
+                      method_type(type_def.type,
+                                  method_def: type_def,
+                                  self_type: self_type,
+                                  subst2: subst)
+                    )
+                  end
                 )
               end
             end
@@ -404,7 +504,25 @@ module Steep
                 Interface::Interface.new(type: self_type, private: private).tap do |interface|
                   common_methods = Set.new(interface1.methods.keys) & Set.new(interface2.methods.keys)
                   common_methods.each do |name|
-                    interface.methods[name] = Interface::Interface::Combination.union([interface1.methods[name], interface2.methods[name]])
+                    types1 = interface1.methods[name].method_types
+                    types2 = interface2.methods[name].method_types
+
+                    if types1 == types2
+                      interface.methods[name] = interface1.methods[name]
+                    else
+                      method_types = {}
+
+                      types1.each do |type1|
+                        types2.each do |type2|
+                          type = type1 | type2 or next
+                          method_types[type] = true
+                        end
+                      end
+
+                      unless method_types.empty?
+                        interface.methods[name] = Interface::Interface::Entry.new(method_types: method_types.keys)
+                      end
+                    end
                   end
                 end
               end
@@ -415,11 +533,8 @@ module Steep
               interfaces = type.types.map {|ty| interface(ty, private: private, self_type: self_type) }
               interfaces.inject do |interface1, interface2|
                 Interface::Interface.new(type: self_type, private: private).tap do |interface|
-                  all_methods = Set.new(interface1.methods.keys) + Set.new(interface2.methods.keys)
-                  all_methods.each do |name|
-                    methods = [interface1.methods[name], interface2.methods[name]].compact
-                    interface.methods[name] = Interface::Interface::Combination.intersection(methods)
-                  end
+                  interface.methods.merge!(interface1.methods)
+                  interface.methods.merge!(interface2.methods)
                 end
               end
             end
@@ -430,8 +545,8 @@ module Steep
               array_type = Builtin::Array.instance_type(element_type)
               interface(array_type, private: private, self_type: self_type).tap do |array_interface|
                 array_interface.methods[:[]] = array_interface.methods[:[]].yield_self do |aref|
-                  Interface::Interface::Combination.overload(
-                    type.types.map.with_index {|elem_type, index|
+                  Interface::Interface::Entry.new(
+                    method_types: type.types.map.with_index {|elem_type, index|
                       Interface::MethodType.new(
                         type_params: [],
                         params: Interface::Params.new(required: [AST::Types::Literal.new(value: index)],
@@ -442,16 +557,16 @@ module Steep
                                                       rest_keywords: nil),
                         block: nil,
                         return_type: elem_type,
+                        method_def: nil,
                         location: nil
                       )
-                    } + aref.types,
-                    incompatible: false
+                    } + aref.method_types
                   )
                 end
 
                 array_interface.methods[:[]=] = array_interface.methods[:[]=].yield_self do |update|
-                  Interface::Interface::Combination.overload(
-                    type.types.map.with_index {|elem_type, index|
+                  Interface::Interface::Entry.new(
+                    method_types: type.types.map.with_index {|elem_type, index|
                       Interface::MethodType.new(
                         type_params: [],
                         params: Interface::Params.new(required: [AST::Types::Literal.new(value: index), elem_type],
@@ -462,10 +577,40 @@ module Steep
                                                       rest_keywords: nil),
                         block: nil,
                         return_type: elem_type,
+                        method_def: nil,
+                        location: nil
+                      )
+                    } + update.method_types
+                  )
+                end
+
+                array_interface.methods[:first] = array_interface.methods[:first].yield_self do |first|
+                  Interface::Interface::Entry.new(
+                    method_types: [
+                      Interface::MethodType.new(
+                        type_params: [],
+                        params: Interface::Params.empty,
+                        block: nil,
+                        return_type: type.types[0] || AST::Builtin.nil_type,
+                        method_def: nil,
                         location: nil
                       )
-                    } + update.types,
-                    incompatible: false
+                    ]
+                  )
+                end
+
+                array_interface.methods[:last] = array_interface.methods[:last].yield_self do |last|
+                  Interface::Interface::Entry.new(
+                    method_types: [
+                      Interface::MethodType.new(
+                        type_params: [],
+                        params: Interface::Params.empty,
+                        block: nil,
+                        return_type: type.types.last || AST::Builtin.nil_type,
+                        method_def: nil,
+                        location: nil
+                      )
+                    ]
                   )
                 end
               end
@@ -481,8 +626,8 @@ module Steep
 
               interface(hash_type, private: private, self_type: self_type).tap do |hash_interface|
                 hash_interface.methods[:[]] = hash_interface.methods[:[]].yield_self do |ref|
-                  Interface::Interface::Combination.overload(
-                    type.elements.map {|key_value, value_type|
+                  Interface::Interface::Entry.new(
+                    method_types: type.elements.map {|key_value, value_type|
                       key_type = Literal.new(value: key_value, location: nil)
                       Interface::MethodType.new(
                         type_params: [],
@@ -494,16 +639,16 @@ module Steep
                                                       rest_keywords: nil),
                         block: nil,
                         return_type: value_type,
+                        method_def: nil,
                         location: nil
                       )
-                    } + ref.types,
-                    incompatible: false
+                    } + ref.method_types
                   )
                 end
 
                 hash_interface.methods[:[]=] = hash_interface.methods[:[]=].yield_self do |update|
-                  Interface::Interface::Combination.overload(
-                    type.elements.map {|key_value, value_type|
+                  Interface::Interface::Entry.new(
+                    method_types: type.elements.map {|key_value, value_type|
                       key_type = Literal.new(value: key_value, location: nil)
                       Interface::MethodType.new(
                         type_params: [],
@@ -515,10 +660,10 @@ module Steep
                                                       rest_keywords: nil),
                         block: nil,
                         return_type: value_type,
+                        method_def: nil,
                         location: nil
                       )
-                    } + update.types,
-                    incompatible: false
+                    } + update.method_types
                   )
                 end
               end
@@ -531,26 +676,28 @@ module Steep
                 params: type.params,
                 return_type: type.return_type,
                 block: nil,
+                method_def: nil,
                 location: nil
               )
 
-              interface.methods[:[]] = Interface::Interface::Combination.overload([method_type], incompatible: false)
-              interface.methods[:call] = Interface::Interface::Combination.overload([method_type], incompatible: false)
+              interface.methods[:[]] = Interface::Interface::Entry.new(method_types: [method_type])
+              interface.methods[:call] = Interface::Interface::Entry.new(method_types: [method_type])
             end
 
+          when Logic::Base
+            interface(AST::Builtin.bool_type, private: private, self_type: self_type)
+
           else
             raise "Unexpected type for interface: #{type}"
           end
         end
 
         def module_name?(type_name)
-          name = type_name_1(type_name)
-          entry = env.class_decls[name] and entry.is_a?(RBS::Environment::ModuleEntry)
+          entry = env.class_decls[type_name] and entry.is_a?(RBS::Environment::ModuleEntry)
         end
 
         def class_name?(type_name)
-          name = type_name_1(type_name)
-          entry = env.class_decls[name] and entry.is_a?(RBS::Environment::ClassEntry)
+          entry = env.class_decls[type_name] and entry.is_a?(RBS::Environment::ClassEntry)
         end
 
         def env
@@ -565,7 +712,22 @@ module Steep
         end
 
         def absolute_type_name(type_name, namespace:)
-          type_name_resolver.resolve(type_name, context: namespace_1(namespace).ascend)
+          type_name_resolver.resolve(type_name, context: namespace.ascend)
+        end
+
+        def instance_type(type_name, args: nil, location: nil)
+          raise unless type_name.class?
+
+          definition = definition_builder.build_singleton(type_name)
+          def_args = definition.type_params.map { Any.new(location: nil) }
+
+          if args
+            raise if def_args.size != args.size
+          else
+            args = def_args
+          end
+
+          AST::Types::Name::Instance.new(location: location, name: type_name, args: args)
         end
       end
     end