steep 0.31.0 → 0.35.0

data/lib/steep/type_inference/context.rb

@@ -80,6 +80,7 @@ module Steep
         end
       end
 
+      attr_reader :call_context
       attr_reader :method_context
       attr_reader :block_context
       attr_reader :break_context
@@ -88,7 +89,7 @@ module Steep
       attr_reader :type_env
       attr_reader :lvar_env
 
-      def initialize(method_context:, block_context:, break_context:, module_context:, self_type:, type_env:, lvar_env:)
+      def initialize(method_context:, block_context:, break_context:, module_context:, self_type:, type_env:, lvar_env:, call_context:)
         @method_context = method_context
         @block_context = block_context
         @break_context = break_context
@@ -96,6 +97,7 @@ module Steep
         @self_type = self_type
         @type_env = type_env
         @lvar_env = lvar_env
+        @call_context = call_context
       end
 
       def with(method_context: self.method_context,
@@ -104,7 +106,8 @@ module Steep
                module_context: self.module_context,
                self_type: self.self_type,
                type_env: self.type_env,
-               lvar_env: self.lvar_env)
+               lvar_env: self.lvar_env,
+               call_context: self.call_context)
         self.class.new(
           method_context: method_context,
           block_context: block_context,
@@ -112,7 +115,8 @@ module Steep
           module_context: module_context,
           self_type: self_type,
           type_env: type_env,
-          lvar_env: lvar_env
+          lvar_env: lvar_env,
+          call_context: call_context
         )
       end
     end

data/lib/steep/type_inference/context_array.rb

@@ -29,7 +29,7 @@ module Steep
                   else
                     ""
                   end
-        buffer = AST::Buffer.new(name: source.path, content: content)
+        buffer = RBS::Buffer.new(name: source.path, content: content)
         new(buffer: buffer, context: context, range: range || 0..buffer.content.size)
       end
 

data/lib/steep/type_inference/local_variable_type_env.rb

@@ -114,7 +114,9 @@ module Steep
             relation = Subtyping::Relation.new(sub_type: inner_type, super_type: outer_type)
             constraints = Subtyping::Constraints.new(unknowns: Set.new)
             subtyping.check(relation, constraints: constraints, self_type: self_type).else do |result|
-              yield var, outer_type, inner_type, result
+              if block_given?
+                yield var, outer_type, inner_type, result
+              end
             end
           end
         end
@@ -147,6 +149,13 @@ module Steep
         )
       end
 
+      def subst(s)
+        update(
+          declared_types: declared_types.transform_values {|e| e.update(type: e.type.subst(s)) },
+          assigned_types: assigned_types.transform_values {|e| e.update(type: e.type.subst(s)) }
+        )
+      end
+
       def each
         if block_given?
           vars.each do |var|

data/lib/steep/type_inference/logic_type_interpreter.rb

@@ -207,6 +207,12 @@ module Steep
             [type]
           ]
 
+        when AST::Types::Name::Interface
+          [
+            [instance_type],
+            [type]
+          ]
+
         else
           [
             [],

data/lib/steep/type_inference/method_call.rb

@@ -0,0 +1,116 @@
+module Steep
+  module TypeInference
+    class MethodCall
+      class MethodDecl
+        attr_reader :method_name
+        attr_reader :method_def
+
+        def initialize(method_name:, method_def:)
+          @method_name = method_name
+          @method_def = method_def
+        end
+
+        def hash
+          method_name.hash
+          # RBS::MethodType doesn't have #hash
+        end
+
+        def ==(other)
+          other.is_a?(MethodDecl) && other.method_name == method_name && other.method_def == method_def
+        end
+
+        alias eql? ==
+
+        def method_type
+          method_def.type
+        end
+      end
+
+      MethodContext = Struct.new(:method_name, keyword_init: true) do
+        def to_s
+          "@#{method_name}"
+        end
+      end
+
+      ModuleContext = Struct.new(:type_name, keyword_init: true) do
+        def to_s
+          "@#{type_name}@"
+        end
+      end
+
+      TopLevelContext = Class.new() do
+        def to_s
+          "@<main>"
+        end
+      end
+
+      UnknownContext = Class.new() do
+        def to_s
+          "@<unknown>"
+        end
+      end
+
+
+      class Base
+        attr_reader :node
+        attr_reader :context
+        attr_reader :method_name
+        attr_reader :return_type
+        attr_reader :receiver_type
+
+        def initialize(node:, context:, method_name:, receiver_type:, return_type:)
+          @node = node
+          @context = context
+          @method_name = method_name
+          @receiver_type = receiver_type
+          @return_type = return_type
+        end
+
+        def with_return_type(new_type)
+          dup.tap do |copy|
+            copy.instance_eval do
+              @return_type = new_type
+            end
+          end
+        end
+      end
+
+      class Typed < Base
+        attr_reader :actual_method_type
+        attr_reader :method_decls
+
+        def initialize(node:, context:, method_name:, receiver_type:, actual_method_type:, method_decls:, return_type: actual_method_type.return_type)
+          super(node: node, context: context, method_name: method_name, receiver_type: receiver_type, return_type: return_type)
+          @actual_method_type = actual_method_type
+          @method_decls = method_decls
+        end
+      end
+
+      class Untyped < Base
+        def initialize(node:, context:, method_name:)
+          super(node: node, context: context, method_name: method_name, receiver_type: AST::Types::Any.new, return_type: AST::Types::Any.new)
+        end
+      end
+
+      class NoMethodError < Base
+        attr_reader :error
+
+        def initialize(node:, context:, method_name:, receiver_type:, error:)
+          super(node: node, context: context, method_name: method_name, receiver_type: receiver_type, return_type: AST::Types::Any.new)
+          @error = error
+        end
+      end
+
+      class Error < Base
+        attr_reader :errors
+        attr_reader :method_decls
+
+        def initialize(node:, context:, method_name:, receiver_type:, errors:, method_decls: Set[], return_type: AST::Types::Any.new)
+          super(node: node, context: context, method_name: method_name, receiver_type: receiver_type, return_type: return_type)
+          @method_decls = method_decls
+          @errors = errors
+        end
+      end
+    end
+  end
+end

data/lib/steep/typing.rb

@@ -20,6 +20,7 @@ module Steep
     attr_reader :should_update
     attr_reader :contexts
     attr_reader :root_context
+    attr_reader :method_calls
 
     def initialize(source:, root_context:, parent: nil, parent_last_update: parent&.last_update, contexts: nil)
       @source = source
@@ -33,6 +34,7 @@ module Steep
       @typing = {}.compare_by_identity
       @root_context = root_context
       @contexts = contexts || TypeInference::ContextArray.from_source(source: source)
+      @method_calls = {}.compare_by_identity
     end
 
     def add_error(error)
@@ -46,6 +48,12 @@ module Steep
       type
     end
 
+    def add_call(node, call)
+      method_calls[node] = call
+
+      call
+    end
+
     def add_context(range, context:)
       contexts.insert_context(range, context: context)
       @last_update += 1
@@ -69,6 +77,20 @@ module Steep
       end
     end
 
+    def call_of(node:)
+      call = method_calls[node]
+
+      if call
+        call
+      else
+        if parent
+          parent.call_of(node: node)
+        else
+          raise UnknownNodeError.new(:call, node: node)
+        end
+      end
+    end
+
     def add_context_for_node(node, context:)
       begin_pos = node.loc.expression.begin_pos
       end_pos = node.loc.expression.end_pos
@@ -76,6 +98,18 @@ module Steep
       add_context(begin_pos..end_pos, context: context)
     end
 
+    def block_range(node)
+      send_node, args_node, _ = node.children
+      begin_pos = if send_node.type != :lambda && args_node.loc.expression
+                    args_node.loc.expression.end_pos
+                  else
+                    node.loc.begin.end_pos
+                  end
+      end_pos = node.loc.end.begin_pos
+
+      begin_pos..end_pos
+    end
+
     def add_context_for_body(node, context:)
       case node.type
       when :class
@@ -117,14 +151,8 @@ module Steep
         add_context(body_begin_pos..body_end_pos, context: context)
 
       when :block
-        send_node, args_node, _ = node.children
-        begin_pos = if send_node.type != :lambda && args_node.loc.expression
-                      args_node.loc.expression.end_pos
-                    else
-                      node.loc.begin.end_pos
-                    end
-        end_pos = node.loc.end.begin_pos
-        add_context(begin_pos..end_pos, context: context)
+        range = block_range(node)
+        add_context(range, context: context)
 
       when :for
         _, collection, _ = node.children
@@ -191,6 +219,8 @@ module Steep
 
       parent.contexts.merge(contexts)
 
+      parent.method_calls.merge!(method_calls)
+
       errors.each do |error|
         parent.add_error error
       end

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.31.0"
+  VERSION = "0.35.0"
 end

data/smoke/regression/fun.rb

@@ -0,0 +1,8 @@
+class Fun
+  def foo(v)
+    !v.nil? && foo2(v)
+  end
+
+  def foo2(_)
+  end
+end

data/smoke/regression/fun.rbs

@@ -0,0 +1,4 @@
+class Fun
+  def foo: (Integer?) -> void
+  def foo2: (Integer) -> void
+end

data/smoke/regression/range.rb

@@ -0,0 +1,5 @@
+# @type var x: Range[String]
+x = "foo".."bar"
+
+# @type var y: Range[String | Integer]
+y = x

data/steep.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rainbow", ">= 2.2.2", "< 4.0"
   spec.add_runtime_dependency "listen", "~> 3.0"
   spec.add_runtime_dependency "language_server-protocol", "~> 3.15.0.1"
-  spec.add_runtime_dependency "rbs", "~> 0.12.0"
+  spec.add_runtime_dependency "rbs", "~> 0.17.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2020-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.17.0
 description: Gradual Typing for Ruby
 email:
 - matsumoto@soutaro.com
@@ -140,9 +140,7 @@ files:
 - lib/steep/annotation_parser.rb
 - lib/steep/ast/annotation.rb
 - lib/steep/ast/annotation/collection.rb
-- lib/steep/ast/buffer.rb
 - lib/steep/ast/builtin.rb
-- lib/steep/ast/location.rb
 - lib/steep/ast/type_params.rb
 - lib/steep/ast/types.rb
 - lib/steep/ast/types/any.rb
@@ -172,6 +170,7 @@ files:
 - lib/steep/drivers/langserver.rb
 - lib/steep/drivers/print_project.rb
 - lib/steep/drivers/signature_error_printer.rb
+- lib/steep/drivers/stats.rb
 - lib/steep/drivers/trace_printer.rb
 - lib/steep/drivers/utils/driver_helper.rb
 - lib/steep/drivers/validate.rb
@@ -183,6 +182,7 @@ files:
 - lib/steep/interface/method.rb
 - lib/steep/interface/method_type.rb
 - lib/steep/interface/substitution.rb
+- lib/steep/method_name.rb
 - lib/steep/module_helper.rb
 - lib/steep/project.rb
 - lib/steep/project/completion_provider.rb
@@ -219,6 +219,7 @@ files:
 - lib/steep/type_inference/local_variable_type_env.rb
 - lib/steep/type_inference/logic.rb
 - lib/steep/type_inference/logic_type_interpreter.rb
+- lib/steep/type_inference/method_call.rb
 - lib/steep/type_inference/send_args.rb
 - lib/steep/type_inference/type_env.rb
 - lib/steep/typing.rb
@@ -331,9 +332,12 @@ files:
 - smoke/regexp/b.rb
 - smoke/regression/Steepfile
 - smoke/regression/array.rb
+- smoke/regression/fun.rb
+- smoke/regression/fun.rbs
 - smoke/regression/hash.rb
 - smoke/regression/poly_new.rb
 - smoke/regression/poly_new.rbs
+- smoke/regression/range.rb
 - smoke/regression/set_divide.rb
 - smoke/rescue/Steepfile
 - smoke/rescue/a.rb

data/lib/steep/ast/buffer.rb

@@ -1,51 +0,0 @@
-module Steep
-  module AST
-    class Buffer
-      attr_reader :name
-      attr_reader :content
-      attr_reader :lines
-      attr_reader :ranges
-
-      def initialize(name:, content:)
-        @name = name
-        @content = content
-
-        @lines = content.split(/\n/, -1)
-
-        @ranges = []
-        offset = 0
-        lines.each.with_index do |line, index|
-          if index == lines.size - 1
-            ranges << (offset..offset)
-          else
-            size = line.size
-            range = offset..(offset+size)
-            ranges << range
-            offset += size+1
-          end
-        end
-      end
-
-      def pos_to_loc(pos)
-        index = ranges.bsearch_index do |range|
-          pos <= range.end
-        end
-
-        if index
-          [index + 1, pos - ranges[index].begin]
-        else
-          [1, pos]
-        end
-      end
-
-      def loc_to_pos(loc)
-        line, column = loc
-        ranges[line - 1].begin + column
-      end
-
-      def source(range)
-        content[range]
-      end
-    end
-  end
-end