Merge pull request #334 from crystal-ameba/Sija/crystal-1.7.0-fixes

Fix specs on Crystal nightly (soon to be v1.7.0)

spec/ameba/rule/lint/duplicated_require_spec.cr

@@ -17,7 +17,7 @@ module Ameba::Rule::Lint
         require "big"
         require "math"
         require "big"
-        # ^{} error: Duplicated require of `big`
+        # ^^^^^^^^^^^ error: Duplicated require of `big`
         CRYSTAL
 
       expect_no_corrections source

spec/ameba/rule/lint/empty_expression_spec.cr

@@ -84,11 +84,6 @@ module Ameba
     it_detects_empty_expression %(
       begin; end
     )
-    it_detects_empty_expression %(
-      begin
-        nil
-      end
-    )
     it_detects_empty_expression %(
       begin
         ()

spec/ameba/rule/lint/redundant_with_index_spec.cr

@@ -77,7 +77,7 @@ module Ameba::Rule::Lint
         issue = s.issues.first
         issue.rule.should_not be_nil
         issue.location.to_s.should eq "source.cr:2:19"
-        issue.end_location.to_s.should eq "source.cr:2:29"
+        issue.end_location.to_s.should eq "source.cr:2:28"
         issue.message.should eq "Remove redundant with_index"
       end
     end
@@ -155,7 +155,7 @@ module Ameba::Rule::Lint
         issue = s.issues.first
         issue.rule.should_not be_nil
         issue.location.to_s.should eq "source.cr:2:14"
-        issue.end_location.to_s.should eq "source.cr:2:29"
+        issue.end_location.to_s.should eq "source.cr:2:28"
         issue.message.should eq "Use each instead of each_with_index"
       end
     end

spec/ameba/rule/lint/redundant_with_object_spec.cr

@@ -76,7 +76,7 @@ module Ameba::Rule::Lint
       issue = s.issues.first
       issue.rule.should_not be_nil
       issue.location.to_s.should eq "source.cr:2:14"
-      issue.end_location.to_s.should eq "source.cr:2:30"
+      issue.end_location.to_s.should eq "source.cr:2:29"
       issue.message.should eq "Use `each` instead of `each_with_object`"
     end
   end

spec/ameba/rule/performance/any_after_filter_spec.cr

@@ -17,7 +17,7 @@ module Ameba::Rule::Performance
     it "reports if there is select followed by any? without a block" do
       source = expect_issue subject, <<-CRYSTAL
         [1, 2, 3].select { |e| e > 2 }.any?
-                # ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `any? {...}` instead of `select {...}.any?`
+                # ^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `any? {...}` instead of `select {...}.any?`
         CRYSTAL
 
       expect_no_corrections source
@@ -32,7 +32,7 @@ module Ameba::Rule::Performance
     it "reports if there is reject followed by any? without a block" do
       source = expect_issue subject, <<-CRYSTAL
         [1, 2, 3].reject { |e| e > 2 }.any?
-                # ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `any? {...}` instead of `reject {...}.any?`
+                # ^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `any? {...}` instead of `reject {...}.any?`
         CRYSTAL
 
       expect_no_corrections source
@@ -60,7 +60,7 @@ module Ameba::Rule::Performance
       it "reports in macro scope" do
         source = expect_issue subject, <<-CRYSTAL
           {{ [1, 2, 3].reject { |e| e > 2  }.any? }}
-                     # ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `any? {...}` instead of `reject {...}.any?`
+                     # ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `any? {...}` instead of `reject {...}.any?`
           CRYSTAL
 
         expect_no_corrections source

spec/ameba/rule/performance/compact_after_map_spec.cr

@@ -19,7 +19,7 @@ module Ameba::Rule::Performance
     it "reports if there is map followed by compact call" do
       expect_issue subject, <<-CRYSTAL
         (1..3).map(&.itself).compact
-             # ^^^^^^^^^^^^^^^^^^^^^^ error: Use `compact_map {...}` instead of `map {...}.compact`
+             # ^^^^^^^^^^^^^^^^^^^^^ error: Use `compact_map {...}` instead of `map {...}.compact`
         CRYSTAL
     end
 

spec/ameba/rule/performance/first_last_after_filter_spec.cr

@@ -17,7 +17,7 @@ module Ameba::Rule::Performance
     it "reports if there is select followed by last" do
       expect_issue subject, <<-CRYSTAL
         [1, 2, 3].select { |e| e > 2 }.last
-                # ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `reverse_each.find {...}` instead of `select {...}.last`
+                # ^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `reverse_each.find {...}` instead of `select {...}.last`
         CRYSTAL
     end
 
@@ -30,14 +30,14 @@ module Ameba::Rule::Performance
     it "reports if there is select followed by last?" do
       expect_issue subject, <<-CRYSTAL
         [1, 2, 3].select { |e| e > 2 }.last?
-                # ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `reverse_each.find {...}` instead of `select {...}.last?`
+                # ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `reverse_each.find {...}` instead of `select {...}.last?`
         CRYSTAL
     end
 
     it "reports if there is select followed by first" do
       expect_issue subject, <<-CRYSTAL
         [1, 2, 3].select { |e| e > 2 }.first
-                # ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `find {...}` instead of `select {...}.first`
+                # ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `find {...}` instead of `select {...}.first`
         CRYSTAL
     end
 
@@ -50,7 +50,7 @@ module Ameba::Rule::Performance
     it "reports if there is select followed by first?" do
       expect_issue subject, <<-CRYSTAL
         [1, 2, 3].select { |e| e > 2 }.first?
-                # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `find {...}` instead of `select {...}.first?`
+                # ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `find {...}` instead of `select {...}.first?`
         CRYSTAL
     end
 

spec/ameba/rule/performance/flatten_after_map_spec.cr

@@ -13,7 +13,7 @@ module Ameba::Rule::Performance
     it "reports if there is map followed by flatten call" do
       expect_issue subject, <<-CRYSTAL
         %w[Alice Bob].map(&.chars).flatten
-                    # ^^^^^^^^^^^^^^^^^^^^^ error: Use `flat_map {...}` instead of `map {...}.flatten`
+                    # ^^^^^^^^^^^^^^^^^^^^ error: Use `flat_map {...}` instead of `map {...}.flatten`
         CRYSTAL
     end
 

spec/ameba/rule/performance/map_instead_of_block_spec.cr

@@ -14,7 +14,7 @@ module Ameba::Rule::Performance
     it "reports if there is map followed by sum without a block" do
       expect_issue subject, <<-CRYSTAL
         (1..3).map(&.to_u64).sum
-             # ^^^^^^^^^^^^^^^^^^ error: Use `sum {...}` instead of `map {...}.sum`
+             # ^^^^^^^^^^^^^^^^^ error: Use `sum {...}` instead of `map {...}.sum`
         CRYSTAL
     end
 
@@ -27,14 +27,14 @@ module Ameba::Rule::Performance
     it "reports if there is map followed by sum without a block (with argument)" do
       expect_issue subject, <<-CRYSTAL
         (1..3).map(&.to_u64).sum(0)
-             # ^^^^^^^^^^^^^^^^^^ error: Use `sum {...}` instead of `map {...}.sum`
+             # ^^^^^^^^^^^^^^^^^ error: Use `sum {...}` instead of `map {...}.sum`
         CRYSTAL
     end
 
     it "reports if there is map followed by sum with a block" do
       expect_issue subject, <<-CRYSTAL
         (1..3).map(&.to_u64).sum(&.itself)
-             # ^^^^^^^^^^^^^^^^^^ error: Use `sum {...}` instead of `map {...}.sum`
+             # ^^^^^^^^^^^^^^^^^ error: Use `sum {...}` instead of `map {...}.sum`
         CRYSTAL
     end
 

spec/ameba/rule/performance/size_after_filter_spec.cr

@@ -19,7 +19,7 @@ module Ameba::Rule::Performance
     it "reports if there is a select followed by size" do
       expect_issue subject, <<-CRYSTAL
         [1, 2, 3].select { |e| e > 2 }.size
-                # ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `count {...}` instead of `select {...}.size`.
+                # ^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `count {...}` instead of `select {...}.size`.
         CRYSTAL
     end
 
@@ -32,14 +32,14 @@ module Ameba::Rule::Performance
     it "reports if there is a reject followed by size" do
       expect_issue subject, <<-CRYSTAL
         [1, 2, 3].reject { |e| e < 2 }.size
-                # ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `count {...}` instead of `reject {...}.size`.
+                # ^^^^^^^^^^^^^^^^^^^^^^^^^ error: Use `count {...}` instead of `reject {...}.size`.
         CRYSTAL
     end
 
     it "reports if a block shorthand used" do
       expect_issue subject, <<-CRYSTAL
         [1, 2, 3].reject(&.empty?).size
-                # ^^^^^^^^^^^^^^^^^^^^^^ error: Use `count {...}` instead of `reject {...}.size`.
+                # ^^^^^^^^^^^^^^^^^^^^^ error: Use `count {...}` instead of `reject {...}.size`.
         CRYSTAL
     end
 

spec/ameba/rule/style/query_bool_methods_spec.cr

@@ -51,7 +51,7 @@ module Ameba::Rule::Style
         expect_issue subject, <<-CRYSTAL, call: {{ call }}
           class Foo
             %{call}   foo : Bool = true
-            _{call} # ^ error: Consider using '%{call}?' for 'foo'
+            _{call} # ^^^ error: Consider using '%{call}?' for 'foo'
           end
           CRYSTAL
       end
@@ -60,7 +60,7 @@ module Ameba::Rule::Style
         expect_issue subject, <<-CRYSTAL, call: {{ call }}
           class Foo
             %{call}   foo : Bool
-            _{call} # ^ error: Consider using '%{call}?' for 'foo'
+            _{call} # ^^^ error: Consider using '%{call}?' for 'foo'
 
             def initialize(@foo = true)
             end

src/ameba/rule/lint/empty_expression.cr

@@ -34,19 +34,11 @@ module Ameba::Rule::Lint
       description "Disallows empty expressions"
     end
 
-    MSG      = "Avoid empty expression %s"
+    MSG = "Avoid empty expressions"
-    MSG_EXRS = "Avoid empty expressions"
-
-    def test(source, node : Crystal::NilLiteral)
-      exp = node_source(node, source.lines)
-      return if exp.in?(nil, "nil")
-
-      issue_for node, MSG % exp
-    end
 
     def test(source, node : Crystal::Expressions)
       return unless node.expressions.size == 1 && node.expressions.first.nop?
-      issue_for node, MSG_EXRS
+      issue_for node, MSG
     end
   end
 end