parser 2.3.0.2 → 2.3.0.3

data/test/test_parser.rb

@@ -3738,6 +3738,18 @@ class TestParser < Minitest::Test
       ALL_VERSIONS - %w(1.8))
   end
 
+  def test_space_args_hash_literal_then_block
+    # This code only parses if the lexer enters expr_endarg state correctly
+    assert_parses(
+      s(:block,
+        s(:send, nil, :f, s(:int, 1), s(:hash, s(:pair, s(:int, 1), s(:int, 2)))),
+        s(:args),
+        s(:int, 1)),
+      %q{f 1, {1 => 2} {1}},
+      %q{},
+      ALL_VERSIONS)
+  end
+
   def test_space_args_arg_call
     assert_parses(
       s(:send, nil, :fun,

data/test/test_source_comment_associator.rb

@@ -255,4 +255,21 @@ __ENCODING__
     assert_equal ['# foo'],
                  associations[ast].map(&:text)
   end
+
+  def test_associate_inside_heredoc
+    ast, associations = associate(<<-END)
+<<x
+\#{
+  foo # bar
+}
+x
+    END
+
+    begin_node = ast.children[0]
+    send_node  = begin_node.children[0]
+
+    assert_equal 1, associations.size
+    assert_equal ['# bar'],
+                 associations[send_node].map(&:text)
+  end
 end

data/test/test_source_range.rb

@@ -55,6 +55,26 @@ class TestSourceRange < Minitest::Test
     assert !sr2.disjoint?(sr3)
   end
 
+  def test_overlaps
+    sr1 = Parser::Source::Range.new(@buf, 1, 3)
+    sr2 = Parser::Source::Range.new(@buf, 2, 6)
+    sr3 = Parser::Source::Range.new(@buf, 5, 8)
+
+    assert !sr1.overlaps?(sr3)
+    assert sr1.overlaps?(sr2)
+    assert sr2.overlaps?(sr3)
+  end
+
+  def test_empty
+    sr1 = Parser::Source::Range.new(@buf, 1, 3)
+    sr2 = Parser::Source::Range.new(@buf, 2, 2)
+    sr3 = Parser::Source::Range.new(@buf, 7, 8)
+
+    assert !sr1.empty?
+    assert sr2.empty?
+    assert !sr3.empty?
+  end
+
   def test_line
     sr = Parser::Source::Range.new(@buf, 7, 8)
     assert_equal 2, sr.line

data/test/test_source_rewriter.rb

@@ -56,16 +56,262 @@ class TestSourceRewriter < Minitest::Test
                     process
   end
 
-  def test_multiple_insertions_at_same_location
-    assert_equal '<([foo] bar) baz>',
-                 @rewriter.
-                   insert_before(range(0, 11), '<').
-                   insert_after( range(0, 11), '>').
-                   insert_before(range(0, 7), '(').
-                   insert_after( range(0, 7), ')').
-                   insert_before(range(0, 3), '[').
-                   insert_after( range(0, 3), ']').
-                   process
+  #
+  # Merging/clobbering of overlapping edits
+  #
+
+  def test_insertion_just_before_replace
+    assert_equal 'foostrawberry jam---bar baz',
+      @rewriter.
+        replace(range(3, 1), '---').
+        insert_before(range(3, 1), 'strawberry jam').
+        process
+  end
+
+  def test_insertion_just_after_replace
+    assert_equal 'foo---strawberry jam baz',
+      @rewriter.
+        replace(range(3, 4), '---').
+        insert_after(range(3, 4), 'strawberry jam').
+        process
+  end
+
+  def test_insertion_just_before_remove
+    assert_equal 'foostrawberry jambar baz',
+      @rewriter.
+        remove(range(3, 1)).
+        insert_before(range(3, 1), 'strawberry jam').
+        process
+  end
+
+  def test_insertion_just_after_remove
+    assert_equal 'foostrawberry jam baz',
+      @rewriter.
+        remove(range(3, 4)).
+        insert_after(range(3, 4), 'strawberry jam').
+        process
+  end
+
+  def test_insertion_just_before_replace_at_buffer_start
+    assert_equal 'strawberry jam--- bar baz',
+      @rewriter.
+        replace(range(0, 3), '---').
+        insert_before(range(0, 1), 'strawberry jam').
+        process
+  end
+
+  def test_insertion_just_after_replace_at_buffer_end
+    assert_equal 'foo bar ---strawberry jam',
+      @rewriter.
+        replace(range(8, 3), '---').
+        insert_after(range(9, 2), 'strawberry jam').
+        process
+  end
+
+  def test_insertion_just_before_remove_at_buffer_start
+    assert_equal 'strawberry bar baz',
+      @rewriter.
+        remove(range(0, 3)).
+        insert_before(range(0, 1), 'strawberry').
+        process
+  end
+
+  def test_insertion_just_after_remove_at_buffer_end
+    assert_equal 'foo bar strawberry',
+      @rewriter.
+        remove(range(8, 3)).
+        insert_after(range(10, 1), 'strawberry').
+        process
+  end
+
+  def test_multiple_insertions_at_same_location_clobber
+    silence_diagnostics
+
+    assert_raises Parser::ClobberingError do
+      @rewriter.
+        insert_before(range(0, 11), '<').
+        insert_after( range(0, 11), '>').
+        insert_before(range(0, 7), '(')
+    end
+  end
+
+  def test_insertion_within_replace_clobber
+    silence_diagnostics
+
+    assert_raises Parser::ClobberingError do
+      @rewriter.
+        replace(range(3, 2), '<').
+        insert_after(range(3, 1), '>')
+    end
+  end
+
+  def test_insertion_within_remove_clobber
+    silence_diagnostics
+
+    assert_raises Parser::ClobberingError do
+      @rewriter.
+        remove(range(3, 2)).
+        insert_after(range(3, 1), '>')
+    end
+  end
+
+  def test_replace_overlapping_insertion_clobber
+    silence_diagnostics
+
+    assert_raises Parser::ClobberingError do
+      @rewriter.
+        insert_after(range(3, 1), '>').
+        replace(range(3, 2), '<')
+    end
+  end
+
+  def test_remove_overlapping_insertion_clobber
+    silence_diagnostics
+
+    assert_raises Parser::ClobberingError do
+      @rewriter.
+        insert_after(range(3, 1), '>').
+        remove(range(3, 2))
+    end
+  end
+
+  def test_insertion_on_merged_insertion_clobber
+    # 2 insertions at the same point clobber each other, even if the 1st one
+    # was merged with an adjacent edit, and even if the same text is being
+    # inserted
+
+    silence_diagnostics
+
+    assert_raises Parser::ClobberingError do
+      @rewriter.
+        insert_before(range(3, 1), '>').
+        remove(range(3, 2)).
+        insert_after(range(2, 1), '>')
+    end
+  end
+
+  def test_insertion_merge_with_overlapping_replace
+    assert_equal 'fo abc bar baz',
+      @rewriter.
+        insert_before(range(3, 1), 'abc').
+        replace(range(2, 2), ' abc ').
+        process
+  end
+
+  def test_replace_merge_with_overlapped_insertion
+    assert_equal 'fo abc bar baz',
+      @rewriter.
+        replace(range(2, 2), ' abc ').
+        insert_before(range(3, 1), 'abc').
+        process
+  end
+
+  def test_replace_same_begin_larger_than_replaced_range_matching
+    assert_equal 'foo supercalifragilistic baz',
+      @rewriter.
+        replace(range(4, 3), 'super').
+        replace(range(4, 3), 'supercalifragilistic').
+        process
+  end
+
+  def test_replace_same_begin_larger_than_replaced_range_non_matching
+    silence_diagnostics
+
+    assert_raises Parser::ClobberingError do
+      @rewriter.
+        replace(range(4, 3), 'super!').
+        replace(range(4, 3), 'supercalifragilistic')
+    end
+  end
+
+  def test_overlapping_replace_left_smaller_than_replaced_matching
+    assert_equal 'superbaz',
+      @rewriter.
+        replace(range(0, 7), 'super').
+        replace(range(2, 6), 'per').
+        process
+  end
+
+  def test_overlapping_replace_left_smaller_than_replaced_non_matching
+    silence_diagnostics
+
+    assert_raises Parser::ClobberingError do
+      @rewriter.
+        replace(range(0, 7), 'super').
+        replace(range(2, 8), 'perk')
+    end
+  end
+
+  def test_overlapping_replace_left_larger_right_smaller_matching
+    assert_equal 'foods baz',
+      @rewriter.
+        replace(range(1, 3), 'oods ').
+        replace(range(3, 6), 'ds b').
+        process
+  end
+
+  def test_overlapping_replace_left_larger_right_larger_matching
+    assert_equal 'foods abcdefghijklm',
+      @rewriter.
+        replace(range(1, 3), 'oods ').
+        replace(range(3, 8), 'ds abcdefghijklm').
+        process
+  end
+
+  def test_overlapping_replace_left_larger_right_smaller_non_matching
+    silence_diagnostics
+
+    assert_raises Parser::ClobberingError do
+      @rewriter.
+        replace(range(1, 3), 'oods ').
+        replace(range(3, 6), 'ds')
+    end
+  end
+
+  def test_overlapping_replace_left_larger_right_larger_non_matching
+    silence_diagnostics
+
+    assert_raises Parser::ClobberingError do
+      @rewriter.
+        replace(range(1, 3), 'oods b').
+        replace(range(3, 8), 'ds abcdefghijklm')
+    end
+  end
+
+  def test_subsuming_replace_both_smaller_matching
+    assert_equal 'food baz',
+      @rewriter.
+        replace(range(0, 7), 'food').
+        replace(range(3, 3), 'd').
+        process
+  end
+
+  def test_subsuming_replace_both_smaller_non_matching
+    silence_diagnostics
+
+    assert_raises Parser::ClobberingError do
+      @rewriter.
+        replace(range(0, 7), 'foo').
+        replace(range(3, 3), 'd')
+    end
+  end
+
+  def test_subsuming_replace_both_larger_matching
+    assert_equal 'foo barr baz',
+      @rewriter.
+        replace(range(0, 7), 'foo barr').
+        replace(range(3, 3), ' bar').
+        process
+  end
+
+  def test_subsuming_replace_both_larger_non_matching
+    silence_diagnostics
+
+    assert_raises Parser::ClobberingError do
+      @rewriter.
+        replace(range(0, 7), 'foo barr').
+        replace(range(3, 3), ' bar ')
+    end
   end
 
   def test_clobber
@@ -111,6 +357,7 @@ class TestSourceRewriter < Minitest::Test
     assert rescued
   end
 
+
   def test_overlapping_delete
     assert_equal 'faz',
                  @rewriter.
@@ -147,6 +394,18 @@ class TestSourceRewriter < Minitest::Test
                    process
   end
 
+  def test_equivalent_delete_insert_replace
+    # A deletion + insertion just before or after the deleted range is
+    # identical in every way to a replacement! So logically, they shouldn't
+    # conflict.
+    assert_equal 'tin bar baz',
+      @rewriter.
+        remove(range(0, 3)).  # ' bar baz'
+        insert_before(range(0, 1), 'tin'). # 'tin bar baz'
+        replace(range(0, 3), 'tin').
+        process
+  end
+
   def test_transaction_returns_self
     assert_equal @rewriter, @rewriter.transaction {}
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.3.0.2
+  version: 2.3.0.3
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-24 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast