steep 1.9.3 → 1.10.0.dev.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02b4d30c83adaf9c3784371edd9f014f772273cec3ea72e9befeb3d882a897c6
-  data.tar.gz: 1146ee79d9b908d96f3079de416ba2d10b43e8b2a32ee440d4a2b7519a29558c
+  metadata.gz: c16f09c4999f414317b991d4c36ed5a5b51a2bf785d4f865ab9d698890050205
+  data.tar.gz: f0a34b2b9c27703a87375e19a33055bed47ae3cc1ac8dae4fc846a931e054223
 SHA512:
-  metadata.gz: 23ab3d323a5395ab7fe9ac37c98c657c780a949637ff4126ea2b0c320f27031fba615239eeaeaa028409cbf9b22dc1016c4299c31a545b387bec61785321a3fa
-  data.tar.gz: 6e94877bc417d187f49f7f8dc105058835785146ad4172d7d98751e790ea05b42f191db588a516fb0151949f68664a16c5ddb2a6220915613cc98f1be824ab0f
+  metadata.gz: 24d081be36d7b8bd33ffe5786db94ff5e8a1b505c7dfa72e4076b3c7612d78e6c5978bebba991d792e9fc4b97bb0da3f004db308eade2b6ed6e63075ce3f9d9f
+  data.tar.gz: 68069586284621fac6acbc1f279a3b866b26dcba5436334f16abb6db3466c2917a549c0f2b48bfc205eab74ee3d865124ab1a87f7b02403bb2a8b39d2c67a938

data/Steepfile

@@ -13,7 +13,6 @@ if (source = rbs_dep&.source).is_a?(Bundler::Source::Path)
   end
 else
   FileUtils.rm_f(tmp_rbs_dir)
-  library "rbs"
 end
 
 target :app do
@@ -64,5 +63,9 @@ target :bin do
   check "bin/generate-diagnostics-docs.rb"
   signature "tmp/rbs-inline/bin"
 
-  library "rbs"
+  if tmp_rbs_dir.directory?
+    signature tmp_rbs_dir.to_s
+  else
+    library "rbs"
+  end
 end

data/lib/steep/annotations_helper.rb

@@ -0,0 +1,18 @@
+module Steep
+  module AnnotationsHelper
+    module_function
+
+    def deprecated_annotation?(annotations)
+      annotations.reverse_each do |annotation|
+        if match = annotation.string.match(/deprecated(:\s*(?<message>.+))?/)
+          return [annotation, match[:message]]
+        end
+        if match = annotation.string.match(/steep:deprecated(:\s*(?<message>.+))?/)
+          return [annotation, match[:message]]
+        end
+      end
+
+      nil
+    end
+  end
+end

data/lib/steep/ast/ignore.rb

@@ -93,15 +93,14 @@ module Steep
       def self.parse(comment, buffer)
         return unless comment.inline?
 
-        comment_location = RBS::Location.new(buffer, comment.loc.expression.begin_pos, comment.loc.expression.end_pos)
+        begin_pos = buffer.loc_to_pos([comment.loc.line, comment.loc.column])
+        end_pos = buffer.loc_to_pos([comment.loc.last_line, comment.loc.last_column])
+        comment_location = RBS::Location.new(buffer, begin_pos, end_pos)
         scanner = BufferScanner.new(comment_location)
 
         scanner.scan(/#/)
         scanner.skip(/\s*/)
 
-        begin_pos = comment.location.expression.begin_pos
-        end_pos = comment.location.expression.end_pos
-
         case
         when loc = scanner.scan(/steep:ignore:start\b/)
           scanner.skip(/\s*/)

data/lib/steep/cli.rb

@@ -24,12 +24,13 @@ module Steep
         opts.banner = <<~USAGE
           Usage: steep [options]
 
-          available commands: #{CLI.available_commands.join(', ')}
+          Available commands:
+              #{CLI.available_commands.join(', ')}
 
           Options:
         USAGE
 
-        opts.on("--version") do
+        opts.on("--version", "Print Steep version") do
           process_version
           exit 0
         end
@@ -60,6 +61,10 @@ module Steep
       __send__(:"process_#{command}")
     end
 
+    def handle_steepfile_option(opts, command)
+      opts.on("--steepfile=PATH", "Specify path to Steepfile") {|path| command.steepfile = Pathname(path) }
+    end
+
     def handle_logging_options(opts)
       opts.on("--log-level=LEVEL", "Specify log level: debug, info, warn, error, fatal") do |level|
         Steep.logger.level = level
@@ -101,10 +106,16 @@ module Steep
     def process_init
       Drivers::Init.new(stdout: stdout, stderr: stderr).tap do |command|
         OptionParser.new do |opts|
-          opts.banner = "Usage: steep init [options]"
+          opts.banner = <<BANNER
+Usage: steep init [options]
+
+Description:
+    Generates a Steepfile at specified path.
 
-          opts.on("--steepfile=PATH") {|path| command.steepfile = Pathname(path) }
-          opts.on("--force") { command.force_write = true }
+Options:
+BANNER
+          handle_steepfile_option(opts, command)
+          opts.on("--force", "Overwrite the Steepfile if it already exists") { command.force_write = true }
 
           handle_logging_options opts
         end.parse!(argv)
@@ -114,9 +125,19 @@ module Steep
     def process_check
       Drivers::Check.new(stdout: stdout, stderr: stderr).tap do |command|
         OptionParser.new do |opts|
-          opts.banner = "Usage: steep check [options] [sources]"
+          opts.banner = <<BANNER
+Usage: steep check [options] [paths]
+
+Description:
+    Type check the program.
+
+    If paths are specified, it type checks and validates the files at the given path.
+    Otherwise, it type checks and validates all files in the project or the groups if specified.
+
+Options:
+BANNER
 
-          opts.on("--steepfile=PATH") {|path| command.steepfile = Pathname(path) }
+          handle_steepfile_option(opts, command)
           opts.on("--with-expectations[=PATH]", "Type check with expectations saved in PATH (or steep_expectations.yml)") do |path|
             command.with_expectations_path = Pathname(path || "steep_expectations.yml")
           end
@@ -172,16 +193,23 @@ module Steep
 
         setup_jobs_for_ci(command.jobs_option)
 
-        command.command_line_patterns.push *argv
+        command.command_line_patterns.push(*argv)
       end.run
     end
 
     def process_checkfile
       Drivers::Checkfile.new(stdout: stdout, stderr: stderr).tap do |command|
         OptionParser.new do |opts|
-          opts.banner = "Usage: steep checkfile [options] [files]"
+          opts.banner = <<BANNER
+Usage: steep checkfile [options] [files]
 
-          opts.on("--steepfile=PATH") {|path| command.steepfile = Pathname(path) }
+Description:
+    Deprecated: Use `steep check` instead.
+
+Options:
+BANNER
+
+          handle_steepfile_option(opts, command)
           opts.on("--all-rbs", "Type check all RBS files") { command.all_rbs = true }
           opts.on("--all-ruby", "Type check all Ruby files") { command.all_ruby = true }
           opts.on("--stdin", "Read files to type check from stdin") do
@@ -197,16 +225,23 @@ module Steep
 
         setup_jobs_for_ci(command.jobs_option)
 
-        command.command_line_args.push *argv
+        command.command_line_args.push(*argv)
       end.run
     end
 
     def process_stats
       Drivers::Stats.new(stdout: stdout, stderr: stderr).tap do |command|
         OptionParser.new do |opts|
-          opts.banner = "Usage: steep stats [options] [sources]"
+          opts.banner = <<BANNER
+Usage: steep stats [options] [sources]
+
+Description:
+    Displays statistics about the typing of method calls.
 
-          opts.on("--steepfile=PATH") {|path| command.steepfile = Pathname(path) }
+Options:
+BANNER
+
+          handle_steepfile_option(opts, command)
           opts.on("--format=FORMAT", "Specify output format: csv, table") {|format| command.format = format }
           handle_jobs_option command.jobs_option, opts
           handle_logging_options opts
@@ -214,7 +249,7 @@ module Steep
 
         setup_jobs_for_ci(command.jobs_option)
 
-        command.command_line_patterns.push *argv
+        command.command_line_patterns.push(*argv)
       end.run
     end
 
@@ -226,19 +261,33 @@ module Steep
     def process_annotations
       Drivers::Annotations.new(stdout: stdout, stderr: stderr).tap do |command|
         OptionParser.new do |opts|
-          opts.banner = "Usage: steep annotations [options] [sources]"
+          opts.banner = <<BANNER
+Usage: steep annotations [options] [sources]
+
+Description:
+    Prints the type annotations in the Ruby code.
+
+Options:
+BANNER
           handle_logging_options opts
         end.parse!(argv)
 
-        command.command_line_patterns.push *argv
+        command.command_line_patterns.push(*argv)
       end.run
     end
 
     def process_project
       Drivers::PrintProject.new(stdout: stdout, stderr: stderr).tap do |command|
         OptionParser.new do |opts|
-          opts.banner = "Usage: steep project [options]"
-          opts.on("--steepfile=PATH") {|path| command.steepfile = Pathname(path) }
+          opts.banner = <<BANNER
+Usage: steep project [options]
+
+Description:
+    Prints the project configuration.
+
+Options:
+BANNER
+          handle_steepfile_option(opts, command)
           opts.on("--[no-]print-files", "Print files") {|v|
             command.print_files = v ? true : false
           }
@@ -250,7 +299,15 @@ module Steep
     def process_watch
       Drivers::Watch.new(stdout: stdout, stderr: stderr).tap do |command|
         OptionParser.new do |opts|
-          opts.banner = "Usage: steep watch [options] [dirs]"
+          opts.banner = <<BANNER
+Usage: steep watch [options] [dirs]
+
+Description:
+    Monitors file changes and automatically type checks updated files.
+    Using LSP is recommended for better performance and more features.
+
+Options:
+BANNER
           opts.on("--severity-level=LEVEL", /^error|warning|information|hint$/, "Specify the minimum diagnostic severity to be recognized as an error (defaults: warning): error, warning, information, or hint") do |level|
             # @type var level: String
             command.severity_level = _ = level.to_sym
@@ -269,7 +326,16 @@ module Steep
     def process_langserver
       Drivers::Langserver.new(stdout: stdout, stderr: stderr, stdin: stdin).tap do |command|
         OptionParser.new do |opts|
-          opts.on("--steepfile=PATH") {|path| command.steepfile = Pathname(path) }
+          opts.banner = <<BANNER
+Usage: steep langserver [options]
+
+Description:
+    Starts language server, which is assumed to be invoked from language client.
+
+Options:
+BANNER
+          handle_steepfile_option(opts, command)
+          opts.on("--refork") { command.refork = true }
           handle_jobs_option command.jobs_option, opts
           handle_logging_options opts
         end.parse!(argv)
@@ -300,8 +366,8 @@ module Steep
         opts.banner = <<BANNER
 Usage: steep binstub [options]
 
-Generate a binstub to execute Steep with setting up Bundler and rbenv/rvm.
-Use the executable for LSP integration setup.
+Description:
+    Generate a binstub which set up ruby executables and bundlers.
 
 Options:
 BANNER
@@ -372,6 +438,15 @@ TEMPLATE
     end
 
     def process_version
+      OptionParser.new do |opts|
+        opts.banner = <<BANNER
+Usage: steep version [options]
+
+Description:
+    Prints Steep version.
+BANNER
+      end.parse!(argv)
+
       stdout.puts Steep::VERSION
       0
     end
@@ -384,7 +459,7 @@ TEMPLATE
 
           opts.on("--interaction") { command.worker_type = :interaction }
           opts.on("--typecheck") { command.worker_type = :typecheck }
-          opts.on("--steepfile=PATH") {|path| command.steepfile = Pathname(path) }
+          handle_steepfile_option(opts, command)
           opts.on("--name=NAME") {|name| command.worker_name = name }
           opts.on("--delay-shutdown") { command.delay_shutdown = true }
           opts.on("--max-index=COUNT") {|count| command.max_index = Integer(count) }

data/lib/steep/diagnostic/lsp_formatter.rb

@@ -49,13 +49,24 @@ module Steep
             } #: LSP::Interface::CodeDescription::json
           end
 
-          {
+          tags = [] #: Array[LSP::Constant::DiagnosticTag::t]
+
+          case diagnostic
+          when Ruby::DeprecatedReference
+            tags << LSP::Constant::DiagnosticTag::DEPRECATED
+          end
+
+          json = {
             message: diagnostic.full_message,
             code: diagnostic.diagnostic_code,
             severity: severity,
             range: range,
-            codeDescription: description
-          }
+            codeDescription: description,
+          } #: LSP::Interface::Diagnostic::json
+
+          json[:tags] = tags unless tags.empty?
+
+          json
         end
       end
 

data/lib/steep/diagnostic/ruby.rb

@@ -977,6 +977,72 @@ module Steep
         end
       end
 
+      class UndeclaredMethodDefinition < Base
+        attr_reader :method_name, :type_name
+
+        def initialize(method_name:, type_name:, node:)
+          @method_name = method_name
+          @type_name = type_name
+          super(node: node, location: (_ = node.loc).name)
+        end
+
+        def header_line
+          name =
+              case node.type
+              when :def
+                "#{type_name}##{method_name}"
+              when :defs
+                "#{type_name}.#{method_name}"
+              else
+                raise
+              end
+          "Method `#{name}` is not declared in RBS"
+        end
+      end
+
+      class MethodDefinitionInUndeclaredModule < Base
+        attr_reader :method_name
+
+        def initialize(method_name:, node:)
+          @method_name = method_name
+          super(node: node, location: (_ = node.loc).name)
+        end
+
+        def header_line
+          "Method `#{method_name}` is defined in undeclared module"
+        end
+      end
+
+      class DeprecatedReference < Base
+        attr_reader :message
+
+        def initialize(node:, location:, message:)
+          super(node: node, location: location)
+          @message = message
+        end
+
+        def header_line
+          header =
+            case node&.type
+            when :send, :csend, :block, :numblock
+              "The method is deprecated"
+            when :const, :casgn
+              "The constant is deprecated"
+            when :gvar, :gvasgn
+              "The global variable is deprecated"
+            else
+              raise "Unexpected node: #{node}"
+            end
+
+          if message
+            header = +header
+            header.concat(": ", message)
+          end
+
+          header
+        end
+      end
+
       ALL = ObjectSpace.each_object(Class).with_object([]) do |klass, array|
         if klass < Base
           array << klass
@@ -997,6 +1063,7 @@ module Steep
             BlockBodyTypeMismatch => :warning,
             BlockTypeMismatch => :warning,
             BreakTypeMismatch => :hint,
+            DeprecatedReference => :warning,
             DifferentMethodParameterKind => :hint,
             FallbackAny => :hint,
             FalseAssertion => :hint,
@@ -1010,6 +1077,7 @@ module Steep
             InvalidIgnoreComment => :warning,
             MethodArityMismatch => :error,
             MethodBodyTypeMismatch => :error,
+            MethodDefinitionInUndeclaredModule => :information,
             MethodDefinitionMissing => nil,
             MethodParameterMismatch => :error,
             MethodReturnTypeAnnotationMismatch => :hint,
@@ -1026,6 +1094,7 @@ module Steep
             SyntaxError => :information,
             TypeArgumentMismatchError => :hint,
             UnannotatedEmptyCollection => :warning,
+            UndeclaredMethodDefinition => :warning,
             UnexpectedBlockGiven => :warning,
             UnexpectedDynamicMethod => :hint,
             UnexpectedError => :hint,
@@ -1057,6 +1126,7 @@ module Steep
             BlockBodyTypeMismatch => :error,
             BlockTypeMismatch => :error,
             BreakTypeMismatch => :error,
+            DeprecatedReference => :warning,
             DifferentMethodParameterKind => :error,
             FallbackAny => :warning,
             FalseAssertion => :error,
@@ -1070,6 +1140,7 @@ module Steep
             InvalidIgnoreComment => :warning,
             MethodArityMismatch => :error,
             MethodBodyTypeMismatch => :error,
+            MethodDefinitionInUndeclaredModule => :warning,
             MethodDefinitionMissing => :hint,
             MethodParameterMismatch => :error,
             MethodReturnTypeAnnotationMismatch => :error,
@@ -1086,6 +1157,7 @@ module Steep
             SyntaxError => :information,
             TypeArgumentMismatchError => :error,
             UnannotatedEmptyCollection => :error,
+            UndeclaredMethodDefinition => :warning,
             UnexpectedBlockGiven => :error,
             UnexpectedDynamicMethod => :information,
             UnexpectedError => :information,
@@ -1117,6 +1189,7 @@ module Steep
             BlockBodyTypeMismatch => :information,
             BlockTypeMismatch => :information,
             BreakTypeMismatch => :hint,
+            DeprecatedReference => :warning,
             DifferentMethodParameterKind => nil,
             FallbackAny => nil,
             FalseAssertion => nil,
@@ -1130,6 +1203,7 @@ module Steep
             InvalidIgnoreComment => :warning,
             MethodArityMismatch => :information,
             MethodBodyTypeMismatch => :warning,
+            MethodDefinitionInUndeclaredModule => :hint,
             MethodDefinitionMissing => nil,
             MethodParameterMismatch => :warning,
             MethodReturnTypeAnnotationMismatch => nil,
@@ -1146,6 +1220,7 @@ module Steep
             SyntaxError => :information,
             TypeArgumentMismatchError => nil,
             UnannotatedEmptyCollection => :hint,
+            UndeclaredMethodDefinition => :information,
             UnexpectedBlockGiven => :hint,
             UnexpectedDynamicMethod => nil,
             UnexpectedError => :hint,

data/lib/steep/drivers/langserver.rb

@@ -8,6 +8,7 @@ module Steep
       attr_reader :type_check_queue
       attr_reader :type_check_thread
       attr_reader :jobs_option
+      attr_accessor :refork
 
       include Utils::DriverHelper
 
@@ -18,6 +19,7 @@ module Steep
         @write_mutex = Mutex.new
         @type_check_queue = Queue.new
         @jobs_option = Utils::JobsOption.new(jobs_count_modifier: -1)
+        @refork = false
       end
 
       def writer
@@ -43,7 +45,8 @@ module Steep
           reader: reader,
           writer: writer,
           interaction_worker: interaction_worker,
-          typecheck_workers: typecheck_workers
+          typecheck_workers: typecheck_workers,
+          refork: refork,
         )
         master.typecheck_automatically = true
 

data/lib/steep/drivers/worker.rb

@@ -9,6 +9,7 @@ module Steep
       attr_accessor :max_index
       attr_accessor :index
       attr_accessor :commandline_args
+      attr_accessor :io_socket
 
       include Utils::DriverHelper
 
@@ -32,6 +33,7 @@ module Steep
                      Server::TypeCheckWorker.new(project: project,
                                                  reader: reader,
                                                  writer: writer,
+                                                 io_socket:,
                                                  assignment: assignment,
                                                  commandline_args: commandline_args)
                    when :interaction

data/lib/steep/interface/builder.rb

@@ -283,7 +283,7 @@ module Steep
                 method_type = factory.method_type(type_def.type)
                 method_type = replace_primitive_method(method_name, type_def, method_type)
                 method_type = replace_kernel_class(method_name, type_def, method_type) { AST::Builtin::Class.instance_type }
-                method_type = add_implicitly_returns_nil(type_def.annotations, method_type)
+                method_type = add_implicitly_returns_nil(type_def.each_annotation, method_type)
                 Shape::MethodOverload.new(method_type, [type_def])
               end
 
@@ -317,7 +317,7 @@ module Steep
                 if type_name.class?
                   method_type = replace_kernel_class(method_name, type_def, method_type) { AST::Types::Name::Singleton.new(name: type_name) }
                 end
-                method_type = add_implicitly_returns_nil(type_def.annotations, method_type)
+                method_type = add_implicitly_returns_nil(type_def.each_annotation, method_type)
                 Shape::MethodOverload.new(method_type, [type_def])
               end
 

data/lib/steep/server/custom_methods.rb

@@ -72,6 +72,18 @@ module Steep
           { id: id, result: result }
         end
       end
+
+      module Refork
+        METHOD = "$/steep/refork"
+
+        def self.request(id, params)
+          { method: METHOD, id: id, params: params }
+        end
+
+        def self.response(id, result)
+          { id: id, result: result }
+        end
+      end
     end
   end
 end

data/lib/steep/server/interaction_worker.rb

@@ -355,6 +355,11 @@ module Steep
 
           detail = LSPFormatter.declaration_summary(item.decl)
 
+          tags = [] #: Array[LSP::Constant::CompletionItemTag::t]
+          if item.deprecated?
+            tags << LSP::Constant::CompletionItemTag::DEPRECATED
+          end
+
           LSP::Interface::CompletionItem.new(
             label: item.identifier.to_s,
             kind: kind,
@@ -363,15 +368,22 @@ module Steep
             text_edit: LSP::Interface::TextEdit.new(
               range: range,
               new_text: item.identifier.to_s
-            )
+            ),
+            tags: tags
           )
         when Services::CompletionProvider::SimpleMethodNameItem
+          tags = [] #: Array[LSP::Constant::CompletionItemTag::t]
+          if item.deprecated
+            tags << LSP::Constant::CompletionItemTag::DEPRECATED
+          end
+
           LSP::Interface::CompletionItem.new(
             label: item.identifier.to_s,
             kind: LSP::Constant::CompletionItemKind::FUNCTION,
             label_details: LSP::Interface::CompletionItemLabelDetails.new(description: item.method_name.relative.to_s),
             insert_text: item.identifier.to_s,
-            documentation: LSPFormatter.markup_content { LSPFormatter.format_completion_docs(item) }
+            documentation: LSPFormatter.markup_content { LSPFormatter.format_completion_docs(item) },
+            tags: tags
           )
         when Services::CompletionProvider::ComplexMethodNameItem
           method_names = item.method_names.map(&:relative).uniq