steep 1.2.1 → 1.3.0.pre.1

data/lib/steep/diagnostic/signature.rb

@@ -11,9 +11,7 @@ module Steep
         end
 
         def header_line
-          StringIO.new.tap do |io|
-            puts io
-          end.string
+          raise
         end
 
         def detail_lines
@@ -25,7 +23,9 @@ module Steep
         end
 
         def path
-          location.buffer.name
+          if location
+            Pathname(location.buffer.name)
+          end
         end
       end
 
@@ -166,7 +166,6 @@ module Steep
       class RecursiveAlias < Base
         attr_reader :class_name
         attr_reader :names
-        attr_reader :location
 
         def initialize(class_name:, names:, location:)
           super(location: location)
@@ -284,7 +283,6 @@ module Steep
 
       class InstanceVariableTypeError < Base
         attr_reader :name
-        attr_reader :variable
         attr_reader :var_type
         attr_reader :parent_type
 
@@ -318,7 +316,7 @@ module Steep
         private
 
         def mixin_name
-          case member
+          case mem = member
           when RBS::AST::Members::Prepend
             "prepend"
           when RBS::AST::Members::Include
@@ -329,6 +327,19 @@ module Steep
         end
       end
 
+      class InheritModuleError < Base
+        attr_reader :super_class
+
+        def initialize(super_class)
+          super(location: super_class.location)
+          @super_class = super_class
+        end
+
+        def header_line
+          "Cannot inherit from a module `#{super_class.name}`"
+        end
+      end
+
       class UnexpectedError < Base
         attr_reader :message
 
@@ -427,7 +438,7 @@ module Steep
           Diagnostic::Signature::RecursiveAlias.new(
             class_name: error.type.name,
             names: error.defs.map(&:name),
-            location: error.defs[0].original.location
+            location: error.defs[0].original&.location
           )
         when RBS::RecursiveAncestorError
           Diagnostic::Signature::RecursiveAncestor.new(
@@ -462,6 +473,8 @@ module Steep
             nonregular_type: factory.type(error.diagnostic.nonregular_type),
             location: error.location
           )
+        when RBS::InheritModuleError
+          Diagnostic::Signature::InheritModuleError.new(error.super_decl)
         else
           raise error
         end

data/lib/steep/drivers/check.rb

@@ -36,7 +36,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.spawn_typecheck_workers(
+        typecheck_workers = Server::WorkerProcess.start_typecheck_workers(
           steepfile: project.steepfile_path,
           args: command_line_patterns,
           delay_shutdown: true,

data/lib/steep/drivers/checkfile.rb

@@ -101,7 +101,7 @@ module Steep
 
         Steep.logger.info { "Starting #{count} workers for #{files.size} files..." }
 
-        typecheck_workers = Server::WorkerProcess.spawn_typecheck_workers(
+        typecheck_workers = Server::WorkerProcess.start_typecheck_workers(
           steepfile: project.steepfile_path,
           args: [],
           delay_shutdown: true,

data/lib/steep/drivers/langserver.rb

@@ -35,8 +35,8 @@ module Steep
       def run
         @project = load_config()
 
-        interaction_worker = Server::WorkerProcess.spawn_worker(:interaction, name: "interaction", steepfile: project.steepfile_path, steep_command: jobs_option.steep_command_value)
-        typecheck_workers = Server::WorkerProcess.spawn_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_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)
 
         master = Server::Master.new(
           project: project,

data/lib/steep/drivers/stats.rb

@@ -126,7 +126,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.spawn_typecheck_workers(
+        typecheck_workers = Server::WorkerProcess.start_typecheck_workers(
           steepfile: project.steepfile_path,
           delay_shutdown: true,
           args: command_line_patterns,

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.spawn_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_value, count: jobs_option.jobs_count_value)
 
         master = Server::Master.new(
           project: project,

data/lib/steep/drivers/worker.rb

@@ -3,7 +3,6 @@ module Steep
     class Worker
       attr_reader :stdout, :stderr, :stdin
 
-      attr_accessor :steepfile_path
       attr_accessor :worker_type
       attr_accessor :worker_name
       attr_accessor :delay_shutdown

data/lib/steep/server/lsp_formatter.rb

@@ -17,6 +17,8 @@ module Steep
         def to_s
           unless @array.empty?
             @array.join("\n\n----\n\n")
+          else
+            ""
           end
         end
 
@@ -83,7 +85,7 @@ module Steep
 #{decl.method_type}
 ```
 
-#{decl.method_def.comment.string.gsub(/\A([ \t]*\n)+/, "")}
+#{comment.string.gsub(/\A([ \t]*\n)+/, "")}
 EOM
               end
             end
@@ -108,10 +110,10 @@ EOM
           end
         when HoverProvider::Ruby::ConstantContent
           CommentBuilder.build do |builder|
-            if content.class_or_module?
+            if decl = content.class_or_module?
               builder << <<EOM
 ```rbs
-#{declaration_summary(content.decl.primary.decl)}
+#{declaration_summary(decl.primary.decl)}
 ```
 EOM
             end
@@ -141,6 +143,14 @@ EOM
               builder << comment.string
             end
           end
+        when HoverProvider::Ruby::TypeAssertionContent
+          CommentBuilder.build do |builder|
+            builder << <<-EOM
+`#{content.asserted_type.to_s}`
+
+↑ Converted from `#{content.original_type.to_s}`
+            EOM
+          end
         when HoverProvider::RBS::ClassContent
           CommentBuilder.build do |builder|
             builder << <<EOM

data/lib/steep/server/master.rb

@@ -796,7 +796,10 @@ module Steep
 
           Steep.logger.info "Sending $/typecheck/start notifications"
           typecheck_workers.each do |worker|
-            assignment = Services::PathAssignment.new(max_index: typecheck_workers.size, index: worker.index)
+            assignment = Services::PathAssignment.new(
+              max_index: typecheck_workers.size,
+              index: worker.index || raise
+            )
 
             job_queue << SendMessageJob.to_worker(
               worker,

data/lib/steep/server/worker_process.rb

@@ -18,48 +18,120 @@ module Steep
         @index = index
       end
 
-      def self.spawn_worker(type, name:, steepfile:, steep_command: "steep", options: [], delay_shutdown: false, index: nil)
+      def self.start_worker(type, name:, steepfile:, steep_command: "steep", index: nil, delay_shutdown: false, patterns: [])
+        begin
+          fork_worker(
+            type,
+            name: name,
+            steepfile: steepfile,
+            index: index,
+            delay_shutdown: delay_shutdown,
+            patterns: patterns
+          )
+        rescue NotImplementedError
+          spawn_worker(
+            type,
+            name: name,
+            steepfile: steepfile,
+            steep_command: steep_command,
+            index: index,
+            delay_shutdown: delay_shutdown,
+            patterns: patterns
+          )
+        end
+      end
+
+      def self.fork_worker(type, name:, steepfile:, index:, delay_shutdown:, patterns:)
+        stdin_in, stdin_out = IO.pipe
+        stdout_in, stdout_out = IO.pipe
+
+        worker = Drivers::Worker.new(stdout: stdout_out, stdin: stdin_in, stderr: STDERR)
+
+        worker.steepfile = steepfile
+        worker.worker_type = type
+        worker.worker_name = name
+        worker.delay_shutdown = delay_shutdown
+        if (max, this = index)
+          worker.max_index = max
+          worker.index = this
+        end
+        worker.commandline_args = patterns
+
+        pid = fork do
+          worker.run()
+        end
+
+        pid or raise
+
+        writer = LanguageServer::Protocol::Transport::Io::Writer.new(stdin_out)
+        reader = LanguageServer::Protocol::Transport::Io::Reader.new(stdout_in)
+
+        # @type var wait_thread: Thread & _ProcessWaitThread
+        wait_thread = _ = Thread.new { Process.waitpid(pid) }
+        wait_thread.define_singleton_method(:pid) { pid }
+
+        stdin_in.close
+        stdout_out.close
+
+        new(
+          reader: reader,
+          writer: writer,
+          stderr: STDERR,
+          wait_thread: wait_thread,
+          name: name,
+          index: index&.[](1)
+        )
+      end
+
+      def self.spawn_worker(type, name:, steepfile:, steep_command:, index:, delay_shutdown:, patterns:)
         args = ["--name=#{name}", "--steepfile=#{steepfile}"]
         args << (%w(debug info warn error fatal unknown)[Steep.logger.level].yield_self {|log_level| "--log-level=#{log_level}" })
+
         if Steep.log_output.is_a?(String)
           args << "--log-output=#{Steep.log_output}"
         end
+
+        if (max, this = index)
+          args << "--max-index=#{max}"
+          args << "--index=#{this}"
+        end
+
+        if delay_shutdown
+          args << "--delay-shutdown"
+        end
+
         command = case type
                   when :interaction
-                    [steep_command, "worker", "--interaction", *args, *options]
+                    [steep_command, "worker", "--interaction", *args, *patterns]
                   when :typecheck
-                    [steep_command, "worker", "--typecheck", *args, *options]
+                    [steep_command, "worker", "--typecheck", *args, *patterns]
                   else
                     raise "Unknown type: #{type}"
                   end
 
-        if delay_shutdown
-          command << "--delay-shutdown"
-        end
-
         stdin, stdout, thread = if Gem.win_platform?
-                                  Open3.popen2(*command, new_pgroup: true)
+                                  __skip__ = Open3.popen2(*command, new_pgroup: true)
                                 else
-                                  Open3.popen2(*command, pgroup: true)
+                                  __skip__ = Open3.popen2(*command, pgroup: true)
                                 end
         stderr = nil
 
         writer = LanguageServer::Protocol::Transport::Io::Writer.new(stdin)
         reader = LanguageServer::Protocol::Transport::Io::Reader.new(stdout)
 
-        new(reader: reader, writer: writer, stderr: stderr, wait_thread: thread, name: name, index: index)
+        new(reader: reader, writer: writer, stderr: stderr, wait_thread: thread, name: name, index: index&.[](1))
       end
 
-      def self.spawn_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: "steep", count: [Etc.nprocessors - 1, 1].max, delay_shutdown: false)
         count.times.map do |i|
-          spawn_worker(
+          start_worker(
             :typecheck,
             name: "typecheck@#{i}",
             steepfile: steepfile,
             steep_command: steep_command,
-            options: ["--max-index=#{count}", "--index=#{i}", *args],
+            index: [count, i],
+            patterns: args,
             delay_shutdown: delay_shutdown,
-            index: i
           )
         end
       end

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

@@ -2,9 +2,9 @@ module Steep
   module Services
     module HoverProvider
       class RBS
-        TypeAliasContent = Struct.new(:location, :decl, keyword_init: true)
-        ClassContent = Struct.new(:location, :decl, keyword_init: true)
-        InterfaceContent = Struct.new(:location, :decl, keyword_init: true)
+        TypeAliasContent = _ = Struct.new(:location, :decl, keyword_init: true)
+        ClassContent = _ = Struct.new(:location, :decl, keyword_init: true)
+        InterfaceContent = _ = Struct.new(:location, :decl, keyword_init: true)
 
         attr_reader :service
 
@@ -33,14 +33,14 @@ module Steep
             alias_decl = service.latest_env.alias_decls[head.name]&.decl or raise
 
             TypeAliasContent.new(
-              location: head.location,
+              location: head.location || raise,
               decl: alias_decl
             )
           when ::RBS::Types::ClassInstance, ::RBS::Types::ClassSingleton
             if loc_key == :name
               env = service.latest_env
-              class_decl = env.class_decls[head.name]&.decls[0]&.decl or raise
-              location = head.location[:name]
+              class_decl = env.class_decls[head.name]&.decls&.[](0)&.decl or raise
+              location = head.location&.[](:name) or raise
               ClassContent.new(
                 location: location,
                 decl: class_decl
@@ -49,7 +49,7 @@ module Steep
           when ::RBS::Types::Interface
             env = service.latest_env
             interface_decl = env.interface_decls[head.name]&.decl or raise
-            location = head.location[:name]
+            location = head.location&.[](:name) or raise
 
             InterfaceContent.new(
               location: location,

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

@@ -4,6 +4,7 @@ module Steep
       class Ruby
         TypeContent = _ = Struct.new(:node, :type, :location, keyword_init: true)
         VariableContent = _ = Struct.new(:node, :name, :type, :location, keyword_init: true)
+        TypeAssertionContent = _ = Struct.new(:node, :original_type, :asserted_type, :location, keyword_init: true)
         MethodCallContent = _ = Struct.new(:node, :method_call, :location, keyword_init: true)
         DefinitionContent = _ = Struct.new(:node, :method_name, :method_type, :definition, :location, keyword_init: true)
         ConstantContent = _ = Struct.new(:location, :full_name, :type, :decl, keyword_init: true) do
@@ -33,11 +34,15 @@ module Steep
           end
 
           def constant?
-            decl.is_a?(::RBS::Environment::SingleEntry)
+            if decl.is_a?(::RBS::Environment::SingleEntry)
+              decl
+            end
           end
 
           def class_or_module?
-            decl.is_a?(::RBS::Environment::MultiEntry)
+            if decl.is_a?(::RBS::Environment::MultiEntry)
+              decl
+            end
           end
         end
 
@@ -78,8 +83,9 @@ module Steep
         end
 
         def method_name_from_method(context, builder:)
-          defined_in = context.method.defined_in
-          method_name = context.name
+          context.method or raise
+          defined_in = context.method.defined_in or raise
+          method_name = context.name or raise
 
           case
           when defined_in.class?
@@ -171,6 +177,15 @@ module Steep
                   decl: decl
                 )
               end
+            when :assertion
+              original_node, _ = node.children
+
+              original_type = typing.type_of(node: original_node)
+              asserted_type = typing.type_of(node: node)
+
+              if original_type != asserted_type
+                return TypeAssertionContent.new(node: node, original_type: original_type, asserted_type: asserted_type, location: node.location.expression)
+              end
             end
 
             TypeContent.new(

data/lib/steep/services/signature_service.rb

@@ -174,7 +174,7 @@ module Steep
                                file.decls
                              else
                                # factory is not used here because the error is a syntax error.
-                               Diagnostic::Signature.from_rbs_error(file.decls, factory: nil)
+                               Diagnostic::Signature.from_rbs_error(file.decls, factory: _ = nil)
                              end
                 diagnostics << diagnostic
               end
@@ -214,6 +214,7 @@ module Steep
 
       def update_env(updated_files, paths:)
         Steep.logger.tagged "#update_env" do
+          # @type var errors: Array[RBS::BaseError]
           errors = []
           new_decls = Set[].compare_by_identity
 
@@ -230,7 +231,9 @@ module Steep
             updated_files.each_value do |content|
               case decls = content.decls
               when RBS::BaseError
-                errors << content.decls
+                errors << decls
+              when Diagnostic::Signature::UnexpectedError
+                return [decls]
               else
                 begin
                   decls.each do |decl|
@@ -255,7 +258,7 @@ module Steep
           unless errors.empty?
             return errors.map {|error|
               # Factory will not be used because of the possible error types.
-              Diagnostic::Signature.from_rbs_error(error, factory: nil)
+              Diagnostic::Signature.from_rbs_error(error, factory: _ = nil)
             }
           end
 
@@ -277,7 +280,7 @@ module Steep
 
           unless errors.empty?
             # Builder won't be used.
-            factory = AST::Types::Factory.new(builder: nil)
+            factory = AST::Types::Factory.new(builder: _ = nil)
             return errors.map {|error| Diagnostic::Signature.from_rbs_error(error, factory: factory) }
           end
 

data/lib/steep/signature/validator.rb

@@ -20,7 +20,7 @@ module Steep
       end
 
       def each_error(&block)
-        if block_given?
+        if block
           @errors.each(&block)
         else
           enum_for :each_error
@@ -64,6 +64,8 @@ module Steep
           )
 
           type_params.zip(type_args).each do |param, arg|
+            arg or raise
+
             if param.upper_bound
               upper_bound_type = factory.type(param.upper_bound).subst(subst)
               arg_type = factory.type(arg)
@@ -121,7 +123,7 @@ module Steep
 
         if name && type_params && type_args
           if !type_params.empty? && !type_args.empty?
-            validate_type_application_constraints(type.name, type_params, type_args, location: type.location)
+            validate_type_application_constraints(name, type_params, type_args, location: type.location)
           end
         end
 
@@ -156,19 +158,21 @@ module Steep
       end
 
       def mixin_constraints(definition, mixin_ancestors, immediate_self_types:)
+        # @type var relations: Array[[Subtyping::Relation[AST::Types::t], RBS::Definition::Ancestor::Instance]]
         relations = []
 
         self_type = checker.factory.type(definition.self_type)
         if immediate_self_types && !immediate_self_types.empty?
-          self_type = AST::Types::Intersection.build(
-            types: immediate_self_types.map {|st| ancestor_to_type(st) }.push(self_type),
-            location: nil
-          )
+          # @type var sts: Array[AST::Types::t]
+          sts = immediate_self_types.map {|st| ancestor_to_type(st) }
+          self_type = AST::Types::Intersection.build(types: sts.push(self_type), location: nil)
         end
 
         mixin_ancestors.each do |ancestor|
           args = ancestor.args.map {|type| checker.factory.type(type) }
           ancestor_ancestors = builder.ancestor_builder.one_instance_ancestors(ancestor.name)
+          ancestor_ancestors.self_types or raise
+          ancestor_ancestors.params or raise
           self_constraints = ancestor_ancestors.self_types.map do |self_ancestor|
             s = Interface::Substitution.build(ancestor_ancestors.params, args)
             ancestor_to_type(self_ancestor).subst(s)
@@ -263,7 +267,7 @@ module Steep
                 end
 
                 ancestors = builder.ancestor_builder.one_instance_ancestors(name)
-                mixin_constraints(definition, ancestors.included_modules, immediate_self_types: ancestors.self_types).each do |relation, ancestor|
+                mixin_constraints(definition, ancestors.included_modules || raise, immediate_self_types: ancestors.self_types).each do |relation, ancestor|
                   checker.check(
                     relation,
                     self_type: AST::Types::Self.new,
@@ -271,6 +275,8 @@ module Steep
                     class_type: AST::Types::Class.new,
                     constraints: Subtyping::Constraints.empty
                   ).else do
+                    raise if ancestor.source.is_a?(Symbol)
+
                     @errors << Diagnostic::Signature::ModuleSelfTypeError.new(
                       name: name,
                       location: ancestor.source&.location || raise,
@@ -292,6 +298,14 @@ module Steep
             end
 
             builder.build_singleton(name).tap do |definition|
+              entry =
+                case definition.entry
+                when RBS::Environment::ClassEntry, RBS::Environment::ModuleEntry
+                  definition.entry
+                else
+                  raise
+                end
+
               definition.instance_variables.each do |name, var|
                 if parent = var.parent_variable
                   var_type = checker.factory.type(var.type)
@@ -327,7 +341,7 @@ module Steep
               definition.class_variables.each do |name, var|
                 if var.declared_in == definition.type_name
                   if (parent = var.parent_variable) && var.declared_in != parent.declared_in
-                    class_var = definition.entry.decls.flat_map {|decl| decl.decl.members }.find do |member|
+                    class_var = entry.decls.flat_map {|decl| decl.decl.members }.find do |member|
                       member.is_a?(RBS::AST::Members::ClassVariable) && member.name == name
                     end
 
@@ -336,7 +350,7 @@ module Steep
                         class_name: definition.type_name,
                         other_class_name: parent.declared_in,
                         variable_name: name,
-                        location: class_var.location[:name]
+                        location: class_var.location&.[](:name)
                       )
                     end
                   end
@@ -344,6 +358,7 @@ module Steep
               end
 
               ancestors = builder.ancestor_builder.one_singleton_ancestors(name)
+              ancestors.extended_modules or raise
               mixin_constraints(definition, ancestors.extended_modules, immediate_self_types: ancestors.self_types).each do |relation, ancestor|
                 checker.check(
                   relation,
@@ -352,6 +367,8 @@ module Steep
                   class_type: AST::Types::Class.new,
                   constraints: Subtyping::Constraints.empty
                 ).else do
+                  raise if ancestor.source.is_a?(Symbol)
+                  
                   @errors << Diagnostic::Signature::ModuleSelfTypeError.new(
                     name: name,
                     location: ancestor.source&.location || raise,
@@ -381,19 +398,23 @@ module Steep
               builder.build_instance(ancestor.name)
             when ancestor.name.interface?
               builder.build_interface(ancestor.name)
+            else
+              raise
             end
 
           location =
-            if ancestor.source == :super
+            case ancestor.source
+            when :super
               primary_decl = env.class_decls[name].primary.decl
+              primary_decl.is_a?(RBS::AST::Declarations::Class) or raise
               if super_class = primary_decl.super_class
                 super_class.location
               else
                 # Implicit super class (Object): this can be skipped in fact...
-                primary_decl.location[:name]
+                primary_decl.location&.aref(:name)
               end
             else
-              ancestor.source.location
+              ancestor.source&.location
             end
 
           validate_type_application_constraints(
@@ -423,12 +444,14 @@ module Steep
                 case ancestor
                 when RBS::Definition::Ancestor::Instance
                   # Interface ancestor cannot be other than Interface
+                  ancestor.source.is_a?(Symbol) and raise
+
                   defn = builder.build_interface(ancestor.name)
                   validate_type_application_constraints(
                     ancestor.name,
                     defn.type_params_decl,
                     ancestor.args,
-                    location: ancestor.source.location || raise
+                    location: ancestor.source&.location || raise
                   )
                 end
               end