Skip to content

Commit d710b89

Browse files
authored
Ditch rubocop (#92)
Fixes #91 rubocop has its own LSP. Stop wrestling with it. It was never worth the effort anyway.
1 parent 649c00c commit d710b89

15 files changed

Lines changed: 144 additions & 361 deletions

File tree

.rubocop.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ AllCops:
1919
Exclude:
2020
- 'spec/fixture_files/**/*'
2121

22+
Gemspec/DependencyVersion:
23+
Enabled: false
24+
25+
Gemspec/DevelopmentDependencies:
26+
Enabled: false
27+
2228
Layout/SpaceInsideHashLiteralBraces:
2329
Enabled: false
2430

@@ -152,23 +158,19 @@ Style/GuardClause:
152158
Style/HashSyntax:
153159
Exclude:
154160
- 'lib/ruby_language_server/location.rb'
155-
- 'spec/lib/ruby_language_server/good_cop_spec.rb'
156161

157162
# Cop supports --auto-correct.
158163
# Configuration parameters: IgnoredMethods.
159164
Style/MethodCallWithoutArgsParentheses:
160165
Exclude:
161166
- 'lib/ruby_language_server/scope_parser.rb'
162-
- 'spec/lib/ruby_language_server/good_cop_spec.rb'
163167

164168
Style/MultilineBlockChain:
165169
Exclude:
166-
- 'lib/ruby_language_server/good_cop.rb'
167170

168171
# Cop supports --auto-correct.
169172
Style/MutableConstant:
170173
Exclude:
171-
- 'lib/ruby_language_server/good_cop.rb'
172174
- 'lib/ruby_language_server/scope_data/base.rb'
173175
- 'lib/ruby_language_server/version.rb'
174176

@@ -222,7 +224,6 @@ Style/StringLiterals:
222224
- 'lib/ruby_language_server/scope_parser.rb'
223225
- 'spec/lib/ruby_language_server/code_file_spec.rb'
224226
- 'spec/lib/ruby_language_server/completion_spec.rb'
225-
- 'spec/lib/ruby_language_server/good_cop_spec.rb'
226227
- 'spec/lib/ruby_language_server/line_context_spec.rb'
227228
- 'spec/lib/ruby_language_server/scope_parser_spec.rb'
228229

Gemfile.lock

Lines changed: 105 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,59 @@ PATH
88
etc
99
fuzzy_match
1010
json
11-
rubocop (> 1.38.0)
12-
rubocop-ast (> 1.32.0)
13-
rubocop-performance
14-
rubocop-rspec
15-
sqlite3 (< 1.5.0)
11+
ostruct
12+
sqlite3
1613

1714
GEM
1815
remote: https://rubygems.org/
1916
specs:
20-
activemodel (7.0.7.2)
21-
activesupport (= 7.0.7.2)
22-
activerecord (7.0.7.2)
23-
activemodel (= 7.0.7.2)
24-
activesupport (= 7.0.7.2)
25-
activesupport (7.0.7.2)
26-
concurrent-ruby (~> 1.0, >= 1.0.2)
17+
activemodel (7.2.2.1)
18+
activesupport (= 7.2.2.1)
19+
activerecord (7.2.2.1)
20+
activemodel (= 7.2.2.1)
21+
activesupport (= 7.2.2.1)
22+
timeout (>= 0.4.0)
23+
activesupport (7.2.2.1)
24+
base64
25+
benchmark (>= 0.3)
26+
bigdecimal
27+
concurrent-ruby (~> 1.0, >= 1.3.1)
28+
connection_pool (>= 2.2.5)
29+
drb
2730
i18n (>= 1.6, < 2)
31+
logger (>= 1.4.2)
2832
minitest (>= 5.1)
29-
tzinfo (~> 2.0)
33+
securerandom (>= 0.3)
34+
tzinfo (~> 2.0, >= 2.0.5)
3035
amatch (0.4.1)
3136
mize
3237
tins (~> 1.0)
3338
ansi (1.5.0)
34-
ast (2.4.2)
35-
builder (3.2.4)
36-
byebug (11.1.3)
39+
ast (2.4.3)
40+
base64 (0.2.0)
41+
benchmark (0.4.0)
42+
bigdecimal (3.1.9)
43+
builder (3.3.0)
3744
coderay (1.1.3)
38-
concurrent-ruby (1.2.2)
39-
etc (1.3.0)
40-
ffi (1.15.5)
45+
concurrent-ruby (1.3.5)
46+
connection_pool (2.5.3)
47+
debug (1.10.0)
48+
irb (~> 1.10)
49+
reline (>= 0.3.8)
50+
drb (2.2.1)
51+
etc (1.4.5)
52+
ffi (1.17.2-aarch64-linux-musl)
53+
ffi (1.17.2-x86_64-linux-gnu)
4154
formatador (1.1.0)
4255
fuzzy_match (2.1.0)
43-
guard (2.18.0)
56+
guard (2.19.1)
4457
formatador (>= 0.2.4)
4558
listen (>= 2.7, < 4.0)
59+
logger (~> 1.6)
4660
lumberjack (>= 1.0.12, < 2.0)
4761
nenv (~> 0.1)
4862
notiffany (~> 0.0)
63+
ostruct (~> 0.6)
4964
pry (>= 0.13.0)
5065
shellany (~> 0.0)
5166
thor (>= 0.18.1)
@@ -56,93 +71,118 @@ GEM
5671
guard-rubocop (1.5.0)
5772
guard (~> 2.0)
5873
rubocop (< 2.0)
59-
i18n (1.14.1)
74+
i18n (1.14.7)
6075
concurrent-ruby (~> 1.0)
61-
json (2.6.2)
62-
listen (3.7.1)
76+
io-console (0.7.1)
77+
irb (1.13.1)
78+
rdoc (>= 4.0.0)
79+
reline (>= 0.4.2)
80+
json (2.11.3)
81+
language_server-protocol (3.17.0.4)
82+
lint_roller (1.1.0)
83+
listen (3.9.0)
6384
rb-fsevent (~> 0.10, >= 0.10.3)
6485
rb-inotify (~> 0.9, >= 0.9.10)
65-
lumberjack (1.2.8)
66-
method_source (1.0.0)
67-
minitest (5.16.3)
68-
minitest-reporters (1.5.0)
86+
logger (1.7.0)
87+
lumberjack (1.2.10)
88+
method_source (1.1.0)
89+
minitest (5.25.5)
90+
minitest-reporters (1.7.1)
6991
ansi
7092
builder
7193
minitest (>= 5.0)
7294
ruby-progressbar
73-
mize (0.4.0)
74-
protocol (~> 2.0)
95+
mize (0.6.1)
7596
nenv (0.3.0)
7697
notiffany (0.1.3)
7798
nenv (~> 0.1)
7899
shellany (~> 0.0)
79-
parallel (1.22.1)
80-
parser (3.3.4.2)
100+
ostruct (0.6.1)
101+
parallel (1.27.0)
102+
parser (3.3.8.0)
81103
ast (~> 2.4.1)
82104
racc
83-
protocol (2.0.0)
84-
ruby_parser (~> 3.0)
85-
pry (0.14.1)
105+
prism (1.4.0)
106+
pry (0.15.2)
86107
coderay (~> 1.1)
87108
method_source (~> 1.0)
109+
psych (5.1.2)
110+
stringio
88111
racc (1.8.1)
89112
rainbow (3.1.1)
90-
rake (13.0.6)
113+
rake (13.2.1)
91114
rb-fsevent (0.11.2)
92-
rb-inotify (0.10.1)
115+
rb-inotify (0.11.1)
93116
ffi (~> 1.0)
94-
regexp_parser (2.6.0)
95-
rexml (3.3.9)
96-
rubocop (1.42.0)
117+
rdoc (6.6.3.1)
118+
psych (>= 4.0.0)
119+
regexp_parser (2.10.0)
120+
reline (0.5.10)
121+
io-console (~> 0.5)
122+
rubocop (1.75.5)
97123
json (~> 2.3)
124+
language_server-protocol (~> 3.17.0.2)
125+
lint_roller (~> 1.1.0)
98126
parallel (~> 1.10)
99-
parser (>= 3.1.2.1)
127+
parser (>= 3.3.0.2)
100128
rainbow (>= 2.2.2, < 4.0)
101-
regexp_parser (>= 1.8, < 3.0)
102-
rexml (>= 3.2.5, < 4.0)
103-
rubocop-ast (>= 1.24.1, < 2.0)
129+
regexp_parser (>= 2.9.3, < 3.0)
130+
rubocop-ast (>= 1.44.0, < 2.0)
104131
ruby-progressbar (~> 1.7)
105-
unicode-display_width (>= 1.4.0, < 3.0)
106-
rubocop-ast (1.32.1)
107-
parser (>= 3.3.1.0)
108-
rubocop-minitest (0.34.5)
109-
rubocop (>= 1.39, < 2.0)
110-
rubocop-ast (>= 1.30.0, < 2.0)
111-
rubocop-performance (1.19.1)
112-
rubocop (>= 1.7.0, < 2.0)
113-
rubocop-ast (>= 0.4.0)
114-
rubocop-rake (0.6.0)
115-
rubocop (~> 1.0)
116-
rubocop-rspec (3.0.0)
117-
rubocop (~> 1.40)
118-
ruby-progressbar (1.11.0)
119-
ruby_parser (3.19.1)
120-
sexp_processor (~> 4.16)
121-
sexp_processor (4.16.1)
132+
unicode-display_width (>= 2.4.0, < 4.0)
133+
rubocop-ast (1.44.1)
134+
parser (>= 3.3.7.2)
135+
prism (~> 1.4)
136+
rubocop-minitest (0.38.0)
137+
lint_roller (~> 1.1)
138+
rubocop (>= 1.75.0, < 2.0)
139+
rubocop-ast (>= 1.38.0, < 2.0)
140+
rubocop-performance (1.25.0)
141+
lint_roller (~> 1.1)
142+
rubocop (>= 1.75.0, < 2.0)
143+
rubocop-ast (>= 1.38.0, < 2.0)
144+
rubocop-rake (0.7.1)
145+
lint_roller (~> 1.1)
146+
rubocop (>= 1.72.1)
147+
rubocop-rspec (3.6.0)
148+
lint_roller (~> 1.1)
149+
rubocop (~> 1.72, >= 1.72.1)
150+
ruby-progressbar (1.13.0)
151+
securerandom (0.4.1)
122152
shellany (0.0.1)
123-
sqlite3 (1.4.4)
153+
sqlite3 (2.6.0-aarch64-linux-musl)
154+
sqlite3 (2.6.0-x86_64-linux-gnu)
155+
stringio (3.1.1)
124156
sync (0.5.0)
125-
thor (1.2.1)
126-
tins (1.31.1)
157+
thor (1.3.2)
158+
timeout (0.4.3)
159+
tins (1.38.0)
160+
bigdecimal
127161
sync
128162
tzinfo (2.0.6)
129163
concurrent-ruby (~> 1.0)
130-
unicode-display_width (2.3.0)
164+
unicode-display_width (3.1.4)
165+
unicode-emoji (~> 4.0, >= 4.0.4)
166+
unicode-emoji (4.0.4)
131167

132168
PLATFORMS
133169
aarch64-linux-musl
134170
x86_64-linux
135171

136172
DEPENDENCIES
137-
byebug
173+
debug
138174
guard
139175
guard-minitest
140176
guard-rubocop
141177
minitest
142178
minitest-reporters
143179
rake
180+
rubocop (> 1.38.0)
181+
rubocop-ast (> 1.32.0)
144182
rubocop-minitest
183+
rubocop-performance
145184
rubocop-rake
185+
rubocop-rspec
146186
ruby_language_server!
147187

148188
BUNDLED WITH

Guardfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ group :red_green_refactor, halt_on_fail: true do
2525
# watch(%r{^test/test_helper\.rb$}) { 'test' }
2626

2727
# with Minitest::Spec
28-
watch(%r{^spec/**/(.*)_spec\.rb$})
28+
watch(%r{^spec/*/(.*)_spec\.rb$})
2929
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
3030
watch(%r{^spec/spec_helper\.rb$}) { 'spec' }
3131
end

lib/config/initializers/active_record.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
timeout: 30.seconds # does not seem to help
88
)
99

10-
database = ActiveRecord::Base.connection.instance_variable_get :@connection
10+
database = ActiveRecord::Base.connection.raw_connection
1111
database.enable_load_extension(1)
1212
if Gem.win_platform?
1313
# load DLL from PATH

lib/resources/fallback_rubocop.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

lib/ruby_language_server/application.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
require_relative 'location'
1414
require_relative 'code_file'
1515
require_relative 'scope_parser'
16-
require_relative 'good_cop'
1716
require_relative 'project_manager'
1817
require_relative 'server'
1918
require_relative 'line_context'

0 commit comments

Comments
 (0)