More test cases, more tests

Author: kddnewton

lib/syntax_tree/node.rb

@@ -5484,12 +5484,14 @@ def format_flat(q)
       q.format(predicate)
       q.text(" ?")
 
-      q.breakable
-      q.format(truthy)
-      q.text(" :")
+      q.indent do
+        q.breakable
+        q.format(truthy)
+        q.text(" :")
 
-      q.breakable
-      q.format(falsy)
+        q.breakable
+        q.format(falsy)
+      end
     end
   end
 

lib/syntax_tree/parser.rb

@@ -548,13 +548,6 @@ def on_aryptn(constant, requireds, rest, posts)
           parts[0].location.to(parts[-1].location)
         end
 
-      # If there's the optional then keyword, then we'll delete that and use it
-      # as the end bounds of the location.
-      if (token = find_token(Kw, "then", consume: false))
-        tokens.delete(token)
-        location = location.to(token.location)
-      end
-
       # If there is a plain *, then we're going to fix up the location of it
       # here because it currently doesn't have anything to use for its precise
       # location. If we hit a comma, then we've gone too far.
@@ -1698,12 +1691,6 @@ def on_hshptn(constant, keywords, keyword_rest)
         end
       end
 
-      # Delete the optional then keyword
-      if (token = find_token(Kw, "then", consume: false))
-        parts << token
-        tokens.delete(token)
-      end
-
       HshPtn.new(
         constant: constant,
         keywords: keywords || [],
@@ -3013,6 +3000,11 @@ def on_stmts_new
     #     (StringEmbExpr | StringDVar | TStringContent) part
     #   ) -> StringContent
     def on_string_add(string, part)
+      # Due to some eccentricities in how ripper works, you need this here in
+      # case you have a syntax error with an embedded expression that doesn't
+      # finish, as in: "#{"
+      return string if part.is_a?(String)
+
       location =
         string.parts.any? ? string.location.to(part.location) : part.location
 

test/fixtures/aryptn.rb

@@ -4,6 +4,22 @@
 end
 %
 case foo
+in [] then
+end
+-
+case foo
+in []
+end
+%
+case foo
+in * then
+end
+-
+case foo
+in [*]
+end
+%
+case foo
 in _, _
 end
 -

test/fixtures/call.rb

@@ -1,6 +1,8 @@
 %
 foo.bar
 %
+foo.bar(baz)
+%
 foo.()
 %
 foo::()
@@ -21,3 +23,40 @@
   .barrrrrrrrrrrrrrrrrrr {}
   .bazzzzzzzzzzzzzzzzzzzzzzzzzz
   .quxxxxxxxxx
+%
+foo. # comment
+  bar
+%
+foo
+  .bar
+  .baz # comment
+  .qux
+  .quux
+%
+foo
+  .bar
+  .baz.
+  # comment
+  qux
+  .quux
+%
+{ a: 1, b: 2 }.fooooooooooooooooo.barrrrrrrrrrrrrrrrrrr.bazzzzzzzzzzzz.quxxxxxxxxxxxx
+-
+{ a: 1, b: 2 }.fooooooooooooooooo
+  .barrrrrrrrrrrrrrrrrrr
+  .bazzzzzzzzzzzz
+  .quxxxxxxxxxxxx
+%
+fooooooooooooooooo.barrrrrrrrrrrrrrrrrrr.bazzzzzzzzzzzz.quxxxxxxxxxxxx.each { block }
+-
+fooooooooooooooooo.barrrrrrrrrrrrrrrrrrr.bazzzzzzzzzzzz.quxxxxxxxxxxxx.each do
+  block
+end
+%
+foo.bar.baz.each do
+  block1
+  block2
+end
+%
+a b do
+end.c d

test/fixtures/command_call.rb

@@ -32,3 +32,5 @@
 foo.
   # comment
   bar baz
+%
+foo.bar baz ? qux : qaz

test/fixtures/do_block.rb

@@ -14,3 +14,15 @@
 foo :bar do
   baz
 end
+%
+sig do
+  override.params(contacts: Contact::ActiveRecord_Relation).returns(
+    Customer::ActiveRecord_Relation
+  )
+end
+-
+sig do
+  override
+    .params(contacts: Contact::ActiveRecord_Relation)
+    .returns(Customer::ActiveRecord_Relation)
+end

test/fixtures/hshptn.rb

@@ -64,6 +64,14 @@
 end
 %
 case foo
+in {} then
+end
+-
+case foo
+in {}
+end
+%
+case foo
 in **nil
 end
 %

test/fixtures/if.rb

@@ -49,3 +49,13 @@
 end
 -
 not(a) ? b : c
+%
+(if foo then bar else baz end)
+-
+(
+  if foo
+    bar
+  else
+    baz
+  end
+)

test/fixtures/ifop.rb

@@ -10,3 +10,9 @@
 end
 %
 foo bar ? 1 : 2
+%
+foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo ? break : baz
+-
+foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo ?
+  break :
+  baz

test/location_test.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+module SyntaxTree
+  class LocationTest < Minitest::Test
+    def test_lines
+      location = Location.fixed(line: 1, char: 0, column: 0)
+      location = location.to(Location.fixed(line: 3, char: 3, column: 3))
+
+      assert_equal(1..3, location.lines)
+    end
+
+    def test_deconstruct
+      location = Location.fixed(line: 1, char: 0, column: 0)
+
+      case location
+      in [1, 0, 0, *]
+      end
+    end
+
+    def test_deconstruct_keys
+      location = Location.fixed(line: 1, char: 0, column: 0)
+
+      case location
+      in { start_line: 1 }
+      end
+    end
+  end
+end

test/node_test.rb

@@ -1032,6 +1032,20 @@ def test_multibyte_column_positions
       assert_node(Command, source, at: at)
     end
 
+    def test_root_class_raises_not_implemented_errors
+      {
+        accept: [nil],
+        child_nodes: [],
+        deconstruct: [],
+        deconstruct_keys: [[]],
+        format: [nil]
+      }.each do |method, arguments|
+        assert_raises(NotImplementedError) do
+          Node.new.public_send(method, *arguments)
+        end
+      end
+    end
+
     private
 
     def location(lines: 1..1, chars: 0..0, columns: 0..0)

test/parser_test.rb

@@ -30,5 +30,23 @@ def test_parses_ripper_methods
       # Finally, assert that we have no remaining events.
       assert_empty(events)
     end
+
+    def test_errors_on_missing_token_with_location
+      assert_raises(Parser::ParseError) do
+        SyntaxTree.parse("\"foo")
+      end
+    end
+
+    def test_errors_on_missing_token_without_location
+      assert_raises(Parser::ParseError) do
+        SyntaxTree.parse(":\"foo")
+      end
+    end
+
+    def test_handles_strings_with_non_terminated_embedded_expressions
+      assert_raises(Parser::ParseError) do
+        SyntaxTree.parse('"#{"')
+      end
+    end
   end
 end