Merge pull request #753 from Shopify/dependabot/bundler/rubocop-65d6729e70

Bump the rubocop group across 1 directory with 2 updates

Author: rafaelfranca

Gemfile.lock

@@ -10,41 +10,41 @@ GEM
   specs:
     ast (2.4.3)
     diffy (3.4.4)
-    json (2.12.2)
+    json (2.15.2)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     minitest (5.26.0)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
-    prism (1.4.0)
+    prism (1.6.0)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.1)
-    regexp_parser (2.10.0)
-    rubocop (1.78.0)
+    regexp_parser (2.11.3)
+    rubocop (1.81.6)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.1, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.47.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
-    rubocop-minitest (0.38.1)
+    rubocop-minitest (0.38.2)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
     ruby-progressbar (1.13.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
 
 PLATFORMS
   ruby

rubocop.yml

@@ -79,6 +79,11 @@ Layout/EmptyLineAfterGuardClause:
 Layout/EmptyLines:
   Enabled: false
 
+<% if rubocop_version >= '1.79' %>
+Layout/EmptyLinesAfterModuleInclusion:
+  Enabled: false
+<% end %>
+
 Layout/EndAlignment:
   Enabled: false
   EnforcedStyleAlignWith: variable
@@ -646,6 +651,11 @@ Style/ArgumentsForwarding:
 Style/ArrayIntersect:
   Enabled: false
 
+<% if rubocop_version >= '1.81' %>
+Style/ArrayIntersectWithSingleElement:
+  Enabled: false
+<% end %>
+
 Style/ArrayJoin:
   Enabled: false
 
@@ -1414,4 +1424,3 @@ Style/YodaCondition:
 
 Style/ZeroLengthPredicate:
   Enabled: false
-

test/fixtures/full_config.yml

@@ -189,7 +189,7 @@ Gemspec/AddRuntimeDependency:
   Description: Prefer `add_dependency` over `add_runtime_dependency`.
   StyleGuide: "#add_dependency_vs_add_runtime_dependency"
   References:
-  - https://github.com/rubygems/rubygems/issues/7799#issuecomment-2192720316
+  - https://github.com/ruby/rubygems/issues/7799#issuecomment-2192720316
   Enabled: false
   VersionAdded: '1.65'
   Include:
@@ -282,7 +282,7 @@ Gemspec/RubyVersionGlobalsUsage:
   Include:
   - "**/*.gemspec"
 Layout/AccessModifierIndentation:
-  Description: Check indentation of private/protected visibility modifiers.
+  Description: Checks indentation of private/protected visibility modifiers.
   StyleGuide: "#indent-public-private-protected"
   Enabled: true
   VersionAdded: '0.49'
@@ -458,6 +458,11 @@ Layout/EmptyLines:
   StyleGuide: "#two-or-more-empty-lines"
   Enabled: false
   VersionAdded: '0.49'
+Layout/EmptyLinesAfterModuleInclusion:
+  Description: Keeps track of empty lines after module inclusion methods.
+  StyleGuide: "#empty-lines-after-module-inclusion"
+  Enabled: false
+  VersionAdded: '1.79'
 Layout/EmptyLinesAroundAccessModifier:
   Description: Keep blank lines around access modifiers.
   StyleGuide: "#empty-lines-around-access-modifier"
@@ -707,7 +712,7 @@ Layout/LeadingCommentSpace:
   AllowRBSInlineAnnotation: true
   AllowSteepAnnotation: false
 Layout/LeadingEmptyLines:
-  Description: Check for unnecessary blank lines at the beginning of a file.
+  Description: Checks for unnecessary blank lines at the beginning of a file.
   Enabled: true
   VersionAdded: '0.57'
   VersionChanged: '0.77'
@@ -774,7 +779,7 @@ Layout/MultilineArrayLineBreaks:
   VersionAdded: '0.67'
   AllowMultilineFinalElement: true
 Layout/MultilineAssignmentLayout:
-  Description: Check for a newline after the assignment operator in multi-line assignments.
+  Description: Checks for a newline after the assignment operator in multi-line assignments.
   StyleGuide: "#indent-conditional-assignment"
   Enabled: false
   VersionAdded: '0.49'
@@ -1162,7 +1167,7 @@ Lint/BinaryOperatorWithIdenticalOperands:
   VersionAdded: '0.89'
   VersionChanged: '1.69'
 Lint/BooleanSymbol:
-  Description: Check for `:true` and `:false` symbols.
+  Description: Checks for `:true` and `:false` symbols.
   Enabled: false
   SafeAutoCorrect: false
   VersionAdded: '0.50'
@@ -1190,7 +1195,7 @@ Lint/ConstantReassignment:
   Enabled: true
   VersionAdded: '1.70'
 Lint/ConstantResolution:
-  Description: Check that constants are fully qualified with `::`.
+  Description: Checks that constants are fully qualified with `::`.
   Enabled: false
   VersionAdded: '0.86'
   Only: []
@@ -1200,7 +1205,7 @@ Lint/CopDirectiveSyntax:
   Enabled: true
   VersionAdded: '1.72'
 Lint/Debugger:
-  Description: Check for debugger calls.
+  Description: Checks for debugger calls.
   Enabled: true
   VersionAdded: '0.14'
   VersionChanged: '1.63'
@@ -1248,7 +1253,7 @@ Lint/Debugger:
     - debug/open
     - debug/start
 Lint/DeprecatedClassMethods:
-  Description: Check for deprecated class method calls.
+  Description: Checks for deprecated class method calls.
   Enabled: true
   VersionAdded: '0.19'
 Lint/DeprecatedConstants:
@@ -1306,28 +1311,28 @@ Lint/DuplicateElsifCondition:
   Enabled: true
   VersionAdded: '0.88'
 Lint/DuplicateHashKey:
-  Description: Check for duplicate keys in hash literals.
+  Description: Checks for duplicate keys in hash literals.
   Enabled: true
   VersionAdded: '0.34'
   VersionChanged: '0.77'
 Lint/DuplicateMagicComment:
-  Description: Check for duplicated magic comments.
+  Description: Checks for duplicated magic comments.
   Enabled: true
   VersionAdded: '1.37'
 Lint/DuplicateMatchPattern:
   Description: Do not repeat patterns in `in` keywords.
   Enabled: true
   VersionAdded: '1.50'
 Lint/DuplicateMethods:
-  Description: Check for duplicate method definitions.
+  Description: Checks for duplicate method definitions.
   Enabled: true
   VersionAdded: '0.29'
 Lint/DuplicateRegexpCharacterClassElement:
   Description: Checks for duplicate elements in Regexp character classes.
   Enabled: true
   VersionAdded: '1.1'
 Lint/DuplicateRequire:
-  Description: Check for duplicate `require`s and `require_relative`s.
+  Description: Checks for duplicate `require`s and `require_relative`s.
   Enabled: true
   SafeAutoCorrect: false
   VersionAdded: '0.90'
@@ -1341,11 +1346,11 @@ Lint/DuplicateSetElement:
   Enabled: true
   VersionAdded: '1.67'
 Lint/EachWithObjectArgument:
-  Description: Check for immutable argument given to each_with_object.
+  Description: Checks for immutable argument given to each_with_object.
   Enabled: true
   VersionAdded: '0.31'
 Lint/ElseLayout:
-  Description: Check for odd code arrangement in an else block.
+  Description: Checks for odd code arrangement in an else block.
   Enabled: true
   VersionAdded: '0.17'
   VersionChanged: '1.2'
@@ -1673,13 +1678,20 @@ Lint/RedundantSafeNavigation:
   Description: Checks for redundant safe navigation calls.
   Enabled: false
   VersionAdded: '0.93'
+  VersionChanged: '1.79'
   AllowedMethods:
   - instance_of?
   - kind_of?
   - is_a?
   - eql?
   - respond_to?
   - equal?
+  InferNonNilReceiver: false
+  AdditionalNilMethods:
+  - present?
+  - blank?
+  - try
+  - try!
   Safe: false
 Lint/RedundantSplatExpansion:
   Description: Checks for splat unnecessarily being called on literals.
@@ -2123,7 +2135,7 @@ Migration/DepartmentName:
   Enabled: false
   VersionAdded: '0.75'
 Naming/AccessorMethodName:
-  Description: Check the naming of accessor methods for get_/set_.
+  Description: Checks the naming of accessor methods for get_/set_.
   StyleGuide: "#accessor_mutator_method_names"
   Enabled: false
   VersionAdded: '0.50'
@@ -2426,6 +2438,7 @@ Security/JSONLoad:
     issues. See reference for more information.
   References:
   - https://ruby-doc.org/stdlib-2.7.0/libdoc/json/rdoc/JSON.html#method-i-load
+  - https://bugs.ruby-lang.org/issues/19528
   Enabled: false
   VersionAdded: '0.43'
   VersionChanged: '1.22'
@@ -2538,6 +2551,11 @@ Style/ArrayIntersect:
   Enabled: false
   Safe: false
   VersionAdded: '1.40'
+Style/ArrayIntersectWithSingleElement:
+  Description: Use `include?(element)` instead of `intersect?([element])`.
+  Enabled: false
+  Safe: false
+  VersionAdded: '1.81'
 Style/ArrayJoin:
   Description: Use Array#join instead of Array#*.
   StyleGuide: "#array-join"
@@ -3174,7 +3192,7 @@ Style/GlobalVars:
   VersionAdded: '0.13'
   AllowedVariables: []
 Style/GuardClause:
-  Description: Check for conditionals that can be replaced with guard clauses.
+  Description: Checks for conditionals that can be replaced with guard clauses.
   StyleGuide: "#no-nested-conditionals"
   Enabled: false
   VersionAdded: '0.20'
@@ -3373,7 +3391,7 @@ Style/IpAddresses:
   - "/**/gems.rb"
   - "/**/*.gemspec"
 Style/ItAssignment:
-  Description: Checks for assignment to `it` inside a block.
+  Description: Checks for local variables and method parameters named `it`.
   Enabled: false
   VersionAdded: '1.70'
 Style/ItBlockParameter:
@@ -3416,8 +3434,9 @@ Style/LambdaCall:
   Description: Use lambda.call(...) instead of lambda.(...).
   StyleGuide: "#proc-call"
   Enabled: false
+  AutoCorrect: contextual
   VersionAdded: '0.13'
-  VersionChanged: '0.14'
+  VersionChanged: "<<next>>"
   EnforcedStyle: call
   SupportedStyles:
   - call
@@ -3942,7 +3961,7 @@ Style/RandomWithOffset:
   Enabled: false
   VersionAdded: '0.52'
 Style/RedundantArgument:
-  Description: Check for a redundant argument passed to certain methods.
+  Description: Checks for a redundant argument passed to certain methods.
   Enabled: false
   Safe: false
   VersionAdded: '1.4'
@@ -4071,7 +4090,7 @@ Style/RedundantInterpolationUnfreeze:
   Enabled: false
   VersionAdded: '1.66'
 Style/RedundantLineContinuation:
-  Description: Check for redundant line continuation.
+  Description: Checks for redundant line continuation.
   Enabled: false
   VersionAdded: '1.49'
 Style/RedundantParentheses:
@@ -4316,7 +4335,7 @@ Style/SpecialGlobalVars:
   - use_english_names
   - use_builtin_english_names
 Style/StabbyLambdaParentheses:
-  Description: Check for the usage of parentheses around stabby lambda arguments.
+  Description: Checks for the usage of parentheses around stabby lambda arguments.
   StyleGuide: "#stabby-lambda-with-args"
   Enabled: false
   VersionAdded: '0.35'
@@ -4475,6 +4494,7 @@ Style/TrailingCommaInArguments:
   SupportedStylesForMultiline:
   - comma
   - consistent_comma
+  - diff_comma
   - no_comma
 Style/TrailingCommaInArrayLiteral:
   Description: Checks for trailing comma in array literals.