Skip to content

Commit 748140c

Browse files
authored
Upgrade rubocop related dependencies (#3614)
1 parent b145e66 commit 748140c

File tree

10 files changed

+959
-878
lines changed

10 files changed

+959
-878
lines changed

Gemfile.lock

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PATH
1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
ast (2.4.2)
13+
ast (2.4.3)
1414
benchmark (0.4.1)
1515
date (3.4.1)
1616
debug (1.10.0)
@@ -31,7 +31,7 @@ GEM
3131
ruby2_keywords (>= 0.0.5)
3232
netrc (0.11.0)
3333
parallel (1.27.0)
34-
parser (3.3.7.1)
34+
parser (3.3.8.0)
3535
ast (~> 2.4.1)
3636
racc
3737
power_assert (2.0.5)
@@ -71,15 +71,16 @@ GEM
7171
rubocop-ast (>= 1.38.0, < 2.0)
7272
ruby-progressbar (~> 1.7)
7373
unicode-display_width (>= 2.4.0, < 4.0)
74-
rubocop-ast (1.38.0)
75-
parser (>= 3.3.1.0)
74+
rubocop-ast (1.45.1)
75+
parser (>= 3.3.7.2)
76+
prism (~> 1.4)
7677
rubocop-minitest (0.36.0)
7778
rubocop (>= 1.61, < 2.0)
7879
rubocop-ast (>= 1.31.1, < 2.0)
7980
rubocop-rake (0.6.0)
8081
rubocop (~> 1.0)
81-
rubocop-shopify (2.15.1)
82-
rubocop (~> 1.51)
82+
rubocop-shopify (2.17.1)
83+
rubocop (~> 1.62)
8384
rubocop-sorbet (0.8.7)
8485
rubocop (>= 1)
8586
ruby-progressbar (1.13.0)

lib/ruby_indexer/lib/ruby_indexer/index.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ def method_completion_candidates(name, receiver_name)
266266
def constant_completion_candidates(name, nesting)
267267
# If we have a top level reference, then we don't need to include completions inside the current nesting
268268
if name.start_with?("::")
269-
return @entries_tree.search(name.delete_prefix("::")) #: as Array[Array[Entry::Constant | Entry::ConstantAlias | Entry::Namespace | Entry::UnresolvedConstantAlias]] # rubocop:disable Layout/LineLength
269+
return @entries_tree.search(name.delete_prefix("::")) #: as Array[Array[Entry::Constant | Entry::ConstantAlias | Entry::Namespace | Entry::UnresolvedConstantAlias]]
270270
end
271271

272272
# Otherwise, we have to include every possible constant the user might be referring to. This is essentially the
@@ -292,7 +292,7 @@ def constant_completion_candidates(name, nesting)
292292
# Top level constants
293293
entries.concat(@entries_tree.search(name))
294294
entries.uniq!
295-
entries #: as Array[Array[Entry::Constant | Entry::ConstantAlias | Entry::Namespace | Entry::UnresolvedConstantAlias]] # rubocop:disable Layout/LineLength
295+
entries #: as Array[Array[Entry::Constant | Entry::ConstantAlias | Entry::Namespace | Entry::UnresolvedConstantAlias]]
296296
end
297297

298298
# Resolve a constant to its declaration based on its name and the nesting where the reference was found. Parameter

lib/ruby_indexer/test/rbs_indexer_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ def test_rbs_method_with_trailing_positionals
232232
signatures = entry.signatures
233233
assert_equal(2, signatures.length)
234234

235-
# def self.select: [X, Y, Z] (::Array[X & io]? read_array, ?::Array[Y & io]? write_array, ?::Array[Z & io]? error_array) -> [ Array[X], Array[Y], Array[Z] ] # rubocop:disable Layout/LineLength
236-
# | [X, Y, Z] (::Array[X & io]? read_array, ?::Array[Y & io]? write_array, ?::Array[Z & io]? error_array, Time::_Timeout? timeout) -> [ Array[X], Array[Y], Array[Z] ]? # rubocop:disable Layout/LineLength
235+
# def self.select: [X, Y, Z] (::Array[X & io]? read_array, ?::Array[Y & io]? write_array, ?::Array[Z & io]? error_array) -> [ Array[X], Array[Y], Array[Z] ]
236+
# | [X, Y, Z] (::Array[X & io]? read_array, ?::Array[Y & io]? write_array, ?::Array[Z & io]? error_array, Time::_Timeout? timeout) -> [ Array[X], Array[Y], Array[Z] ]?
237237

238238
parameters = signatures[0]&.parameters #: as !nil
239239
assert_equal([:read_array, :write_array, :error_array], parameters.map(&:name))

lib/ruby_lsp/requests/code_action_resolve.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ def create_attribute_accessor
365365
end
366366
end
367367

368-
node = node #: as Prism::InstanceVariableAndWriteNode | Prism::InstanceVariableOperatorWriteNode | Prism::InstanceVariableOrWriteNode | Prism::InstanceVariableReadNode | Prism::InstanceVariableTargetNode | Prism::InstanceVariableWriteNode # rubocop:disable Layout/LineLength
368+
node = node #: as Prism::InstanceVariableAndWriteNode | Prism::InstanceVariableOperatorWriteNode | Prism::InstanceVariableOrWriteNode | Prism::InstanceVariableReadNode | Prism::InstanceVariableTargetNode | Prism::InstanceVariableWriteNode
369369

370370
node_context = @document.locate_node(
371371
{

lib/ruby_lsp/requests/references.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def perform
5555
)
5656
end
5757

58-
target = target #: as Prism::ConstantReadNode | Prism::ConstantPathNode | Prism::ConstantPathTargetNode | Prism::InstanceVariableAndWriteNode | Prism::InstanceVariableOperatorWriteNode | Prism::InstanceVariableOrWriteNode | Prism::InstanceVariableReadNode | Prism::InstanceVariableTargetNode | Prism::InstanceVariableWriteNode | Prism::CallNode | Prism::DefNode, # rubocop:disable Layout/LineLength
58+
target = target #: as Prism::ConstantReadNode | Prism::ConstantPathNode | Prism::ConstantPathTargetNode | Prism::InstanceVariableAndWriteNode | Prism::InstanceVariableOperatorWriteNode | Prism::InstanceVariableOrWriteNode | Prism::InstanceVariableReadNode | Prism::InstanceVariableTargetNode | Prism::InstanceVariableWriteNode | Prism::CallNode | Prism::DefNode,
5959

6060
reference_target = create_reference_target(target, node_context)
6161
return @locations unless reference_target

lib/ruby_lsp/ruby_document.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def locate(node, char_position, code_units_cache:, node_types: [])
2626
queue = node.child_nodes.compact #: Array[Prism::Node?]
2727
closest = node
2828
parent = nil #: Prism::Node?
29-
nesting_nodes = [] #: Array[(Prism::ClassNode | Prism::ModuleNode | Prism::SingletonClassNode | Prism::DefNode | Prism::BlockNode | Prism::LambdaNode | Prism::ProgramNode)] # rubocop:disable Layout/LineLength
29+
nesting_nodes = [] #: Array[(Prism::ClassNode | Prism::ModuleNode | Prism::SingletonClassNode | Prism::DefNode | Prism::BlockNode | Prism::LambdaNode | Prism::ProgramNode)]
3030

3131
nesting_nodes << node if node.is_a?(Prism::ProgramNode)
3232
call_node = nil #: Prism::CallNode?
Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)