From 1d5f554e88a875b92a38729a69ecc2a32f6a7ce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?fn=20=E2=8C=83=20=E2=8C=A5?= <70830482+FnControlOption@users.noreply.github.com> Date: Tue, 26 Oct 2021 08:17:06 -0700 Subject: [PATCH] Apply suggestions from code review --- spec/ameba/rule/style/large_numbers_spec.cr | 4 ++-- src/ameba/cli/cmd.cr | 2 +- src/ameba/rule/style/large_numbers.cr | 4 ++-- src/ameba/runner.cr | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/ameba/rule/style/large_numbers_spec.cr b/spec/ameba/rule/style/large_numbers_spec.cr index f29884b5..ff950b2e 100644 --- a/spec/ameba/rule/style/large_numbers_spec.cr +++ b/spec/ameba/rule/style/large_numbers_spec.cr @@ -9,7 +9,7 @@ module Ameba expect_issue rule, <<-CRYSTAL, number: number number = %{number} - # ^{number} error: Large numbers should be written with underscores. + # ^{number} error: Large numbers should be written with underscores: #{expected} CRYSTAL expect_correction <<-CRYSTAL @@ -126,7 +126,7 @@ module Ameba issue.rule.should_not be_nil issue.location.to_s.should eq "source.cr:1:1" issue.end_location.to_s.should eq "source.cr:1:7" - issue.message.should eq "Large numbers should be written with underscores." + issue.message.should match /1_200_000/ end context "properties" do diff --git a/src/ameba/cli/cmd.cr b/src/ameba/cli/cmd.cr index e6212cde..42238e30 100644 --- a/src/ameba/cli/cmd.cr +++ b/src/ameba/cli/cmd.cr @@ -91,7 +91,7 @@ module Ameba::Cli opts.all = true end - parser.on("-a", "--autocorrect", "Autocorrect issues") do + parser.on("--fix", "Autocorrect issues") do opts.autocorrect = true end diff --git a/src/ameba/rule/style/large_numbers.cr b/src/ameba/rule/style/large_numbers.cr index 2f72ff1f..4c2de7ff 100644 --- a/src/ameba/rule/style/large_numbers.cr +++ b/src/ameba/rule/style/large_numbers.cr @@ -33,7 +33,7 @@ module Ameba::Rule::Style int_min_digits 5 end - MSG = "Large numbers should be written with underscores." + MSG = "Large numbers should be written with underscores: %s" def test(source) Tokenizer.new(source).run do |token| @@ -48,7 +48,7 @@ module Ameba::Rule::Style location.line_number, location.column_number + token.raw.size - 1 ) - issue_for location, end_location, MSG do |corrector| + issue_for location, end_location, MSG % expected do |corrector| corrector.replace(location, end_location, expected) end end diff --git a/src/ameba/runner.cr b/src/ameba/runner.cr index b6820e9a..429e7bd5 100644 --- a/src/ameba/runner.cr +++ b/src/ameba/runner.cr @@ -109,7 +109,7 @@ module Ameba source.issues.clear end corrected_issues.reverse_each { |issue| source.issues.unshift(issue) } - File.write(source.path, source.code) if corrected_issues.any? + File.write(source.path, source.code) unless corrected_issues.empty? @formatter.source_finished source end