steep 1.3.0.pre.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f43e7d3a3abaa803d24bb2ef587d495e1d000380e9a4de2318d6371403a70238
-  data.tar.gz: d5fd761223ef4dcc6dcc4e76f3eb952a5dab19a5713e73e024871043ae6fbab8
+  metadata.gz: f878620b37610ff6bb38ba9f71c8275ebebf1a119969acca92dae226e9e82371
+  data.tar.gz: e5cfe0950b4cfe16d3ac2aeb0992601b5a0b43315736b637cae05792b0774bb9
 SHA512:
-  metadata.gz: 243b110b292f2da9dbde2f348aa9dd23353da8dc0854776cb10f74f21e97103af23f868eff56b48a78c9e400399858062b2d07a72ddb78493abcc33f8bd2fe1d
-  data.tar.gz: 36e71cdf0113ff3b4d3946cf44befd945e8304b0deb16478762f90aa4f7f6a58bca28cc0f09f70155196fc116ea39164543b254a870b4e8c81cb203b6980cbfd
+  metadata.gz: c81207ff4dd7893ccc4680b4d6bc1c74b36a59badbfac8c08f02f7ecb6e17f887bc440f40c2dcfe840f219df003c384d0365f54b55340c2ddce771492945b232
+  data.tar.gz: bca9c65b22080f4d8e4f8cf162146a7868f520f4f13e34c22e79a95e5ba81f186b914f422afb89918c6d095d896badcd07832a731d8dd0cd152a908a6f7a71ad

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 ## master
 
+## 1.3.0 (2022-11-25)
+
+### Type checker core
+
+* Type check types ([#676](https://github.com/soutaro/steep/pull/676))
+
+## 1.3.0.pre.2 (2022-11-23)
+
+### Type checker core
+
+* Add missing `#level` method ([\#671](https://github.com/soutaro/steep/pull/671))
+* Cache `constant_resolver` among files in a target([\#673](https://github.com/soutaro/steep/pull/673))
+* Early return from type checking overloads ([\#674](https://github.com/soutaro/steep/pull/674))
+
+### Commandline tool
+
+* Spawn worker processes if `--steep-command` is specified ([\#672](https://github.com/soutaro/steep/pull/672))
+
 ## 1.3.0.pre.1 (2022-11-22)
 
 ### Type checker core

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    steep (1.3.0.pre.1)
+    steep (1.3.0)
       activesupport (>= 5.1)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
@@ -12,7 +12,7 @@ PATH
       parallel (>= 1.0.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 2.8.0.pre)
+      rbs (>= 2.8.0)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
@@ -54,7 +54,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.8.0.pre.1)
+    rbs (2.8.0)
     ruby-debug-ide (0.7.3)
       rake (>= 0.8.1)
     securerandom (0.2.0)

data/Gemfile.steep

@@ -1,4 +1,3 @@
 source "https://rubygems.org"
 
-gem 'steep', '~> 1.2.0'
-gem "rbs", '~> 2.8.0.pre'
+gem 'steep', '~> 1.3.0.pre'

data/Gemfile.steep.lock

@@ -27,9 +27,9 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.8.0.pre.1)
+    rbs (2.8.0)
     securerandom (0.2.0)
-    steep (1.2.1)
+    steep (1.3.0.pre.2)
       activesupport (>= 5.1)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
@@ -40,7 +40,7 @@ GEM
       parallel (>= 1.0.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 2.7.0)
+      rbs (>= 2.8.0.pre)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
@@ -55,8 +55,7 @@ PLATFORMS
   arm64-darwin-21
 
 DEPENDENCIES
-  rbs (~> 2.8.0.pre)
-  steep (~> 1.2.0)
+  steep (~> 1.3.0.pre)
 
 BUNDLED WITH
    2.3.15

data/bin/steep-prof

@@ -2,7 +2,7 @@
 
 require "stackprof"
 
-mode = (ENV["STEEP_STACKPROF_MODE"] || :wall).to_sym
+mode = (ENV["STEEP_STACKPROF_MODE"] || :cpu).to_sym
 out = ENV["STEEP_STACKPROF_OUT"] || "tmp/stackprof-#{mode}-steep.dump"
 interval = ENV["STEEP_STACKPROF_INTERVAL"]&.to_i || 1000
 

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

@@ -27,11 +27,17 @@ module Steep
         alias eql? ==
 
         def subst(s)
-          s.module_type or raise "Unexpected substitution: #{inspect}"
+          if s.module_type
+            s.module_type
+          else
+            self
+          end
         end
 
-        def free_variables()
-          @fvs = Set.new([self])
+        @@fvs = Set[instance]
+
+        def free_variables
+          @@fvs
         end
 
         include Helper::NoChild

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

@@ -204,7 +204,7 @@ module Steep
           when Logic::Base
             RBS::Types::Bases::Bool.new(location: type.location)
           else
-            raise "Unexpected type given: #{type} (#{type.class})"
+            __skip__ = raise "Unexpected type given: #{type} (#{type.class})"
           end
         end
 
@@ -248,7 +248,14 @@ module Steep
           RBS::AST::TypeParam.new(
             name: type_param.name,
             variance: type_param.variance,
-            upper_bound: type_param.upper_bound&.yield_self {|u| type_1(u) },
+            upper_bound: type_param.upper_bound&.yield_self {|u|
+              case u_ = type_1(u)
+              when RBS::Types::ClassInstance, RBS::Types::ClassSingleton, RBS::Types::Interface
+                u_
+              else
+                raise "`#{u_}` cannot be type parameter upper bound"
+              end
+            },
             location: type_param.location
           ).unchecked!(type_param.unchecked)
         end

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

@@ -4,12 +4,13 @@ module Steep
       module Helper
         module ChildrenLevel
           def level_of_children(children)
-            children.map(&:level).sort {|a, b| b.size <=> a.size }.inject() do |a, b|
-              a.zip(b).map do |(x, y)|
+            levels = children.map(&:level)
+            children.map(&:level).sort {|a, b| (b.size <=> a.size) || 0 }.inject() do |a, b|
+              a.zip(b).map do |x, y|
                 if x && y
                   x + y
                 else
-                  x || y
+                  x || y || raise
                 end
               end
             end || []

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

@@ -23,11 +23,16 @@ module Steep
         alias eql? ==
 
         def subst(s)
-          s.instance_type or raise "Unexpected substitution: #{inspect}"
+          if s.instance_type
+            s.instance_type
+          else
+            self
+          end
         end
 
-        def free_variables()
-          @fvs = Set.new([self])
+        @@fvs = Set[instance]
+        def free_variables
+          @@fvs
         end
 
         include Helper::NoChild

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

@@ -35,7 +35,7 @@ module Steep
             when 0
               AST::Types::Top.new(location: location)
             when 1
-              tys.first
+              tys.first || raise
             else
               new(types: dups.to_a, location: location)
             end
@@ -73,7 +73,11 @@ module Steep
         include Helper::ChildrenLevel
 
         def each_child(&block)
-          types.each(&block)
+          if block
+            types.each(&block)
+          else
+            types.each
+          end
         end
 
         def level

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

@@ -54,7 +54,7 @@ module Steep
                   when false
                     Builtin::FalseClass
                   else
-                    raise "Unexpected literal type: #{value.inspect}"
+                    raise "Unexpected literal type: #{(_ = value).inspect}"
                   end
 
           Name::Instance.new(name: klass.module_name, args: [], location: location)

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

@@ -9,9 +9,7 @@ module Steep
             self
           end
 
-          def free_variables
-            @fvs ||= Set[]
-          end
+          include Helper::NoFreeVariables
 
           include Helper::NoChild
 
@@ -28,6 +26,10 @@ module Steep
           def to_s
             "<% #{self.class} %>"
           end
+
+          def level
+            [0]
+          end
         end
 
         class Not < Base

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

@@ -51,14 +51,16 @@ module Steep
           end
 
           def with_location(new_location)
-            self.class.new(name: name, args: args, location: new_location)
+            _ = self.class.new(name: name, args: args, location: new_location)
           end
 
           def subst(s)
             if free_variables.intersect?(s.domain)
-              self.class.new(location: location,
-                             name: name,
-                             args: args.map {|a| a.subst(s) })
+              _ = self.class.new(
+                location: location,
+                name: name,
+                args: args.map {|a| a.subst(s) }
+              )
             else
               self
             end
@@ -73,7 +75,11 @@ module Steep
           end
 
           def each_child(&block)
-            args.each(&block)
+            if block
+              args.each(&block)
+            else
+              args.each
+            end
           end
 
           include Helper::ChildrenLevel

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

@@ -68,10 +68,6 @@ module Steep
           [0] + level_of_children(children)
         end
 
-        def closed?
-          type.closed? && (block.nil? || block.closed?) &&  (self_type ? self_type.closed? : false)
-        end
-
         def with_location(new_location)
           self.class.new(location: new_location, block: block, type: type, self_type: self_type)
         end
@@ -103,7 +99,11 @@ module Steep
         end
 
         def block_required?
-          block && !block.optional?
+          if block
+            !block.optional?
+          else
+            false
+          end
         end
 
         def each_child(&block)

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

@@ -43,7 +43,11 @@ module Steep
         include Helper::ChildrenLevel
 
         def each_child(&block)
-          elements.each_value(&block)
+          if block
+            elements.each_value(&block)
+          else
+            elements.each_value
+          end
         end
 
         def level

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

@@ -29,11 +29,17 @@ module Steep
         include Helper::NoChild
 
         def subst(s)
-          s.self_type or raise "Unexpected substitution: #{inspect}"
+          if s.self_type
+            s.self_type
+          else
+            self
+          end
         end
 
+        @@fvs = Set[instance]
+
         def free_variables
-          @fvs ||= Set.new([self])
+          @@fvs
         end
 
         def level

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

@@ -31,17 +31,19 @@ module Steep
         end
 
         def free_variables()
-          @fvs ||= Set.new.tap do |set|
-            types.each do |type|
-              set.merge(type.free_variables)
-            end
+          @fvs ||= each_child.with_object(Set[]) do |type, set| #$ Set[variable]
+            set.merge(type.free_variables)
           end
         end
 
         include Helper::ChildrenLevel
 
         def each_child(&block)
-          types.each(&block)
+          if block
+            types.each(&block)
+          else
+            types.each
+          end
         end
 
         def level

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

@@ -12,7 +12,9 @@ module Steep
 
         def self.build(types:, location: nil)
           return AST::Types::Bot.new if types.empty?
-          return types.first if types.size == 1
+          if types.size == 1
+            return types.first || raise
+          end
 
           types.flat_map do |type|
             if type.is_a?(Union)
@@ -36,7 +38,7 @@ module Steep
             when 0
               AST::Types::Bot.new
             when 1
-              tys.first
+              tys.first || raise
             else
               new(types: tys, location: location)
             end
@@ -49,7 +51,7 @@ module Steep
         end
 
         def hash
-          @hash ||= types.inject(self.class.hash) {|c, type| type.hash ^ c }
+          @hash ||= types.inject(self.class.hash) {|c, type| type.hash ^ c } #$ Integer
         end
 
         alias eql? ==
@@ -71,7 +73,11 @@ module Steep
         end
 
         def each_child(&block)
-          types.each(&block)
+          if block
+            types.each(&block)
+          else
+            types.each
+          end
         end
 
         include Helper::ChildrenLevel

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

@@ -22,7 +22,7 @@ module Steep
         alias eql? ==
 
         def self.fresh_name(name)
-          @mutex ||= Mutex.new
+          @mutex ||= Thread::Mutex.new
 
           @mutex.synchronize do
             @max ||= 0

data/lib/steep/drivers/check.rb

@@ -40,7 +40,7 @@ module Steep
           steepfile: project.steepfile_path,
           args: command_line_patterns,
           delay_shutdown: true,
-          steep_command: jobs_option.steep_command_value,
+          steep_command: jobs_option.steep_command,
           count: jobs_option.jobs_count_value
         )
 

data/lib/steep/drivers/checkfile.rb

@@ -105,7 +105,7 @@ module Steep
           steepfile: project.steepfile_path,
           args: [],
           delay_shutdown: true,
-          steep_command: jobs_option.steep_command_value,
+          steep_command: jobs_option.steep_command,
           count: count
         )
 

data/lib/steep/drivers/langserver.rb

@@ -35,8 +35,8 @@ module Steep
       def run
         @project = load_config()
 
-        interaction_worker = Server::WorkerProcess.start_worker(:interaction, name: "interaction", steepfile: project.steepfile_path, steep_command: jobs_option.steep_command_value)
-        typecheck_workers = Server::WorkerProcess.start_typecheck_workers(steepfile: project.steepfile_path, args: [], steep_command: jobs_option.steep_command_value, count: jobs_option.jobs_count_value)
+        interaction_worker = Server::WorkerProcess.start_worker(:interaction, name: "interaction", steepfile: project.steepfile_path, steep_command: jobs_option.steep_command)
+        typecheck_workers = Server::WorkerProcess.start_typecheck_workers(steepfile: project.steepfile_path, args: [], steep_command: jobs_option.steep_command, count: jobs_option.jobs_count_value)
 
         master = Server::Master.new(
           project: project,

data/lib/steep/drivers/stats.rb

@@ -130,7 +130,7 @@ module Steep
           steepfile: project.steepfile_path,
           delay_shutdown: true,
           args: command_line_patterns,
-          steep_command: jobs_option.steep_command_value,
+          steep_command: jobs_option.steep_command,
           count: jobs_option.jobs_count_value
         )
 

data/lib/steep/drivers/utils/jobs_option.rb

@@ -17,10 +17,6 @@ module Steep
         def jobs_count_value
           jobs_count || default_jobs_count
         end
-
-        def steep_command_value
-          steep_command || "steep"
-        end
       end
     end
   end

data/lib/steep/drivers/watch.rb

@@ -42,7 +42,7 @@ module Steep
         server_reader = LanguageServer::Protocol::Transport::Io::Reader.new(server_read)
         server_writer = LanguageServer::Protocol::Transport::Io::Writer.new(server_write)
 
-        typecheck_workers = Server::WorkerProcess.start_typecheck_workers(steepfile: project.steepfile_path, args: dirs.map(&:to_s), steep_command: jobs_option.steep_command_value, count: jobs_option.jobs_count_value)
+        typecheck_workers = Server::WorkerProcess.start_typecheck_workers(steepfile: project.steepfile_path, args: dirs.map(&:to_s), steep_command: jobs_option.steep_command, count: jobs_option.jobs_count_value)
 
         master = Server::Master.new(
           project: project,

data/lib/steep/interface/substitution.rb

@@ -6,7 +6,7 @@ module Steep
         attr_reader :types_size
 
         def initialize(vars_size:, types_size:)
-          @var_size = vars_size
+          @vars_size = vars_size
           @types_size = types_size
 
           super "Invalid substitution: vars.size=#{vars_size}, types.size=#{types_size}"
@@ -43,15 +43,15 @@ module Steep
         set = Set.new
 
         set.merge(dictionary.keys)
-        set << AST::Types::Instance.instance unless instance_type.is_a?(AST::Types::Instance)
-        set << AST::Types::Class.instance unless instance_type.is_a?(AST::Types::Class)
-        set << AST::Types::Instance.instance unless instance_type.is_a?(AST::Types::Self)
+        set << AST::Types::Self.instance if self_type
+        set << AST::Types::Class.instance if module_type
+        set << AST::Types::Instance.instance if instance_type
 
         set
       end
 
       def to_s
-        a = []
+        a = [] #: Array[String]
 
         dictionary.each do |x, ty|
           a << "#{x} -> #{ty}"
@@ -87,12 +87,13 @@ module Steep
         end
       end
 
-      def self.build(vars, types = nil, instance_type: AST::Types::Instance.instance, module_type: AST::Types::Class.instance, self_type: AST::Types::Self.instance)
+      def self.build(vars, types = nil, instance_type: nil, module_type: nil, self_type: nil)
         types ||= vars.map {|var| AST::Types::Var.fresh(var) }
 
         raise InvalidSubstitutionError.new(vars_size: vars.size, types_size: types.size) unless vars.size == types.size
 
-        dic = vars.zip(types).each.with_object({}) do |(var, type), d|
+        dic = vars.zip(types).each.with_object({}) do |(var, type), d| #$ Hash[Symbol, AST::Types::t]
+          type or raise
           d[var] = type
         end
 
@@ -130,9 +131,9 @@ module Steep
           end
         end
 
-        @instance_type = instance_type.subst(s)
-        @module_type = module_type.subst(s)
-        @self_type = self_type.subst(s)
+        @instance_type = instance_type.subst(s) if instance_type
+        @module_type = module_type.subst(s) if module_type
+        @self_type = self_type.subst(s) if self_type
 
         self
       end

data/lib/steep/server/worker_process.rb

@@ -18,22 +18,27 @@ module Steep
         @index = index
       end
 
-      def self.start_worker(type, name:, steepfile:, steep_command: "steep", index: nil, delay_shutdown: false, patterns: [])
+      def self.start_worker(type, name:, steepfile:, steep_command:, index: nil, delay_shutdown: false, patterns: [])
         begin
-          fork_worker(
-            type,
-            name: name,
-            steepfile: steepfile,
-            index: index,
-            delay_shutdown: delay_shutdown,
-            patterns: patterns
-          )
+          unless steep_command
+            fork_worker(
+              type,
+              name: name,
+              steepfile: steepfile,
+              index: index,
+              delay_shutdown: delay_shutdown,
+              patterns: patterns
+            )
+          else
+            # Use `#spawn_worker`
+            raise NotImplementedError
+          end
         rescue NotImplementedError
           spawn_worker(
             type,
             name: name,
             steepfile: steepfile,
-            steep_command: steep_command,
+            steep_command: steep_command || "steep",
             index: index,
             delay_shutdown: delay_shutdown,
             patterns: patterns
@@ -122,7 +127,7 @@ module Steep
         new(reader: reader, writer: writer, stderr: stderr, wait_thread: thread, name: name, index: index&.[](1))
       end
 
-      def self.start_typecheck_workers(steepfile:, args:, steep_command: "steep", count: [Etc.nprocessors - 1, 1].max, delay_shutdown: false)
+      def self.start_typecheck_workers(steepfile:, args:, steep_command:, count: [Etc.nprocessors - 1, 1].max, delay_shutdown: false)
         count.times.map do |i|
           start_worker(
             :typecheck,

data/lib/steep/services/completion_provider.rb

@@ -88,7 +88,8 @@ module Steep
         end
 
         Steep.measure "typechecking" do
-          @typing = TypeCheckService.type_check(source: source, subtyping: subtyping)
+          resolver = RBS::Resolver::ConstantResolver.new(builder: subtyping.factory.definition_builder)
+          @typing = TypeCheckService.type_check(source: source, subtyping: subtyping, constant_resolver: resolver)
         end
       end
 

data/lib/steep/services/goto_service.rb

@@ -211,8 +211,9 @@ module Steep
         subtyping = signature_service.current_subtyping or return
         source = Source.parse(content, path: path, factory: subtyping.factory)
         source = source.without_unrelated_defs(line: line, column: column)
+        resolver = RBS::Resolver::ConstantResolver.new(builder: subtyping.factory.definition_builder)
         [
-          Services::TypeCheckService.type_check(source: source, subtyping: subtyping),
+          Services::TypeCheckService.type_check(source: source, subtyping: subtyping, constant_resolver: resolver),
           signature_service
         ]
       rescue

data/lib/steep/services/hover_provider/ruby.rb

@@ -77,7 +77,8 @@ module Steep
           subtyping = service.signature_services[target.name].current_subtyping or return
           source = Source.parse(content, path: path, factory: subtyping.factory)
           source = source.without_unrelated_defs(line: line, column: column)
-          Services::TypeCheckService.type_check(source: source, subtyping: subtyping)
+          resolver = ::RBS::Resolver::ConstantResolver.new(builder: subtyping.factory.definition_builder)
+          Services::TypeCheckService.type_check(source: source, subtyping: subtyping, constant_resolver: resolver)
         rescue
           nil
         end