Update tests for hash label fixes

Author: kddnewton

lib/syntax_tree/cli.rb

@@ -332,7 +332,21 @@ def highlight_error(error, source)
       # Take a line of Ruby source and colorize the output.
       def colorize_line(line)
         require "irb"
-        IRB::Color.colorize_code(line, complete: false, ignore_error: true)
+        IRB::Color.colorize_code(line, **colorize_options)
+      end
+
+      # These are the options we're going to pass into IRB::Color.colorize_code.
+      # Since we support multiple versions of IRB, we're going to need to do
+      # some reflection to make sure we always pass valid options.
+      def colorize_options
+        options = { complete: false }
+
+        parameters = IRB::Color.method(:colorize_code).parameters
+        if parameters.any? { |(_type, name)| name == :ignore_error }
+          options[:ignore_error] = true
+        end
+
+        options
       end
     end
   end

lib/syntax_tree/node.rb

@@ -1388,14 +1388,19 @@ def format(q)
   module HashKeyFormatter
     # Formats the keys of a hash literal using labels.
     class Labels
+      LABEL = /^[@$_A-Za-z]([_A-Za-z0-9]*)?([!_=?A-Za-z0-9])?$/
+
       def format_key(q, key)
         case key
-        when Label
+        in Label
           q.format(key)
-        when SymbolLiteral
+        in SymbolLiteral
           q.format(key.value)
           q.text(":")
-        when DynaSymbol
+        in DynaSymbol[parts: [TStringContent[value: LABEL] => part]]
+          q.format(part)
+          q.text(":")
+        in DynaSymbol
           q.format(key)
           q.text(":")
         end

test/cli_test.rb

@@ -119,8 +119,10 @@ def test_help_default
     end
 
     def test_no_arguments
-      *, stderr = capture_io { SyntaxTree::CLI.run(["check"]) }
-      assert_includes(stderr, "stree help")
+      $stdin.stub(:tty?, true) do
+        *, stderr = capture_io { SyntaxTree::CLI.run(["check"]) }
+        assert_includes(stderr, "stree help")
+      end
     end
 
     def test_no_arguments_no_tty
@@ -134,7 +136,7 @@ def test_no_arguments_no_tty
     end
 
     def test_generic_error
-      SyntaxTree.stub(:format, -> (*) { raise }) do
+      SyntaxTree.stub(:format, ->(*) { raise }) do
         result = run_cli("format")
         refute_equal(0, result.status)
       end
@@ -154,9 +156,7 @@ def run_cli(command, file: nil)
 
       status = nil
       stdio, stderr =
-        capture_io do
-          status = SyntaxTree::CLI.run([command, file.path])
-        end
+        capture_io { status = SyntaxTree::CLI.run([command, file.path]) }
 
       Result.new(status: status, stdio: stdio, stderr: stderr)
     ensure

test/fixtures/assoc.rb

@@ -40,3 +40,9 @@
 }
 % # >= 3.1.0
 { foo: }
+%
+{ "foo": "bar" }
+-
+{ foo: "bar" }
+%
+{ "foo #{bar}": "baz" }

test/fixtures/bare_assoc_hash.rb

@@ -7,7 +7,7 @@
 %
 foo(:"bar" => bar)
 -
-foo("bar": bar)
+foo(bar: bar)
 %
 foo(bar => bar, baz: baz)
 -

test/fixtures/dyna_symbol.rb

@@ -15,7 +15,7 @@
 %
 { %s[foo] => bar }
 -
-{ "foo": bar }
+{ foo: bar }
 %
 %s[
   foo

test/fixtures/hash.rb

@@ -9,7 +9,7 @@
 %
 { :"bar" => bar }
 -
-{ "bar": bar }
+{ bar: bar }
 %
 { bar => bar, baz: baz }
 -