language_server 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d1bb86816f7e13333c5e9fbc6ed4930d48dcc90b7c865fc10942ffd3e279fd2
-  data.tar.gz: 59f55973ed8a7fcba78d0172235baa6247ca755758533bd64f0516c13da491fa
+  metadata.gz: 468e34ca809d762b9c90a5ed0d1906777e01a570fb085a92dc345c90e6a71e59
+  data.tar.gz: 3ec3706c296754ba08a6b5262407eafbd91cd5a1413efafc0f881db99f18876c
 SHA512:
-  metadata.gz: 015ee3cdc9cdf83bf92fc39f892c09aa27c5cf2161cc55da7168b67f58ad59214a9c38cdd10ffa3e3aeb6757dcd4c3c89c8564a1211ead9649b205acdb9da847
-  data.tar.gz: c5360bb9e9a02a8fa326dce7ebae9e331b8556534e692f7885f919430c9928c9cb9132371b78af3742bc410e03d8cc7ea922fa8ad09f0b085938c0797512a27f
+  metadata.gz: a830d47d8e451e9b1584d98540d4808c90288176d84ac726585f4d5ce4802a58ee2558ba00cb045df3095131fff06a6c5cdb8bc547045cabf038b21eb5d48953
+  data.tar.gz: 3e180506cfec812ed29c7ef21cf845896fe169f911ab69989430c38b70e45b11cfe276e5e39c92d37086003ac642941999ebeadda05f82dfc13f2dbefde34c2e

data/.rubocop.yml

@@ -1,5 +1,5 @@
 inherit_from:
-  - https://github.com/onk/onkcop/raw/v0.51.0.0/config/rubocop.yml
+  - https://github.com/onk/onkcop/raw/v0.52.0.0/config/rubocop.yml
 
 AllCops:
   TargetRubyVersion: 2.2
@@ -43,3 +43,6 @@ Metrics/ModuleLength:
 
 Metrics/LineLength:
   Max: 200
+  Exclude:
+    # To use power_assert, we must pub assertion in one line
+    - 'test/**/*'

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Not released
 
+## 0.11.0
+
+- Remove rcodetools integration (for now)
+- Bump language_server-protocol
+
 ## 0.10.0
 
 - Add --experimental-features flag

data/Gemfile

@@ -3,5 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in language_server.gemspec
 gemspec
 
-# TODO: Use released gem after new release includes https://github.com/bbatsov/rubocop/pull/4987
-gem "rubocop", git: "https://github.com/bbatsov/rubocop", ref: "88d9e3b"
+gem "rubocop", "0.52.1"

data/Rakefile

@@ -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

data/language_server.gemspec

@@ -25,8 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "language_server-protocol", "0.4.0"
-  spec.add_dependency "rcodetools"
+  spec.add_dependency "language_server-protocol", "0.5.0"
 
   spec.add_development_dependency "awesome_print"
   spec.add_development_dependency "benchmark-ips"

data/lib/language_server.rb

@@ -3,7 +3,6 @@ require "language_server/logger"
 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"
@@ -137,14 +136,15 @@ module LanguageServer
     )
   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:|

data/lib/language_server/project/node.rb

@@ -5,7 +5,7 @@ module LanguageServer
         def attributes(*attrs)
           attr_accessor(*attrs)
           attribute_names.concat(attrs)
-          class_eval <<-RUBY, __FILE__, __LINE__
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1
 def initialize(#{attribute_names.map { |n| "#{n}:" }.join(",")})
   #{attribute_names.map { |n|
       "@#{n} = #{n}"

data/lib/language_server/version.rb

@@ -1,3 +1,3 @@
 module LanguageServer
-  VERSION = "0.10.0".freeze
+  VERSION = "0.11.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: language_server
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Fumiaki MATSUSHIMA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: language_server-protocol
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
-- !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'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +217,6 @@ files:
 - language_server.gemspec
 - lib/language_server.rb
 - lib/language_server/completion_provider/ad_hoc.rb
-- lib/language_server/completion_provider/rcodetools.rb
 - lib/language_server/definition_provider/ad_hoc.rb
 - lib/language_server/file_store.rb
 - lib/language_server/linter/rubocop.rb
@@ -262,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A Ruby Language Server implementation

data/lib/language_server/completion_provider/rcodetools.rb

@@ -1,43 +0,0 @@
-require "language_server/protocol"
-require "rcodetools/completion"
-
-module LanguageServer
-  module CompletionProvider
-    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:, file_store:)
-        @uri = uri
-        @line = line
-        @character = character
-        @file_store = file_store
-      end
-
-      def call
-        _, candidates = Filter.run(source, lineno: @line + 1, column: @character)
-        candidates.map do |candidate|
-          method_name, description = candidate.split(/\0/, 2)
-          Protocol::Interface::CompletionItem.new(
-            label: method_name,
-            detail: description,
-            kind: Protocol::Constant::CompletionItemKind::METHOD,
-          )
-        end
-      end
-
-      private
-
-        def source
-          @file_store.read_remote_uri(@uri)
-        end
-    end
-  end
-end