iv-org-mirror/shard-ameba
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/shard-ameba.git synced 2024-08-15 00:53:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Redundant begin: do not report if there is an inner handler

Browse source 
fixes #56
This commit is contained in:
Vitalii Elenhaupt 2018-05-24 22:58:58 +03:00 committed by V. Elenhaupt
parent 3e099e9afc
commit 3887da1438
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
spec/ameba/rule/redundant_begin_spec.cr
View file

@ -153,7 +153,7 @@ module Ameba::Rule
subject.catch(s).should_not be_valid subject.catch(s).should_not be_valid
end end
it "fails if there is an inner redundant block" do it "doesn't report if there is an inner redundant block" do
s = Source.new %q( s = Source.new %q(
def method def method
begin begin
@ -164,7 +164,7 @@ module Ameba::Rule
rescue rescue
end end
) )
subject.catch(s).should_not be_valid subject.catch(s).should be_valid
end end
it "fails if there is a redundant block with yield" do it "fails if there is a redundant block with yield" do

6
src/ameba/rule/redundant_begin.cr
View file

@ -88,7 +88,7 @@ module Ameba::Rule
end end
private def redundant_begin_in_handler?(source, handler, node) private def redundant_begin_in_handler?(source, handler, node)
return false if begin_exprs_in_handler?(handler) return false if begin_exprs_in_handler?(handler) || inner_handler?(handler)
code = node_source(node, source.lines).try &.join("\n") code = node_source(node, source.lines).try &.join("\n")
def_redundant_begin? code if code def_redundant_begin? code if code
@ -96,6 +96,10 @@ module Ameba::Rule
false false
end end
private def inner_handler?(handler)
handler.body.is_a?(Crystal::ExceptionHandler)
end
private def begin_exprs_in_handler?(handler) private def begin_exprs_in_handler?(handler)
if (body = handler.body).is_a?(Crystal::Expressions) if (body = handler.body).is_a?(Crystal::Expressions)
exception_handler?(body.expressions.first) exception_handler?(body.expressions.first)