Skip to content

Upgrade RuboCop related gems #3367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
inherit_gem:
rubocop-shopify: rubocop.yml

plugins:
- rubocop-rake
- rubocop-minitest

require:
- rubocop-sorbet
- rubocop-minitest
- rubocop-rake
- ./lib/rubocop/cop/ruby_lsp/use_language_server_aliases
- ./lib/rubocop/cop/ruby_lsp/use_register_with_handler_method

Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ group :development do
gem "mocha", "~> 2.3"
gem "psych", "~> 5.1", require: false
gem "rake", "~> 13.2"
gem "rubocop-minitest", "~> 0.36.0", require: false
gem "rubocop-rake", "~> 0.6.0", require: false
gem "rubocop-shopify", "~> 2.15", require: false
gem "rubocop-minitest", "~> 0.38", require: false
gem "rubocop-rake", "~> 0.7", require: false
gem "rubocop-shopify", "~> 2.16", require: false
gem "rubocop-sorbet", "~> 0.8", require: false
gem "rubocop", "~> 1.70"
gem "syntax_tree", ">= 6.1.1", "< 7"
Expand Down
24 changes: 13 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,27 @@ GEM
io-console (~> 0.5)
require-hooks (0.2.2)
rexml (3.4.1)
rubocop (1.72.0)
rubocop (1.76.2)
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.38.0, < 2.0)
rubocop-ast (>= 1.45.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.45.1)
parser (>= 3.3.7.2)
prism (~> 1.4)
rubocop-minitest (0.36.0)
rubocop (>= 1.61, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-minitest (0.38.1)
lint_roller (~> 1.1)
rubocop (>= 1.75.0, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
rubocop-rake (0.7.1)
lint_roller (~> 1.1)
rubocop (>= 1.72.1)
rubocop-shopify (2.17.1)
rubocop (~> 1.62)
rubocop-sorbet (0.8.7)
Expand Down Expand Up @@ -141,9 +143,9 @@ DEPENDENCIES
psych (~> 5.1)
rake (~> 13.2)
rubocop (~> 1.70)
rubocop-minitest (~> 0.36.0)
rubocop-rake (~> 0.6.0)
rubocop-shopify (~> 2.15)
rubocop-minitest (~> 0.38)
rubocop-rake (~> 0.7)
rubocop-shopify (~> 2.16)
rubocop-sorbet (~> 0.8)
ruby-lsp!
sorbet-static-and-runtime
Expand All @@ -152,4 +154,4 @@ DEPENDENCIES
test-unit

BUNDLED WITH
2.6.2
2.6.9
6 changes: 5 additions & 1 deletion lib/ruby_lsp/requests/support/rubocop_runner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,11 @@ def run(path, contents)
rescue ::RuboCop::ValidationError => error
raise ConfigurationError, error.message
rescue StandardError => error
raise InternalRuboCopError, error
# Maintain the original backtrace so that debugging cops that are breaking is easier, but re-raise as a
# different error class
internal_error = InternalRuboCopError.new(error)
internal_error.set_backtrace(error.backtrace)
raise internal_error
end

#: -> String
Expand Down
154 changes: 154 additions & 0 deletions sorbet/rbi/gems/[email protected]

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading