Skip to content

Commit b7e15cf

Browse files
authored
Merge pull request #748 from standardrb/dependabot/bundler/rubocop-1.80.2
Update rubocop requirement from ~> 1.75.5 to >= 1.75.5, < 1.81.0
2 parents 2a0584e + 2976e77 commit b7e15cf

File tree

6 files changed

+44
-14
lines changed

6 files changed

+44
-14
lines changed

Gemfile.lock

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ PATH
44
standard (1.50.0)
55
language_server-protocol (~> 3.17.0.2)
66
lint_roller (~> 1.0)
7-
rubocop (~> 1.75.5)
7+
rubocop (~> 1.80.2)
88
standard-custom (~> 1.0.0)
99
standard-performance (~> 1.8)
1010

1111
GEM
1212
remote: https://rubygems.org/
1313
specs:
14-
ast (2.4.2)
14+
ast (2.4.3)
1515
docile (1.4.0)
16-
json (2.6.3)
16+
json (2.13.2)
1717
language_server-protocol (3.17.0.5)
1818
lint_roller (1.1.0)
1919
logger (1.7.0)
@@ -23,29 +23,29 @@ GEM
2323
method_source (1.0.0)
2424
minitest (5.25.5)
2525
mutex_m (0.3.0)
26-
parallel (1.23.0)
27-
parser (3.3.7.4)
26+
parallel (1.27.0)
27+
parser (3.3.9.0)
2828
ast (~> 2.4.1)
2929
racc
3030
prism (1.4.0)
31-
racc (1.7.1)
31+
racc (1.8.1)
3232
rainbow (3.1.1)
3333
rake (13.3.0)
3434
rbs (3.6.1)
3535
logger
36-
regexp_parser (2.9.3)
37-
rubocop (1.75.5)
36+
regexp_parser (2.11.2)
37+
rubocop (1.80.2)
3838
json (~> 2.3)
3939
language_server-protocol (~> 3.17.0.2)
4040
lint_roller (~> 1.1.0)
4141
parallel (~> 1.10)
4242
parser (>= 3.3.0.2)
4343
rainbow (>= 2.2.2, < 4.0)
4444
regexp_parser (>= 2.9.3, < 3.0)
45-
rubocop-ast (>= 1.44.0, < 2.0)
45+
rubocop-ast (>= 1.46.0, < 2.0)
4646
ruby-progressbar (~> 1.7)
4747
unicode-display_width (>= 2.4.0, < 4.0)
48-
rubocop-ast (1.44.0)
48+
rubocop-ast (1.46.0)
4949
parser (>= 3.3.7.2)
5050
prism (~> 1.4)
5151
rubocop-performance (1.25.0)
@@ -69,7 +69,9 @@ GEM
6969
standard-performance (1.8.0)
7070
lint_roller (~> 1.1)
7171
rubocop-performance (~> 1.25.0)
72-
unicode-display_width (2.5.0)
72+
unicode-display_width (3.1.5)
73+
unicode-emoji (~> 4.0, >= 4.0.4)
74+
unicode-emoji (4.0.4)
7375

7476
PLATFORMS
7577
ruby

config/base.yml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ Bundler/OrderedGems:
3030
Gemspec/AddRuntimeDependency:
3131
Enabled: false
3232

33+
Gemspec/AttributeAssignment:
34+
Enabled: false
35+
3336
Gemspec/DependencyVersion:
3437
Enabled: false
3538

@@ -122,7 +125,7 @@ Layout/EmptyComment:
122125
AllowMarginComment: true
123126

124127
Layout/EmptyLineAfterGuardClause:
125-
Enabled: false
128+
Enabled: true
126129

127130
Layout/EmptyLineAfterMagicComment:
128131
Enabled: true
@@ -138,6 +141,9 @@ Layout/EmptyLineBetweenDefs:
138141
Layout/EmptyLines:
139142
Enabled: true
140143

144+
Layout/EmptyLinesAfterModuleInclusion:
145+
Enabled: true
146+
141147
Layout/EmptyLinesAroundAccessModifier:
142148
Enabled: true
143149

@@ -867,6 +873,9 @@ Lint/UselessAssignment:
867873
Lint/UselessConstantScoping:
868874
Enabled: false
869875

876+
Lint/UselessDefaultValueArgument:
877+
Enabled: false
878+
870879
Lint/UselessDefined:
871880
Enabled: true
872881

@@ -879,6 +888,9 @@ Lint/UselessMethodDefinition:
879888
Lint/UselessNumericOperation:
880889
Enabled: false
881890

891+
Lint/UselessOr:
892+
Enabled: true
893+
882894
Lint/UselessRescue:
883895
Enabled: true
884896

@@ -975,7 +987,10 @@ Naming/MethodName:
975987
Naming/MethodParameterName:
976988
Enabled: false
977989

978-
Naming/PredicateName:
990+
Naming/PredicateMethod:
991+
Enabled: false
992+
993+
Naming/PredicatePrefix:
979994
Enabled: false
980995

981996
Naming/RescuedExceptionsVariableName:
@@ -1102,6 +1117,9 @@ Style/CollectionCompact:
11021117
Style/CollectionMethods:
11031118
Enabled: false
11041119

1120+
Style/CollectionQuerying:
1121+
Enabled: false
1122+
11051123
Style/ColonMethodCall:
11061124
Enabled: true
11071125

@@ -1212,6 +1230,10 @@ Style/EmptyMethod:
12121230
Enabled: true
12131231
EnforcedStyle: expanded
12141232

1233+
Style/EmptyStringInsideInterpolation:
1234+
Enabled: true
1235+
EnforcedStyle: trailing_conditional
1236+
12151237
Style/Encoding:
12161238
Enabled: true
12171239

@@ -1605,6 +1627,9 @@ Style/RedundantArgument:
16051627
Style/RedundantArrayConstructor:
16061628
Enabled: true
16071629

1630+
Style/RedundantArrayFlatten:
1631+
Enabled: true
1632+
16081633
Style/RedundantAssignment:
16091634
Enabled: true
16101635

lib/ruby_lsp/standard/wraps_built_in_lsp_standardizer.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ module RubyLsp
22
module Standard
33
class WrapsBuiltinLspStandardizer
44
include RubyLsp::Requests::Support::Formatter
5+
56
def initialize
67
init!
78
end

lib/standard/lsp/logger.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ def puts(message)
1212

1313
def puts_once(message)
1414
return if @puts_onces.include?(message)
15+
1516
@puts_onces << message
1617
puts(message)
1718
end

lib/standard/resolves_yaml_option.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def search_argv(argv, option_name)
2121

2222
def argv_value_for(argv, option_name)
2323
return unless (index = argv.index(option_name))
24+
2425
argv[index + 1]
2526
end
2627
end

standard.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
2121
spec.require_paths = ["lib"]
2222
spec.metadata["rubygems_mfa_required"] = "true"
2323

24-
spec.add_dependency "rubocop", "~> 1.75.5"
24+
spec.add_dependency "rubocop", "~> 1.80.2"
2525

2626
spec.add_dependency "lint_roller", "~> 1.0"
2727
spec.add_dependency "standard-custom", "~> 1.0.0"

0 commit comments

Comments
 (0)