Skip to content

Commit 4badcda

Browse files
authored
Remove rcodetools integration (for now) (#55)
1 parent 6bf4fa3 commit 4badcda

File tree

6 files changed

+9
-110
lines changed

6 files changed

+9
-110
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## Not released
44

5+
- Remove rcodetools integration (for now)
6+
57
## 0.10.0
68

79
- Add --experimental-features flag

Rakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Rake::TestTask.new(:test) do |t|
55
t.libs << "test"
66
t.libs << "lib"
77
t.test_files = FileList["test/**/*_test.rb"]
8+
t.warning = false
89
end
910

1011
task :default => :test

language_server.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
2626
spec.require_paths = ["lib"]
2727

2828
spec.add_dependency "language_server-protocol", "0.4.0"
29-
spec.add_dependency "rcodetools"
3029

3130
spec.add_development_dependency "awesome_print"
3231
spec.add_development_dependency "benchmark-ips"

lib/language_server.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
require "language_server/protocol"
44
require "language_server/linter/ruby_wc"
55
require "language_server/linter/rubocop"
6-
require "language_server/completion_provider/rcodetools"
76
require "language_server/completion_provider/ad_hoc"
87
require "language_server/definition_provider/ad_hoc"
98
require "language_server/file_store"
@@ -137,14 +136,15 @@ def on(method, &callback)
137136
)
138137
end
139138

140-
on :"textDocument/completion" do |request:, file_store:, project:|
139+
on :"textDocument/completion" do |request:, project:|
141140
uri = request[:params][:textDocument][:uri]
142141
line, character = request[:params][:position].fetch_values(:line, :character).map(&:to_i)
143142

144-
providers = [CompletionProvider::Rcodetools.new(uri: uri, line: line, character: character, file_store: file_store)]
145-
providers << CompletionProvider::AdHoc.new(uri: uri, line: line, character: character, project: project) if LanguageServer.adhoc_enabled?
146-
147-
providers.flat_map(&:call)
143+
if LanguageServer.adhoc_enabled?
144+
[
145+
CompletionProvider::AdHoc.new(uri: uri, line: line, character: character, project: project),
146+
].flat_map(&:call)
147+
end
148148
end
149149

150150
on :"textDocument/definition" do |request:, project:|

lib/language_server/completion_provider/rcodetools.rb

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

test/language_server/completion_provider/rcodetools_test.rb

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

0 commit comments

Comments
 (0)