steep 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7775c9db83acf70b19f27b4983923ee40e8d1a39043c981726573b0c06eb1c8
-  data.tar.gz: 1d9f2753a19a577cce778f6ec1ee924534523812764c0350c21280d82a0e1c69
+  metadata.gz: c6fac293e42dfa305b98aa0f8dbf49acdad88f0794a6081f7c6e548ccab49f4b
+  data.tar.gz: 2824c6289d92fadc1d062571d9652d759fc7774531d532d2bcf846ce20240bec
 SHA512:
-  metadata.gz: 6bd6340dfecc114df47a959d25a4201a87ccccbc0b1e59238962de51c28218b01aa25499ae8a760e678481192131dfdd3c99b6c89412ce4b6e0b3fad2bf34ca5
-  data.tar.gz: 87437181a053c65f297192eb9e339c0b58ad074d4c6716eef2a1019116d3ed06d0525eebcc49855ae99a8393bffac82640d77f608479b98f67e158b42c54d327
+  metadata.gz: 800d77371db9fcc77688a30c442355d84f31cbbf21ccc7fda46155e394b011887b98b1c47f3f9a9a117087c4790a3fecfee9ac4bdbfb4dea096deafa959e2d96
+  data.tar.gz: 2d1eed9a3397eeeb1c5675a7038acbf5cdab173aec3285d8c88df925f9fe7d07bf4ef0f248ae7df5895bef21509bc0e2156883c84a7bdb4a53598b1608041864

data/.github/dependabot.yml

@@ -8,6 +8,13 @@ updates:
       time: "20:00"
     open-pull-requests-limit: 10
 
+  - package-ecosystem: bundler
+    directory: "/gemfile_steep"
+    schedule:
+      interval: daily
+      time: "20:00"
+    open-pull-requests-limit: 10
+
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## master
 
+## 1.5.3 (2023-08-10)
+
+### Type checker core
+
+* Fix type checking parenthesized conditional nodes ([#896](https://github.com/soutaro/steep/pull/896))
+
+## 1.5.2 (2023-07-27)
+
+### Type checker core
+
+* Avoid inifinite loop in `#shape` ([#884](https://github.com/soutaro/steep/pull/884))
+* Fix `nil?` typing with `untyped` receiver ([#882](https://github.com/soutaro/steep/pull/882))
+
+### Language server
+
+* Avoid breaking the original source code through `CompletionProvider` ([#883](https://github.com/soutaro/steep/pull/883))
+
 ## 1.5.1 (2023-07-20)
 
 ### Type checker core

data/Gemfile

@@ -4,13 +4,9 @@ source 'https://rubygems.org'
 gemspec
 
 gem "rake"
-gem "minitest", "~> 5.18"
+gem "minitest", "~> 5.19"
 gem "minitest-hooks"
 group :stackprof, optional: true do
   gem "stackprof"
 end
 gem 'minitest-slow_test'
-
-group :development do
-  gem "ruby-lsp", require: false
-end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    steep (1.5.1)
+    steep (1.5.3)
       activesupport (>= 5.1)
       concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
@@ -20,7 +20,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.6)
+    activesupport (7.0.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -38,32 +38,24 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.5.3)
-    minitest (5.18.1)
-    minitest-hooks (1.5.0)
+    minitest (5.19.0)
+    minitest-hooks (1.5.1)
       minitest (> 5.3)
     minitest-slow_test (0.2.0)
       minitest (>= 5.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
-    prettier_print (1.2.1)
     racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (3.1.1)
-    ruby-lsp (0.5.1)
-      language_server-protocol (~> 3.17.0)
-      sorbet-runtime
-      syntax_tree (>= 6.1.1, < 7)
+    rbs (3.1.3)
     securerandom (0.2.2)
-    sorbet-runtime (0.5.10832)
     stackprof (0.2.25)
     strscan (3.0.6)
-    syntax_tree (6.1.1)
-      prettier_print (>= 1.2.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     tzinfo (2.0.6)
@@ -74,11 +66,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  minitest (~> 5.18)
+  minitest (~> 5.19)
   minitest-hooks
   minitest-slow_test
   rake
-  ruby-lsp
   stackprof
   steep!
 

data/Gemfile.steep

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem 'steep', require: false

data/bin/rbs

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 BINSTUB_DIR=$(cd $(dirname $0); pwd)
-GEMFILE=$(readlink -f ${BINSTUB_DIR}/../Gemfile.steep)
+GEMFILE=$(readlink -f ${BINSTUB_DIR}/../gemfile_steep/Gemfile)
 COLLECTION=$(readlink -f ${BINSTUB_DIR}/../rbs_collection.steep.yaml)
 ROOT_DIR=$(readlink -f ${BINSTUB_DIR}/..)
 

data/bin/setup

@@ -5,5 +5,5 @@ set -vx
 
 bundle install
 
-bundle install --gemfile=Gemfile.steep
+bundle install --gemfile=gemfile_steep/Gemfile
 bin/rbs collection install

data/bin/steep

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 BINSTUB_DIR=$(cd $(dirname $0); pwd)
-GEMFILE=$(readlink -f ${BINSTUB_DIR}/../Gemfile.steep)
+GEMFILE=$(readlink -f ${BINSTUB_DIR}/../gemfile_steep/Gemfile)
 ROOT_DIR=$(readlink -f ${BINSTUB_DIR}/..)
 
 STEEP="bundle exec --gemfile=${GEMFILE} steep"

data/gemfile_steep/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem 'steep', require: false

data/{Gemfile.steep.lock → gemfile_steep/Gemfile.lock}

@@ -19,7 +19,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.5.3)
-    minitest (5.18.1)
+    minitest (5.19.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
@@ -28,9 +28,9 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (3.1.1)
+    rbs (3.1.2)
     securerandom (0.2.2)
-    steep (1.5.0)
+    steep (1.5.2)
       activesupport (>= 5.1)
       concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
@@ -55,6 +55,7 @@ GEM
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   steep

data/lib/steep/interface/builder.rb

@@ -68,6 +68,24 @@ module Steep
             )
           end
         end
+
+        def self_type?
+          unless self_type.is_a?(AST::Types::Self)
+            self_type
+          end
+        end
+
+        def instance_type?
+          unless instance_type.is_a?(AST::Types::Instance)
+            instance_type
+          end
+        end
+
+        def class_type?
+          unless class_type.is_a?(AST::Types::Class)
+            class_type
+          end
+        end
       end
 
       attr_reader :factory, :cache, :raw_object_cache
@@ -122,16 +140,18 @@ module Steep
         fetch_cache(type, public_only, config) do
           case type
           when AST::Types::Self
-            self_type = config.self_type.subst(config.subst)
-            shape(self_type, public_only: public_only, config: config.update(resolve_self: false))
+            if self_type = config.self_type?
+              self_type = self_type.subst(config.subst)
+              shape(self_type, public_only: public_only, config: config.update(resolve_self: false))
+            end
           when AST::Types::Instance
-            if config.instance_type
-              instance_type = config.instance_type.subst(config.subst)
+            if instance_type = config.instance_type?
+              instance_type = instance_type.subst(config.subst)
               shape(instance_type, public_only: public_only, config: config.update(resolve_instance: false))
             end
           when AST::Types::Class
-            if config.class_type
-              class_type = config.class_type.subst(config.subst)
+            if class_type = config.class_type?
+              class_type = class_type.subst(config.subst)
               shape(class_type, public_only: public_only, config: config.update(resolve_class: false))
             end
           when AST::Types::Name::Instance, AST::Types::Name::Interface, AST::Types::Name::Singleton
@@ -159,7 +179,7 @@ module Steep
               instance_var = AST::Types::Var.fresh(:INSTANCE)
 
               bounds = config.variable_bounds.merge({ self_var.name => config.self_type, instance_var.name => config.instance_type, class_var.name => config.class_type })
-              type_ = type.subst(Substitution.build([], [], self_type: self_var, instance_type: instance_var, module_type: class_var))
+              type_ = type.subst(Substitution.build([], [], self_type: self_var, instance_type: instance_var, module_type: class_var)) #: AST::Types::Union
 
               config_ = config.update(resolve_self: false, resolve_class: true, resolve_instance: true, variable_bounds: bounds)
 
@@ -203,7 +223,7 @@ module Steep
             instance_var = AST::Types::Var.fresh(:INSTANCE)
 
             bounds = config.variable_bounds.merge({ self_var.name => config.self_type, instance_var.name => config.instance_type, class_var.name => config.class_type })
-            type_ = type.subst(Substitution.build([], [], self_type: self_var, instance_type: instance_var, module_type: class_var))
+            type_ = type.subst(Substitution.build([], [], self_type: self_var, instance_type: instance_var, module_type: class_var)) #: AST::Types::Intersection
 
             config_ = config.update(resolve_self: false, resolve_class: true, resolve_instance: true, variable_bounds: bounds)
 

data/lib/steep/services/completion_provider.rb

@@ -244,6 +244,9 @@ module Steep
 
         rescue Parser::SyntaxError => exn
           Steep.logger.info "recovering syntax error: #{exn.inspect}"
+
+          @source_text = source_text.dup
+
           case possible_trigger
           when "."
             if source_text[index-2] == "&"

data/lib/steep/type_construction.rb

@@ -710,7 +710,7 @@ module Steep
                 end
               end
 
-              p = pair.constr.synthesize(last_node, hint: hint)
+              p = pair.constr.synthesize(last_node, hint: hint, condition: condition)
               last_pair = pair + p
               last_pair.constr.add_typing(node, type: last_pair.type, constr: last_pair.constr)
             else

data/lib/steep/type_inference/logic_type_interpreter.rb

@@ -292,7 +292,7 @@ module Steep
             )
 
             truthy_result = Result.new(type: TRUE, env: truthy_env, unreachable: false)
-            truthy_result.unreachable! if unwrap == receiver_type
+            truthy_result.unreachable! if no_subtyping?(sub_type: AST::Builtin.nil_type, super_type: receiver_type)
 
             falsy_result = Result.new(type: FALSE, env: falsy_env, unreachable: false)
             falsy_result.unreachable! unless unwrap
@@ -529,15 +529,14 @@ module Steep
           # 3. K <: T           (example: T = Numeric, K = Integer)
           # 4. none of the above (example: T = String, K = Integer)
 
-          relation = Subtyping::Relation.new(sub_type: type, super_type: instance_type)
-          if subtyping.check(relation, constraints: Subtyping::Constraints.empty, self_type: AST::Types::Self.instance, instance_type: AST::Types::Instance.instance, class_type: AST::Types::Class.instance).success?
+          if subtyping?(sub_type: type, super_type: instance_type)
             # 1 or 2. Satisfies the condition, no narrowing because `type` is already more specific than/equals to `instance_type`
             [
               [type],
               []
             ]
           else
-            if subtyping.check(relation.flip, constraints: Subtyping::Constraints.empty, self_type: AST::Types::Self.instance, instance_type: AST::Types::Instance.instance, class_type: AST::Types::Class.instance).success?
+            if subtyping?(sub_type: instance_type, super_type: type)
               # 3. Satisfied the condition, narrows to `instance_type`, but cannot remove it from *falsy* list
               [
                 [instance_type],
@@ -554,6 +553,19 @@ module Steep
         end
       end
 
+      def no_subtyping?(sub_type:, super_type:)
+        relation = Subtyping::Relation.new(sub_type: sub_type, super_type: super_type)
+        result = subtyping.check(relation, constraints: Subtyping::Constraints.empty, self_type: AST::Types::Self.instance, instance_type: AST::Types::Instance.instance, class_type: AST::Types::Class.instance)
+
+        if result.failure?
+          result
+        end
+      end
+
+      def subtyping?(sub_type:, super_type:)
+        !no_subtyping?(sub_type: sub_type, super_type: super_type)
+      end
+
       def try_convert(type, method)
         if shape = subtyping.builder.shape(type, public_only: true, config: config)
           if entry = shape.methods[method]

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "1.5.1"
+  VERSION = "1.5.3"
 end

data/rbs_collection.steep.lock.yaml

@@ -103,4 +103,4 @@ gems:
   version: '0'
   source:
     type: stdlib
-gemfile_lock_path: Gemfile.steep.lock
+gemfile_lock_path: gemfile_steep/Gemfile.lock

data/sig/steep/interface/builder.rbs

@@ -71,6 +71,18 @@ module Steep
 
         # Substitution for immediate type expressions
         def subst: () -> Substitution
+
+        # Returns `self_type`, or `nil` when it is `Types::Self`
+        #
+        def self_type?: () -> AST::Types::t?
+
+        # Returns `class_type`, or `nil` when it is `Types::Class`
+        #
+        def class_type?: () -> AST::Types::t?
+
+        # Returns `instanc_type`, or `nil` when it is `Types::Instance`
+        #
+        def instance_type?: () -> AST::Types::t?
       end
 
       attr_reader factory: AST::Types::Factory

data/sig/steep/type_inference/logic_type_interpreter.rbs

@@ -99,6 +99,10 @@ module Steep
       def type_case_select0: (AST::Types::t `type`, RBS::TypeName klass) -> [Array[AST::Types::t], Array[AST::Types::t]]
 
       def try_convert: (AST::Types::t, Symbol) -> AST::Types::t?
+
+      def no_subtyping?: (sub_type: AST::Types::t, super_type: AST::Types::t) -> Subtyping::Result::t?
+
+      def subtyping?: (sub_type: AST::Types::t, super_type: AST::Types::t) -> bool
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-20 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -242,7 +242,6 @@ files:
 - Gemfile
 - Gemfile.lock
 - Gemfile.steep
-- Gemfile.steep.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -255,6 +254,8 @@ files:
 - bin/steep
 - bin/steep-prof
 - exe/steep
+- gemfile_steep/Gemfile
+- gemfile_steep/Gemfile.lock
 - guides/README.md
 - guides/src/gem-rbs-collection/gem-rbs-collection.md
 - guides/src/getting-started/getting-started.md