steep 0.46.0 → 0.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e43c16938ef0238a9b3e44934a3e183ec663722b4c1161f9bd016dfcd2442b9b
-  data.tar.gz: 20168ebc69417b83c9eff010d44aac53ac43f47c572c8acc99d52d08ec11866d
+  metadata.gz: dcd473b07b749d136220c73d4434747c909fc516b5d14332590a5e46abed65f9
+  data.tar.gz: c652c1608f635556d3c6704746c901b97047b5f2fc670ea563f50aa30d198210
 SHA512:
-  metadata.gz: 33c2bd116ea87f549ffb29fbc2382e7c000405a74280fcc4a1a8553ae52e6b7af3d5611a150c828d494fe50f37e120e58e45f286bd374bbd35958ee0c760c872
-  data.tar.gz: 0466f3f59d18bf0ba34ce522bc6a1cceed85c1f6ca4df66b6647a557bec165c64dd9d594f673833dc24a0b5a9d0eb04795bff37dc391e22cf560b566c6f08319
+  metadata.gz: 9a540a74cb3d514500a5d57d7111ce45b16cafde7855aa182d0a6a188edf74d7203b17368cc275aa574aaa16f5a7f265eb0a95c1fa9c0a524e42fb78b67bffdc
+  data.tar.gz: eac07db23cad1f7eeb697d4f27e4548c45174e23d7552e7bd4246494efb25d8a967c10d6f00c112a1b3070b1a86e0131a4e3f0b95af8bf66f65747ba4e57f16b

data/.github/workflows/ruby.yml

@@ -12,7 +12,6 @@ jobs:
     strategy:
       matrix:
         container_tag:
-        - "2.6"
         - "2.7"
         - "3.0"
         - "master-nightly-focal"

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master
 
+## 0.47.0 (2021-11-30)
+
+This update contains update for RBS 1.7.
+
+* RBS 1.7 ([#455](https://github.com/soutaro/steep/pull/455))
+* Bug fixes related to `SendArgs` ([#444](https://github.com/soutaro/steep/pull/444), [#449](https://github.com/soutaro/steep/pull/449), [#451](https://github.com/soutaro/steep/pull/451))
+* LSP completion item formatting improvement ([#442](https://github.com/soutaro/steep/pull/442))
+
 ## 0.46.0 (2021-08-30)
 
 This release updates Steepfile DSL syntax, introducing `stdlib_path` and `configure_code_diagnostics` syntax (methods).

data/Gemfile

@@ -8,6 +8,5 @@ gem "without_steep_types", path: "test/gems/without_steep_types"
 
 gem "rake"
 gem "minitest", "~> 5.0"
-gem "racc", "~> 1.4"
 gem "minitest-hooks"
 gem "stackprof"

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    steep (0.46.0)
+    steep (0.47.0)
       activesupport (>= 5.1)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
       parallel (>= 1.0.0)
       parser (>= 3.0)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 1.2.0)
+      rbs (~> 1.7.0)
       terminal-table (>= 2, < 4)
 
 PATH
@@ -32,33 +32,32 @@ GEM
       zeitwerk (~> 2.3)
     ast (2.4.2)
     concurrent-ruby (1.1.9)
-    ffi (1.15.3)
-    i18n (1.8.10)
+    ffi (1.15.4)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    language_server-protocol (3.16.0.2)
+    language_server-protocol (3.16.0.3)
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.14.4)
     minitest-hooks (1.5.0)
       minitest (> 5.3)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    parallel (1.21.0)
+    parser (3.0.3.1)
       ast (~> 2.4.1)
-    racc (1.5.2)
     rainbow (3.0.0)
     rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (1.5.1)
+    rbs (1.7.1)
     stackprof (0.2.17)
-    terminal-table (3.0.1)
+    terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -66,7 +65,6 @@ PLATFORMS
 DEPENDENCIES
   minitest (~> 5.0)
   minitest-hooks
-  racc (~> 1.4)
   rake
   stackprof
   steep!
@@ -74,4 +72,4 @@ DEPENDENCIES
   without_steep_types!
 
 BUNDLED WITH
-   2.2.22
+   2.2.27

data/README.md

@@ -8,7 +8,7 @@ Install via RubyGems.
 
 ### Requirements
 
-Steep requires Ruby 2.6.
+Steep requires Ruby 2.6 or later.
 
 ## Usage
 
@@ -126,6 +126,7 @@ end
 
 class Phone
   # @dynamic country, number
+  attr_reader :country, :number
 
   def initialize(country:, number:)
     @country = country

data/lib/steep/annotation_parser.rb

@@ -25,7 +25,7 @@ module Steep
         @location = location
 
         message = case exn
-                  when RBS::Parser::SyntaxError
+                  when RBS::ParsingError
                     Diagnostic::Signature::SyntaxError.parser_syntax_error_message(exn)
                   else
                     exn.message

data/lib/steep/diagnostic/signature.rb

@@ -38,25 +38,16 @@ module Steep
         end
 
         def self.parser_syntax_error_message(exception)
-          value = if exception.error_value.is_a?(RBS::Parser::LocatedValue)
-                    exception.error_value.value
-                  else
-                    exception.error_value
-                  end
-          string = value.to_s
+          string = exception.location.source.to_s
           unless string.empty?
             string = " (#{string})"
           end
 
-          "Syntax error caused by token `#{exception.token_str}`#{string}"
+          "Syntax error caused by token `#{exception.token_type}`#{string}"
         end
 
         def header_line
-          if exception.is_a?(RBS::Parser::SyntaxError)
-            SyntaxError.parser_syntax_error_message(exception)
-          else
-            exception.message
-          end
+          exception.message
         end
       end
 
@@ -318,10 +309,8 @@ module Steep
 
       def self.from_rbs_error(error, factory:)
         case error
-        when RBS::Parser::SemanticsError, RBS::Parser::LexerError
+        when RBS::ParsingError
           Diagnostic::Signature::SyntaxError.new(error, location: error.location)
-        when RBS::Parser::SyntaxError
-          Diagnostic::Signature::SyntaxError.new(error, location: error.error_value.location)
         when RBS::DuplicatedDeclarationError
           Diagnostic::Signature::DuplicatedDeclaration.new(
             type_name: error.name,

data/lib/steep/project/dsl.rb

@@ -11,8 +11,12 @@ module Steep
         attr_reader :core_root
         attr_reader :repo_paths
         attr_reader :code_diagnostics_config
+        attr_reader :project
+        attr_reader :collection_config_path
 
-        def initialize(name, sources: [], libraries: [], signatures: [], ignored_sources: [], repo_paths: [], code_diagnostics_config: {})
+        NONE = Object.new.freeze
+
+        def initialize(name, sources: [], libraries: [], signatures: [], ignored_sources: [], repo_paths: [], code_diagnostics_config: {}, project: nil, collection_config_path: NONE)
           @name = name
           @sources = sources
           @libraries = libraries
@@ -22,6 +26,15 @@ module Steep
           @stdlib_root = nil
           @repo_paths = []
           @code_diagnostics_config = code_diagnostics_config
+          @project = project
+          @collection_config_path =
+            case collection_config_path
+            when NONE
+              path = project&.absolute_path(RBS::Collection::Config::PATH)
+              path&.exist? ? path : nil
+            else
+              collection_config_path
+            end
         end
 
         def initialize_copy(other)
@@ -34,6 +47,8 @@ module Steep
           @core_root = other.core_root
           @stdlib_root = other.stdlib_root
           @code_diagnostics_config = other.code_diagnostics_config.dup
+          @project = other.project
+          @collection_config_path = other.collection_config_path
         end
 
         def check(*args)
@@ -100,13 +115,14 @@ module Steep
           signatures.push(*args)
         end
 
-        def update(name: self.name, sources: self.sources, libraries: self.libraries, ignored_sources: self.ignored_sources, signatures: self.signatures)
+        def update(name: self.name, sources: self.sources, libraries: self.libraries, ignored_sources: self.ignored_sources, signatures: self.signatures, project: self.project)
           self.class.new(
             name,
             sources: sources,
             libraries: libraries,
             signatures: signatures,
-            ignored_sources: ignored_sources
+            ignored_sources: ignored_sources,
+            project: project,
           )
         end
 
@@ -155,6 +171,14 @@ module Steep
 
           yield code_diagnostics_config if block_given?
         end
+
+        def collection_config(path)
+          @collection_config_path = project.absolute_path(path)
+        end
+
+        def disable_collection
+          @collection_config_path = nil
+        end
       end
 
       attr_reader :project
@@ -187,10 +211,10 @@ module Steep
 
       def target(name, template: nil, &block)
         target = if template
-                   self.class.templates[template]&.dup&.update(name: name) or
+                   self.class.templates[template]&.dup&.update(name: name, project: project) or
                      raise "Unknown template: #{template}, available templates: #{@@templates.keys.join(", ")}"
                  else
-                   TargetDSL.new(name, code_diagnostics_config: Diagnostic::Ruby.default.dup)
+                   TargetDSL.new(name, code_diagnostics_config: Diagnostic::Ruby.default.dup, project: project)
                  end
 
         Steep.logger.tagged "target=#{name}" do
@@ -200,6 +224,8 @@ module Steep
         source_pattern = Pattern.new(patterns: target.sources, ignores: target.ignored_sources, ext: ".rb")
         signature_pattern = Pattern.new(patterns: target.signatures, ext: ".rbs")
 
+        collection_lock = target.collection_config_path&.then { |p| RBS::Collection::Config.lockfile_of(p) }
+
         Project::Target.new(
           name: target.name,
           source_pattern: source_pattern,
@@ -211,6 +237,7 @@ module Steep
               stdlib_root: target.stdlib_root,
               repo_paths: target.repo_paths
             )
+            options.collection_lock = collection_lock
           end,
           code_diagnostics_config: target.code_diagnostics_config
         ).tap do |target|

data/lib/steep/project/options.rb

@@ -13,6 +13,7 @@ module Steep
 
       attr_reader :libraries
       attr_accessor :paths
+      attr_accessor :collection_lock
 
       def initialize
         @paths = PathOptions.new(repo_paths: [])

data/lib/steep/project/target.rb

@@ -57,6 +57,7 @@ module Steep
           name, version = lib.split(/:/, 2)
           loader.add(library: name, version: version)
         end
+        loader.add_collection(options.collection_lock) if options.collection_lock
 
         loader
       end

data/lib/steep/server/interaction_worker.rb

@@ -383,7 +383,7 @@ HOVER
         when RBS::AST::Declarations::Interface
           "interface #{name_and_params(decl.name, decl.type_params)}"
         end
-    end
+      end
 
       def format_completion_item(item)
         range = LanguageServer::Protocol::Interface::Range.new(
@@ -402,18 +402,18 @@ HOVER
           LanguageServer::Protocol::Interface::CompletionItem.new(
             label: item.identifier,
             kind: LanguageServer::Protocol::Constant::CompletionItemKind::VARIABLE,
-            detail: "#{item.identifier}: #{item.type}",
+            detail: item.type.to_s,
             text_edit: LanguageServer::Protocol::Interface::TextEdit.new(
               range: range,
-              new_text: "#{item.identifier}"
+              new_text: item.identifier
             )
           )
         when Services::CompletionProvider::MethodNameItem
-          label = "def #{item.identifier}: #{item.method_type}"
           method_type_snippet = method_type_to_snippet(item.method_type)
           LanguageServer::Protocol::Interface::CompletionItem.new(
-            label: label,
+            label: item.identifier,
             kind: LanguageServer::Protocol::Constant::CompletionItemKind::METHOD,
+            detail: item.method_type.to_s,
             text_edit: LanguageServer::Protocol::Interface::TextEdit.new(
               new_text: "#{item.identifier}#{method_type_snippet}",
               range: range
@@ -423,14 +423,14 @@ HOVER
             sort_text: item.inherited? ? 'z' : 'a' # Ensure language server puts non-inherited methods before inherited methods
           )
         when Services::CompletionProvider::InstanceVariableItem
-          label = "#{item.identifier}: #{item.type}"
           LanguageServer::Protocol::Interface::CompletionItem.new(
-            label: label,
+            label: item.identifier,
             kind: LanguageServer::Protocol::Constant::CompletionItemKind::FIELD,
+            detail: item.type.to_s,
             text_edit: LanguageServer::Protocol::Interface::TextEdit.new(
               range: range,
               new_text: item.identifier,
-              ),
+            ),
             insert_text_format: LanguageServer::Protocol::Constant::InsertTextFormat::SNIPPET
           )
         end

data/lib/steep/services/hover_content.rb

@@ -74,6 +74,9 @@ module Steep
           locator = RBS::Locator.new(decls: decls)
           hd, tail = locator.find2(line: line, column: column)
 
+          # Maybe hover on comment
+          return if tail.nil?
+
           case type = tail[0]
           when RBS::Types::Alias
             alias_decl = service.latest_env.alias_decls[type.name]&.decl or raise

data/lib/steep/source.rb

@@ -71,7 +71,11 @@ module Steep
 
       mapping = {}.compare_by_identity
 
-      construct_mapping(node: node, annotations: annotations, mapping: mapping)
+      if node
+        construct_mapping(node: node, annotations: annotations, mapping: mapping)
+      else
+        Steep.logger.fatal { "#{path} is empty source code" }
+      end
 
       annotations.each do |annot|
         mapping[node] ||= []

data/lib/steep/type_construction.rb

@@ -3798,7 +3798,7 @@ module Steep
     # `record_type` can be nil when the keys are not specified.
     #
     def type_hash_record(hash_node, record_type)
-      raise unless hash_node.type == :hash
+      raise unless hash_node.type == :hash || hash_node.type == :kwargs
 
       constr = self
 

data/lib/steep/type_inference/block_params.rb

@@ -131,7 +131,7 @@ module Steep
         else
           leadings = leading_params.map {|param| param.type || AST::Types::Any.new }
           optionals = optional_params.map {|param| param.type || AST::Types::Any.new }
-          rest = rest_param&.yield_self {|param| param.type.args[0] }
+          rest = rest_param&.yield_self {|param| param.type&.args&.[](0) || AST::Types::Any.new }
         end
 
         Interface::Function::Params.build(

data/lib/steep/type_inference/send_args.rb

@@ -99,19 +99,7 @@ module Steep
           PositionalArgs.new(args: args, index: index, positional_params: positional_params, uniform: uniform)
         end
 
-        def uniform!
-          update(uniform: true)
-        end
-
         def next()
-          if uniform
-            if node
-              return [node, uniform_type, update(index: index+1)]
-            else
-              return
-            end
-          end
-
           case
           when !node && param.is_a?(Interface::Function::Params::PositionalParams::Required)
             [
@@ -153,6 +141,7 @@ module Steep
         end
 
         def uniform_type
+          return nil unless positional_params
           if positional_params.each.any? {|param| param.is_a?(Interface::Function::Params::PositionalParams::Rest) }
             AST::Types::Intersection.build(types: positional_params.each.map(&:type))
           end

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.46.0"
+  VERSION = "0.47.0"
 end

data/lib/steep.rb

@@ -213,7 +213,7 @@ module Steep
     end
 
     def percentile(p)
-      slowests(count - count * p / 100r).last&.last || 0
+      slowests([count * p / 100r, 1].max).last&.last || 0
     end
   end
 

data/smoke/diagnostics/test_expectations.yml

@@ -95,8 +95,8 @@
         line: 7
         character: 21
     severity: ERROR
-    message: 'The method parameter has different kind from the declaration `(size:
-      ::Integer, name: ::String) -> void`'
+    message: 'The method parameter has different kind from the declaration `(name:
+      ::String, size: ::Integer) -> void`'
     code: Ruby::DifferentMethodParameterKind
   - range:
       start:
@@ -106,8 +106,8 @@
         line: 7
         character: 29
     severity: ERROR
-    message: 'The method parameter has different kind from the declaration `(size:
-      ::Integer, name: ::String) -> void`'
+    message: 'The method parameter has different kind from the declaration `(name:
+      ::String, size: ::Integer) -> void`'
     code: Ruby::DifferentMethodParameterKind
 - file: else_on_exhaustive_case.rb
   diagnostics:

data/smoke/extension/e.rbs

@@ -3,5 +3,5 @@ class NumberLike
 end
 
 class Integer
-  overload def `+`: (NumberLike) -> NumberLike
+  def `+`: (NumberLike) -> NumberLike | ...
 end

data/steep.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   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", ">= 1.2.0"
+  spec.add_runtime_dependency "rbs", "~> 1.7.0"
   spec.add_runtime_dependency "parallel", ">= 1.0.0"
   spec.add_runtime_dependency "terminal-table", ">= 2", "< 4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.46.0
+  version: 0.47.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-11-30 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: 1.2.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -272,8 +272,6 @@ files:
 - sample/Steepfile
 - sample/lib/conference.rb
 - sample/sig/conference.rbs
-- sig/project.rbi
-- sig/steep/type_inference/send_args.rbs
 - smoke/alias/Steepfile
 - smoke/alias/a.rb
 - smoke/alias/a.rbs

data/sig/project.rbi

@@ -1,109 +0,0 @@
-class Pathname
-end
-
-class Time
-  def self.now: -> instance
-  def < : (Time) -> bool
-  def >=: (Time) -> bool
-end
-
-type annotation = any
-
-class Steep::Source
-  def self.parse: (String, path: String, labeling: any) -> instance
-  def annotations: (block: any, builder: any, current_module: any) -> Array<annotation>
-  def node: -> any
-  def find_node: (line: Integer, column: Integer) -> any
-end
-
-class Steep::Typing
-  attr_reader errors: Array<type_error>
-  attr_reader nodes: any
-end
-
-type type_error = any
-
-class Steep::Project::Options
-  attr_accessor fallback_any_is_error: bool
-  attr_accessor allow_missing_definitions: bool
-end
-
-class Parser::SyntaxError
-end
-
-class Steep::Project::SourceFile
-  attr_reader options: Options
-  attr_reader path: Pathname
-  attr_accessor content: String
-  attr_reader content_updated_at: Time
-
-  attr_reader source: (Source | Parser::SyntaxError | nil)
-  attr_reader typing: Typing?
-  attr_reader last_type_checked_at: Time?
-
-  def initialize: (path: Pathname, options: Options) -> any
-  def requires_type_check?: -> bool
-  def invalidate: -> void
-  def parse: -> (Source | Parser::SyntaxError)
-  def errors: -> Array<type_error>?
-  def type_check: (any) -> void
-end
-
-class Steep::Project::SignatureFile
-  attr_reader path: Pathname
-  attr_accessor content: String
-  attr_reader content_updated_at: Time
-
-  def parse: -> Array<any>
-end
-
-interface Steep::Project::_Listener
-  def parse_signature: <'x> (project: Project, file: SignatureFile) { -> 'x } -> 'x
-  def parse_source: <'x> (project: Project, file: SourceFile) { -> 'x } -> 'x
-  def check: <'x> (project: Project) { -> 'x } -> 'x
-  def load_signature: <'x> (project: Project) { -> 'x } -> 'x
-  def validate_signature: <'x> (project: Project) { -> 'x } -> 'x
-  def type_check_source: <'x> (project: Project, file: SourceFile) { -> 'x } -> 'x
-  def clear_project: <'x> (project: Project) { -> 'x } -> 'x
-end
-
-class Steep::Project::SignatureLoaded
-  attr_reader check: any
-  attr_reader loaded_at: Time
-  attr_reader file_paths: Array<Pathname>
-
-  def initialize: (check: any, loaded_at: Time, file_paths: Array<Pathname>) -> any
-end
-
-class Steep::Project::SignatureHasSyntaxError
-  attr_reader errors: Hash<Pathname, any>
-  def initialize: (errors: Hash<Pathname, any>) -> any
-end
-
-class Steep::Project::SignatureHasError
-  attr_reader errors: Array<any>
-  def initialize: (errors: Array<any>) -> any
-end
-
-class Steep::Project
-  attr_reader listener: _Listener
-  attr_reader source_files: Hash<Pathname, SourceFile>
-  attr_reader signature_files: Hash<Pathname, SignatureFile>
-
-  attr_reader signature: (SignatureLoaded | SignatureHasError | SignatureHasSyntaxError | nil)
-
-  def initialize: (?_Listener?) -> any
-  def clear: -> void
-  def type_check: (?force_signatures: bool, ?force_sources: bool) -> void
-
-  def success?: -> bool
-  def has_type_error?: -> bool
-  def errors: -> Array<type_error>
-  def each_updated_source: (?force: bool) { (SourceFile) -> void } -> void
-                         | (?force: bool) -> Enumerator<SourceFile, void>
-  def signature_updated?: -> bool
-  def reload_signature: -> void
-  def validate_signature: (any) -> Array<any>
-
-  def type_of: (path: Pathname, line: Integer, column: Integer) -> any
-end

data/sig/steep/type_inference/send_args.rbs

@@ -1,42 +0,0 @@
-module Steep
-  type node = untyped
-
-  module TypeInference
-    class SendArgs
-      class PositionalArgs
-      end
-
-      class KeywordArgs
-        type value = ArgTypePairs | UnexpectedKeyword | MissingKeyword
-
-        class ArgTypePairs
-        end
-
-        class UnexpectedKeyword
-        end
-
-        class MissingKeyword
-        end
-
-        def consume: () -> [value, self]?
-
-        def consume_keys: (Array[Symbol], node: node) -> [AST::Types::t | UnexpectedKeyword, self]
-      end
-
-
-      type error = Diagnostics::Ruby::IncompatibleArguments
-                 | Diagnostics::Ruby::UnexpectedBlockGiven
-                 | Diagnostics::Ruby::RequiredBlockMissing
-
-      type arg = PositionalArgs::NodeParamPair
-               | PositionalArgs::NodeTypePair
-               | PositionalArgs::SplatArg
-               | PositionalArgs::UnexpectedArg
-               | KeywordArgs::ArgTypePairs
-               | KeywordArgs::SplatArg
-               | KeywordArgs::UnexpectedKeyword
-
-      def each_arg: (TypeConstruction) { (arg, TypeConstruction) -> TypeConstruction } -> Array[error]
-    end
-  end
-end