steep 1.8.0.dev.2 → 1.8.0.pre.2

data/lib/steep/type_inference/logic_type_interpreter.rb

@@ -36,22 +36,22 @@ module Steep
           method = node.children[1]
           case method
           when :is_a?, :kind_of?, :instance_of?
-            AST::Types::Logic::ReceiverIsArg.new
+            AST::Types::Logic::ReceiverIsArg.instance
           when :nil?
-            AST::Types::Logic::ReceiverIsNil.new
+            AST::Types::Logic::ReceiverIsNil.instance
           when :!
-            AST::Types::Logic::Not.new
+            AST::Types::Logic::Not.instance
           when :===
-            AST::Types::Logic::ArgIsReceiver.new
+            AST::Types::Logic::ArgIsReceiver.instance
           end
         end
       end
 
       TRUE = AST::Types::Literal.new(value: true)
       FALSE = AST::Types::Literal.new(value: false)
-      BOOL = AST::Types::Boolean.new
-      BOT = AST::Types::Bot.new
-      UNTYPED = AST::Types::Any.new
+      BOOL = AST::Types::Boolean.instance
+      BOT = AST::Types::Bot.instance
+      UNTYPED = AST::Types::Any.instance
 
       def eval(env:, node:)
         evaluate_node(env: env, node: node)
@@ -77,6 +77,10 @@ module Steep
           ]
         end
 
+        if type.is_a?(AST::Types::Var)
+          type = config.upper_bound(type.name) || type
+        end
+
         case node.type
         when :lvar
           name = node.children[0]

data/lib/steep/type_inference/method_call.rb

@@ -165,7 +165,7 @@ module Steep
 
       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)
+          super(node: node, context: context, method_name: method_name, receiver_type: AST::Types::Any.instance, return_type: AST::Types::Any.instance)
         end
       end
 
@@ -173,7 +173,7 @@ module Steep
         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)
+          super(node: node, context: context, method_name: method_name, receiver_type: receiver_type, return_type: AST::Types::Any.instance)
           @error = error
         end
       end
@@ -182,7 +182,7 @@ module Steep
         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)
+        def initialize(node:, context:, method_name:, receiver_type:, errors:, method_decls: Set[], return_type: AST::Types::Any.instance)
           super(node: node, context: context, method_name: method_name, receiver_type: receiver_type, return_type: return_type)
           @method_decls = method_decls
           @errors = errors

data/lib/steep/type_inference/method_params.rb

@@ -114,7 +114,7 @@ module Steep
             proc_type = AST::Types::Proc.new(type: type, block: nil, self_type: self_type)
 
             if optional?
-              AST::Types::Union.build(types: [proc_type, AST::Builtin.nil_type], location: proc_type.location)
+              AST::Types::Union.build(types: [proc_type, AST::Builtin.nil_type])
             else
               proc_type
             end

data/lib/steep/type_inference/send_args.rb

@@ -656,7 +656,7 @@ module Steep
                       errors << ts
                     when Array
                       pairs = keys.zip(ts) #: Array[[Symbol, AST::Types::t]]
-                      record = AST::Types::Record.new(elements: Hash[pairs])
+                      record = AST::Types::Record.new(elements: Hash[pairs], required_keys: Set.new(keys))
                       yield KeywordArgs::ArgTypePairs.new(pairs: [[a.node, record]])
                     end
                   else

data/lib/steep/typing.rb

@@ -11,6 +11,147 @@ module Steep
       end
     end
 
+    class CursorContext
+      attr_reader :index
+
+      attr_reader :data
+
+      def initialize(index)
+        @index = index
+      end
+
+      def set(range, context = nil)
+        if range.is_a?(CursorContext)
+          range, context = range.data
+          range or return
+          context or return
+        end
+
+        context or raise
+        return unless index
+
+        if current_range = self.range
+          if range.begin <= index && index <= range.end
+            if current_range.begin <= range.begin && range.end <= current_range.end
+              @data = [range, context]
+            end
+          end
+        else
+          @data = [range, context]
+        end
+      end
+
+      def set_node_context(node, context)
+        begin_pos = node.loc.expression.begin_pos
+        end_pos = node.loc.expression.end_pos
+
+        set(begin_pos..end_pos, context)
+      end
+
+      def set_body_context(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 # steep:ignore NoMethod
+
+          set(begin_pos..end_pos, context)
+
+        when :module
+          name_node = node.children[0]
+          begin_pos = name_node.loc.expression.end_pos
+          end_pos = node.loc.end.begin_pos # steep:ignore NoMethod
+          set(begin_pos..end_pos, context)
+
+        when :sclass
+          name_node = node.children[0]
+          begin_pos = name_node.loc.expression.end_pos
+          end_pos = node.loc.end.begin_pos # steep:ignore NoMethod
+          set(begin_pos..end_pos, context)
+
+        when :def, :defs
+          if node.children.last
+            args_node =
+              case node.type
+              when :def
+                node.children[1]
+              when :defs
+                node.children[2]
+              end
+
+            body_begin_pos =
+              case
+              when node.loc.assignment # steep:ignore NoMethod
+                # endless def
+                node.loc.assignment.end_pos # steep:ignore NoMethod
+              when args_node.loc.expression
+                # with args
+                args_node.loc.expression.end_pos
+              else
+                # without args
+                node.loc.name.end_pos # steep:ignore NoMethod
+              end
+
+            body_end_pos =
+              if node.loc.end # steep:ignore NoMethod
+                node.loc.end.begin_pos # steep:ignore NoMethod
+              else
+                node.loc.expression.end_pos
+              end
+
+            set(body_begin_pos..body_end_pos, context)
+          end
+
+        when :block, :numblock
+          range = block_range(node)
+          set(range, context)
+
+        when :for
+          _, collection, _ = node.children
+
+          begin_pos = collection.loc.expression.end_pos
+          end_pos = node.loc.end.begin_pos # steep:ignore NoMethod
+
+          set(begin_pos..end_pos, context)
+        else
+          raise "Unexpected node for insert_context: #{node.type}"
+        end
+      end
+
+      def block_range(node)
+        case node.type
+        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 # steep:ignore NoMethod
+                      end
+          end_pos = node.loc.end.begin_pos # steep:ignore NoMethod
+        when :numblock
+          send_node, _ = node.children
+          begin_pos = node.loc.begin.end_pos # steep:ignore NoMethod
+          end_pos = node.loc.end.begin_pos # steep:ignore NoMethod
+        end
+
+        begin_pos..end_pos
+      end
+
+      def range
+        range, _ = data
+        range
+      end
+
+      def context
+        _, context = data
+        context
+      end
+    end
+
     attr_reader :source
     attr_reader :errors
     attr_reader :typing
@@ -22,8 +163,9 @@ module Steep
     attr_reader :root_context
     attr_reader :method_calls
     attr_reader :source_index
+    attr_reader :cursor_context
 
-    def initialize(source:, root_context:, parent: nil, parent_last_update: parent&.last_update, contexts: nil, source_index: nil)
+    def initialize(source:, root_context:, parent: nil, parent_last_update: parent&.last_update, source_index: nil, cursor:)
       @source = source
 
       @parent = parent
@@ -34,9 +176,13 @@ module Steep
       @errors = []
       (@typing = {}).compare_by_identity
       @root_context = root_context
-      @contexts = contexts || TypeInference::ContextArray.from_source(source: source, context: root_context)
       (@method_calls = {}).compare_by_identity
 
+      @cursor_context = CursorContext.new(cursor)
+      if root_context
+        cursor_context.set(0..source.buffer.content&.size || 0, root_context)
+      end
+
       @source_index = source_index || Index::SourceIndex.new(source: source)
     end
 
@@ -57,11 +203,6 @@ module Steep
       call
     end
 
-    def add_context(range, context:)
-      contexts.insert_context(range, context: context)
-      @last_update += 1
-    end
-
     def has_type?(node)
       typing.key?(node)
     end
@@ -96,13 +237,6 @@ module Steep
       end
     end
 
-    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 block_range(node)
       case node.type
       when :block
@@ -122,85 +256,6 @@ module Steep
       begin_pos..end_pos
     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 # steep:ignore NoMethod
-
-        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 # steep:ignore NoMethod
-        add_context(begin_pos..end_pos, context: context)
-
-      when :sclass
-        name_node = node.children[0]
-        begin_pos = name_node.loc.expression.end_pos
-        end_pos = node.loc.end.begin_pos # steep:ignore NoMethod
-        add_context(begin_pos..end_pos, context: context)
-
-      when :def, :defs
-        if node.children.last
-          args_node =
-            case node.type
-            when :def
-              node.children[1]
-            when :defs
-              node.children[2]
-            end
-
-          body_begin_pos =
-            case
-            when node.loc.assignment # steep:ignore NoMethod
-              # endless def
-              node.loc.assignment.end_pos # steep:ignore NoMethod
-            when args_node.loc.expression
-              # with args
-              args_node.loc.expression.end_pos
-            else
-              # without args
-              node.loc.name.end_pos # steep:ignore NoMethod
-            end
-
-          body_end_pos =
-            if node.loc.end # steep:ignore NoMethod
-              node.loc.end.begin_pos # steep:ignore NoMethod
-            else
-              node.loc.expression.end_pos
-            end
-
-          add_context(body_begin_pos..body_end_pos, context: context)
-        end
-
-      when :block, :numblock
-        range = block_range(node)
-        add_context(range, context: context)
-
-      when :for
-        _, collection, _ = node.children
-
-        begin_pos = collection.loc.expression.end_pos
-        end_pos = node.loc.end.begin_pos # steep:ignore NoMethod
-
-        add_context(begin_pos..end_pos, context: context)
-      else
-        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)
       # steep:ignore:start
       io.puts "Typing: "
@@ -223,13 +278,14 @@ module Steep
       "#{line}:#{col}:#{src}"
     end
 
-    def new_child(range)
-      context = contexts[range.begin] || contexts.root.context
-      child = self.class.new(source: source,
-                             parent: self,
-                             root_context: root_context,
-                             contexts: TypeInference::ContextArray.new(buffer: contexts.buffer, range: range, context: context),
-                             source_index: source_index.new_child)
+    def new_child()
+      child = self.class.new(
+        source: source,
+        parent: self,
+        root_context: root_context,
+        source_index: source_index.new_child,
+        cursor: cursor_context.index
+      )
       @should_update = true
 
       if block_given?
@@ -251,14 +307,14 @@ module Steep
         parent.add_typing(node, type, nil)
       end
 
-      parent.contexts.merge(contexts)
-
       parent.method_calls.merge!(method_calls)
 
       errors.each do |error|
         parent.add_error error
       end
 
+      parent.cursor_context.set(cursor_context)
+
       parent.source_index.merge!(source_index)
     end
   end

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "1.8.0.dev.2"
+  VERSION = "1.8.0.pre.2"
 end

data/lib/steep.rb

@@ -15,6 +15,8 @@ require "stringio"
 require 'uri'
 require "yaml"
 require "securerandom"
+require "base64"
+require "time"
 
 require "concurrent/utility/processor_counter"
 require "terminal-table"
@@ -22,11 +24,12 @@ require "terminal-table"
 require "rbs"
 
 require "steep/path_helper"
-
+require "steep/located_value"
 require "steep/thread_waiter"
 require "steep/equatable"
 require "steep/method_name"
 require "steep/node_helper"
+require "steep/ast/types/shared_instance"
 require "steep/ast/types/helper"
 require "steep/ast/types/any"
 require "steep/ast/types/instance"
@@ -83,7 +86,6 @@ require "steep/annotation_parser"
 require "steep/typing"
 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/method_params"
@@ -113,6 +115,8 @@ require "steep/services/stats_calculator"
 require "steep/services/file_loader"
 require "steep/services/goto_service"
 
+require "steep/server/custom_methods"
+require "steep/server/work_done_progress"
 require "steep/server/delay_queue"
 require "steep/server/lsp_formatter"
 require "steep/server/change_buffer"
@@ -160,7 +164,16 @@ module Steep
   end
 
   def self.new_logger(output, prev_level)
-    ActiveSupport::TaggedLogging.new(Logger.new(output)).tap do |logger|
+    logger = Logger.new(output)
+    logger.formatter = proc do |severity, datetime, progname, msg|
+      # @type var severity: String
+      # @type var datetime: Time
+      # @type var progname: untyped
+      # @type var msg: untyped
+      # @type block: String
+      "#{datetime.strftime('%Y-%m-%d %H:%M:%S.%L')}: #{severity}: #{msg}\n"
+    end
+    ActiveSupport::TaggedLogging.new(logger).tap do |logger|
       logger.push_tags "Steep #{VERSION}"
       logger.level = prev_level || Logger::ERROR
     end
@@ -339,3 +352,15 @@ module GCCounter
     end
   end
 end
+
+
+
+
+# klasses = [Set]
+# klasses.each do |klass|
+#   # steep:ignore:start
+#   def klass.new(...)
+#     super
+#   end
+#   # steep:ignore:end
+# end

data/steep.gemspec

@@ -29,14 +29,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = '>= 3.1.0'
 
   spec.add_runtime_dependency "parser", ">= 3.1"
   spec.add_runtime_dependency "activesupport", ">= 5.1"
   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", "< 4.0"
-  spec.add_runtime_dependency "rbs", ">= 3.5.0.pre"
+  spec.add_runtime_dependency "rbs", "~> 3.6.0.pre"
   spec.add_runtime_dependency "concurrent-ruby", ">= 1.1.10"
   spec.add_runtime_dependency "terminal-table", ">= 2", "< 4"
   spec.add_runtime_dependency "securerandom", ">= 0.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.8.0.dev.2
+  version: 1.8.0.pre.2
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2024-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -96,16 +96,16 @@ dependencies:
   name: rbs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0.pre
+        version: 3.6.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0.pre
+        version: 3.6.0.pre
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -240,11 +240,15 @@ files:
 - Rakefile
 - Steepfile
 - bin/console
+- bin/mem_graph.rb
+- bin/mem_prof.rb
 - bin/output_rebaseline.rb
 - bin/output_test.rb
 - bin/rbs
 - bin/setup
+- bin/stackprof_test.rb
 - bin/steep
+- bin/steep-check.rb
 - bin/steep-prof
 - doc/narrowing.md
 - doc/shape.md
@@ -276,6 +280,7 @@ files:
 - lib/steep/ast/types/proc.rb
 - lib/steep/ast/types/record.rb
 - lib/steep/ast/types/self.rb
+- lib/steep/ast/types/shared_instance.rb
 - lib/steep/ast/types/top.rb
 - lib/steep/ast/types/tuple.rb
 - lib/steep/ast/types/union.rb
@@ -314,6 +319,7 @@ files:
 - lib/steep/interface/shape.rb
 - lib/steep/interface/substitution.rb
 - lib/steep/interface/type_param.rb
+- lib/steep/located_value.rb
 - lib/steep/method_name.rb
 - lib/steep/module_helper.rb
 - lib/steep/node_helper.rb
@@ -327,11 +333,13 @@ files:
 - lib/steep/range_extension.rb
 - lib/steep/server/base_worker.rb
 - lib/steep/server/change_buffer.rb
+- lib/steep/server/custom_methods.rb
 - lib/steep/server/delay_queue.rb
 - lib/steep/server/interaction_worker.rb
 - lib/steep/server/lsp_formatter.rb
 - lib/steep/server/master.rb
 - lib/steep/server/type_check_worker.rb
+- lib/steep/server/work_done_progress.rb
 - lib/steep/server/worker_process.rb
 - lib/steep/services/completion_provider.rb
 - lib/steep/services/content_change.rb
@@ -362,7 +370,6 @@ files:
 - lib/steep/type_inference/case_when.rb
 - lib/steep/type_inference/constant_env.rb
 - lib/steep/type_inference/context.rb
-- lib/steep/type_inference/context_array.rb
 - lib/steep/type_inference/logic_type_interpreter.rb
 - lib/steep/type_inference/method_call.rb
 - lib/steep/type_inference/method_params.rb
@@ -394,7 +401,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="