Merge pull request #48 from mtsmfm/flag

Add --experimental-features flag

Author: mtsmfm

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Not released
 
+- Add --experimental-features flag
+
 ## 0.9.0
 
 - rubocop support #27

Dockerfile.development

@@ -11,4 +11,4 @@ ENV LANG=C.UTF-8 \
 
 USER ruby
 WORKDIR /app
-CMD ["bin/language_server-ruby"]
+CMD ["bin/language_server-ruby", "--experimental-features"]

Gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 gemspec
 
 # TODO: Use released gem after new release includes https://github.com/bbatsov/rubocop/pull/4987
-gem "rubocop", git: "https://github.com/bbatsov/rubocop"
+gem "rubocop", git: "https://github.com/bbatsov/rubocop", ref: "88d9e3b"

README.md

@@ -1,5 +1,7 @@
 # LanguageServer
 
+[Alpha quality]
+
 A Ruby Language Server implementation.
 
 ## Installation

exe/language_server-ruby

@@ -5,4 +5,26 @@ if Dir.exist?(File.join(__dir__, "..", ".git"))
 end
 
 require "language_server"
-LanguageServer.run
+require "optparse"
+
+options = { experimental_features_enabled: false }
+opt_parser = OptionParser.new do |opts|
+  opts.banner = "Usage: language_server-ruby [options]"
+
+  opts.on("--experimental-features", "Enable experimental features") do |e|
+    options[:experimental_features_enabled] = e
+  end
+
+  opts.on("-v", "--version", "Show version") do
+    puts LanguageServer::VERSION
+    exit
+  end
+end
+begin
+  opt_parser.parse!
+rescue OptionParser::InvalidOption
+  puts opt_parser
+  exit 1
+end
+
+LanguageServer.run(options)

lib/language_server.rb

@@ -13,7 +13,11 @@
 
 module LanguageServer
   class << self
-    def run
+    attr_accessor :options
+
+    def run(options)
+      self.options = options
+
       writer = Protocol::Transport::Stdio::Writer.new
       reader = Protocol::Transport::Stdio::Reader.new
       variables = {}
@@ -56,6 +60,14 @@ def notify(method:, params: {})
       end
     end
 
+    def rubocop_enabled?
+      options[:experimental_features_enabled]
+    end
+
+    def adhoc_enabled?
+      options[:experimental_features_enabled]
+    end
+
     def subscribers
       @subscribers ||= {}
     end
@@ -67,7 +79,10 @@ def on(method, &callback)
 
   on :initialize do |request:, variables:|
     variables[:file_store] = FileStore.new(load_paths: $LOAD_PATH, remote_root: request[:params][:rootPath], local_root: Dir.getwd)
-    variables[:project] = Project.new(variables[:file_store])
+    variables[:project] =
+      if LanguageServer.adhoc_enabled?
+        variables[:project] = Project.new(variables[:file_store])
+      end
 
     Protocol::Interface::InitializeResult.new(
       capabilities: Protocol::Interface::ServerCapabilities.new(
@@ -78,7 +93,7 @@ def on(method, &callback)
           resolve_provider: true,
           trigger_characters: %w[.],
         ),
-        definition_provider: true,
+        definition_provider: LanguageServer.adhoc_enabled?,
       ),
     )
   end
@@ -91,8 +106,10 @@ def on(method, &callback)
     uri = request[:params][:textDocument][:uri]
     text = request[:params][:contentChanges][0][:text]
     file_store.cache(uri, text)
-    project.recalculate_result(uri)
-    diagnostics = (Linter::Rubocop.new(text).call + Linter::RubyWC.new(text).call).flatten
+    project.recalculate_result(uri) if LanguageServer.adhoc_enabled?
+
+    diagnostics = Linter::RubyWC.new(text).call
+    diagnostics += Linter::Rubocop.new(text).call if LanguageServer.rubocop_enabled?
 
     diagnostics = diagnostics.map do |error|
       Protocol::Interface::Diagnostic.new(
@@ -124,18 +141,20 @@ def on(method, &callback)
     uri = request[:params][:textDocument][:uri]
     line, character = request[:params][:position].fetch_values(:line, :character).map(&:to_i)
 
-    [
-      CompletionProvider::AdHoc.new(uri: uri, line: line, character: character, project: project),
-      CompletionProvider::Rcodetools.new(uri: uri, line: line, character: character, file_store: file_store),
-    ].flat_map(&:call)
+    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)
   end
 
   on :"textDocument/definition" do |request:, project:|
     uri = request[:params][:textDocument][:uri]
     line, character = request[:params][:position].fetch_values(:line, :character).map(&:to_i)
 
-    [
-      DefinitionProvider::AdHoc.new(uri: uri, line: line, character: character, project: project),
-    ].flat_map(&:call)
+    if LanguageServer.adhoc_enabled?
+      [
+        DefinitionProvider::AdHoc.new(uri: uri, line: line, character: character, project: project),
+      ].flat_map(&:call)
+    end
   end
 end