steep 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e15a2388cd89e6b169243007211840853be8c126e035f7aa6434b00258e1087
-  data.tar.gz: e3bb8c7a1d816cb2667e7dc977f5e3155bcb9444e995a210bd58dc716a6a71b7
+  metadata.gz: 5d09c66d40509db4956625f6be82477c4cda1b375d4cc37ebc2b4fdfdfdd971f
+  data.tar.gz: bfe074e9fc6e833faa4442f718e2bade7e54a5b6921fd8cf63465972ec39ced5
 SHA512:
-  metadata.gz: fb77f06dcef27e222984269a637966fa581cd78b3157c31a71793e8447f7059467140b7bb3f8f3e7f059a37492c9988f428234011ff7b3f7133a627f60a63cf4
-  data.tar.gz: 9319aebc6f74f89d055098312f460b2ed86ae9cfcd5c17bd21425c69e3ebe8838dffa3f4db9c99bc23bbc4657e4ee9f453bf1a2b3b7e4afe1531c0ba0ccb386c
+  metadata.gz: 05d54b1565ccf9189d335163d952d075bd6f7b3a08c26362efb815c3d19cfd2ffa2eb13e124a5dc7a4a5f1343a6fbbe5694ed3d6000a4fe37f3ace4cb2d7c1d5
+  data.tar.gz: 2661d5a8a5273e5c4341b27fd78a5f57c296c31663f16d46bf8de39ea1af40b827bfdf48f9266e071a37b1fe395a58ec716149d88656cf983587ecbe89fa24e6

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 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))

data/lib/steep.rb

@@ -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"

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
 
@@ -81,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/factory.rb

@@ -43,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)
+            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)
@@ -103,22 +103,22 @@ module Steep
           when Var
             RBS::Types::Variable.new(name: type.name, location: nil)
           when Name::Singleton
-            RBS::Types::ClassSingleton.new(name: type_name_1(type.name), location: nil)
+            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) },
@@ -151,32 +151,6 @@ module Steep
           end
         end
 
-        def type_name(name)
-          n = type_name_cache[name] and return n
-
-          type_name_cache[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)) },
@@ -201,7 +175,7 @@ module Steep
           )
         end
 
-        def method_type(method_type, self_type:, subst2: nil)
+        def method_type(method_type, self_type:, subst2: nil, method_def: nil)
           fvs = self_type.free_variables()
 
           type_params = []
@@ -225,14 +199,15 @@ module Steep
             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?
@@ -292,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
@@ -312,6 +287,105 @@ 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
+
+            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
+
+          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)
@@ -325,7 +399,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) },
@@ -345,8 +419,14 @@ module Steep
                   next if method.private? && !private
 
                   interface.methods[name] = Interface::Interface::Entry.new(
-                    method_types: method.method_types.map do |type|
-                      method_type(type, self_type: self_type, subst2: subst)
+                    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
@@ -355,7 +435,7 @@ module Steep
 
           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(
@@ -366,8 +446,8 @@ module Steep
 
               definition.methods.each do |name, method|
                 interface.methods[name] = Interface::Interface::Entry.new(
-                  method_types: method.method_types.map do |type|
-                    method_type(type, self_type: self_type, subst2: subst)
+                  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
@@ -375,7 +455,7 @@ module Steep
 
           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)},
@@ -391,8 +471,14 @@ module Steep
                 next if !private && method.private?
 
                 interface.methods[name] = Interface::Interface::Entry.new(
-                  method_types: method.method_types.map do |type|
-                    method_type(type, self_type: self_type, subst2: subst)
+                  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
@@ -469,6 +555,7 @@ module Steep
                                                       rest_keywords: nil),
                         block: nil,
                         return_type: elem_type,
+                        method_def: nil,
                         location: nil
                       )
                     } + aref.method_types
@@ -488,6 +575,7 @@ module Steep
                                                       rest_keywords: nil),
                         block: nil,
                         return_type: elem_type,
+                        method_def: nil,
                         location: nil
                       )
                     } + update.method_types
@@ -502,6 +590,7 @@ module Steep
                         params: Interface::Params.empty,
                         block: nil,
                         return_type: type.types[0] || AST::Builtin.nil_type,
+                        method_def: nil,
                         location: nil
                       )
                     ]
@@ -516,6 +605,7 @@ module Steep
                         params: Interface::Params.empty,
                         block: nil,
                         return_type: type.types.last || AST::Builtin.nil_type,
+                        method_def: nil,
                         location: nil
                       )
                     ]
@@ -547,6 +637,7 @@ module Steep
                                                       rest_keywords: nil),
                         block: nil,
                         return_type: value_type,
+                        method_def: nil,
                         location: nil
                       )
                     } + ref.method_types
@@ -567,6 +658,7 @@ module Steep
                                                       rest_keywords: nil),
                         block: nil,
                         return_type: value_type,
+                        method_def: nil,
                         location: nil
                       )
                     } + update.method_types
@@ -582,6 +674,7 @@ module Steep
                 params: type.params,
                 return_type: type.return_type,
                 block: nil,
+                method_def: nil,
                 location: nil
               )
 
@@ -589,19 +682,20 @@ module Steep
               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
@@ -616,7 +710,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