Skip to content
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## Unreleased

* Update rubocop-performance from 1.15.2 to [1.16.0](https://github.com/rubocop/rubocop-performance/releases/tag/v1.16.0)
* Update rubocop from 1.44.1 to [1.48.1](https://github.com/rubocop/rubocop/releases/tag/v1.48.1)

## 1.24.3

* _Further_ _further_ _further_ improve `--lsp` server to ignore files correctly
Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ PATH
specs:
standard (1.24.3)
language_server-protocol (~> 3.17.0.2)
rubocop (= 1.44.1)
rubocop-performance (= 1.15.2)
rubocop (= 1.48.1)
rubocop-performance (= 1.16.0)

GEM
remote: https://rubygems.org/
Expand All @@ -19,9 +19,9 @@ GEM
method_source (>= 0.6.7)
rake (>= 0.9.2.2)
method_source (1.0.0)
minitest (5.17.0)
minitest (5.18.0)
parallel (1.22.1)
parser (3.2.1.0)
parser (3.2.1.1)
ast (~> 2.4.1)
pry (0.14.2)
coderay (~> 1.1)
Expand All @@ -30,22 +30,22 @@ GEM
rake (13.0.6)
regexp_parser (2.7.0)
rexml (3.2.5)
rubocop (1.44.1)
rubocop (1.48.1)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.2.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.24.1, < 2.0)
rubocop-ast (>= 1.26.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.26.0)
rubocop-ast (1.27.0)
parser (>= 3.2.1.0)
rubocop-performance (1.15.2)
rubocop-performance (1.16.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
ruby-progressbar (1.11.0)
ruby-progressbar (1.13.0)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand Down
12 changes: 12 additions & 0 deletions config/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,9 @@ Metrics/BlockNesting:
Metrics/ClassLength:
Enabled: false

Metrics/CollectionLiteralLength:
Enabled: false

Metrics/CyclomaticComplexity:
Enabled: false

Expand Down Expand Up @@ -1246,6 +1249,9 @@ Style/DefWithParentheses:
Style/Dir:
Enabled: true

Style/DirEmpty:
Enabled: true

Style/DisableCopsWithinSourceCodeDirective:
Enabled: false

Expand Down Expand Up @@ -1325,6 +1331,9 @@ Style/ExponentialNotation:
Style/FetchEnvVar:
Enabled: false

Style/FileEmpty:
Enabled: false

Style/FileRead:
Enabled: true

Expand Down Expand Up @@ -1692,6 +1701,9 @@ Style/RedundantFileExtensionInRequire:
Style/RedundantFreeze:
Enabled: true

Style/RedundantHeredocDelimiterQuotes:
Enabled: true

Style/RedundantInitialize:
Enabled: true

Expand Down
3 changes: 3 additions & 0 deletions config/ruby-2.3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ AllCops:

Style/ComparableClamp:
Enabled: false

Style/DirEmpty:
Enabled: false
4 changes: 2 additions & 2 deletions standard.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "rubocop", "1.44.1"
spec.add_dependency "rubocop-performance", "1.15.2"
spec.add_dependency "rubocop", "1.48.1"
spec.add_dependency "rubocop-performance", "1.16.0"

# not semver: first three are lsp protocol version, last is patch
spec.add_dependency "language_server-protocol", "~> 3.17.0.2"
Expand Down
2 changes: 1 addition & 1 deletion test/cop_invoker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def with_offense_annotations(offenses)
end

def _investigate(cop, processed_source)
team = RuboCop::Cop::Team.new([cop], nil, raise_error: true)
team = RuboCop::Cop::Team.new([cop], configuration, raise_error: true)
report = team.investigate(processed_source)
@processed_source = processed_source
@last_corrector = report.correctors.first || RuboCop::Cop::Corrector.new(processed_source)
Expand Down