steep 1.4.0.dev.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c5431b7816a655799dcfc5ab49aff4d630062176b52b14f377b4d6ca754674f
-  data.tar.gz: ea016b12eac32d93fffcbb315009aeb143626fd831669b36ade6c7d01b55a475
+  metadata.gz: d0c3f3309cc8169ca1616f43b6bfcaf977339107d6e6e14f7c256d71921b9455
+  data.tar.gz: 0a85c1429383a0321fe2932befbd880942c00df1e788913a4f5c2e3d8abd9479
 SHA512:
-  metadata.gz: a6e97f6c64d6e5dfc86a0d28e6129b1fe66aa75e1b28290092c47b12dda165fc9ce87187f8f27358cef169d2a3a2b3eb4eae42aa4702dd11d9586aad8d7733e2
-  data.tar.gz: 94f611f5db76c09c853af7f5a333d43a0650e21fadde356990acb447231a86eb18bc3b63aa1ed1ead1c6d39066427eedf14f7379932dc077a1b4f9446184e749
+  metadata.gz: 8ce071dd59d2a6e4c21c9c2114d33603e4628052074b7a6f8500f8e4380ca53dfdd77baac210c1ced711eeccc7da94257baceefdafe5633cbd3932687dab6e8c
+  data.tar.gz: db71a9ab6ca415b266e62b7ef17a34e88dd4135326bae512fcf8fe8051610a6c2259bcf11773f09ebb8192958d96f03154a5a1be955beddc7088f2bfc0bf57a5

data/CHANGELOG.md

@@ -2,6 +2,41 @@
 
 ## master
 
+## 1.4.0 (2023-04-25)
+
+### Type checker core
+
+* Return immediately if blocks are incompatible ([#765](https://github.com/soutaro/steep/pull/765))
+* Fix location of no method error ([#763](https://github.com/soutaro/steep/pull/763))
+* Support `gvasgn` in assignment variants ([#762](https://github.com/soutaro/steep/pull/762))
+* Set up break contexts correctly for untyped blocks ([#752](https://github.com/soutaro/steep/pull/752))
+* Fix flow sensitive on `case` without condition ([#751](https://github.com/soutaro/steep/pull/751))
+* Support `...` syntax ([#750](https://github.com/soutaro/steep/pull/750))
+* Fix constant declaration type checking ([#738](https://github.com/soutaro/steep/pull/738))
+* Fix errors caused by non-ascii variable names ([#703](https://github.com/soutaro/steep/pull/703))
+* Update RBS to 3.0 ([#716](https://github.com/soutaro/steep/pull/716), [#754](https://github.com/soutaro/steep/pull/754))
+
+### Language server
+
+* Implement signature help, better completion and hover ([#759](https://github.com/soutaro/steep/pull/759), [#761](https://github.com/soutaro/steep/pull/761), [#766](https://github.com/soutaro/steep/pull/766))
+
+### Miscellaneous
+
+* Remove pathname from runtime_dependency ([#739](https://github.com/soutaro/steep/pull/739))
+* `parallel` out, `concurrent-ruby` in ([#760](https://github.com/soutaro/steep/pull/760))
+
+## 1.3.2 (2023-03-17)
+
+### Miscellaneous
+
+* Remove pathname from runtime_dependency ([#740](https://github.com/soutaro/steep/pull/740))
+
+## 1.3.1 (2023-03-08)
+
+### Miscellaneous
+
+* Require rbs-2.8.x ([#732](https://github.com/soutaro/steep/pull/732))
+
 ## 1.3.0 (2022-11-25)
 
 ### Type checker core

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    steep (1.4.0.dev.4)
+    steep (1.4.0)
       activesupport (>= 5.1)
+      concurrent-ruby (>= 1.2.2)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
       json (>= 2.1.0)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
       logger (>= 1.3.0)
-      parallel (>= 1.0.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
       rbs (>= 2.8.0)
@@ -46,8 +46,7 @@ GEM
       minitest (> 5.3)
     minitest-slow_test (0.2.0)
       minitest (>= 5.0)
-    parallel (1.23.0)
-    parser (3.2.2.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)

data/Gemfile.steep.lock

@@ -20,7 +20,6 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.5.3)
     minitest (5.18.0)
-    parallel (1.22.1)
     parser (3.2.2.0)
       ast (~> 2.4.1)
     rainbow (3.1.1)
@@ -29,15 +28,15 @@ GEM
       ffi (~> 1.0)
     rbs (3.0.4)
     securerandom (0.2.2)
-    steep (1.4.0.dev.3)
+    steep (1.4.0.dev.5)
       activesupport (>= 5.1)
+      concurrent-ruby (>= 1.2.2)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
       json (>= 2.1.0)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
       logger (>= 1.3.0)
-      parallel (>= 1.0.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
       rbs (>= 2.8.0)

data/lib/steep/cli.rb

@@ -8,8 +8,6 @@ module Steep
     attr_reader :stderr
     attr_reader :command
 
-    include Parallel::ProcessorCount
-
     def initialize(stdout:, stdin:, stderr:, argv:)
       @stdout = stdout
       @stdin = stdin

data/lib/steep/diagnostic/lsp_formatter.rb

@@ -41,7 +41,7 @@ module Steep
         severity = severity_for(diagnostic)
 
         if severity
-          range = diagnostic.location&.as_lsp_range or raise
+          range = diagnostic.location&.as_lsp_range or raise "#{diagnostic.class} object (#{diagnostic.full_message}) instance must have `#location`"
 
           LSP::Interface::Diagnostic.new(
             message: diagnostic.full_message,

data/lib/steep/diagnostic/ruby.rb

@@ -286,13 +286,14 @@ module Steep
         def initialize(node:, type:, method:)
           loc = case node.type
                 when :send
-                  node.loc.selector
+                  loc = _ = nil
+                  loc ||= node.loc.operator if node.loc.respond_to?(:operator)
+                  loc ||= node.loc.selector if node.loc.respond_to?(:selector)
+                  loc
                 when :block
                   node.children[0].loc.selector
-                else
-                  node.loc.expression
                 end
-          super(node: node, location: loc)
+          super(node: node, location: loc || node.loc.expression)
           @type = type
           @method = method
         end

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

@@ -4,14 +4,12 @@ module Steep
       class JobsOption
         attr_accessor :jobs_count, :steep_command, :jobs_count_modifier
 
-        include Parallel::ProcessorCount
-
         def initialize(jobs_count_modifier: 0)
           @jobs_count_modifier = jobs_count_modifier
         end
 
         def default_jobs_count
-          physical_processor_count + jobs_count_modifier
+          Concurrent.physical_processor_count + jobs_count_modifier
         end
 
         def jobs_count_value

data/lib/steep/server/interaction_worker.rb

@@ -144,7 +144,6 @@ module Steep
 
               case sig_service.status
               when Services::SignatureService::SyntaxErrorStatus, Services::SignatureService::AncestorErrorStatus
-
                 if buffer = sig_service.latest_env.buffers.find {|buf| Pathname(buf.name) == Pathname(relative_path) }
                   dirs = sig_service.latest_env.signatures[buffer][0]
                 else
@@ -208,7 +207,7 @@ module Steep
               end
 
               LSP::Interface::CompletionList.new(
-                is_incomplete: false,
+                is_incomplete: !sig_service.status.is_a?(Services::SignatureService::LoadedStatus),
                 items: completion_items
               )
             end
@@ -394,6 +393,8 @@ module Steep
             end
           end
         end
+      rescue Parser::SyntaxError
+        # Ignore syntax error
       end
     end
   end

data/lib/steep/subtyping/check.rb

@@ -627,7 +627,7 @@ module Steep
 
         sub_interface, super_interface = relation
 
-        method_pairs = super_interface.methods.each_with_object({}) do |(method_name, sup_method), hash|
+        method_pairs = super_interface.methods.each_with_object({}) do |(method_name, sup_method), hash| #$ Hash[Symbol, Relation[Interface::Shape::Entry]]
           if sub_method = sub_interface.methods[method_name]
             hash[method_name] = Relation.new(sub_type: sub_method, super_type: sup_method)
           else
@@ -806,26 +806,23 @@ module Steep
         super_type.type_params.empty? or raise "Expected monomorphic method type: #{super_type}"
 
         All(relation) do |result|
-          result.add(Relation.new(sub_type: sub_type.type, super_type: super_type.type)) do |rel|
-            check_function(name, rel)
-          end
-
-          result.add(Relation.new(sub_type: sub_type.block, super_type: super_type.block)) do |rel|
-            ret = expand_block_given(name, rel)
-
-            case ret
-            when Relation
+          type_relation = Relation.new(sub_type: sub_type.type, super_type: super_type.type)
+
+          case ret = expand_block_given(name, Relation.new(sub_type: sub_type.block, super_type: super_type.block))
+          when true
+            result.add(type_relation) { check_function(name, type_relation) }
+          when Relation
+            result.add(type_relation) { check_function(name, type_relation) }
+            result.add(ret) do
               All(ret) do |result|
                 result.add_result(check_self_type_binding(ret, ret.super_type.self_type, ret.sub_type.self_type))
-                result.add(Relation(ret.super_type.type, ret.sub_type.type)) do |rel|
-                  check_function(name, rel)
+                result.add(Relation(ret.super_type.type, ret.sub_type.type)) do |block_relation|
+                  check_function(name, block_relation)
                 end
               end
-            when Result::Base
-              ret
-            else
-              nil
             end
+          when Result::Failure
+            result.add { ret }
           end
         end
       end

data/lib/steep/type_construction.rb

@@ -848,6 +848,15 @@ module Steep
 
               constr.add_typing(node, type: type)
 
+            when :gvasgn
+              var_node = lhs.updated(:gvar)
+              send_node = rhs.updated(:send, [var_node, op, rhs])
+              new_node = node.updated(:gvasgn, [lhs.children[0], send_node])
+
+              type, constr = synthesize(new_node, hint: hint)
+
+              constr.add_typing(node, type: type)
+
             when :send
               new_rhs = rhs.updated(:send, [lhs, node.children[1], node.children[2]])
               new_node = lhs.updated(:send, [lhs.children[0], :"#{lhs.children[1]}=", *lhs.children.drop(2), new_rhs])
@@ -2226,6 +2235,9 @@ module Steep
             when :ivasgn
               type, constr = synthesize(rhs, hint: hint)
               constr.ivasgn(asgn, type)
+            when :gvasgn
+              type, constr = synthesize(rhs, hint: hint)
+              constr.gvasgn(asgn, type)
             when :send
               children = asgn.children.dup
               children[1] = :"#{children[1]}="
@@ -2257,27 +2269,11 @@ module Steep
           yield_self do
             name, rhs = node.children
             lhs_type = context.type_env[name]
-
             rhs_type, constr = synthesize(rhs, hint: lhs_type).to_ary
 
-            if lhs_type
-              result = constr.check_relation(sub_type: rhs_type, super_type: lhs_type)
-
-              if result.failure?
-                constr.typing.add_error(
-                  Diagnostic::Ruby::IncompatibleAssignment.new(
-                    node: node,
-                    lhs_type: lhs_type,
-                    rhs_type: rhs_type,
-                    result: result
-                  )
-                )
-              end
-            else
-              constr.typing.add_error(Diagnostic::Ruby::UnknownGlobalVariable.new(node: node, name: name))
-            end
+            type, constr = constr.gvasgn(node, rhs_type)
 
-            constr.add_typing(node, type: rhs_type)
+            constr.add_typing(node, type: type)
           end
 
         when :gvar
@@ -2584,7 +2580,7 @@ module Steep
                     else
                       a.type
                     end
-        asgn_type.nil? || asgn_type == :lvasgn || asgn_type == :ivasgn
+        asgn_type.nil? || asgn_type == :lvasgn || asgn_type == :ivasgn || asgn_type == :gvasgn
       end
     end
 
@@ -2632,6 +2628,24 @@ module Steep
       add_typing(node, type: rhs_type)
     end
 
+    def gvasgn(node, rhs_type)
+      name = node.children[0]
+
+      lhs_type = context.type_env[name]
+
+      if lhs_type
+        if result = no_subtyping?(sub_type: rhs_type, super_type: lhs_type)
+          typing.add_error(
+            Diagnostic::Ruby::IncompatibleAssignment.new(node: node, lhs_type: lhs_type, rhs_type: rhs_type, result: result)
+          )
+        end
+      else
+        typing.add_error(Diagnostic::Ruby::UnknownGlobalVariable.new(node: node, name: name))
+      end
+
+      add_typing(node, type: rhs_type)
+    end
+
     def type_masgn_type(mlhs_node, rhs_type, masgn:, optional:)
       # @type var constr: TypeConstruction
       constr = self
@@ -2659,7 +2673,7 @@ module Steep
           when :ivasgn
             _, constr = constr.ivasgn(asgn_node, type)
           when :gvasgn
-            raise
+            _, constr = constr.gvasgn(asgn_node, type)
           when :mlhs
             constr = (constr.type_masgn_type(asgn_node, type, masgn: masgn, optional: optional) or return)
           end
@@ -2714,11 +2728,11 @@ module Steep
         each_descendant_node(lhs) do |node|
           case node.type
           when :lvasgn
-            _, constr = constr.lvasgn(node, AST::Builtin.any_type).to_ary
+            _, constr = constr.lvasgn(node, AST::Builtin.any_type)
           when :ivasgn
-            _, constr = constr.ivasgn(node, AST::Builtin.any_type).to_ary
+            _, constr = constr.ivasgn(node, AST::Builtin.any_type)
           when :gvasgn
-            raise
+            _, constr = constr.gvasgn(node, AST::Builtin.any_type)
           else
             _, constr = constr.add_typing(node, type: AST::Builtin.any_type).to_ary
           end

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "1.4.0.dev.4"
+  VERSION = "1.4.0"
 end

data/lib/steep.rb

@@ -16,7 +16,7 @@ require 'uri'
 require "yaml"
 require "securerandom"
 
-require "parallel/processor_count"
+require "concurrent/utility/processor_counter"
 require "terminal-table"
 
 require "rbs"

data/sig/shims/concurrent-ruby.rbs

@@ -0,0 +1,39 @@
+module Concurrent
+  # Number of physical processor cores on the current system. For performance
+  # reasons the calculated value will be memoized on the first call.
+  #
+  # On Windows the Win32 API will be queried for the `NumberOfCores from
+  # Win32_Processor`. This will return the total number "of cores for the
+  # current instance of the processor." On Unix-like operating systems either
+  # the `hwprefs` or `sysctl` utility will be called in a subshell and the
+  # returned value will be used. In the rare case where none of these methods
+  # work or an exception is raised the function will simply return 1.
+  #
+  # @return [Integer] number physical processor cores on the current system
+  #
+  # @see https://github.com/grosser/parallel/blob/4fc8b89d08c7091fe0419ca8fba1ec3ce5a8d185/lib/parallel.rb
+  #
+  # @see http://msdn.microsoft.com/en-us/library/aa394373(v=vs.85).aspx
+  # @see http://www.unix.com/man-page/osx/1/HWPREFS/
+  # @see http://linux.die.net/man/8/sysctl
+  def self.physical_processor_count: () -> Integer
+
+  # Number of processors seen by the OS and used for process scheduling. For
+  # performance reasons the calculated value will be memoized on the first
+  # call.
+  #
+  # When running under JRuby the Java runtime call
+  # `java.lang.Runtime.getRuntime.availableProcessors` will be used. According
+  # to the Java documentation this "value may change during a particular
+  # invocation of the virtual machine... [applications] should therefore
+  # occasionally poll this property." Subsequently the result will NOT be
+  # memoized under JRuby.
+  #
+  # Otherwise Ruby's Etc.nprocessors will be used.
+  #
+  # @return [Integer] number of processors seen by the OS or Java runtime
+  #
+  # @see http://docs.oracle.com/javase/6/docs/api/java/lang/Runtime.html#availableProcessors()
+  #
+  def self.processor_count: () -> Integer
+end

data/sig/steep/cli.rbs

@@ -10,8 +10,6 @@ module Steep
 
     attr_reader command: Symbol
 
-    include Parallel::ProcessorCount
-
     def initialize: (stdout: IO, stdin: IO, stderr: IO, argv: Array[String]) -> void
 
     def self.available_commands: () -> ::Array[Symbol]

data/sig/steep/drivers/utils/jobs_option.rbs

@@ -8,8 +8,6 @@ module Steep
 
         attr_reader jobs_count_modifier: Integer
 
-        include Parallel::ProcessorCount
-
         def initialize: (?jobs_count_modifier: Integer) -> void
 
         def default_jobs_count: () -> Integer

data/sig/steep/subtyping/check.rbs

@@ -97,7 +97,7 @@ module Steep
       # Returns a Relation when the given relation can be expanded to relation between Interface::Block.
       # Returns a failure otherwise.
       #
-      def expand_block_given: (Symbol name, Relation[Interface::Block?] relation) -> (Relation[Interface::Block] | true | Result::t)
+      def expand_block_given: (Symbol name, Relation[Interface::Block?] relation) -> (Relation[Interface::Block] | true | Result::Failure)
 
       # Receives a subtyping relation between self bindings `S <: S'` that is included in procs or blocks as:
       #

data/sig/steep/type_construction.rbs

@@ -122,6 +122,8 @@ module Steep
 
     def ivasgn: (Parser::AST::Node node, AST::Types::t rhs_type) -> Pair
 
+    def gvasgn: (Parser::AST::Node node, AST::Types::t rhs_type) -> Pair
+
     def type_masgn: (Parser::AST::Node node) -> Pair
 
     def type_masgn_type: (Parser::AST::Node mlhs_node, AST::Types::t? rhs_type, masgn: TypeInference::MultipleAssignment, optional: bool) -> TypeConstruction?

data/smoke/regression/Steepfile

@@ -1,7 +1,6 @@
 target :test do
   check "*.rb"
   signature "*.rbs"
-  library "set"
 
   configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

data/smoke/regression/enumerator_product.rb

@@ -0,0 +1 @@
+Enumerator::Product.new([1,2,3], ["a", "b", "c"])

data/steep.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "listen", "~> 3.0"
   spec.add_runtime_dependency "language_server-protocol", ">= 3.15", "< 4.0"
   spec.add_runtime_dependency "rbs", ">= 2.8.0"
-  spec.add_runtime_dependency "parallel", ">= 1.0.0"
+  spec.add_runtime_dependency "concurrent-ruby", ">= 1.2.2"
   spec.add_runtime_dependency "terminal-table", ">= 2", "< 4"
   spec.add_runtime_dependency "securerandom", ">= 0.1"
   spec.add_runtime_dependency "json", ">= 2.1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.4.0.dev.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -107,19 +107,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -380,9 +380,9 @@ files:
 - sample/lib/length.rb
 - sample/sig/conference.rbs
 - sample/sig/length.rbs
+- sig/shims/concurrent-ruby.rbs
 - sig/shims/exception.rbs
 - sig/shims/language-server_protocol.rbs
-- sig/shims/parallel.rbs
 - sig/shims/parser.rbs
 - sig/shims/parser/comment.rbs
 - sig/shims/parser/nodes.rbs
@@ -702,6 +702,7 @@ files:
 - smoke/regression/block_param_split.rbs
 - smoke/regression/empty_yield.rb
 - smoke/regression/empty_yield.rbs
+- smoke/regression/enumerator_product.rb
 - smoke/regression/fun.rb
 - smoke/regression/fun.rbs
 - smoke/regression/hash.rb
@@ -774,9 +775,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.6
 signing_key:

data/sig/shims/parallel.rbs

@@ -1,5 +0,0 @@
-module Parallel
-  module ProcessorCount
-    def physical_processor_count: () -> Integer
-  end
-end