From 35284c77f1c0f65561ea7b7157f1ab69a3e4632a Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Wed, 16 Oct 2024 10:56:58 +0800 Subject: [PATCH] Build(deps-dev): Bump rubocop from 1.66.1 to 1.67.0 (#29226) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.66.1 to 1.67.0.
Release notes

Sourced from rubocop's releases.

RuboCop 1.67

New features

  • #13259: Add new Lint/DuplicateSetElement cop. ([@​koic][])
  • #13223: Add AllowRBSInlineAnnotation config option to Layout/LeadingCommentSpace to support RBS::Inline style annotation comments. ([@​tk0miya][])
  • #13310: Display analysis Ruby version in rubocop -V. ([@​koic][])

Bug fixes

  • #13314: Fix a false negative for Style/Semicolon when using a semicolon between a closing parenthesis after a line break and a consequent expression. ([@​koic][])
  • #13217: Fix a false positive in Lint/ParenthesesAsGroupedExpression with compound ranges. ([@​gsamokovarov][])
  • #13268: Fix a false positive for Style/BlockDelimiters when a single line do-end block with an inline rescue with a semicolon before rescue. ([@​koic][])
  • #13298: Fix an error for Layout/AccessModifierIndentation when the access modifier is on the same line as the class definition. ([@​koic][])
  • #13198: Fix an error for Style/OneLineConditional when using nested if/then/else/end. ([@​koic][])
  • #13316: Fix an incorrect autocorrect for Lint/ImplicitStringConcatenation with Lint/TripleQuotes when string literals with triple quotes are used. ([@​koic][])
  • #13220: Fix an incorrect autocorrect for Style/ArgumentsForwarding when using only forwarded arguments in brackets. ([@​koic][])
  • #13202: Fix an incorrect autocorrect for Style/CombinableLoops when looping over the same data with different block variable names. ([@​koic][])
  • #13291: Fix an incorrect autocorrect for Style/RescueModifier when using modifier rescue for method call with heredoc argument. ([@​koic][])
  • #13226: Fix --auto-gen-config when passing an absolute config path. ([@​earlopain][])
  • #13225: Avoid syntax error when correcting Style/OperatorMethodCall with / operations followed by a parenthesized argument. ([@​dvandersluis][])
  • #13235: Fix an error for Style/IfUnlessModifier when multiline if that fits on one line and using implicit method call with hash value omission syntax. ([@​koic][])
  • #13219: Fix a false positive for Style/ArgumentsForwarding with Ruby 3.0 and optional position arguments. ([@​earlopain][])
  • #13271: Fix a false positive for Lint/AmbiguousRange when using rational literals. ([@​koic][])
  • #13260: Fix a false positive for Lint/RedundantSafeNavigation with namespaced constants. ([@​earlopain][])
  • #13224: Fix false positives for Style/OperatorMethodCall with named forwarding. ([@​earlopain][])
  • #13213: Fix false positives for Style/AccessModifierDeclarations when AllowModifiersOnAttrs: true and using splat with a percent symbol array, or with a constant. ([@​koic][])
  • #13145: Fix false positives for Style/RedundantLineContinuation when line continuations with comparison operator and the LHS is wrapped in parentheses. ([@​koic][])
  • #12875: Fix false positive for Style/ArgumentsForwarding when argument is used inside a block. ([@​dvandersluis][])
  • #13239: Fix false positive for Style/CollectionCompact when using delete_if. ([@​masato-bkn][])
  • #13210: Fix omit_parentheses style for pattern match with value omission in single-line branch. ([@​gsamokovarov][])
  • #13149: Handle crashes in custom Ruby extractors more gracefully. ([@​earlopain][])
  • #13319: Handle literal forward slashes inside a regexp in Lint/LiteralInInterpolation. ([@​dvandersluis][])
  • #13208: Fix an incorrect autocorrect for Style/IfWithSemicolon when single-line if/;/end when the then body contains a method call with [] or []=. ([@​koic][])
  • #13318: Prevent modifying blocks with Style/HashEachMethods if the hash is modified within the block. ([@​dvandersluis][])
  • #13293: Fix TargetRubyVersion from a gemspec when the gemspec is not named like the folder it is located in. ([@​earlopain][])
  • #13211: Fix wrong autocorrect for Style/GuardClause when using heredoc without else branch. ([@​earlopain][])
  • #13215: Fix wrong autocorrect for Lint/BigDecimalNew when using ::BigDecimal.new. ([@​earlopain][])
  • #13215: Fix wrong autocorrect for Style/MethodCallWithArgsParentheses with EnforcedStyle: omit_parentheses and whitespace. ([@​earlopain][])
  • #13302: Fix incompatible autocorrect between Style/RedundantBegin and Style/BlockDelimiters with EnforcedStyle: braces_for_chaining. ([@​earlopain][])

Changes

  • #13221: Do not group accessors having RBS::Inline annotation comments in Style/AccessorGrouping. ([@​tk0miya][])
  • #13286: Add AllowedMethods configuration to Layout/FirstMethodArgumentLineBreak. ([@​dvandersluis][])
  • #13110: Add support in Style/ArgumentsForwarding for detecting forwarding of all anonymous arguments. ([@​dvandersluis][])
  • #13222: Allow to write RBS::Inline annotation comments after method definition in Style/CommentedKeyword. ([@​tk0miya][])
  • #13253: Emit a deprecation when custom cops inherit from RuboCop::Cop::Cop. ([@​earlopain][])
  • #13300: Set EnforcedShorthandSyntax: either by default for Style/HashSyntax. ([@​koic][])
  • #13254: Enhance the autocorrect for Naming/InclusiveLanguage when a sole suggestion is set. ([@​koic][])
  • #13232: Make server mode aware of auto-restart for local config update. ([@​koic][])

... (truncated)

Changelog

Sourced from rubocop's changelog.

1.67.0 (2024-10-15)

New features

  • #13259: Add new Lint/DuplicateSetElement cop. ([@​koic][])
  • #13223: Add AllowRBSInlineAnnotation config option to Layout/LeadingCommentSpace to support RBS::Inline style annotation comments. ([@​tk0miya][])
  • #13310: Display analysis Ruby version in rubocop -V. ([@​koic][])

Bug fixes

  • #13314: Fix a false negative for Style/Semicolon when using a semicolon between a closing parenthesis after a line break and a consequent expression. ([@​koic][])
  • #13217: Fix a false positive in Lint/ParenthesesAsGroupedExpression with compound ranges. ([@​gsamokovarov][])
  • #13268: Fix a false positive for Style/BlockDelimiters when a single line do-end block with an inline rescue with a semicolon before rescue. ([@​koic][])
  • #13298: Fix an error for Layout/AccessModifierIndentation when the access modifier is on the same line as the class definition. ([@​koic][])
  • #13198: Fix an error for Style/OneLineConditional when using nested if/then/else/end. ([@​koic][])
  • #13316: Fix an incorrect autocorrect for Lint/ImplicitStringConcatenation with Lint/TripleQuotes when string literals with triple quotes are used. ([@​koic][])
  • #13220: Fix an incorrect autocorrect for Style/ArgumentsForwarding when using only forwarded arguments in brackets. ([@​koic][])
  • #13202: Fix an incorrect autocorrect for Style/CombinableLoops when looping over the same data with different block variable names. ([@​koic][])
  • #13291: Fix an incorrect autocorrect for Style/RescueModifier when using modifier rescue for method call with heredoc argument. ([@​koic][])
  • #13226: Fix --auto-gen-config when passing an absolute config path. ([@​earlopain][])
  • #13225: Avoid syntax error when correcting Style/OperatorMethodCall with / operations followed by a parenthesized argument. ([@​dvandersluis][])
  • #13235: Fix an error for Style/IfUnlessModifier when multiline if that fits on one line and using implicit method call with hash value omission syntax. ([@​koic][])
  • #13219: Fix a false positive for Style/ArgumentsForwarding with Ruby 3.0 and optional position arguments. ([@​earlopain][])
  • #13271: Fix a false positive for Lint/AmbiguousRange when using rational literals. ([@​koic][])
  • #13260: Fix a false positive for Lint/RedundantSafeNavigation with namespaced constants. ([@​earlopain][])
  • #13224: Fix false positives for Style/OperatorMethodCall with named forwarding. ([@​earlopain][])
  • #13213: Fix false positives for Style/AccessModifierDeclarations when AllowModifiersOnAttrs: true and using splat with a percent symbol array, or with a constant. ([@​koic][])
  • #13145: Fix false positives for Style/RedundantLineContinuation when line continuations with comparison operator and the LHS is wrapped in parentheses. ([@​koic][])
  • #12875: Fix false positive for Style/ArgumentsForwarding when argument is used inside a block. ([@​dvandersluis][])
  • #13239: Fix false positive for Style/CollectionCompact when using delete_if. ([@​masato-bkn][])
  • #13210: Fix omit_parentheses style for pattern match with value omission in single-line branch. ([@​gsamokovarov][])
  • #13149: Handle crashes in custom Ruby extractors more gracefully. ([@​earlopain][])
  • #13319: Handle literal forward slashes inside a regexp in Lint/LiteralInInterpolation. ([@​dvandersluis][])
  • #13208: Fix an incorrect autocorrect for Style/IfWithSemicolon when single-line if/;/end when the then body contains a method call with [] or []=. ([@​koic][])
  • #13318: Prevent modifying blocks with Style/HashEachMethods if the hash is modified within the block. ([@​dvandersluis][])
  • #13293: Fix TargetRubyVersion from a gemspec when the gemspec is not named like the folder it is located in. ([@​earlopain][])
  • #13211: Fix wrong autocorrect for Style/GuardClause when using heredoc without else branch. ([@​earlopain][])
  • #13215: Fix wrong autocorrect for Lint/BigDecimalNew when using ::BigDecimal.new. ([@​earlopain][])
  • #13215: Fix wrong autocorrect for Style/MethodCallWithArgsParentheses with EnforcedStyle: omit_parentheses and whitespace. ([@​earlopain][])
  • #13302: Fix incompatible autocorrect between Style/RedundantBegin and Style/BlockDelimiters with EnforcedStyle: braces_for_chaining. ([@​earlopain][])

Changes

  • #13221: Do not group accessors having RBS::Inline annotation comments in Style/AccessorGrouping. ([@​tk0miya][])
  • #13286: Add AllowedMethods configuration to Layout/FirstMethodArgumentLineBreak. ([@​dvandersluis][])
  • #13110: Add support in Style/ArgumentsForwarding for detecting forwarding of all anonymous arguments. ([@​dvandersluis][])
  • #13222: Allow to write RBS::Inline annotation comments after method definition in Style/CommentedKeyword. ([@​tk0miya][])
  • #13253: Emit a deprecation when custom cops inherit from RuboCop::Cop::Cop. ([@​earlopain][])
  • #13300: Set EnforcedShorthandSyntax: either by default for Style/HashSyntax. ([@​koic][])
  • #13254: Enhance the autocorrect for Naming/InclusiveLanguage when a sole suggestion is set. ([@​koic][])

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rubocop&package-manager=bundler&previous-version=1.66.1&new-version=1.67.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- Gemfile.lock | 2 +- app/controllers/topics_controller.rb | 4 ++-- script/import_scripts/jive_api.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d43718d5237..5f32f174f9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -451,7 +451,7 @@ GEM rspec-core (>= 2.14) rtlcss (0.2.1) mini_racer (>= 0.6.3) - rubocop (1.66.1) + rubocop (1.67.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 3e85270ee61..cd4c1224f09 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -125,7 +125,7 @@ class TopicsController < ApplicationController deleted = guardian.can_see_topic?(ex.obj, false) || - (!guardian.can_see_topic?(ex.obj) && ex.obj&.access_topic_via_group && ex.obj&.deleted_at) + (!guardian.can_see_topic?(ex.obj) && ex.obj&.access_topic_via_group && ex.obj.deleted_at) if SiteSetting.detailed_404 if deleted @@ -990,7 +990,7 @@ class TopicsController < ApplicationController rescue Discourse::InvalidAccess => ex deleted = guardian.can_see_topic?(ex.obj, false) || - (!guardian.can_see_topic?(ex.obj) && ex.obj&.access_topic_via_group && ex.obj&.deleted_at) + (!guardian.can_see_topic?(ex.obj) && ex.obj&.access_topic_via_group && ex.obj.deleted_at) raise Discourse::NotFound.new( nil, diff --git a/script/import_scripts/jive_api.rb b/script/import_scripts/jive_api.rb index 7a84231b730..af22cd5343e 100644 --- a/script/import_scripts/jive_api.rb +++ b/script/import_scripts/jive_api.rb @@ -282,7 +282,7 @@ class ImportScripts::JiveApi < ImportScripts::Base post_id = post_id_from_imported_post_id(topic[:id]) parent_post = post_id ? Post.unscoped.find_by(id: post_id) : create_post(topic, topic[:id]) - if parent_post&.id && parent_post&.topic_id + if parent_post&.id && parent_post.topic_id resources = content["resources"] if content["likeCount"].to_i > 0 && resources.dig("likes", "ref").present? import_likes(resources["likes"]["ref"], parent_post.id)