Merge pull request #210 from ruby/schneems/rev-min-version

Bump minimum Ruby version & update standardrb

Author: schneems

CHANGELOG.md

@@ -1,6 +1,6 @@
 ## HEAD (unreleased)
 
-- No longer supports EOL versions of Ruby.
+- No longer supports EOL versions of Ruby. (https://github.com/ruby/syntax_suggest/pull/210)
 - Handle Ruby 3.3 new eval source location format (https://github.com/ruby/syntax_suggest/pull/200).
 
 ## 1.1.0

Gemfile.lock

@@ -9,13 +9,18 @@ GEM
     ast (2.4.2)
     benchmark-ips (2.9.2)
     diff-lcs (1.4.4)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    json (2.7.0)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.1.0)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
+      racc
+    racc (1.7.3)
+    rainbow (3.1.1)
     rake (12.3.3)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
+    regexp_parser (2.8.3)
+    rexml (3.2.6)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -29,27 +34,38 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (1.20.0)
+    rubocop (1.57.2)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.11.5)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-prof (1.4.3)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     stackprof (0.2.16)
-    standard (1.3.0)
-      rubocop (= 1.20.0)
-      rubocop-performance (= 1.11.5)
-    unicode-display_width (2.1.0)
+    standard (1.32.1)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.57.2)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.2)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.2.1)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.19.1)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby

lib/syntax_suggest/code_frontier.rb

@@ -117,7 +117,7 @@ def expand?
 
       if ENV["SYNTAX_SUGGEST_DEBUG"]
         puts "```"
-        puts @queue.peek.to_s
+        puts @queue.peek
         puts "```"
         puts "  @frontier indent:  #{frontier_indent}"
         puts "  @unvisited indent: #{unvisited_indent}"

lib/syntax_suggest/code_search.rb

@@ -43,7 +43,7 @@ class CodeSearch
 
     def initialize(source, record_dir: DEFAULT_VALUE)
       record_dir = if record_dir == DEFAULT_VALUE
-        ENV["SYNTAX_SUGGEST_RECORD_DIR"] || ENV["SYNTAX_SUGGEST_DEBUG"] ? "tmp" : nil
+        (ENV["SYNTAX_SUGGEST_RECORD_DIR"] || ENV["SYNTAX_SUGGEST_DEBUG"]) ? "tmp" : nil
       else
         record_dir
       end
@@ -73,7 +73,7 @@ def record(block:, name: "record")
       if ENV["SYNTAX_SUGGEST_DEBUG"]
         puts "\n\n==== #{filename} ===="
         puts "\n```#{block.starts_at}..#{block.ends_at}"
-        puts block.to_s
+        puts block
         puts "```"
         puts "  block indent:      #{block.current_indent}"
       end

lib/syntax_suggest/display_invalid_blocks.rb

@@ -14,7 +14,7 @@ def initialize(code_lines:, blocks:, io: $stderr, filename: nil, terminal: DEFAU
       @filename = filename
       @code_lines = code_lines
 
-      @terminal = terminal == DEFAULT_VALUE ? io.isatty : terminal
+      @terminal = (terminal == DEFAULT_VALUE) ? io.isatty : terminal
     end
 
     def document_ok?

spec/integration/ruby_command_line_spec.rb

@@ -9,7 +9,7 @@ module SyntaxSuggest
       Dir.mktmpdir do |dir|
         tmpdir = Pathname(dir)
         script = tmpdir.join("script.rb")
-        script.write <<~'EOM'
+        script.write <<~EOM
           puts Kernel.private_methods
         EOM
 
@@ -159,7 +159,7 @@ class Dog
       Dir.mktmpdir do |dir|
         tmpdir = Pathname(dir)
         script = tmpdir.join("script.rb")
-        script.write <<~'EOM'
+        script.write <<~EOM
           $stderr = STDOUT
           eval("def lol")
         EOM
@@ -178,7 +178,7 @@ class Dog
       Dir.mktmpdir do |dir|
         tmpdir = Pathname(dir)
         script = tmpdir.join("script.rb")
-        script.write <<~'EOM'
+        script.write <<~EOM
           break
         EOM
 

spec/integration/syntax_suggest_spec.rb

@@ -26,7 +26,7 @@ module SyntaxSuggest
       debug_display(io.string)
       debug_display(benchmark)
 
-      expect(io.string).to include(<<~'EOM')
+      expect(io.string).to include(<<~EOM)
              6  class SyntaxTree < Ripper
            170    def self.parse(source)
            174    end
@@ -54,7 +54,7 @@ module SyntaxSuggest
       end
 
       expect(io.string).to_not include("def ruby_install_binstub_path")
-      expect(io.string).to include(<<~'EOM')
+      expect(io.string).to include(<<~EOM)
         > 1067    def add_yarn_binary
         > 1068      return [] if yarn_preinstalled?
         > 1069  |
@@ -72,7 +72,7 @@ module SyntaxSuggest
       )
       debug_display(io.string)
 
-      expect(io.string).to include(<<~'EOM')
+      expect(io.string).to include(<<~EOM)
            1  Rails.application.routes.draw do
         > 113    namespace :admin do
         > 116    match "/foobar(*path)", via: :all, to: redirect { |_params, req|
@@ -91,7 +91,7 @@ module SyntaxSuggest
       )
       debug_display(io.string)
 
-      expect(io.string).to include(<<~'EOM')
+      expect(io.string).to include(<<~EOM)
            1  describe "webmock tests" do
           22    it "body" do
           27      query = Cutlass::FunctionQuery.new(
@@ -113,7 +113,7 @@ module SyntaxSuggest
       )
       debug_display(io.string)
 
-      expect(io.string).to include(<<~'EOM')
+      expect(io.string).to include(<<~EOM)
            5  module DerailedBenchmarks
            6    class RequireTree
         > 13      def initialize(name)
@@ -166,7 +166,7 @@ module SyntaxSuggest
     end
 
     it "ambiguous end" do
-      source = <<~'EOM'
+      source = <<~EOM
         def call          # 0
             print "lol"   # 1
           end # one       # 2
@@ -186,7 +186,7 @@ def call          # 0
     end
 
     it "simple regression" do
-      source = <<~'EOM'
+      source = <<~EOM
         class Dog
           def bark
             puts "woof"
@@ -206,7 +206,7 @@ def bark
     end
 
     it "empty else" do
-      source = <<~'EOM'
+      source = <<~EOM
         class Foo
           def foo
             if cond?

spec/unit/around_block_scan_spec.rb

@@ -5,7 +5,7 @@
 module SyntaxSuggest
   RSpec.describe AroundBlockScan do
     it "continues scan from last location even if scan is false" do
-      source = <<~'EOM'
+      source = <<~EOM
         print 'omg'
         print 'lol'
         print 'haha'

spec/unit/capture/before_after_keyword_ends_spec.rb

@@ -5,7 +5,7 @@
 module SyntaxSuggest
   RSpec.describe Capture::BeforeAfterKeywordEnds do
     it "before after keyword ends" do
-      source = <<~'EOM'
+      source = <<~EOM
         def nope
           print 'not me'
         end
@@ -36,7 +36,7 @@ def nada
       ).call
       lines.sort!
 
-      expect(lines.join).to include(<<~'EOM')
+      expect(lines.join).to include(<<~EOM)
         def lol
         end
         def yolo

spec/unit/capture/falling_indent_lines_spec.rb

@@ -5,7 +5,7 @@
 module SyntaxSuggest
   RSpec.describe Capture::FallingIndentLines do
     it "on_falling_indent" do
-      source = <<~'EOM'
+      source = <<~EOM
         class OH
           def lol
             print 'lol
@@ -33,7 +33,7 @@ def yolo
       end
       lines.sort!
 
-      expect(lines.join).to eq(<<~'EOM')
+      expect(lines.join).to eq(<<~EOM)
         class OH
           def hello
           end