mirror of
https://gitea.invidious.io/iv-org/shard-ameba.git
synced 2024-08-15 00:53:29 +00:00
MethodNames: correct reported location/end_location
This commit is contained in:
parent
e951c0772a
commit
f8dab3bc34
3 changed files with 20 additions and 4 deletions
|
@ -40,14 +40,14 @@ module Ameba
|
||||||
|
|
||||||
it "reports rule, pos and message" do
|
it "reports rule, pos and message" do
|
||||||
s = Source.new %(
|
s = Source.new %(
|
||||||
def bad_Name
|
def bad_Name(a)
|
||||||
end
|
end
|
||||||
), "source.cr"
|
), "source.cr"
|
||||||
subject.catch(s).should_not be_valid
|
subject.catch(s).should_not be_valid
|
||||||
issue = s.issues.first
|
issue = s.issues.first
|
||||||
issue.rule.should_not be_nil
|
issue.rule.should_not be_nil
|
||||||
issue.location.to_s.should eq "source.cr:1:1"
|
issue.location.to_s.should eq "source.cr:1:5"
|
||||||
issue.end_location.to_s.should eq "source.cr:2:3"
|
issue.end_location.to_s.should eq "source.cr:1:12"
|
||||||
issue.message.should eq(
|
issue.message.should eq(
|
||||||
"Method name should be underscore-cased: bad_name, not bad_Name"
|
"Method name should be underscore-cased: bad_name, not bad_Name"
|
||||||
)
|
)
|
||||||
|
|
|
@ -26,6 +26,13 @@ module Ameba
|
||||||
add_issue rule, location, nil, message, **args
|
add_issue rule, location, nil, message, **args
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Adds a new issue for *location* and *end_location* defined by line and column numbers.
|
||||||
|
def add_issue(rule, location : Tuple(Int32, Int32), end_location : Tuple(Int32, Int32), message, **args)
|
||||||
|
location = Crystal::Location.new path, *location
|
||||||
|
end_location = Crystal::Location.new path, *end_location
|
||||||
|
add_issue rule, location, end_location, message, **args
|
||||||
|
end
|
||||||
|
|
||||||
# Returns true if the list of not disabled issues is empty, false otherwise.
|
# Returns true if the list of not disabled issues is empty, false otherwise.
|
||||||
def valid?
|
def valid?
|
||||||
issues.reject(&.disabled?).empty?
|
issues.reject(&.disabled?).empty?
|
||||||
|
|
|
@ -52,7 +52,16 @@ module Ameba::Rule::Style
|
||||||
def test(source, node : Crystal::Def)
|
def test(source, node : Crystal::Def)
|
||||||
return if (expected = node.name.underscore) == node.name
|
return if (expected = node.name.underscore) == node.name
|
||||||
|
|
||||||
issue_for node, MSG % {expected, node.name}
|
line_number = node.location.try &.line_number
|
||||||
|
column_number = node.name_column_number
|
||||||
|
|
||||||
|
return unless line_number
|
||||||
|
|
||||||
|
issue_for(
|
||||||
|
{line_number, column_number},
|
||||||
|
{line_number, column_number + node.name.size - 1},
|
||||||
|
MSG % {expected, node.name}
|
||||||
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue