steep 0.14.0 → 0.15.0

data/lib/steep/typing.rb

@@ -11,6 +11,7 @@ module Steep
       end
     end
 
+    attr_reader :source
     attr_reader :errors
     attr_reader :typing
     attr_reader :parent
@@ -18,8 +19,11 @@ module Steep
     attr_reader :last_update
     attr_reader :should_update
     attr_reader :contexts
+    attr_reader :root_context
+
+    def initialize(source:, root_context:, parent: nil, parent_last_update: parent&.last_update, contexts: nil)
+      @source = source
 
-    def initialize(parent: nil, parent_last_update: parent&.last_update)
       @parent = parent
       @parent_last_update = parent_last_update
       @last_update = parent&.last_update || 0
@@ -27,25 +31,26 @@ module Steep
 
       @errors = []
       @typing = {}.compare_by_identity
-      @contexts = {}.compare_by_identity
+      @root_context = root_context
+      @contexts = contexts || TypeInference::ContextArray.from_source(source: source)
     end
 
     def add_error(error)
       errors << error
     end
 
-    def add_typing(node, type, context)
+    def add_typing(node, type, _context)
       typing[node] = type
-      contexts[node] = context
-
-      if should_update
-        @last_update += 1
-        @should_update = false
-      end
+      @last_update += 1
 
       type
     end
 
+    def add_context(range, context:)
+      contexts.insert_context(range, context: context)
+      @last_update += 1
+    end
+
     def has_type?(node)
       typing.key?(node)
     end
@@ -64,20 +69,67 @@ module Steep
       end
     end
 
-    def context_of(node:)
-      ctx = contexts[node]
+    def add_context_for_node(node, context:)
+      begin_pos = node.loc.expression.begin_pos
+      end_pos = node.loc.expression.end_pos
+
+      add_context(begin_pos..end_pos, context: context)
+    end
+
+    def add_context_for_body(node, context:)
+      case node.type
+      when :class
+        name_node, super_node, _ = node.children
+        begin_pos = if super_node
+                      super_node.loc.expression.end_pos
+                    else
+                      name_node.loc.expression.end_pos
+                    end
+        end_pos = node.loc.end.begin_pos
+
+        add_context(begin_pos..end_pos, context: context)
+
+      when :module
+        name_node = node.children[0]
+        begin_pos = name_node.loc.expression.end_pos
+        end_pos = node.loc.end.begin_pos
+        add_context(begin_pos..end_pos, context: context)
+
+      when :def, :defs
+        args_node = case node.type
+                    when :def
+                      node.children[1]
+                    when :defs
+                      node.children[2]
+                    end
+        body_begin_pos = if args_node.loc.expression
+                           args_node.loc.expression.end_pos
+                         else
+                           node.loc.name.end_pos
+                         end
+        body_end_pos = node.loc.end.begin_pos
+        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)
 
-      if ctx
-        ctx
       else
-        if parent
-          parent.context_of(node: node)
-        else
-          raise UnknownNodeError.new(:context, node: node)
-        end
+        raise "Unexpected node for insert_context: #{node.type}"
       end
     end
 
+    def context_at(line:, column:)
+      contexts.at(line: line, column: column) ||
+        (parent ? parent.context_at(line: line, column: column) : root_context)
+    end
+
     def dump(io)
       io.puts "Typing: "
       nodes.each_value do |node|
@@ -98,8 +150,11 @@ module Steep
       "#{line}:#{col}:#{src}"
     end
 
-    def new_child
-      child = self.class.new(parent: self)
+    def new_child(range)
+      child = self.class.new(source: source,
+                             parent: self,
+                             root_context: root_context,
+                             contexts: TypeInference::ContextArray.new(buffer: contexts.buffer, range: range, context: nil))
       @should_update = true
 
       if block_given?
@@ -115,12 +170,14 @@ module Steep
 
     def save!
       raise "Unexpected save!" unless parent
-      raise "Parent modified since new_child" unless parent.last_update == parent_last_update
+      raise "Parent modified since #new_child: parent.last_update=#{parent.last_update}, parent_last_update=#{parent_last_update}" unless parent.last_update == parent_last_update
 
       each_typing do |node, type|
-        parent.add_typing(node, type, contexts[node])
+        parent.add_typing(node, type, nil)
       end
 
+      parent.contexts.merge(contexts)
+
       errors.each do |error|
         parent.add_error error
       end

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

data/lib/steep.rb

@@ -11,7 +11,7 @@ require "listen"
 require 'pry'
 require 'language_server-protocol'
 
-require "ruby/signature"
+require "rbs"
 
 require "steep/ast/namespace"
 require "steep/names"
@@ -61,10 +61,13 @@ require "steep/typing"
 require "steep/errors"
 require "steep/type_construction"
 require "steep/type_inference/context"
+require "steep/type_inference/context_array"
 require "steep/type_inference/send_args"
 require "steep/type_inference/block_params"
 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/ast/types"
 
 require "steep/project"
@@ -91,6 +94,8 @@ if ENV["NO_COLOR"]
   Rainbow.enabled = false
 end
 
+$stderr = STDERR
+
 module Steep
   def self.logger
     @logger

data/smoke/alias/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/and/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/array/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/array/b.rb

@@ -1,9 +1,7 @@
 x = ""
 y = 1
 
-# !expects IncompatibleAssignment: lhs_type=::String, rhs_type=::Integer
 x = y
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=::String
 y = x
 
 # @type var a: Array[Integer]

data/smoke/block/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/case/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/class/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/const/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/dstr/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/ensure/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/enumerator/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/extension/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/extension/c.rb

@@ -5,5 +5,6 @@ class Foo
     # @type var string: String
     # !expects IncompatibleAssignment: lhs_type=::String, rhs_type=::Object
     string = super()
+    string
   end
 end

data/smoke/hash/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/hello/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/if/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/if/a.rb

@@ -2,7 +2,7 @@
 
 x = y = z = (_ = nil)
 
-# !expects IncompatibleAssignment: lhs_type=::String, rhs_type=::Symbol
+# !expects IncompatibleAssignment: lhs_type=::String, rhs_type=(::Symbol | nil)
 a = if x
       :foo
     end

data/smoke/implements/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/initialize/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/integer/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/interface/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/kwbegin/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/lambda/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/literal/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/map/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/method/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/module/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/regexp/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/regression/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
   library "set"

data/smoke/rescue/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/rescue/a.rb

@@ -34,7 +34,7 @@ d = begin
 
 # @type var e: Integer
 
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Array[::Integer] | ::Integer | ::String | ::Symbol)
+# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Array[::Integer] | ::Integer | ::Symbol)
 e = begin
       'foo'
     rescue RuntimeError

data/smoke/self/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/skip/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/stdout/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/super/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/type_case/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/smoke/yield/Steepfile

@@ -1,4 +1,5 @@
 target :test do
+  typing_options :strict
   check "*.rb"
   signature "*.rbs"
 end

data/steep.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
       .reject {|f| f.match(%r{^(test|spec|features)/}) }
       .map {|f| File.join("vendor/ruby-signature", f) }
   }
-  spec.files         << "vendor/ruby-signature/lib/ruby/signature/parser.rb"
+  spec.files         << "vendor/ruby-signature/lib/rbs/parser.rb"
 
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/vendor/ruby-signature/.gitignore

@@ -7,6 +7,6 @@
 /tmp/
 /Gemfile.lock
 /.ruby-version
-/lib/ruby/signature/parser.rb
-/lib/ruby/signature/parser.output
+/lib/rbs/parser.rb
+/lib/rbs/parser.output
 /vendor/sigs

data/vendor/ruby-signature/README.md

@@ -1,6 +1,6 @@
-# Ruby::Signature
+# RBS
 
-Ruby::Signature provides syntax and semantics definition for the `Ruby Signature` language, `.rbs` files.
+RBS provides syntax and semantics definition for the `Ruby Signature` language, `.rbs` files.
 It consists of a parser, the syntax, and class definition interpreter, the semantics.
 
 ## Build

data/vendor/ruby-signature/Rakefile

@@ -30,7 +30,7 @@ rule ".rb" => ".y" do |t|
   sh "racc -v -o #{t.name} #{t.source}"
 end
 
-task :parser => "lib/ruby/signature/parser.rb"
+task :parser => "lib/rbs/parser.rb"
 task :test => :parser
 task :stdlib_test => :parser
 task :build => :parser
@@ -64,4 +64,4 @@ namespace :generate do
   end
 end
 
-CLEAN.include("lib/ruby/signature/parser.rb")
+CLEAN.include("lib/rbs/parser.rb")

data/vendor/ruby-signature/bin/annotate-with-rdoc

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-require "ruby/signature"
+require "bundler/setup"
+require "rbs"
 require "rdoc"
 
 def store_for_class(name, stores:)
@@ -29,7 +30,7 @@ def comment_for_constant(decl, stores:)
 
     if constant&.documented?
       string = format_comment(constant.comment)
-      Ruby::Signature::AST::Comment.new(location: nil, string: string)
+      RBS::AST::Comment.new(location: nil, string: string)
     end
   end
 end
@@ -42,7 +43,7 @@ def comment_for_class(decl, stores:)
 
   if klass&.documented?
     string = format_comment(klass.comment)
-    Ruby::Signature::AST::Comment.new(location: nil, string: string)
+    RBS::AST::Comment.new(location: nil, string: string)
   end
 end
 
@@ -61,7 +62,7 @@ def comment_for_method(klass, method, stores:)
     end
 
     string = out.accept(RDoc::Markup::ToMarkdown.new)
-    Ruby::Signature::AST::Comment.new(location: nil, string: string)
+    RBS::AST::Comment.new(location: nil, string: string)
   end
 
 rescue RDoc::Store::MissingFileError
@@ -77,7 +78,7 @@ end
 def print_members(stores, klass_name, members)
   members.each do |member|
     case member
-    when Ruby::Signature::AST::Members::MethodDefinition
+    when RBS::AST::Members::MethodDefinition
       puts "    Processing #{member.name}..."
 
       method_name = case
@@ -96,9 +97,9 @@ def print_members(stores, klass_name, members)
       end
 
       member.instance_variable_set(:@comment, comment)
-    when Ruby::Signature::AST::Members::AttrReader, Ruby::Signature::AST::Members::AttrAccessor, Ruby::Signature::AST::Members::AttrWriter
+    when RBS::AST::Members::AttrReader, RBS::AST::Members::AttrAccessor, RBS::AST::Members::AttrWriter
       puts "    👻 Attributes not supported (#{klass_name})"
-    when Ruby::Signature::AST::Members::Alias
+    when RBS::AST::Members::Alias
       puts "    Processing #{member.new_name}(alias)..."
       prefix = case
                when member.instance?
@@ -125,22 +126,22 @@ end
 ARGV.map {|f| Pathname(f) }.each do |path|
   puts "Opening #{path}..."
 
-  buffer = Ruby::Signature::Buffer.new(name: path, content: path.read)
-  sigs = Ruby::Signature::Parser.parse_signature(buffer)
+  buffer = RBS::Buffer.new(name: path, content: path.read)
+  sigs = RBS::Parser.parse_signature(buffer)
 
   sigs.each do |decl|
     case decl
-    when Ruby::Signature::AST::Declarations::Constant
+    when RBS::AST::Declarations::Constant
       puts "  Importing documentation for #{decl.name}..."
       comment = comment_for_constant(decl, stores: stores)
       decl.instance_variable_set(:@comment, comment)
-    when Ruby::Signature::AST::Declarations::Class, Ruby::Signature::AST::Declarations::Module
+    when RBS::AST::Declarations::Class, RBS::AST::Declarations::Module
       puts "  Importing documentation for #{decl.name}..."
       comment = comment_for_class(decl, stores: stores)
       decl.instance_variable_set(:@comment, comment)
 
       print_members stores, decl.name.to_s, decl.members
-    when Ruby::Signature::AST::Declarations::Extension
+    when RBS::AST::Declarations::Extension
       puts "  Importing documentation for #{decl.name} (#{decl.extension_name})"
 
       print_members stores, decl.name.to_s, decl.members
@@ -149,7 +150,7 @@ ARGV.map {|f| Pathname(f) }.each do |path|
 
   puts "Writing #{path}..."
   path.open('w') do |out|
-    writer = Ruby::Signature::Writer.new(out: out)
+    writer = RBS::Writer.new(out: out)
     writer.write sigs
   end
 end

data/vendor/ruby-signature/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "ruby/signature"
+require "rbs"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/vendor/ruby-signature/bin/sort

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 
-require "ruby/signature"
+require "bundler/setup"
+require "rbs"
 
-Members = Ruby::Signature::AST::Members
+Members = RBS::AST::Members
 
 def group(member)
   case member
@@ -61,12 +62,12 @@ end
 ARGV.map {|f| Pathname(f) }.each do |path|
   puts "Opening #{path}..."
 
-  buffer = Ruby::Signature::Buffer.new(name: path, content: path.read)
-  sigs = Ruby::Signature::Parser.parse_signature(buffer)
+  buffer = RBS::Buffer.new(name: path, content: path.read)
+  sigs = RBS::Parser.parse_signature(buffer)
 
   sigs.each do |sig|
     case sig
-    when Ruby::Signature::AST::Declarations::Class, Ruby::Signature::AST::Declarations::Module, Ruby::Signature::AST::Declarations::Interface
+    when RBS::AST::Declarations::Class, RBS::AST::Declarations::Module, RBS::AST::Declarations::Interface
       sig.members.sort! do |m1, m2|
         group1 = group(m1)
         group2 = group(m2)
@@ -82,7 +83,7 @@ ARGV.map {|f| Pathname(f) }.each do |path|
 
   puts "Writing #{path}..."
   path.open('w') do |out|
-    writer = Ruby::Signature::Writer.new(out: out)
+    writer = RBS::Writer.new(out: out)
     writer.write sigs
   end
 end