From a8f953a2b20ee866ea2aaadf8856215456597ca7 Mon Sep 17 00:00:00 2001 From: Sijawusz Pur Rahnama Date: Mon, 28 Nov 2022 03:40:20 +0100 Subject: [PATCH] Compress identical method definitions --- src/ameba/rule/lint/empty_loop.cr | 6 +----- src/ameba/rule/lint/literal_in_condition.cr | 10 +--------- .../rule/lint/shadowing_outer_local_var.cr | 6 +----- .../rule/lint/useless_condition_in_when.cr | 7 +------ src/ameba/rule/style/type_names.cr | 18 +----------------- src/ameba/rule/style/variable_names.cr | 10 +--------- 6 files changed, 6 insertions(+), 51 deletions(-) diff --git a/src/ameba/rule/lint/empty_loop.cr b/src/ameba/rule/lint/empty_loop.cr index b58e2366..ee884428 100644 --- a/src/ameba/rule/lint/empty_loop.cr +++ b/src/ameba/rule/lint/empty_loop.cr @@ -52,11 +52,7 @@ module Ameba::Rule::Lint check_node(source, node, node.block) end - def test(source, node : Crystal::While) - check_node(source, node, node.body) if literal?(node.cond) - end - - def test(source, node : Crystal::Until) + def test(source, node : Crystal::While | Crystal::Until) check_node(source, node, node.body) if literal?(node.cond) end diff --git a/src/ameba/rule/lint/literal_in_condition.cr b/src/ameba/rule/lint/literal_in_condition.cr index d232ca83..294a10f6 100644 --- a/src/ameba/rule/lint/literal_in_condition.cr +++ b/src/ameba/rule/lint/literal_in_condition.cr @@ -33,15 +33,7 @@ module Ameba::Rule::Lint issue_for node, MSG if static_literal?(node.cond) end - def test(source, node : Crystal::If) - check_node source, node - end - - def test(source, node : Crystal::Unless) - check_node source, node - end - - def test(source, node : Crystal::Case) + def test(source, node : Crystal::If | Crystal::Unless | Crystal::Case) check_node source, node end end diff --git a/src/ameba/rule/lint/shadowing_outer_local_var.cr b/src/ameba/rule/lint/shadowing_outer_local_var.cr index 6a397af8..d61221ec 100644 --- a/src/ameba/rule/lint/shadowing_outer_local_var.cr +++ b/src/ameba/rule/lint/shadowing_outer_local_var.cr @@ -45,11 +45,7 @@ module Ameba::Rule::Lint ] end - def test(source, node : Crystal::ProcLiteral, scope : AST::Scope) - find_shadowing source, scope - end - - def test(source, node : Crystal::Block, scope : AST::Scope) + def test(source, node : Crystal::ProcLiteral | Crystal::Block, scope : AST::Scope) find_shadowing source, scope end diff --git a/src/ameba/rule/lint/useless_condition_in_when.cr b/src/ameba/rule/lint/useless_condition_in_when.cr index 7cf7784d..2d52f480 100644 --- a/src/ameba/rule/lint/useless_condition_in_when.cr +++ b/src/ameba/rule/lint/useless_condition_in_when.cr @@ -61,12 +61,7 @@ module Ameba::Rule::Lint @parent.accept self end - def visit(node : Crystal::If) - @rule.check_node(@source, @parent, node.cond) - true - end - - def visit(node : Crystal::Unless) + def visit(node : Crystal::If | Crystal::Unless) @rule.check_node(@source, @parent, node.cond) true end diff --git a/src/ameba/rule/style/type_names.cr b/src/ameba/rule/style/type_names.cr index c0569987..ebaf23e5 100644 --- a/src/ameba/rule/style/type_names.cr +++ b/src/ameba/rule/style/type_names.cr @@ -66,23 +66,7 @@ module Ameba::Rule::Style issue_for node, MSG % {expected, name} end - def test(source, node : Crystal::ClassDef) - check_node(source, node) - end - - def test(source, node : Crystal::Alias) - check_node(source, node) - end - - def test(source, node : Crystal::LibDef) - check_node(source, node) - end - - def test(source, node : Crystal::EnumDef) - check_node(source, node) - end - - def test(source, node : Crystal::ModuleDef) + def test(source, node : Crystal::Alias | Crystal::ClassDef | Crystal::ModuleDef | Crystal::LibDef | Crystal::EnumDef) check_node(source, node) end end diff --git a/src/ameba/rule/style/variable_names.cr b/src/ameba/rule/style/variable_names.cr index 44615ab3..c3cded64 100644 --- a/src/ameba/rule/style/variable_names.cr +++ b/src/ameba/rule/style/variable_names.cr @@ -39,15 +39,7 @@ module Ameba::Rule::Style VarVisitor.new self, source end - def test(source, node : Crystal::Var) - check_node source, node - end - - def test(source, node : Crystal::InstanceVar) - check_node source, node - end - - def test(source, node : Crystal::ClassVar) + def test(source, node : Crystal::Var | Crystal::InstanceVar | Crystal::ClassVar) check_node source, node end