From 0f893971dc63fa88b24a5457837a3de9c9fecbbf Mon Sep 17 00:00:00 2001 From: Sijawusz Pur Rahnama Date: Fri, 25 Nov 2022 04:00:15 +0100 Subject: [PATCH] Avoid one-letter names if possible --- src/ameba/formatter/disabled_formatter.cr | 6 +++--- src/ameba/formatter/flycheck_formatter.cr | 12 ++++++------ src/ameba/rule/lint/literal_in_interpolation.cr | 4 ++-- src/ameba/rule/lint/redundant_string_coercion.cr | 12 ++++++------ src/ameba/rule/style/negated_conditions_in_unless.cr | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ameba/formatter/disabled_formatter.cr b/src/ameba/formatter/disabled_formatter.cr index 37865c0f..681e981f 100644 --- a/src/ameba/formatter/disabled_formatter.cr +++ b/src/ameba/formatter/disabled_formatter.cr @@ -5,11 +5,11 @@ module Ameba::Formatter output << "Disabled rules using inline directives: \n\n" sources.each do |source| - source.issues.select(&.disabled?).each do |e| - next unless loc = e.location + source.issues.select(&.disabled?).each do |issue| + next unless loc = issue.location output << "#{source.path}:#{loc.line_number}".colorize(:cyan) - output << " #{e.rule.name}\n" + output << " #{issue.rule.name}\n" end end end diff --git a/src/ameba/formatter/flycheck_formatter.cr b/src/ameba/formatter/flycheck_formatter.cr index 936bb001..491567e4 100644 --- a/src/ameba/formatter/flycheck_formatter.cr +++ b/src/ameba/formatter/flycheck_formatter.cr @@ -3,16 +3,16 @@ module Ameba::Formatter @mutex = Mutex.new def source_finished(source : Source) - source.issues.each do |e| - next if e.disabled? - next if e.correctable? && config[:autocorrect]? + source.issues.each do |issue| + next if issue.disabled? + next if issue.correctable? && config[:autocorrect]? - next unless loc = e.location + next unless loc = issue.location @mutex.synchronize do output.printf "%s:%d:%d: %s: [%s] %s\n", - source.path, loc.line_number, loc.column_number, e.rule.severity.symbol, - e.rule.name, e.message.gsub('\n', " ") + source.path, loc.line_number, loc.column_number, issue.rule.severity.symbol, + issue.rule.name, issue.message.gsub('\n', " ") end end end diff --git a/src/ameba/rule/lint/literal_in_interpolation.cr b/src/ameba/rule/lint/literal_in_interpolation.cr index a8683d12..fce21501 100644 --- a/src/ameba/rule/lint/literal_in_interpolation.cr +++ b/src/ameba/rule/lint/literal_in_interpolation.cr @@ -26,8 +26,8 @@ module Ameba::Rule::Lint def test(source, node : Crystal::StringInterpolation) node.expressions - .select { |e| !e.is_a?(Crystal::StringLiteral) && literal?(e) } - .each { |n| issue_for n, MSG } + .select { |exp| !exp.is_a?(Crystal::StringLiteral) && literal?(exp) } + .each { |exp| issue_for exp, MSG } end end end diff --git a/src/ameba/rule/lint/redundant_string_coercion.cr b/src/ameba/rule/lint/redundant_string_coercion.cr index 0273e6d9..35c5f662 100644 --- a/src/ameba/rule/lint/redundant_string_coercion.cr +++ b/src/ameba/rule/lint/redundant_string_coercion.cr @@ -36,12 +36,12 @@ module Ameba::Rule::Lint end private def string_coercion_nodes(node) - node.expressions.select do |e| - e.is_a?(Crystal::Call) && - e.name == "to_s" && - e.args.size.zero? && - e.named_args.nil? && - e.obj + node.expressions.select do |exp| + exp.is_a?(Crystal::Call) && + exp.name == "to_s" && + exp.args.size.zero? && + exp.named_args.nil? && + exp.obj end end end diff --git a/src/ameba/rule/style/negated_conditions_in_unless.cr b/src/ameba/rule/style/negated_conditions_in_unless.cr index 62e477f7..129ba274 100644 --- a/src/ameba/rule/style/negated_conditions_in_unless.cr +++ b/src/ameba/rule/style/negated_conditions_in_unless.cr @@ -42,7 +42,7 @@ module Ameba::Rule::Style when Crystal::BinaryOp negated_condition?(node.left) || negated_condition?(node.right) when Crystal::Expressions - node.expressions.any? { |e| negated_condition?(e) } + node.expressions.any? { |exp| negated_condition?(exp) } when Crystal::Not true else