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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Not released

- Remove rcodetools integration (for now)

## 0.10.0

- Add --experimental-features flag
Expand Down
1 change: 1 addition & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Rake::TestTask.new(:test) do |t|
t.libs << "test"
t.libs << "lib"
t.test_files = FileList["test/**/*_test.rb"]
t.warning = false
end

task :default => :test
1 change: 0 additions & 1 deletion language_server.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]

spec.add_dependency "language_server-protocol", "0.4.0"
spec.add_dependency "rcodetools"

spec.add_development_dependency "awesome_print"
spec.add_development_dependency "benchmark-ips"
Expand Down
12 changes: 6 additions & 6 deletions lib/language_server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
require "language_server/protocol"
require "language_server/linter/ruby_wc"
require "language_server/linter/rubocop"
require "language_server/completion_provider/rcodetools"
require "language_server/completion_provider/ad_hoc"
require "language_server/definition_provider/ad_hoc"
require "language_server/file_store"
Expand Down Expand Up @@ -137,14 +136,15 @@ def on(method, &callback)
)
end

on :"textDocument/completion" do |request:, file_store:, project:|
on :"textDocument/completion" do |request:, project:|
uri = request[:params][:textDocument][:uri]
line, character = request[:params][:position].fetch_values(:line, :character).map(&:to_i)

providers = [CompletionProvider::Rcodetools.new(uri: uri, line: line, character: character, file_store: file_store)]
providers << CompletionProvider::AdHoc.new(uri: uri, line: line, character: character, project: project) if LanguageServer.adhoc_enabled?

providers.flat_map(&:call)
if LanguageServer.adhoc_enabled?
[
CompletionProvider::AdHoc.new(uri: uri, line: line, character: character, project: project),
].flat_map(&:call)
end
end

on :"textDocument/definition" do |request:, project:|
Expand Down
43 changes: 0 additions & 43 deletions lib/language_server/completion_provider/rcodetools.rb

This file was deleted.

60 changes: 0 additions & 60 deletions test/language_server/completion_provider/rcodetools_test.rb

This file was deleted.