rubocop 0.71.0 → 0.75.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +5 -8
- data/bin/console +1 -0
- data/config/default.yml +84 -488
- data/lib/rubocop.rb +16 -54
- data/lib/rubocop/ast/builder.rb +2 -0
- data/lib/rubocop/ast/node.rb +9 -15
- data/lib/rubocop/ast/node/float_node.rb +12 -0
- data/lib/rubocop/ast/node/int_node.rb +12 -0
- data/lib/rubocop/ast/node/mixin/method_dispatch_node.rb +4 -4
- data/lib/rubocop/ast/node/mixin/numeric_node.rb +21 -0
- data/lib/rubocop/ast/node/resbody_node.rb +1 -6
- data/lib/rubocop/ast/traversal.rb +3 -3
- data/lib/rubocop/cached_data.rb +1 -1
- data/lib/rubocop/comment_config.rb +3 -2
- data/lib/rubocop/config.rb +21 -508
- data/lib/rubocop/config_loader.rb +22 -8
- data/lib/rubocop/config_loader_resolver.rb +2 -16
- data/lib/rubocop/config_obsoletion.rb +213 -0
- data/lib/rubocop/config_validator.rb +239 -0
- data/lib/rubocop/cop/autocorrect_logic.rb +71 -1
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +1 -1
- data/lib/rubocop/cop/bundler/ordered_gems.rb +1 -1
- data/lib/rubocop/cop/commissioner.rb +3 -9
- data/lib/rubocop/cop/cop.rb +39 -12
- data/lib/rubocop/cop/corrector.rb +2 -3
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +43 -17
- data/lib/rubocop/cop/correctors/empty_line_corrector.rb +2 -2
- data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +2 -2
- data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +1 -1
- data/lib/rubocop/cop/gemspec/duplicated_assignment.rb +2 -2
- data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +1 -1
- data/lib/rubocop/cop/gemspec/required_ruby_version.rb +1 -1
- data/lib/rubocop/cop/gemspec/ruby_version_globals_usage.rb +55 -0
- data/lib/rubocop/cop/generator.rb +4 -4
- data/lib/rubocop/cop/generator/configuration_injector.rb +9 -4
- data/lib/rubocop/cop/generator/require_file_injector.rb +1 -1
- data/lib/rubocop/cop/internal_affairs/node_destructuring.rb +2 -2
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +1 -1
- data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +2 -2
- data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +1 -1
- data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +2 -2
- data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb +2 -2
- data/lib/rubocop/cop/layout/block_alignment.rb +3 -3
- data/lib/rubocop/cop/layout/class_structure.rb +2 -2
- data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +1 -1
- data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +22 -7
- data/lib/rubocop/cop/layout/empty_line_after_magic_comment.rb +2 -2
- data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb +2 -2
- data/lib/rubocop/cop/layout/extra_spacing.rb +14 -59
- data/lib/rubocop/cop/layout/indent_assignment.rb +10 -1
- data/lib/rubocop/cop/layout/indent_first_argument.rb +7 -3
- data/lib/rubocop/cop/layout/indent_first_parameter.rb +7 -3
- data/lib/rubocop/cop/layout/indent_heredoc.rb +4 -4
- data/lib/rubocop/cop/layout/indentation_consistency.rb +13 -12
- data/lib/rubocop/cop/layout/indentation_width.rb +28 -10
- data/lib/rubocop/cop/layout/leading_comment_space.rb +28 -0
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +24 -2
- data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +18 -4
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +5 -1
- data/lib/rubocop/cop/layout/space_around_operators.rb +42 -23
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +1 -1
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +21 -2
- data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +24 -40
- data/lib/rubocop/cop/layout/tab.rb +10 -22
- data/lib/rubocop/cop/lint/assignment_in_condition.rb +17 -4
- data/lib/rubocop/cop/lint/big_decimal_new.rb +1 -1
- data/lib/rubocop/cop/lint/debugger.rb +4 -6
- data/lib/rubocop/cop/lint/duplicate_methods.rb +3 -3
- data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -1
- data/lib/rubocop/cop/lint/empty_interpolation.rb +4 -4
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +57 -1
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +11 -37
- data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +1 -1
- data/lib/rubocop/cop/lint/inherit_exception.rb +1 -1
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +7 -8
- data/lib/rubocop/cop/lint/multiple_compare.rb +1 -1
- data/lib/rubocop/cop/lint/nested_method_definition.rb +3 -3
- data/lib/rubocop/cop/lint/next_without_accumulator.rb +1 -1
- data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +1 -1
- data/lib/rubocop/cop/lint/number_conversion.rb +4 -4
- data/lib/rubocop/cop/lint/rand_one.rb +1 -1
- data/lib/rubocop/cop/lint/redundant_with_index.rb +1 -1
- data/lib/rubocop/cop/lint/redundant_with_object.rb +1 -1
- data/lib/rubocop/cop/lint/safe_navigation_chain.rb +5 -5
- data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +1 -1
- data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +91 -0
- data/lib/rubocop/cop/lint/string_conversion_in_interpolation.rb +6 -6
- data/lib/rubocop/cop/lint/unified_integer.rb +1 -1
- data/lib/rubocop/cop/lint/unneeded_cop_disable_directive.rb +1 -1
- data/lib/rubocop/cop/lint/unneeded_require_statement.rb +1 -1
- data/lib/rubocop/cop/lint/unneeded_splat_expansion.rb +7 -2
- data/lib/rubocop/cop/lint/unreachable_code.rb +1 -1
- data/lib/rubocop/cop/lint/unused_block_argument.rb +22 -6
- data/lib/rubocop/cop/lint/unused_method_argument.rb +23 -5
- data/lib/rubocop/cop/lint/uri_escape_unescape.rb +1 -1
- data/lib/rubocop/cop/lint/uri_regexp.rb +2 -2
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +6 -6
- data/lib/rubocop/cop/lint/useless_setter_call.rb +1 -1
- data/lib/rubocop/cop/lint/void.rb +3 -22
- data/lib/rubocop/cop/message_annotator.rb +16 -7
- data/lib/rubocop/cop/metrics/class_length.rb +1 -1
- data/lib/rubocop/cop/metrics/line_length.rb +6 -0
- data/lib/rubocop/cop/metrics/module_length.rb +1 -1
- data/lib/rubocop/cop/metrics/parameter_lists.rb +1 -1
- data/lib/rubocop/cop/migration/department_name.rb +44 -0
- data/lib/rubocop/cop/mixin/alignment.rb +1 -1
- data/lib/rubocop/cop/mixin/def_node.rb +1 -1
- data/lib/rubocop/cop/mixin/documentation_comment.rb +0 -2
- data/lib/rubocop/cop/mixin/empty_parameter.rb +1 -1
- data/lib/rubocop/cop/mixin/enforce_superclass.rb +4 -4
- data/lib/rubocop/cop/mixin/frozen_string_literal.rb +1 -1
- data/lib/rubocop/cop/mixin/interpolation.rb +27 -0
- data/lib/rubocop/cop/mixin/method_complexity.rb +1 -1
- data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +3 -3
- data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +87 -0
- data/lib/rubocop/cop/mixin/safe_mode.rb +2 -0
- data/lib/rubocop/cop/mixin/surrounding_space.rb +7 -5
- data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +1 -1
- data/lib/rubocop/cop/naming/constant_name.rb +2 -2
- data/lib/rubocop/cop/naming/method_name.rb +12 -1
- data/lib/rubocop/cop/naming/predicate_name.rb +1 -1
- data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +21 -20
- data/lib/rubocop/cop/naming/variable_name.rb +1 -0
- data/lib/rubocop/cop/offense.rb +18 -7
- data/lib/rubocop/cop/registry.rb +22 -1
- data/lib/rubocop/cop/security/eval.rb +1 -1
- data/lib/rubocop/cop/security/json_load.rb +1 -1
- data/lib/rubocop/cop/security/marshal_load.rb +1 -1
- data/lib/rubocop/cop/security/open.rb +1 -1
- data/lib/rubocop/cop/security/yaml_load.rb +1 -1
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +1 -0
- data/lib/rubocop/cop/style/alias.rb +1 -1
- data/lib/rubocop/cop/style/block_delimiters.rb +2 -1
- data/lib/rubocop/cop/style/braces_around_hash_parameters.rb +29 -10
- data/lib/rubocop/cop/style/class_and_module_children.rb +1 -1
- data/lib/rubocop/cop/style/colon_method_call.rb +1 -1
- data/lib/rubocop/cop/style/commented_keyword.rb +16 -30
- data/lib/rubocop/cop/style/conditional_assignment.rb +8 -9
- data/lib/rubocop/cop/style/constant_visibility.rb +14 -3
- data/lib/rubocop/cop/style/date_time.rb +3 -3
- data/lib/rubocop/cop/style/dir.rb +1 -1
- data/lib/rubocop/cop/style/documentation_method.rb +45 -1
- data/lib/rubocop/cop/style/double_cop_disable_directive.rb +55 -0
- data/lib/rubocop/cop/style/each_for_simple_loop.rb +1 -1
- data/lib/rubocop/cop/style/each_with_object.rb +1 -1
- data/lib/rubocop/cop/style/eval_with_location.rb +2 -2
- data/lib/rubocop/cop/style/even_odd.rb +1 -1
- data/lib/rubocop/cop/style/expand_path_arguments.rb +4 -4
- data/lib/rubocop/cop/style/float_division.rb +94 -0
- data/lib/rubocop/cop/style/format_string.rb +13 -9
- data/lib/rubocop/cop/style/format_string_token.rb +18 -69
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +18 -33
- data/lib/rubocop/cop/style/guard_clause.rb +39 -10
- data/lib/rubocop/cop/style/hash_syntax.rb +2 -2
- data/lib/rubocop/cop/style/if_inside_else.rb +42 -0
- data/lib/rubocop/cop/style/if_unless_modifier.rb +51 -15
- data/lib/rubocop/cop/style/infinite_loop.rb +1 -1
- data/lib/rubocop/cop/style/inverse_methods.rb +2 -2
- data/lib/rubocop/cop/style/lambda.rb +0 -2
- data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +32 -26
- data/lib/rubocop/cop/style/min_max.rb +1 -1
- data/lib/rubocop/cop/style/mixin_usage.rb +12 -2
- data/lib/rubocop/cop/style/multiline_memoization.rb +1 -1
- data/lib/rubocop/cop/style/multiline_when_then.rb +55 -0
- data/lib/rubocop/cop/style/multiple_comparison.rb +1 -1
- data/lib/rubocop/cop/style/mutable_constant.rb +3 -3
- data/lib/rubocop/cop/style/nested_modifier.rb +18 -2
- data/lib/rubocop/cop/style/numeric_predicate.rb +3 -3
- data/lib/rubocop/cop/style/option_hash.rb +1 -1
- data/lib/rubocop/cop/style/or_assignment.rb +8 -3
- data/lib/rubocop/cop/style/parentheses_around_condition.rb +15 -1
- data/lib/rubocop/cop/style/random_with_offset.rb +6 -6
- data/lib/rubocop/cop/style/redundant_conditional.rb +2 -2
- data/lib/rubocop/cop/style/redundant_exception.rb +2 -2
- data/lib/rubocop/cop/style/redundant_freeze.rb +1 -1
- data/lib/rubocop/cop/style/redundant_parentheses.rb +15 -6
- data/lib/rubocop/cop/style/redundant_return.rb +12 -0
- data/lib/rubocop/cop/style/redundant_self.rb +18 -1
- data/lib/rubocop/cop/style/redundant_sort_by.rb +1 -1
- data/lib/rubocop/cop/style/rescue_modifier.rb +24 -0
- data/lib/rubocop/cop/style/rescue_standard_error.rb +2 -2
- data/lib/rubocop/cop/style/return_nil.rb +1 -1
- data/lib/rubocop/cop/style/safe_navigation.rb +19 -2
- data/lib/rubocop/cop/style/sample.rb +1 -1
- data/lib/rubocop/cop/style/semicolon.rb +11 -0
- data/lib/rubocop/cop/style/single_line_methods.rb +8 -1
- data/lib/rubocop/cop/style/stderr_puts.rb +1 -1
- data/lib/rubocop/cop/style/string_hash_keys.rb +2 -2
- data/lib/rubocop/cop/style/strip.rb +1 -1
- data/lib/rubocop/cop/style/struct_inheritance.rb +3 -3
- data/lib/rubocop/cop/style/symbol_proc.rb +1 -1
- data/lib/rubocop/cop/style/ternary_parentheses.rb +32 -3
- data/lib/rubocop/cop/style/trailing_method_end_statement.rb +4 -6
- data/lib/rubocop/cop/style/trivial_accessors.rb +1 -1
- data/lib/rubocop/cop/style/unneeded_sort.rb +1 -1
- data/lib/rubocop/cop/style/unpack_first.rb +1 -1
- data/lib/rubocop/cop/style/variable_interpolation.rb +6 -16
- data/lib/rubocop/cop/style/word_array.rb +2 -2
- data/lib/rubocop/cop/style/zero_length_predicate.rb +6 -6
- data/lib/rubocop/cop/team.rb +15 -14
- data/lib/rubocop/cop/utils/format_string.rb +128 -0
- data/lib/rubocop/cop/variable_force/variable.rb +15 -2
- data/lib/rubocop/core_ext/string.rb +0 -24
- data/lib/rubocop/error.rb +23 -0
- data/lib/rubocop/formatter/clang_style_formatter.rb +8 -3
- data/lib/rubocop/formatter/emacs_style_formatter.rb +22 -9
- data/lib/rubocop/formatter/file_list_formatter.rb +1 -1
- data/lib/rubocop/formatter/formatter_set.rb +16 -15
- data/lib/rubocop/formatter/pacman_formatter.rb +80 -0
- data/lib/rubocop/formatter/simple_text_formatter.rb +16 -4
- data/lib/rubocop/formatter/tap_formatter.rb +17 -4
- data/lib/rubocop/magic_comment.rb +4 -0
- data/lib/rubocop/node_pattern.rb +2 -2
- data/lib/rubocop/options.rb +21 -17
- data/lib/rubocop/path_util.rb +1 -1
- data/lib/rubocop/processed_source.rb +6 -1
- data/lib/rubocop/rspec/cop_helper.rb +0 -1
- data/lib/rubocop/rspec/expect_offense.rb +4 -1
- data/lib/rubocop/rspec/shared_contexts.rb +12 -17
- data/lib/rubocop/rspec/support.rb +0 -1
- data/lib/rubocop/runner.rb +14 -25
- data/lib/rubocop/target_finder.rb +6 -4
- data/lib/rubocop/version.rb +1 -1
- data/lib/rubocop/yaml_duplication_checker.rb +8 -2
- metadata +17 -92
- data/lib/rubocop/cop/mixin/ignored_method_patterns.rb +0 -19
- data/lib/rubocop/cop/mixin/target_rails_version.rb +0 -16
- data/lib/rubocop/cop/rails/action_filter.rb +0 -117
- data/lib/rubocop/cop/rails/active_record_aliases.rb +0 -48
- data/lib/rubocop/cop/rails/active_record_override.rb +0 -82
- data/lib/rubocop/cop/rails/active_support_aliases.rb +0 -69
- data/lib/rubocop/cop/rails/application_job.rb +0 -40
- data/lib/rubocop/cop/rails/application_record.rb +0 -40
- data/lib/rubocop/cop/rails/assert_not.rb +0 -44
- data/lib/rubocop/cop/rails/belongs_to.rb +0 -102
- data/lib/rubocop/cop/rails/blank.rb +0 -164
- data/lib/rubocop/cop/rails/bulk_change_table.rb +0 -289
- data/lib/rubocop/cop/rails/create_table_with_timestamps.rb +0 -91
- data/lib/rubocop/cop/rails/date.rb +0 -161
- data/lib/rubocop/cop/rails/delegate.rb +0 -132
- data/lib/rubocop/cop/rails/delegate_allow_blank.rb +0 -37
- data/lib/rubocop/cop/rails/dynamic_find_by.rb +0 -91
- data/lib/rubocop/cop/rails/enum_uniqueness.rb +0 -45
- data/lib/rubocop/cop/rails/environment_comparison.rb +0 -68
- data/lib/rubocop/cop/rails/exit.rb +0 -67
- data/lib/rubocop/cop/rails/file_path.rb +0 -108
- data/lib/rubocop/cop/rails/find_by.rb +0 -55
- data/lib/rubocop/cop/rails/find_each.rb +0 -51
- data/lib/rubocop/cop/rails/has_and_belongs_to_many.rb +0 -25
- data/lib/rubocop/cop/rails/has_many_or_has_one_dependent.rb +0 -106
- data/lib/rubocop/cop/rails/http_positional_arguments.rb +0 -117
- data/lib/rubocop/cop/rails/http_status.rb +0 -179
- data/lib/rubocop/cop/rails/ignored_skip_action_filter_option.rb +0 -94
- data/lib/rubocop/cop/rails/inverse_of.rb +0 -246
- data/lib/rubocop/cop/rails/lexically_scoped_action_filter.rb +0 -175
- data/lib/rubocop/cop/rails/link_to_blank.rb +0 -98
- data/lib/rubocop/cop/rails/not_null_column.rb +0 -67
- data/lib/rubocop/cop/rails/output.rb +0 -49
- data/lib/rubocop/cop/rails/output_safety.rb +0 -99
- data/lib/rubocop/cop/rails/pluralization_grammar.rb +0 -107
- data/lib/rubocop/cop/rails/presence.rb +0 -124
- data/lib/rubocop/cop/rails/present.rb +0 -153
- data/lib/rubocop/cop/rails/read_write_attribute.rb +0 -74
- data/lib/rubocop/cop/rails/redundant_allow_nil.rb +0 -111
- data/lib/rubocop/cop/rails/redundant_receiver_in_with_options.rb +0 -136
- data/lib/rubocop/cop/rails/reflection_class_name.rb +0 -37
- data/lib/rubocop/cop/rails/refute_methods.rb +0 -76
- data/lib/rubocop/cop/rails/relative_date_constant.rb +0 -93
- data/lib/rubocop/cop/rails/request_referer.rb +0 -56
- data/lib/rubocop/cop/rails/reversible_migration.rb +0 -286
- data/lib/rubocop/cop/rails/safe_navigation.rb +0 -87
- data/lib/rubocop/cop/rails/save_bang.rb +0 -316
- data/lib/rubocop/cop/rails/scope_args.rb +0 -29
- data/lib/rubocop/cop/rails/skips_model_validations.rb +0 -87
- data/lib/rubocop/cop/rails/time_zone.rb +0 -238
- data/lib/rubocop/cop/rails/uniq_before_pluck.rb +0 -105
- data/lib/rubocop/cop/rails/unknown_env.rb +0 -63
- data/lib/rubocop/cop/rails/validation.rb +0 -109
- data/lib/rubocop/rspec/shared_examples.rb +0 -59
data/lib/rubocop/cop/team.rb
CHANGED
@@ -81,6 +81,9 @@ module RuboCop
|
|
81
81
|
File.open(filename, 'w') { |f| f.write(new_source) }
|
82
82
|
end
|
83
83
|
@updated_source_file = true
|
84
|
+
rescue RuboCop::ErrorWithAnalyzedFileLocation => e
|
85
|
+
process_errors(buffer.name, [e])
|
86
|
+
raise e.cause
|
84
87
|
end
|
85
88
|
|
86
89
|
private
|
@@ -103,8 +106,8 @@ module RuboCop
|
|
103
106
|
|
104
107
|
other = investigate(other_cops, processed_source)
|
105
108
|
|
106
|
-
errors = autocorrect.errors
|
107
|
-
|
109
|
+
errors = [*autocorrect.errors, *other.errors]
|
110
|
+
process_errors(processed_source.path, errors)
|
108
111
|
|
109
112
|
autocorrect.offenses.concat(other.offenses)
|
110
113
|
end
|
@@ -149,19 +152,17 @@ module RuboCop
|
|
149
152
|
end
|
150
153
|
end
|
151
154
|
|
152
|
-
def
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
location = "#{file}#{line}#{column}"
|
155
|
+
def process_errors(file, errors)
|
156
|
+
errors.each do |error|
|
157
|
+
line = ":#{error.line}" if error.line
|
158
|
+
column = ":#{error.column}" if error.column
|
159
|
+
location = "#{file}#{line}#{column}"
|
160
|
+
cause = error.cause
|
159
161
|
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
end
|
162
|
+
if cause.is_a?(Warning)
|
163
|
+
handle_warning(cause, location)
|
164
|
+
else
|
165
|
+
handle_error(cause, location, error.cop)
|
165
166
|
end
|
166
167
|
end
|
167
168
|
end
|
@@ -0,0 +1,128 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module Utils
|
6
|
+
# Parses {Kernel#sprintf} format strings.
|
7
|
+
class FormatString
|
8
|
+
DIGIT_DOLLAR = /(\d+)\$/.freeze
|
9
|
+
FLAG = /[ #0+-]|#{DIGIT_DOLLAR}/.freeze
|
10
|
+
NUMBER_ARG = /\*#{DIGIT_DOLLAR}?/.freeze
|
11
|
+
NUMBER = /\d+|#{NUMBER_ARG}/.freeze
|
12
|
+
WIDTH = /(?<width>#{NUMBER})/.freeze
|
13
|
+
PRECISION = /\.(?<precision>#{NUMBER})/.freeze
|
14
|
+
TYPE = /(?<type>[bBdiouxXeEfgGaAcps])/.freeze
|
15
|
+
NAME = /<(?<name>\w+)>/.freeze
|
16
|
+
TEMPLATE_NAME = /\{(?<name>\w+)\}/.freeze
|
17
|
+
|
18
|
+
SEQUENCE = /
|
19
|
+
% (?<type>%)
|
20
|
+
| % (?<flags>#{FLAG}*)
|
21
|
+
(?:
|
22
|
+
(?: #{WIDTH}? #{PRECISION}? #{NAME}?
|
23
|
+
| #{WIDTH}? #{NAME} #{PRECISION}?
|
24
|
+
| #{NAME} (?<more_flags>#{FLAG}*) #{WIDTH}? #{PRECISION}?
|
25
|
+
) #{TYPE}
|
26
|
+
| #{WIDTH}? #{PRECISION}? #{TEMPLATE_NAME}
|
27
|
+
)
|
28
|
+
/x.freeze
|
29
|
+
|
30
|
+
# The syntax of a format sequence is as follows.
|
31
|
+
#
|
32
|
+
# ```
|
33
|
+
# %[flags][width][.precision]type
|
34
|
+
# ```
|
35
|
+
#
|
36
|
+
# A format sequence consists of a percent sign, followed by optional
|
37
|
+
# flags, width, and precision indicators, then terminated with a field
|
38
|
+
# type character.
|
39
|
+
#
|
40
|
+
# For more complex formatting, Ruby supports a reference by name.
|
41
|
+
#
|
42
|
+
# @see https://ruby-doc.org/core-2.6.3/Kernel.html#method-i-format
|
43
|
+
class FormatSequence
|
44
|
+
attr_reader :begin_pos, :end_pos
|
45
|
+
attr_reader :flags, :width, :precision, :name, :type
|
46
|
+
|
47
|
+
def initialize(string, **opts)
|
48
|
+
@source = string
|
49
|
+
@begin_pos = opts[:begin_pos]
|
50
|
+
@end_pos = opts[:end_pos]
|
51
|
+
@flags = opts[:flags]
|
52
|
+
@width = opts[:width]
|
53
|
+
@precision = opts[:precision]
|
54
|
+
@name = opts[:name]
|
55
|
+
@type = opts[:type]
|
56
|
+
end
|
57
|
+
|
58
|
+
def percent?
|
59
|
+
type == '%'
|
60
|
+
end
|
61
|
+
|
62
|
+
def annotated?
|
63
|
+
name && @source.include?('<')
|
64
|
+
end
|
65
|
+
|
66
|
+
def template?
|
67
|
+
name && @source.include?('{')
|
68
|
+
end
|
69
|
+
|
70
|
+
# Number of arguments required for the format sequence
|
71
|
+
def arity
|
72
|
+
@source.scan('*').count + 1
|
73
|
+
end
|
74
|
+
|
75
|
+
def max_digit_dollar_num
|
76
|
+
@source.scan(DIGIT_DOLLAR).map do |(digit_dollar_num)|
|
77
|
+
digit_dollar_num.to_i
|
78
|
+
end.max
|
79
|
+
end
|
80
|
+
|
81
|
+
def style
|
82
|
+
if annotated?
|
83
|
+
:annotated
|
84
|
+
elsif template?
|
85
|
+
:template
|
86
|
+
else
|
87
|
+
:unannotated
|
88
|
+
end
|
89
|
+
end
|
90
|
+
end
|
91
|
+
|
92
|
+
def initialize(string)
|
93
|
+
@source = string
|
94
|
+
end
|
95
|
+
|
96
|
+
def format_sequences
|
97
|
+
@format_sequences ||= parse
|
98
|
+
end
|
99
|
+
|
100
|
+
def named_interpolation?
|
101
|
+
format_sequences.any?(&:name)
|
102
|
+
end
|
103
|
+
|
104
|
+
def max_digit_dollar_num
|
105
|
+
format_sequences.map(&:max_digit_dollar_num).max
|
106
|
+
end
|
107
|
+
|
108
|
+
private
|
109
|
+
|
110
|
+
def parse
|
111
|
+
@source.to_enum(:scan, SEQUENCE).map do
|
112
|
+
match = Regexp.last_match
|
113
|
+
FormatSequence.new(
|
114
|
+
match[0],
|
115
|
+
begin_pos: match.begin(0),
|
116
|
+
end_pos: match.end(0),
|
117
|
+
flags: match[:flags].to_s + match[:more_flags].to_s,
|
118
|
+
width: match[:width],
|
119
|
+
precision: match[:precision],
|
120
|
+
name: match[:name],
|
121
|
+
type: match[:type]
|
122
|
+
)
|
123
|
+
end
|
124
|
+
end
|
125
|
+
end
|
126
|
+
end
|
127
|
+
end
|
128
|
+
end
|
@@ -37,7 +37,7 @@ module RuboCop
|
|
37
37
|
!@references.empty?
|
38
38
|
end
|
39
39
|
|
40
|
-
# rubocop:disable Metrics/AbcSize
|
40
|
+
# rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
|
41
41
|
def reference!(node)
|
42
42
|
reference = Reference.new(node, @scope)
|
43
43
|
@references << reference
|
@@ -50,6 +50,13 @@ module RuboCop
|
|
50
50
|
assignment.reference!(node)
|
51
51
|
end
|
52
52
|
|
53
|
+
# Modifier if/unless conditions are special. Assignments made in
|
54
|
+
# them do not put the assigned variable in scope to the left of the
|
55
|
+
# if/unless keyword. A preceding assignment is needed to put the
|
56
|
+
# variable in scope. For this reason we skip to the next assignment
|
57
|
+
# here.
|
58
|
+
next if in_modifier_if?(assignment)
|
59
|
+
|
53
60
|
break if !assignment.branch || assignment.branch == reference.branch
|
54
61
|
|
55
62
|
unless assignment.branch.may_run_incompletely?
|
@@ -57,7 +64,13 @@ module RuboCop
|
|
57
64
|
end
|
58
65
|
end
|
59
66
|
end
|
60
|
-
# rubocop:enable Metrics/AbcSize
|
67
|
+
# rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
|
68
|
+
|
69
|
+
def in_modifier_if?(assignment)
|
70
|
+
parent = assignment.node.parent
|
71
|
+
parent = parent.parent if parent&.begin_type?
|
72
|
+
parent&.if_type? && parent&.modifier_form?
|
73
|
+
end
|
61
74
|
|
62
75
|
def capture_with_block!
|
63
76
|
@captured_by_block = true
|
@@ -20,28 +20,4 @@ class String
|
|
20
20
|
empty? || strip.empty?
|
21
21
|
end
|
22
22
|
end
|
23
|
-
|
24
|
-
unless method_defined? :strip_indent
|
25
|
-
# The method strips the whitespace preceding the base indentation.
|
26
|
-
# Useful for HEREDOCs and other multi-line strings.
|
27
|
-
#
|
28
|
-
# @example
|
29
|
-
#
|
30
|
-
# code = <<~END
|
31
|
-
# def test
|
32
|
-
# some_method
|
33
|
-
# other_method
|
34
|
-
# end
|
35
|
-
# END
|
36
|
-
#
|
37
|
-
# #=> "def\n some_method\n \nother_method\nend"
|
38
|
-
#
|
39
|
-
# @todo Replace call sites with squiggly heredocs when required Ruby
|
40
|
-
# version is >= 2.3.0
|
41
|
-
def strip_indent
|
42
|
-
leading_space = scan(/^[ \t]*(?=\S)/).min
|
43
|
-
indent = leading_space ? leading_space.size : 0
|
44
|
-
gsub(/^[ \t]{#{indent}}/, '')
|
45
|
-
end
|
46
|
-
end
|
47
23
|
end
|
data/lib/rubocop/error.rb
CHANGED
@@ -8,4 +8,27 @@ module RuboCop
|
|
8
8
|
class Error < StandardError; end
|
9
9
|
|
10
10
|
class ValidationError < Error; end
|
11
|
+
|
12
|
+
# A wrapper to display errored location of analyzed file.
|
13
|
+
class ErrorWithAnalyzedFileLocation < Error
|
14
|
+
def initialize(cause:, node:, cop:)
|
15
|
+
@cause = cause
|
16
|
+
@cop = cop
|
17
|
+
@location = node.is_a?(RuboCop::AST::Node) ? node.loc : node
|
18
|
+
end
|
19
|
+
|
20
|
+
attr_reader :cause, :cop
|
21
|
+
|
22
|
+
def line
|
23
|
+
@location&.line
|
24
|
+
end
|
25
|
+
|
26
|
+
def column
|
27
|
+
@location&.column
|
28
|
+
end
|
29
|
+
|
30
|
+
def message
|
31
|
+
"cause: #{cause.inspect}"
|
32
|
+
end
|
33
|
+
end
|
11
34
|
end
|
@@ -15,9 +15,14 @@ module RuboCop
|
|
15
15
|
private
|
16
16
|
|
17
17
|
def report_offense(file, offense)
|
18
|
-
output.printf(
|
19
|
-
|
20
|
-
|
18
|
+
output.printf(
|
19
|
+
"%<path>s:%<line>d:%<column>d: %<severity>s: %<message>s\n",
|
20
|
+
path: cyan(smart_path(file)),
|
21
|
+
line: offense.line,
|
22
|
+
column: offense.real_column,
|
23
|
+
severity: colored_severity_code(offense),
|
24
|
+
message: message(offense)
|
25
|
+
)
|
21
26
|
|
22
27
|
# rubocop:disable Lint/HandleExceptions
|
23
28
|
begin
|
@@ -8,17 +8,30 @@ module RuboCop
|
|
8
8
|
class EmacsStyleFormatter < BaseFormatter
|
9
9
|
def file_finished(file, offenses)
|
10
10
|
offenses.each do |o|
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
message.tr("\n", ' '))
|
11
|
+
output.printf(
|
12
|
+
"%<path>s:%<line>d:%<column>d: %<severity>s: %<message>s\n",
|
13
|
+
path: file,
|
14
|
+
line: o.line,
|
15
|
+
column: o.real_column,
|
16
|
+
severity: o.severity.code,
|
17
|
+
message: message(o)
|
18
|
+
)
|
20
19
|
end
|
21
20
|
end
|
21
|
+
|
22
|
+
private
|
23
|
+
|
24
|
+
def message(offense)
|
25
|
+
message =
|
26
|
+
if offense.corrected_with_todo?
|
27
|
+
"[Todo] #{offense.message}"
|
28
|
+
elsif offense.corrected?
|
29
|
+
"[Corrected] #{offense.message}"
|
30
|
+
else
|
31
|
+
offense.message
|
32
|
+
end
|
33
|
+
message.tr("\n", ' ')
|
34
|
+
end
|
22
35
|
end
|
23
36
|
end
|
24
37
|
end
|
@@ -9,20 +9,21 @@ module RuboCop
|
|
9
9
|
# which invoke same method of each formatters.
|
10
10
|
class FormatterSet < Array
|
11
11
|
BUILTIN_FORMATTERS_FOR_KEYS = {
|
12
|
-
'
|
13
|
-
'
|
14
|
-
'
|
15
|
-
'
|
16
|
-
'
|
17
|
-
'
|
18
|
-
'
|
19
|
-
'
|
20
|
-
'
|
21
|
-
'
|
22
|
-
'
|
23
|
-
'
|
24
|
-
'
|
25
|
-
'
|
12
|
+
'[a]utogenconf' => AutoGenConfigFormatter,
|
13
|
+
'[c]lang' => ClangStyleFormatter,
|
14
|
+
'[d]isabled' => DisabledLinesFormatter,
|
15
|
+
'[e]macs' => EmacsStyleFormatter,
|
16
|
+
'[fi]les' => FileListFormatter,
|
17
|
+
'[fu]ubar' => FuubarStyleFormatter,
|
18
|
+
'[h]tml' => HTMLFormatter,
|
19
|
+
'[j]son' => JSONFormatter,
|
20
|
+
'[o]ffenses' => OffenseCountFormatter,
|
21
|
+
'[pa]cman' => PacmanFormatter,
|
22
|
+
'[p]rogress' => ProgressFormatter,
|
23
|
+
'[q]uiet' => QuietFormatter,
|
24
|
+
'[s]imple' => SimpleTextFormatter,
|
25
|
+
'[t]ap' => TapFormatter,
|
26
|
+
'[w]orst' => WorstOffendersFormatter
|
26
27
|
}.freeze
|
27
28
|
|
28
29
|
FORMATTER_APIS = %i[started finished].freeze
|
@@ -81,7 +82,7 @@ module RuboCop
|
|
81
82
|
|
82
83
|
def builtin_formatter_class(specified_key)
|
83
84
|
matching_keys = BUILTIN_FORMATTERS_FOR_KEYS.keys.select do |key|
|
84
|
-
key.
|
85
|
+
key =~ /^\[#{specified_key}\]/ || specified_key == key.delete('[]')
|
85
86
|
end
|
86
87
|
|
87
88
|
raise %(No formatter for "#{specified_key}") if matching_keys.empty?
|
@@ -0,0 +1,80 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Formatter
|
5
|
+
# This formatter prints a PACDOT per every file to be analyzed.
|
6
|
+
# Pacman will "eat" one PACDOT per file when no offense is detected.
|
7
|
+
# Otherwise it will print a Ghost.
|
8
|
+
# This is inspired by the Pacman formatter for RSpec by Carlos Rojas.
|
9
|
+
# https://github.com/go-labs/rspec_pacman_formatter
|
10
|
+
class PacmanFormatter < ClangStyleFormatter
|
11
|
+
include TextUtil
|
12
|
+
attr_accessor :progress_line
|
13
|
+
|
14
|
+
FALLBACK_TERMINAL_WIDTH = 80
|
15
|
+
GHOST = 'ᗣ'
|
16
|
+
PACMAN = Rainbow('ᗧ').yellow.bright
|
17
|
+
PACDOT = Rainbow('•').yellow.bright
|
18
|
+
|
19
|
+
def initialize(output, options = {})
|
20
|
+
super
|
21
|
+
@progress_line = ''
|
22
|
+
@total_files = 0
|
23
|
+
@repetitions = 0
|
24
|
+
end
|
25
|
+
|
26
|
+
def started(target_files)
|
27
|
+
super
|
28
|
+
@total_files = target_files.size
|
29
|
+
output.puts "Eating #{pluralize(target_files.size, 'file')}"
|
30
|
+
update_progress_line
|
31
|
+
end
|
32
|
+
|
33
|
+
def file_started(_file, _options)
|
34
|
+
step(PACMAN)
|
35
|
+
end
|
36
|
+
|
37
|
+
def file_finished(file, offenses)
|
38
|
+
count_stats(offenses) unless offenses.empty?
|
39
|
+
next_step(offenses)
|
40
|
+
report_file(file, offenses)
|
41
|
+
end
|
42
|
+
|
43
|
+
def next_step(offenses)
|
44
|
+
return step('.') if offenses.empty?
|
45
|
+
|
46
|
+
ghost_color = COLOR_FOR_SEVERITY[offenses.last.severity.name]
|
47
|
+
step(colorize(GHOST, ghost_color))
|
48
|
+
end
|
49
|
+
|
50
|
+
def cols
|
51
|
+
@cols ||= begin
|
52
|
+
_height, width = $stdout.winsize
|
53
|
+
width.nil? || width.zero? ? FALLBACK_TERMINAL_WIDTH : width
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|
57
|
+
def update_progress_line
|
58
|
+
return pacdots(@total_files) unless @total_files > cols
|
59
|
+
return pacdots(cols) unless (@total_files / cols).eql?(@repetitions)
|
60
|
+
|
61
|
+
pacdots((@total_files - (cols * @repetitions)))
|
62
|
+
end
|
63
|
+
|
64
|
+
def pacdots(number)
|
65
|
+
@progress_line = PACDOT * number
|
66
|
+
end
|
67
|
+
|
68
|
+
def step(character)
|
69
|
+
regex = /#{Regexp.quote(PACMAN)}|#{Regexp.quote(PACDOT)}/
|
70
|
+
@progress_line = @progress_line.sub(regex, character)
|
71
|
+
output.printf("%<line>s\r", line: @progress_line)
|
72
|
+
return unless @progress_line[-1] =~ /ᗣ|\./
|
73
|
+
|
74
|
+
@repetitions += 1
|
75
|
+
output.puts
|
76
|
+
update_progress_line
|
77
|
+
end
|
78
|
+
end
|
79
|
+
end
|
80
|
+
end
|