Handle multiple Ruby versions

Author: kddnewton

.github/workflows/main.yml

@@ -4,6 +4,14 @@ on:
 - pull_request_target
 jobs:
   ci:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+        - '2.7'
+        - '3.0'
+        - '3.1'
+        - head
     name: CI
     runs-on: ubuntu-latest
     env:
@@ -13,7 +21,7 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
-        ruby-version: '3.1'
+        ruby-version: ${{ matrix.ruby }}
     - name: Test
       run: bundle exec rake test
   automerge:

Gemfile.lock

@@ -26,6 +26,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
+  ruby
   x86_64-darwin-19
   x86_64-darwin-21
   x86_64-linux

lib/syntax_tree/node.rb

@@ -3295,9 +3295,10 @@ def to_json(*opts)
     private
 
     def align?(node)
-      if node.arguments in Args[parts: [Def | Defs | DefEndless]]
+      case node.arguments
+      in Args[parts: [Def | Defs | DefEndless]]
         false
-      elsif node.arguments in Args[parts: [Command => command]]
+      in Args[parts: [Command => command]]
         align?(command)
       else
         true

test/fixtures/begin.rb

@@ -5,7 +5,3 @@
 begin
   expression
 end
-%
-case value
-in ^(expression)
-end

test/fixtures/command.rb

@@ -23,9 +23,3 @@
 %
 meta3 meta2 meta1 def self.foo
 end
-%
-meta1 def foo = 1
-%
-meta2 meta1 def foo = 1
-%
-meta3 meta2 meta1 def foo = 1

test/fixtures/command_def_endless.rb

@@ -0,0 +1,6 @@
+%
+meta1 def foo = 1
+%
+meta2 meta1 def foo = 1
+%
+meta3 meta2 meta1 def foo = 1

test/fixtures/pinned_begin.rb

@@ -0,0 +1,4 @@
+%
+case value
+in ^(expression)
+end

test/fixtures/var_field.rb

@@ -8,13 +8,3 @@
 foo = bar
 %
 @foo = bar
-%
-foo in bar
-%
-foo in ^bar
-%
-foo in ^@bar
-%
-foo in ^@@bar
-%
-foo in ^$gvar

test/fixtures/var_field_rassign.rb

@@ -0,0 +1,10 @@
+%
+foo in bar
+%
+foo in ^bar
+%
+foo in ^@bar
+%
+foo in ^@@bar
+%
+foo in ^$gvar

test/formatting_test.rb

@@ -4,13 +4,28 @@
 
 module SyntaxTree
   class FormattingTest < Minitest::Test
-    delimiter = /%(?: # (.+?))?\n/
+    FIXTURES_3_0_0 = %w[
+      command_def_endless
+      def_endless
+      fndptn
+      rassign
+      rassign_rocket
+    ]
+
+    FIXTURES_3_1_0 = %w[
+      pinned_begin
+      var_field_rassign
+    ]
 
-    Dir[File.join(__dir__, "fixtures", "*.rb")].each do |filepath|
-      basename = File.basename(filepath, ".rb")
-      sources = File.readlines(filepath).slice_before(delimiter)
+    fixtures = Dir[File.join(__dir__, "fixtures", "*.rb")].map { |filepath| File.basename(filepath, ".rb") }
+    fixtures -= FIXTURES_3_1_0 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.1.0")
+    fixtures -= FIXTURES_3_0_0 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")
+
+    delimiter = /%(?: # (.+?))?\n/
+    fixtures.each do |fixture|
+      filepath = File.join(__dir__, "fixtures", "#{fixture}.rb")
 
-      sources.each_with_index do |source, index|
+      File.readlines(filepath).slice_before(delimiter).each_with_index do |source, index|
         comment = source.shift.match(delimiter)[1]
         original, expected = source.join.split("-\n")
 
@@ -22,7 +37,7 @@ class FormattingTest < Minitest::Test
           next if Gem::Version.new(RUBY_VERSION) < version
         end
 
-        define_method(:"test_formatting_#{basename}_#{index}") do
+        define_method(:"test_formatting_#{fixture}_#{index}") do
           assert_equal(expected || original, SyntaxTree.format(original))
         end
       end

test/node_test.rb

@@ -289,12 +289,14 @@ def test_case
       assert_node(Case, "case", source)
     end
 
-    def test_rassign_in
-      assert_node(RAssign, "rassign", "value in pattern")
-    end
+    guard_version("3.0.0") do
+      def test_rassign_in
+        assert_node(RAssign, "rassign", "value in pattern")
+      end
 
-    def test_rassign_rocket
-      assert_node(RAssign, "rassign", "value => pattern")
+      def test_rassign_rocket
+        assert_node(RAssign, "rassign", "value => pattern")
+      end
     end
 
     def test_class
@@ -352,8 +354,10 @@ def method
       assert_node(Def, "def", source)
     end
 
-    def test_def_endless
-      assert_node(DefEndless, "def_endless", "def method = result")
+    guard_version("3.0.0") do
+      def test_def_endless
+        assert_node(DefEndless, "def_endless", "def method = result")
+      end
     end
 
     guard_version("3.1.0") do
@@ -478,16 +482,18 @@ def test_float_literal
       assert_node(FloatLiteral, "float", "1.0")
     end
 
-    def test_fndptn
-      source = <<~SOURCE
-        case value
-        in Container[*, 7, *]
-        end
-      SOURCE
+    guard_version("3.0.0") do
+      def test_fndptn
+        source = <<~SOURCE
+          case value
+          in Container[*, 7, *]
+          end
+        SOURCE
 
-      at = location(lines: 2..2, chars: 14..32)
-      assert_node(FndPtn, "fndptn", source, at: at) do |node|
-        node.consequent.pattern
+        at = location(lines: 2..2, chars: 14..32)
+        assert_node(FndPtn, "fndptn", source, at: at) do |node|
+          node.consequent.pattern
+        end
       end
     end
 

test/parser_test.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+module SyntaxTree
+  class ParserTest < Minitest::Test
+    def test_parses_ripper_methods
+      # First, get a list of all of the dispatched events from ripper.
+      events = Ripper::EVENTS
+
+      # Next, subtract all of the events that we have explicitly defined.
+      events -= Parser.private_instance_methods(false).grep(/^on_(\w+)/) { $1.to_sym }
+
+      # Next, subtract the list of events that we purposefully skipped.
+      events -= %i[
+        arg_ambiguous
+        assoclist_from_args
+        ignored_nl
+        ignored_sp
+        magic_comment
+        nl
+        nokw_param
+        operator_ambiguous
+        semicolon
+        sp
+        words_sep
+      ]
+
+      # Finally, assert that we have no remaining events.
+      assert_empty(events)
+    end
+  end
+end

test/visitor_test.rb

@@ -11,12 +11,27 @@ def test_visit_all_nodes
       program = SyntaxTree.parse(SyntaxTree.read(filepath))
 
       program.statements.body.last.bodystmt.statements.body.each do |node|
-        next unless node in SyntaxTree::ClassDeclaration[superclass: { value: { value: "Node" } }]
+        case node
+        in SyntaxTree::ClassDeclaration[superclass: { value: { value: "Node" } }]
+          # this is a class we want to look at
+        else
+          next
+        end
 
-        accept = node.bodystmt.statements.body.detect { |defm| defm in SyntaxTree::Def[name: { value: "accept" }] }
-        accept => { bodystmt: { statements: { body: [SyntaxTree::Call[message: { value: visit_method }]] } } }
+        accept =
+          node.bodystmt.statements.body.detect do |defm|
+            case defm
+            in SyntaxTree::Def[name: { value: "accept" }]
+              true
+            else
+              false
+            end
+          end
 
-        assert_respond_to(visitor, visit_method)
+        case accept
+        in { bodystmt: { statements: { body: [SyntaxTree::Call[message: { value: visit_method }]] } } }
+          assert_respond_to(visitor, visit_method)
+        end
       end
     end
   end