From b8a1797d9cc2c218a5494a9bc3129ddb3df60c19 Mon Sep 17 00:00:00 2001 From: Soutaro Matsumoto Date: Tue, 26 Jul 2022 13:12:21 +0900 Subject: [PATCH 1/2] bundle steep 1.1.pre --- Gemfile.steep | 3 ++- Gemfile.steep.lock | 13 +++++++------ rbs_collection.steep.lock.yaml | 18 +++++++----------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/Gemfile.steep b/Gemfile.steep index 7fcbf773c..64724986f 100644 --- a/Gemfile.steep +++ b/Gemfile.steep @@ -1,3 +1,4 @@ source "https://rubygems.org" -gem "steep" +gem 'steep', '~> 1.1.pre' +gem "rbs", "~> 2.5.0" diff --git a/Gemfile.steep.lock b/Gemfile.steep.lock index 9a8b5ec8d..5ddce4d1e 100644 --- a/Gemfile.steep.lock +++ b/Gemfile.steep.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.3) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -9,7 +9,7 @@ GEM ast (2.4.2) concurrent-ruby (1.1.10) ffi (1.15.5) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) language_server-protocol (3.16.0.3) listen (3.7.1) @@ -23,8 +23,8 @@ GEM rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (2.6.0) - steep (1.0.1) + rbs (2.5.1) + steep (1.1.0.pre.1) activesupport (>= 5.1) language_server-protocol (>= 3.15, < 4.0) listen (~> 3.0) @@ -35,7 +35,7 @@ GEM terminal-table (>= 2, < 4) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) unicode-display_width (2.2.0) @@ -43,7 +43,8 @@ PLATFORMS arm64-darwin-21 DEPENDENCIES - steep + rbs (~> 2.5.0) + steep (~> 1.1.pre) BUNDLED WITH 2.3.15 diff --git a/rbs_collection.steep.lock.yaml b/rbs_collection.steep.lock.yaml index 130542ff0..5a3aebbd8 100644 --- a/rbs_collection.steep.lock.yaml +++ b/rbs_collection.steep.lock.yaml @@ -11,7 +11,7 @@ gems: source: type: stdlib - name: rbs - version: 2.6.0 + version: 2.5.1 source: type: rubygems - name: activesupport @@ -19,7 +19,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: cd6db41310b911e1df3476246257510673f01b8a + revision: 933f7176968d8620224c0b22baefadbd7d77ef27 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: ast @@ -27,7 +27,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: cd6db41310b911e1df3476246257510673f01b8a + revision: 933f7176968d8620224c0b22baefadbd7d77ef27 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: i18n @@ -35,7 +35,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: cd6db41310b911e1df3476246257510673f01b8a + revision: 933f7176968d8620224c0b22baefadbd7d77ef27 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: listen @@ -43,19 +43,15 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: cd6db41310b911e1df3476246257510673f01b8a + revision: 933f7176968d8620224c0b22baefadbd7d77ef27 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems -- name: minitest - version: '0' - source: - type: stdlib - name: parallel version: '1.20' source: type: git name: ruby/gem_rbs_collection - revision: cd6db41310b911e1df3476246257510673f01b8a + revision: 933f7176968d8620224c0b22baefadbd7d77ef27 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: rainbow @@ -63,7 +59,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: cd6db41310b911e1df3476246257510673f01b8a + revision: 933f7176968d8620224c0b22baefadbd7d77ef27 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: logger From c77d4f15ffc441c4794e250637d3b88d807c2185 Mon Sep 17 00:00:00 2001 From: Soutaro Matsumoto Date: Tue, 26 Jul 2022 13:12:28 +0900 Subject: [PATCH 2/2] Fix SystemStackError --- lib/steep/node_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/steep/node_helper.rb b/lib/steep/node_helper.rb index 7c9221cb0..26ef96251 100644 --- a/lib/steep/node_helper.rb +++ b/lib/steep/node_helper.rb @@ -40,7 +40,7 @@ def value_node?(node) when :dstr each_child_node(node).all? {|child| value_node?(child)} when :begin - each_child_node(node).all? {|child| value_node?(node) } + each_child_node(node).all? {|child| value_node?(child) } else false end