language_server 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7139ff0bb62fcf30de5f216cc102cc2e06a52f8a
-  data.tar.gz: '019a3200bde8868ffa962478c9a0f5347adeebdb'
+  metadata.gz: eea2a987076e6db2c0d04467487fbe2e23af67ca
+  data.tar.gz: a171c9796c6cb96bc70175728d19f2ff093928e9
 SHA512:
-  metadata.gz: dae2397674045b4c88433c9efd9d4191739f2ed0cd36f908a86aca03d634bde4f1741900539439a72c252600f89008f7149d28b24cba6fc62e4d1963c724b406
-  data.tar.gz: 6c49f740e25807d8856df833c297d02a42802863d1abeb2b9c5278c9968d87c69c69b7be59ef7c79a1ebbc5d14a2a6e290adc91390e196aff4b75c54ca854818
+  metadata.gz: 456d5911f25822d1fc2ffc270b4ea979a34aacb9fa79f283a7298f2647581032857242ce9e33afe6af2af8695fda533e2c93747c83fc378b12b1fb7bfdcf0124
+  data.tar.gz: 39a4b4ab6984d4d55d6de26d480817d3eaab800d04c06389242e61bbd574bf514da8fec3f8ef3ea53b6ecf4177cb1947cb0dceaa6565d3c08808669f5d61c95b

data/.dockerignore

@@ -0,0 +1,2 @@
+.git
+.??*

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Not released
 
+## 0.9.0
+
+- rubocop support #27
+
 ## 0.8.0
 
 - Use RubyVM::InstructionSequence.compile instead of open3

data/Guardfile

@@ -0,0 +1,9 @@
+# More info at https://github.com/guard/guard#readme
+
+guard :minitest, all_after_pass: true do
+  # with Minitest::Unit
+  watch(%r{^test/(.*)\/?test_(.*)\.rb$})
+  watch(%r{^test/(.*)\/?(.*)_test\.rb$})
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  watch(%r{^test/test_helper\.rb$})      { 'test' }
+end

data/README.md

@@ -56,10 +56,18 @@ https://docs.docker.com/engine/installation
 
 ### Run test
 
+You can run test via m:
+
     $ docker-compose run app bin/m
     $ docker-compose run ruby-2-3 bin/m
     $ docker-compose run ruby-2-2 bin/m
 
+Or run via guard:
+
+    $ docker-compose run app bin/guard
+    $ docker-compose run ruby-2-3 bin/guard
+    $ docker-compose run ruby-2-2 bin/guard
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/mtsmfm/language_server-ruby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/bin/_guard-core

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application '_guard-core' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("guard", "_guard-core")

data/bin/guard

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'guard' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("guard", "guard")

data/bin/setup

@@ -4,5 +4,3 @@ IFS=$'\n\t'
 set -vx
 
 bundle install
-
-# Do any other automated setup that you need to do here

data/language_server.gemspec

@@ -31,9 +31,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-minitest"
+  spec.add_development_dependency "minitest-color"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "minitest-power_assert"
   spec.add_development_dependency "m"
   spec.add_development_dependency "awesome_print"
   spec.add_development_dependency "benchmark-ips"
+  spec.add_development_dependency "rubocop"
 end

data/lib/language_server/linter/rubocop.rb

@@ -0,0 +1,55 @@
+begin
+  require 'rubocop'
+rescue LoadError
+end
+
+module LanguageServer
+  module Linter
+    class Rubocop
+      def initialize(source, config_path="")
+        @source = source
+        @config_path = config_path
+      end
+
+
+      def call
+        return [] unless defined? ::RuboCop
+        args = []
+        args += ["--config", @config_path] if @config_path != ''
+        args += ["--format", "json","--stdin", "lsp_buffer.rb"]
+        o = nil
+        begin
+          $stdin = StringIO.new(@source)
+          $stdout = StringIO.new
+          config_store = ::RuboCop::ConfigStore.new
+          options, paths = ::RuboCop::Options.new.parse(args)
+          config_store.options_config = options[:config] if options[:config]
+          runner = ::RuboCop::Runner.new(options, config_store)
+          runner.run(paths)
+          o = $stdout.string
+        ensure
+          $stdin = STDIN
+          $stdout = STDOUT
+        end
+        return [] unless o
+        JSON
+          .parse(o)['files'].map { |v| v['offenses'] }
+          .flatten
+          .map { |v| Error.new(line_num: v['location']['line'].to_i - 1, message: v['message'], type: convert_type(v['severity'])) }
+      end
+
+      private
+
+      def convert_type(type)
+        case type
+        when 'refactor' then 'warning'
+        when 'convention' then 'warning'
+        when 'warning' then 'warning'
+        when 'error' then 'error'
+        when 'fatal' then 'error'
+        end
+      end
+
+    end
+  end
+end

data/lib/language_server/version.rb

@@ -1,3 +1,3 @@
 module LanguageServer
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/lib/language_server.rb

@@ -2,6 +2,7 @@ require "language_server/version"
 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"
@@ -93,8 +94,9 @@ module LanguageServer
     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
 
-    diagnostics = Linter::RubyWC.new(text).call.map do |error|
+    diagnostics = diagnostics.map do |error|
       Protocol::Interface::Diagnostic.new(
         message: error.message,
         severity: error.warning? ? Protocol::Constant::DiagnosticSeverity::WARNING : Protocol::Constant::DiagnosticSeverity::ERROR,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: language_server
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Fumiaki MATSUSHIMA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcodetools
@@ -80,6 +80,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-color
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby Language Server implementation
 email:
 - mtsmfm@gmail.com
@@ -158,6 +214,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
 - ".gitignore"
 - ".vscode/settings.json"
 - CHANGELOG.md
@@ -165,11 +222,14 @@ files:
 - Dockerfile
 - Dockerfile.development
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - benchmark/ruby_wc
+- bin/_guard-core
 - bin/console
+- bin/guard
 - bin/language_server-ruby
 - bin/m
 - bin/setup
@@ -184,6 +244,7 @@ files:
 - 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
 - lib/language_server/linter/ruby_wc.rb
 - lib/language_server/logger.rb
 - lib/language_server/project.rb