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

Merge pull request #259 from crystal-ameba/fix/crystal-nightly

Browse source
This commit is contained in:
Sijawusz Pur Rahnama 2022-04-05 14:49:47 +02:00 • committed by GitHub
commit 734e55fbab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 131 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shard.yml
View file

@ -15,6 +15,6 @@ scripts:
executables:
- ameba
crystal: ">= 0.35.0"
crystal: ">= 1.4.0"
license: MIT

6
spec/ameba/ast/util_spec.cr
View file

@ -1,5 +1,4 @@
require "../../spec_helper"
require "semantic_version"
module Ameba::AST
struct Test
@ -77,14 +76,9 @@ module Ameba::AST
CRYSTAL
node = as_nodes(s).nil_literal_nodes.first
source = subject.node_source node, s.split("\n")
if SemanticVersion.parse(Crystal::VERSION) <= SemanticVersion.parse("0.35.1")
source.should be_nil
else
source.should eq "nil"
end
end
end
describe "#flow_command?" do
it "returns true if this is return" do

35
spec/ameba/rule/lint/empty_ensure_spec.cr
View file

@ -5,7 +5,7 @@ module Ameba::Rule::Lint
subject = EmptyEnsure.new
it "passes if there is no empty ensure blocks" do
s = Source.new %(
expect_no_issues subject, <<-CRYSTAL
def some_method
do_some_stuff
ensure
@ -23,47 +23,30 @@ module Ameba::Rule::Lint
ensure
nil
end
)
subject.catch(s).should be_valid
CRYSTAL
end
it "fails if there is an empty ensure in method" do
s = Source.new %(
expect_issue subject, <<-CRYSTAL
def method
do_some_stuff
ensure
# ^^^^^^ error: Empty `ensure` block detected
end
)
subject.catch(s).should_not be_valid
CRYSTAL
end
it "fails if there is an empty ensure in a block" do
s = Source.new %(
begin
do_some_stuff
ensure
# nothing here
end
)
subject.catch(s).should_not be_valid
end
it "reports rule, pos and message" do
s = Source.new %(
expect_issue subject, <<-CRYSTAL
begin
do_some_stuff
rescue
do_some_other_stuff
ensure
# ^^^^^^ error: Empty `ensure` block detected
# nothing here
end
), "source.cr"
subject.catch(s).should_not be_valid
issue = s.issues.first
issue.rule.should_not be_nil
issue.location.to_s.should eq "source.cr:2:3"
issue.end_location.to_s.should eq "source.cr:6:3"
issue.message.should eq "Empty `ensure` block detected"
CRYSTAL
end
end
end

98
spec/ameba/rule/lint/shadowed_exception_spec.cr
View file

@ -1,17 +1,11 @@
require "../../../spec_helper"
private def check_shadowed(source, exceptions)
s = Ameba::Source.new source
Ameba::Rule::Lint::ShadowedException.new.catch(s).should_not be_valid
s.issues.first.message.should contain exceptions.join(", ")
end
module Ameba::Rule::Lint
describe ShadowedException do
subject = ShadowedException.new
it "passes if there isn't shadowed exception" do
s = Source.new %(
expect_no_issues subject, <<-CRYSTAL
def method
do_something
rescue ArgumentError
@ -31,146 +25,158 @@ module Ameba::Rule::Lint
rescue e : Exception
handle_exception
end
)
subject.catch(s).should be_valid
CRYSTAL
end
it "fails if there is a shadowed exception" do
check_shadowed %(
expect_issue subject, <<-CRYSTAL
begin
do_something
rescue Exception
handle_exception
rescue ArgumentError
# ^^^^^^^^^^^^^ error: Shadowed exception found: ArgumentError
handle_argument_error_exception
end
), %w(ArgumentError)
CRYSTAL
end
it "fails if there is a custom shadowed exceptions" do
check_shadowed %(
expect_issue subject, <<-CRYSTAL
begin
1
rescue Exception
2
rescue MySuperException
# ^^^^^^^^^^^^^^^^ error: Shadowed exception found: MySuperException
3
end
), %w(MySuperException)
CRYSTAL
end
it "fails if there is a shadowed exception in a type list" do
check_shadowed %(
expect_issue subject, <<-CRYSTAL
begin
rescue Exception | IndexError
# ^^^^^^^^^^ error: Shadowed exception found: IndexError
end
), %w(IndexError)
CRYSTAL
end
it "fails if there is a first shadowed exception in a type list" do
check_shadowed %(
expect_issue subject, <<-CRYSTAL
begin
rescue IndexError | Exception
# ^^^^^^^^^^ error: Shadowed exception found: IndexError
rescue Exception
# ^^^^^^^^^ error: Shadowed exception found: Exception
rescue
end
), %w(IndexError)
CRYSTAL
end
it "fails if there is a shadowed duplicated exception" do
check_shadowed %(
expect_issue subject, <<-CRYSTAL
begin
rescue IndexError
rescue ArgumentError
rescue IndexError
# ^^^^^^^^^^ error: Shadowed exception found: IndexError
end
), %w(IndexError)
CRYSTAL
end
it "fails if there is a shadowed duplicated exception in a type list" do
check_shadowed %(
expect_issue subject, <<-CRYSTAL
begin
rescue IndexError
rescue ArgumentError | IndexError
# ^^^^^^^^^^ error: Shadowed exception found: IndexError
end
), %w(IndexError)
CRYSTAL
end
it "fails if there is only shadowed duplicated exceptions" do
check_shadowed %(
expect_issue subject, <<-CRYSTAL
begin
rescue IndexError
rescue IndexError
# ^^^^^^^^^^ error: Shadowed exception found: IndexError
rescue Exception
end
), %w(IndexError)
CRYSTAL
end
it "fails if there is only shadowed duplicated exceptions in a type list" do
check_shadowed %(
expect_issue subject, <<-CRYSTAL
begin
rescue IndexError | IndexError
# ^^^^^^^^^^ error: Shadowed exception found: IndexError
end
), %w(IndexError)
CRYSTAL
end
it "fails if all rescues are shadowed and there is a catch-all rescue" do
check_shadowed %(
expect_issue subject, <<-CRYSTAL
begin
rescue Exception
rescue ArgumentError
# ^^^^^^^^^^^^^ error: Shadowed exception found: ArgumentError
rescue IndexError
# ^^^^^^^^^^ error: Shadowed exception found: IndexError
rescue KeyError | IO::Error
# ^^^^^^^^^ error: Shadowed exception found: IO::Error
# ^^^^^^^^ error: Shadowed exception found: KeyError
rescue
end
), %w(IndexError KeyError IO::Error)
CRYSTAL
end
it "fails if there are shadowed exception with args" do
check_shadowed %(
expect_issue subject, <<-CRYSTAL
begin
rescue Exception
rescue ex : IndexError
# ^^^^^^^^^^ error: Shadowed exception found: IndexError
rescue
end
), %w(IndexError)
CRYSTAL
end
it "fails if there are multiple shadowed exceptions" do
check_shadowed %(
expect_issue subject, <<-CRYSTAL
begin
rescue Exception
rescue ArgumentError
# ^^^^^^^^^^^^^ error: Shadowed exception found: ArgumentError
rescue IndexError
# ^^^^^^^^^^ error: Shadowed exception found: IndexError
end
), %w(ArgumentError IndexError)
CRYSTAL
end
it "fails if there are multiple shadowed exceptions in a type list" do
check_shadowed %(
expect_issue subject, <<-CRYSTAL
begin
rescue Exception
rescue ArgumentError | IndexError
# ^^^^^^^^^^ error: Shadowed exception found: IndexError
# ^^^^^^^^^^^^^ error: Shadowed exception found: ArgumentError
rescue IO::Error
# ^^^^^^^^^ error: Shadowed exception found: IO::Error
end
), %w(ArgumentError IndexError IO::Error)
CRYSTAL
end
it "reports rule, location and a message" do
s = Source.new %q(
it "fails if there are multiple shadowed exceptions in a single rescue" do
expect_issue subject, <<-CRYSTAL
begin
do_something
rescue Exception | IndexError
rescue Exception | IndexError | ArgumentError
# ^^^^^^^^^^^^^ error: Shadowed exception found: ArgumentError
# ^^^^^^^^^^ error: Shadowed exception found: IndexError
end
), "source.cr"
subject.catch(s).should_not be_valid
issue = s.issues.first
issue.rule.should_not be_nil
issue.location.to_s.should eq "source.cr:2:3"
issue.end_location.to_s.should eq "source.cr:4:3"
issue.message.should eq(
"Exception handler has shadowed exceptions: IndexError"
)
CRYSTAL
end
end
end

22
spec/ameba/tokenizer_spec.cr
View file

@ -3,9 +3,9 @@ require "../spec_helper"
module Ameba
private def it_tokenizes(str, expected)
it "tokenizes #{str}" do
([] of Symbol).tap do |token_types|
([] of String).tap do |token_types|
Tokenizer.new(Source.new str, normalize: false)
.run { |token| token_types << token.type }
.run { |token| token_types << token.type.to_s }
.should be_true
end.should eq expected
end
@ -13,20 +13,20 @@ module Ameba
describe Tokenizer do
describe "#run" do
it_tokenizes %("string"), %i(DELIMITER_START STRING DELIMITER_END EOF)
it_tokenizes %(100), %i(NUMBER EOF)
it_tokenizes %('a'), %i(CHAR EOF)
it_tokenizes %([]), %i([] EOF)
it_tokenizes %([] of String), %i([] SPACE IDENT SPACE CONST EOF)
it_tokenizes %q("str #{3}"), %i(
it_tokenizes %("string"), %w(DELIMITER_START STRING DELIMITER_END EOF)
it_tokenizes %(100), %w(NUMBER EOF)
it_tokenizes %('a'), %w(CHAR EOF)
it_tokenizes %([]), %w([] EOF)
it_tokenizes %([] of String), %w([] SPACE IDENT SPACE CONST EOF)
it_tokenizes %q("str #{3}"), %w(
DELIMITER_START STRING INTERPOLATION_START NUMBER } DELIMITER_END EOF
)
it_tokenizes %(%w(1 2)),
%i(STRING_ARRAY_START STRING STRING STRING_ARRAY_END EOF)
%w(STRING_ARRAY_START STRING STRING STRING_ARRAY_END EOF)
it_tokenizes %(%i(one two)),
%i(SYMBOL_ARRAY_START STRING STRING STRING_ARRAY_END EOF)
%w(SYMBOL_ARRAY_START STRING STRING STRING_ARRAY_END EOF)
it_tokenizes %(
class A
@ -34,7 +34,7 @@ module Ameba
puts "hello"
end
end
), %i(
), %w(
NEWLINE SPACE IDENT SPACE CONST NEWLINE SPACE IDENT SPACE IDENT
NEWLINE SPACE IDENT SPACE DELIMITER_START STRING DELIMITER_END
NEWLINE SPACE IDENT NEWLINE SPACE IDENT NEWLINE SPACE EOF

2
src/ameba/ast/util.cr
View file

@ -195,7 +195,7 @@ module Ameba::AST::Util
case name
when Crystal::ASTNode then name.name_size
when Symbol then name.to_s.size # Crystal::MagicConstant
when Crystal::Token::Kind then name.to_s.size # Crystal::MagicConstant
else name.size
end
end

2
src/ameba/inline_comments.cr
View file

@ -95,7 +95,7 @@ module Ameba
commented = false
lexer = Crystal::Lexer.new(line).tap(&.comments_enabled = true)
Tokenizer.new(lexer).run { |t| commented = true if t.type == :COMMENT }
Tokenizer.new(lexer).run { |t| commented = true if t.type.comment? }
commented
end
end

2
src/ameba/rule/lint/bad_directive.cr
View file

@ -28,7 +28,7 @@ module Ameba::Rule::Lint
def test(source)
Tokenizer.new(source).run do |token|
next unless token.type == :COMMENT
next unless token.type.comment?
next unless directive = source.parse_inline_directive(token.value.to_s)
check_action source, token, directive[:action]

2
src/ameba/rule/lint/empty_ensure.cr
View file

@ -49,7 +49,7 @@ module Ameba::Rule::Lint
node_ensure = node.ensure
return if node_ensure.nil? || !node_ensure.nop?
issue_for node, MSG
issue_for node.ensure_location, node.end_location, MSG
end
end
end

6
src/ameba/rule/lint/percent_array.cr
View file

@ -38,13 +38,13 @@ module Ameba::Rule::Lint
Tokenizer.new(source).run do |token|
case token.type
when :STRING_ARRAY_START, :SYMBOL_ARRAY_START
when .string_array_start?, .symbol_array_start?
start_token = token.dup
when :STRING
when .string?
if start_token && issue.nil?
issue = array_entry_invalid?(token.value, start_token.not_nil!.raw)
end
when :STRING_ARRAY_END, :SYMBOL_ARRAY_END
when .string_array_end?
if issue
issue_for start_token.not_nil!, issue.not_nil!
end

46
src/ameba/rule/lint/shadowed_exception.cr
View file

@ -38,38 +38,44 @@ module Ameba::Rule::Lint
description "Disallows rescued exception that get shadowed"
end
MSG = "Exception handler has shadowed exceptions: %s"
MSG = "Shadowed exception found: %s"
def test(source, node : Crystal::ExceptionHandler)
return unless excs = node.rescues.try &.map(&.types)
return if (excs = shadowed excs).empty?
rescues = node.rescues
issue_for node, MSG % excs.join(", ")
return if rescues.nil?
shadowed(rescues).each { |tp| issue_for tp, MSG % tp.names.join("::") }
end
private def shadowed(exceptions, exception_found = false)
previous_exceptions = [] of String
private def shadowed(rescues, catch_all = false)
traversed_types = Set(String).new
exceptions.reduce([] of String) do |shadowed, excs|
excs = excs.try(&.map(&.to_s)) || %w[Exception]
if exception_found
shadowed.concat excs
previous_exceptions.concat excs
filter_rescues(rescues).each_with_object([] of Crystal::Path) do |types, shadowed|
case
when catch_all
shadowed.concat(types)
next
when types.any?(&.single?("Exception"))
nodes = types.reject(&.single?("Exception"))
shadowed.concat(nodes) unless nodes.empty?
catch_all = true
next
else
exception_found ||= excs.any? &.== "Exception"
excs.each do |exc|
if exception_found && exc != "Exception"
shadowed << exc
else
shadowed << exc if previous_exceptions.any? &.== exc
nodes = types.select { |tp| traverse(tp.to_s, traversed_types) }
shadowed.concat(nodes) unless nodes.empty?
end
previous_exceptions << exc
end
end
shadowed
private def filter_rescues(rescues)
rescues.compact_map(&.types.try &.select(Crystal::Path))
end
private def traverse(path, traversed_types)
dup = traversed_types.includes?(path)
dup || (traversed_types << path)
dup
end
end
end

2
src/ameba/rule/lint/unneeded_disable_directive.cr
View file

@ -33,7 +33,7 @@ module Ameba::Rule::Lint
def test(source)
Tokenizer.new(source).run do |token|
next unless token.type == :COMMENT
next unless token.type.comment?
next unless directive = source.parse_inline_directive(token.value.to_s)
next unless names = unneeded_disables(source, directive, token.location)
next if names.empty?

2
src/ameba/rule/style/large_numbers.cr
View file

@ -37,7 +37,7 @@ module Ameba::Rule::Style
def test(source)
Tokenizer.new(source).run do |token|
next unless token.type == :NUMBER && decimal?(token.raw)
next unless token.type.number? && decimal?(token.raw)
parsed = parse_number token.raw

16
src/ameba/rule/style/redundant_begin.cr
View file

@ -90,7 +90,7 @@ module Ameba::Rule::Style
end
private def redundant_begin_in_expressions?(node)
node.keyword == :begin
!!node.keyword.try(&.begin?)
end
private def inner_handler?(handler)
@ -119,19 +119,19 @@ module Ameba::Rule::Style
token = lexer.next_token
case token.type
when :EOF, :"->"
when .eof?, .op_minus_gt?
break
when :IDENT
when .ident?
next unless in_body
return unless token.value == :begin
return token.location
when :"("
when .op_lparen?
in_argument_list = true
when :")"
when .op_rparen?
in_argument_list = false
when :NEWLINE
when .newline?
in_body = true unless in_argument_list
when :SPACE
when .space?
# ignore
else
return if in_body
@ -142,7 +142,7 @@ module Ameba::Rule::Style
private def def_redundant_end_loc(lexer)
end_loc = def_end_loc = nil
while (token = lexer.next_token).type != :EOF
while !(token = lexer.next_token).type.eof?
next unless token.value == :end
end_loc, def_end_loc = def_end_loc, token.location

18
src/ameba/tokenizer.cr
View file

@ -56,13 +56,13 @@ module Ameba
block.call token
case token.type
when :DELIMITER_START
when .delimiter_start?
run_delimiter_state lexer, token, &block
when :STRING_ARRAY_START, :SYMBOL_ARRAY_START
when .string_array_start?, .symbol_array_start?
run_array_state lexer, token, &block
when :EOF
when .eof?
break
when :"}"
when .op_rcurly?
break if break_on_rcurly
end
end
@ -74,11 +74,11 @@ module Ameba
block.call token
case token.type
when :DELIMITER_END
when .delimiter_end?
break
when :INTERPOLATION_START
when .interpolation_start?
run_normal_state lexer, break_on_rcurly: true, &block
when :EOF
when .eof?
break
end
end
@ -90,9 +90,9 @@ module Ameba
block.call token
case token.type
when :STRING_ARRAY_END
when .string_array_end?
break
when :EOF
when .eof?
break
end
end