language_server 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4ad7bdb98ed0fdc4c493cecd7c296fc551d23c0
-  data.tar.gz: a458cc4c3aaf8b95d5ae5780fb9896d157476e8e
+  metadata.gz: 4d42055dc4ef0fbe7007913db9a924082a9370af
+  data.tar.gz: cce1ea0bd8e0adad433428032fab8a72832c2494
 SHA512:
-  metadata.gz: 8cd2bf30dd8548f44fa82dd28530f694fce2b68445de389a1945d754ce56de2f96ec8a7fb9ad40c3225a1d017a433a0e88b5193e3773f52075fe0a9e71fd344d
-  data.tar.gz: e37e1fd641490f0ab03deb515fec382724248231f59ffc179e6ea3c4cc5ef6722a503cf3cfd5f65dbea336049afe1090dbfe99d528764c7d27b1a8cac7cb548a
+  metadata.gz: b53cfe73ccb8c8c53030a0807b5675410c6d9d99c9f7a222f49ac16d02cb2d255456a9bae2df19a34c79dc8efe8acca4bb910d52107ecc906bff3669dd26917e
+  data.tar.gz: b88d4f4fa7039b551fd948e4b6564f8e5a95855fc2295079cd72fb3fc1cbe46a3372808ccc756b12b16715acf6cdc069845ee1de920ef11090a4dbc6df261da3

data/Dockerfile-node.development

@@ -0,0 +1,6 @@
+FROM node:7.10-alpine
+
+RUN mkdir /app && chown node:node /app
+
+USER node
+WORKDIR /app

data/README.md

@@ -55,7 +55,7 @@ https://github.com/EugenMayer/docker-sync/wiki/1.-Installation
 ### Setup
 
     $ git clone https://github.com/mtsmfm/language_server-ruby.git
-    $ cs language_server-ruby
+    $ cd language_server-ruby
     $ docker-sync start
     $ docker-compose run app bin/setup
 

data/docker-compose.yml

@@ -7,14 +7,13 @@ services:
     volumes:
       - app-sync:/app:nocopy
       - home:/home/ruby
-      - $HOME:/$HOME
       - $HOME/.gitconfig:/home/ruby/.gitconfig:ro
       - $HOME/.ssh:/home/ruby/.ssh:ro
       - $HOME/.gem:/home/ruby/.gem
   node:
-    image: node:7.10-alpine
-    user: node
-    working_dir: /app
+    build:
+      context: .
+      dockerfile: Dockerfile-node.development
     volumes:
       - app-sync/:/app
       - home:/home/node

data/language_server.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "rcodetools"
+
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

data/lib/language_server.rb

@@ -1,84 +1,15 @@
 require "language_server/version"
 require "language_server/protocol/interfaces"
 require "language_server/protocol/constants"
+require "language_server/protocol/stdio"
 require "language_server/linter/ruby_wc"
+require "language_server/completion_provider/rcodetools"
+require "language_server/uri_store"
 
 require "json"
 require "logger"
-require "open3"
-require "tempfile"
-require "shellwords"
 
 module LanguageServer
-  module Protocol
-    module Stdio
-      class Reader
-        def read(&block)
-          buffer = ""
-          header_parsed = false
-          content_length = nil
-
-          while char = STDIN.getc
-            buffer << char
-
-            unless header_parsed
-              if buffer[-4..-1] == "\r\n" * 2
-                content_length = buffer.match(/Content-Length: (\d+)/i)[1].to_i
-
-                header_parsed = true
-                buffer.clear
-              end
-            else
-              if buffer.bytesize == content_length
-                LanguageServer.logger.debug("Receive: #{buffer}")
-
-                request = JSON.parse(buffer, symbolize_names: true)
-
-                block.call(request)
-
-                header_parsed = false
-                buffer.clear
-              end
-            end
-          end
-        end
-      end
-
-      class Writer
-        def respond(id:, result:)
-          write(id: id, result: result)
-        end
-
-        def notify(method:, params: {})
-          write(method: method, params: params)
-        end
-
-        private
-
-        def write(response)
-          response_str = response.merge(
-            jsonrpc: "2.0"
-          ).to_json
-
-          headers = {
-            "Content-Length" => response_str.bytesize
-          }
-
-          headers.each do |k, v|
-            STDOUT.print "#{k}: #{v}\r\n"
-          end
-
-          STDOUT.print "\r\n"
-
-          STDOUT.print response_str
-          STDOUT.flush
-
-          LanguageServer.logger.debug("Response: #{response_str}")
-        end
-      end
-    end
-  end
-
   class << self
     def logger
       @logger ||= Logger.new(STDERR)
@@ -123,6 +54,10 @@ module LanguageServer
       capabilities: Protocol::Interfaces::ServerCapabilities.new(
         text_document_sync: Protocol::Interfaces::TextDocumentSyncOptions.new(
           change: Protocol::Constants::TextDocumentSyncKind::FULL
+        ),
+        completion_provider: Protocol::Interfaces::CompletionOptions.new(
+          resolve_provider: true,
+          trigger_characters: %w(.)
         )
       )
     )
@@ -133,7 +68,11 @@ module LanguageServer
   end
 
   on :"textDocument/didChange" do |request, notifier|
-    diagnostics = Linter::RubyWC.new(request[:params][:contentChanges][0][:text]).call.map do |error|
+    uri = request[:params][:textDocument][:uri]
+    text = request[:params][:contentChanges][0][:text]
+    UriStore[uri] = text
+
+    diagnostics = Linter::RubyWC.new(text).call.map do |error|
       Protocol::Interfaces::Diagnostic.new(
         message: error.message,
         severity: error.warning? ? Protocol::Constants::DiagnosticSeverity::WARNING : Protocol::Constants::DiagnosticSeverity::ERROR,
@@ -153,9 +92,21 @@ module LanguageServer
     notifier.call(
       method: :"textDocument/publishDiagnostics",
       params: Protocol::Interfaces::PublishDiagnosticsParams.new(
-        uri: request[:params][:textDocument][:uri],
+        uri: uri,
         diagnostics: diagnostics
       )
     )
   end
+
+  on :"textDocument/completion" do |request|
+    uri = request[:params][:textDocument][:uri]
+    line, character = request[:params][:position].fetch_values(:line, :character)
+    CompletionProvider::Rcodetools.new(uri, line.to_i, character.to_i).call.map do |candidate|
+      Protocol::Interfaces::CompletionItem.new(
+        label: candidate.method_name,
+        detail: candidate.description,
+        kind: Protocol::Constants::CompletionItemKind::METHOD
+      )
+    end
+  end
 end

data/lib/language_server/completion_provider/rcodetools.rb

@@ -0,0 +1,52 @@
+require "language_server/uri_store"
+
+require "rcodetools/completion"
+
+module LanguageServer
+  module CompletionProvider
+    class Candidate
+      attr_reader :method_name, :description
+
+      def initialize(method_name:, description:)
+        @method_name = method_name
+        @description = description
+      end
+
+      def ==(other)
+        method_name == other.method_name && description == other.description
+      end
+    end
+
+    class Filter < ::Rcodetools::XMPCompletionFilter
+      @candidates_with_description_flag = true
+
+      def completion_code(*args)
+        candidates_with_class(*args)
+      rescue NewCodeError, RuntimeDataError, NoCandidates
+        [nil, []]
+      end
+    end
+
+    class Rcodetools
+      def initialize(uri, line, character)
+        @uri = uri
+        @line = line
+        @character = character
+      end
+
+      def call
+        _, candidates = Filter.run(source, lineno: @line + 1, column: @character)
+        candidates.map do |candidate|
+          method_name, description = candidate.split(/\0/, 2)
+          Candidate.new(method_name: method_name, description: description)
+        end
+      end
+
+      private
+
+      def source
+        UriStore[@uri]
+      end
+    end
+  end
+end

data/lib/language_server/protocol/stdio.rb

@@ -0,0 +1,2 @@
+require "language_server/protocol/stdio/reader"
+require "language_server/protocol/stdio/writer"

data/lib/language_server/protocol/stdio/reader.rb

@@ -0,0 +1,37 @@
+module LanguageServer
+  module Protocol
+    module Stdio
+      class Reader
+        def read(&block)
+          buffer = ""
+          header_parsed = false
+          content_length = nil
+
+          while char = STDIN.getc
+            buffer << char
+
+            unless header_parsed
+              if buffer[-4..-1] == "\r\n" * 2
+                content_length = buffer.match(/Content-Length: (\d+)/i)[1].to_i
+
+                header_parsed = true
+                buffer.clear
+              end
+            else
+              if buffer.bytesize == content_length
+                LanguageServer.logger.debug("Receive: #{buffer}")
+
+                request = JSON.parse(buffer, symbolize_names: true)
+
+                block.call(request)
+
+                header_parsed = false
+                buffer.clear
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/language_server/protocol/stdio/writer.rb

@@ -0,0 +1,38 @@
+module LanguageServer
+  module Protocol
+    module Stdio
+      class Writer
+        def respond(id:, result:)
+          write(id: id, result: result)
+        end
+
+        def notify(method:, params: {})
+          write(method: method, params: params)
+        end
+
+        private
+
+        def write(response)
+          response_str = response.merge(
+            jsonrpc: "2.0"
+          ).to_json
+
+          headers = {
+            "Content-Length" => response_str.bytesize
+          }
+
+          headers.each do |k, v|
+            STDOUT.print "#{k}: #{v}\r\n"
+          end
+
+          STDOUT.print "\r\n"
+
+          STDOUT.print response_str
+          STDOUT.flush
+
+          LanguageServer.logger.debug("Response: #{response_str}")
+        end
+      end
+    end
+  end
+end

data/lib/language_server/uri_store.rb

@@ -0,0 +1,23 @@
+module LanguageServer
+  class UriStore
+    class << self
+      def []=(uri, content)
+        store[uri] = content
+      end
+
+      def [](uri)
+        store[uri]
+      end
+
+      def clear
+        store.clear
+      end
+
+      private
+
+      def store
+        @store ||= {}
+      end
+    end
+  end
+end

data/lib/language_server/version.rb

@@ -1,3 +1,3 @@
 module LanguageServer
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: language_server
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Fumiaki MATSUSHIMA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rcodetools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +106,7 @@ files:
 - ".vscode/settings.json"
 - CODE_OF_CONDUCT.md
 - Dockerfile
+- Dockerfile-node.development
 - Dockerfile.development
 - Gemfile
 - LICENSE.txt
@@ -105,6 +120,7 @@ files:
 - exe/language_server
 - language_server.gemspec
 - lib/language_server.rb
+- lib/language_server/completion_provider/rcodetools.rb
 - lib/language_server/linter/ruby_wc.rb
 - lib/language_server/protocol/constants.rb
 - lib/language_server/protocol/constants/completion_item_kind.rb
@@ -206,6 +222,10 @@ files:
 - lib/language_server/protocol/interfaces/workspace_client_capabilites.rb
 - lib/language_server/protocol/interfaces/workspace_edit.rb
 - lib/language_server/protocol/interfaces/workspace_symbol_params.rb
+- lib/language_server/protocol/stdio.rb
+- lib/language_server/protocol/stdio/reader.rb
+- lib/language_server/protocol/stdio/writer.rb
+- lib/language_server/uri_store.rb
 - lib/language_server/version.rb
 - package.json
 - scripts/generateFiles.ts