ruby_language_server 0.2.5 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d2d06142de7157e3b1dfde9820bfdba546fc85a14a15fecce200a31c34926e4
-  data.tar.gz: 824942950a83e2fc1b5386ede7291155e3b60f3696914bb471ffb8c52e60345b
+  metadata.gz: 285ad2144f635133ae96f19b46a9761a784fff11a58288e6ca260f111fbf60e1
+  data.tar.gz: 8627bc9f34ed97b9f86f11e73a90d71fc94f50bb936b2423534cf7e8d70ea293
 SHA512:
-  metadata.gz: 0d06a2a79bc69a1300be8b5248c4624553635e0551667fd5c508102b5d605de5631fee20eef769d43ecc009ceec52e793c733fbb8f13b6a1b7a62416456bd876
-  data.tar.gz: 8eb0deae2c9af024fa891f7e45a7c702a43b3d6861cf3a154ec88c83297e3593676040c39f1369230249235f6ff3bc7e11b00abbd2b655ede3c2cd3a3f44ff7a
+  metadata.gz: fafa5f0caa4d1f712e6e0ed8fff4ba02ee47babba1f565151b8fc26905adbb36403cf29979c1a46b7683d828cbc2b1ffa21f7fcbc817b31f4e08673d680eef52
+  data.tar.gz: 76d6193d16b82bf7c5830625bf1bbaedec0b6acfc0305a4b413443043fdf5bc88f422c1028b84a12e105e50f3a40da5d7b9e37f4206e17d6e5c52e4146a41532

data/CHANGELOG.txt

@@ -1,5 +1,18 @@
 # Changelog
 
+#### 0.2.8 Sun Jun  2 16:17:04 PDT 2019
+
+* #37 - Bundler::LockfileError: You must use Bundler 2 or greater.  Thanks to Dmytro Konstantinov for the heads up
+
+#### 0.2.7 Sun May  5 15:36:21 PDT 2019
+
+* #34 - fix rubocop exclude paths.  Thanks to Sebastian Delmont!
+
+#### 0.2.6 Wed Feb  6 12:50:52 PST 2019
+
+* Fixed a couple of issues with projecy root
+* Main upshot: .rubocop.yml file will be found again
+
 #### 0.2.3 Wed Jan 30 11:46:09 PST 2019
 
 * Fixed a few bugs having to do with block variables

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_language_server (0.2.5)
+    ruby_language_server (0.2.8)
       amatch
       bundler
       etc
@@ -17,10 +17,10 @@ GEM
       mize
       tins (~> 1.0)
     ast (2.4.0)
-    byebug (10.0.2)
+    byebug (11.0.1)
     coderay (1.1.2)
     etc (1.0.1)
-    ffi (1.9.25)
+    ffi (1.11.1)
     formatador (0.2.5)
     fuzzy_match (2.1.0)
     guard (2.15.0)
@@ -39,8 +39,8 @@ GEM
     guard-rubocop (1.3.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
-    jaro_winkler (1.5.1)
-    json (2.1.0)
+    jaro_winkler (1.5.2)
+    json (2.2.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -56,42 +56,40 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
     protocol (1.0.1)
       ruby_parser (~> 3.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
     rainbow (3.0.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    rubocop (0.61.1)
+    rubocop (0.71.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    rubocop-rspec (1.32.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-rspec (1.33.0)
       rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.0)
+    ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
-    ruby_parser (3.12.0)
+    ruby_parser (3.13.1)
       sexp_processor (~> 4.9)
-    sexp_processor (4.11.0)
+    sexp_processor (4.12.0)
     shellany (0.0.1)
     thor (0.20.3)
-    tins (1.20.2)
-    unicode-display_width (1.4.1)
+    tins (1.20.3)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -108,4 +106,4 @@ DEPENDENCIES
   ruby_language_server!
 
 BUNDLED WITH
-   1.17.3
+   2.0.1

data/Guardfile

@@ -17,20 +17,22 @@
 #
 # and, you'll have to watch "config/Guardfile" instead of "Guardfile"
 
-guard :minitest, all_after_pass: true do
-  # with Minitest::Unit
-  # watch(%r{^test/(.*)\/?test_(.*)\.rb$})
-  # watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
-  # watch(%r{^test/test_helper\.rb$})      { 'test' }
+group :red_green_refactor, halt_on_fail: true do
+  guard :minitest, all_after_pass: true do
+    # with Minitest::Unit
+    # watch(%r{^test/(.*)\/?test_(.*)\.rb$})
+    # watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+    # watch(%r{^test/test_helper\.rb$})      { 'test' }
 
-  # with Minitest::Spec
-  watch(%r{^spec/**/(.*)_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})          { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^spec/spec_helper\.rb$})  { 'spec' }
-end
+    # with Minitest::Spec
+    watch(%r{^spec/**/(.*)_spec\.rb$})
+    watch(%r{^lib/(.+)\.rb$})          { |m| "spec/lib/#{m[1]}_spec.rb" }
+    watch(%r{^spec/spec_helper\.rb$})  { 'spec' }
+  end
 
-guard :rubocop, cli: [] do
-  watch('.rubocop_ruby_language_parser.yml')
-  watch(/.+\.rb$/)
-  watch(%r{(?:.+/)?\.rubocop(?:_todo)?\.yml$}) { |m| File.dirname(m[0]) }
+  guard :rubocop, cli: [] do
+    watch('.rubocop_ruby_language_parser.yml')
+    watch(/.+\.rb$/)
+    watch(%r{(?:.+/)?\.rubocop(?:_todo)?\.yml$}) { |m| File.dirname(m[0]) }
+  end
 end

data/Makefile

@@ -5,7 +5,7 @@ build:
 	docker build -t $(PROJECT_NAME) .
 
 guard: build
-	docker run -it $(LOCAL_LINK) $(PROJECT_NAME) sh -c 'bundle && guard'
+	docker run -it $(LOCAL_LINK) $(PROJECT_NAME) bundle exec guard
 
 continuous_development: build
 	echo "You are going to want to set the ide-ruby 'Image Name' to local_ruby_language_server"
@@ -20,7 +20,7 @@ console: build
 	docker run -it $(LOCAL_LINK) $(PROJECT_NAME) bin/console
 
 test: build
-	docker run -it $(LOCAL_LINK) $(PROJECT_NAME) rake test && rubocop -c .rubocop_ruby_language_parser.yml
+	docker run -it $(LOCAL_LINK) $(PROJECT_NAME) rake test && rubocop
 
 shell: build
 	docker run -it $(LOCAL_LINK) $(PROJECT_NAME) sh

data/README.md

@@ -52,4 +52,5 @@ Write tests and guard will run them.  Make changes and reload the window.  Test
 
 # Contributors
 
+* [Sebastian Delmont](sd@notso.net)
 * *Your name here!*

data/lib/ruby_language_server/code_file.rb

@@ -8,7 +8,7 @@ module RubyLanguageServer
   class CodeFile
     attr_reader :uri
     attr_reader :text
-    attr_reader :lint_found
+    attr_accessor :diagnostics
 
     def initialize(uri, text)
       RubyLanguageServer.logger.debug("CodeFile initialize #{uri}")
@@ -106,12 +106,6 @@ module RubyLanguageServer
       @tags
     end
 
-    def diagnostics
-      # Maybe we should be sharing this GoodCop across instances
-      @good_cop ||= GoodCop.new
-      @good_cop.diagnostics(@text, @uri)
-    end
-
     def root_scope
       # RubyLanguageServer.logger.error("Asking about root_scope with #{text}")
       if @refresh_root_scope

data/lib/ruby_language_server/good_cop.rb

@@ -4,17 +4,13 @@ require 'rubocop'
 
 module RubyLanguageServer
   class GoodCop < RuboCop::Runner
-    CONFIG_PATH = '/project/.rubocop.yml'
-    FALLBACK_PATH = '/app/.rubocop.yml'
-
     def initialize
       @initialization_error = nil
       config_store = RuboCop::ConfigStore.new
-
       config_store.options_config = config_path
       super({}, config_store)
-    rescue Exception => exception
-      RubyLanguageServer.logger.error(exception)
+    rescue Exception => e
+      RubyLanguageServer.logger.error(e)
       @initialization_error = "There was an issue loading the rubocop configuration file: #{exception}.  Maybe you need to add some additional gems to the ide-ruby settings?"
     end
 
@@ -100,9 +96,13 @@ module RubyLanguageServer
     private
 
     def offenses(text, filename)
-      processed_source = RuboCop::ProcessedSource.new(text, 2.4, filename)
-      offenses = inspect_file(processed_source)
-      offenses.compact.flatten
+      if excluded_file?(filename)
+        []
+      else
+        processed_source = RuboCop::ProcessedSource.new(text, 2.4, filename)
+        offenses = inspect_file(processed_source)
+        offenses.compact.flatten
+      end
     end
 
     def initialization_offenses
@@ -123,8 +123,14 @@ module RubyLanguageServer
       pathname = Pathname.new(my_path)
       my_directory = pathname.dirname
       fallback_pathname = my_directory + '../resources/fallback_rubocop.yml'
-      possible_config_paths = [RubyLanguageServer::ProjectManager.root_path + '/.rubocop.yml', fallback_pathname.to_s]
+      project_path = RubyLanguageServer::ProjectManager.root_path + '.rubocop.yml'
+      possible_config_paths = [project_path, fallback_pathname.to_s]
       possible_config_paths.detect { |path| File.exist?(path) }
     end
+
+    def excluded_file?(filename)
+      file_config = @config_store.for(filename)
+      file_config.file_to_exclude?(filename)
+    end
   end
 end

data/lib/ruby_language_server/io.rb

@@ -74,8 +74,8 @@ module RubyLanguageServer
       while content.length < length + 2
         begin
           content += get_content(length + 2, io) # Why + 2?  CRLF?
-        rescue Exception => exception
-          RubyLanguageServer.logger.error exception
+        rescue Exception => e
+          RubyLanguageServer.logger.error e
           # We have almost certainly been disconnected from the server
           exit!(1)
         end

data/lib/ruby_language_server/project_manager.rb

@@ -20,13 +20,33 @@ module RubyLanguageServer
       end
 
       def root_path
-        @_root_path
+        # I'm torn about  this.  Should this be set in the Server?  Or is this right.
+        # Rather than worry too much, I'll just do this here and change it later if it feels wrong.
+        path = ENV['RUBY_LANGUAGE_SERVER_PROJECT_ROOT'] || @_root_path
+        return path if path.nil?
+
+        path.end_with?(File::SEPARATOR) ? path : "#{path}#{File::SEPARATOR}"
+      end
+
+      def root_uri=(uri)
+        ROOT_PATH_MUTEX.synchronize do
+          if uri
+            uri = "#{uri}/" unless uri.end_with?('/')
+            @_root_uri = uri
+          end
+        end
+      end
+
+      def root_uri
+        @_root_uri || "file://#{root_path}"
       end
     end
 
-    def initialize(path)
+    def initialize(path, uri = nil)
       # Should probably lock for read, but I'm feeling crazy!
       self.class.root_path = path if self.class.root_path.nil?
+      self.class.root_uri = uri if uri
+
       @root_uri = "file://#{path}"
       # This is {uri: code_file} where content stuff is like
       @uri_code_file_hash = {}
@@ -54,12 +74,6 @@ module RubyLanguageServer
       code_file&.text || ''
     end
 
-    def code_file_for_uri(uri, text = nil)
-      code_file = @uri_code_file_hash[uri]
-      code_file = @uri_code_file_hash[uri] = CodeFile.new(uri, text) if code_file.nil?
-      code_file
-    end
-
     def tags_for_uri(uri)
       code_file = code_file_for_uri(uri)
       return {} if code_file.nil?
@@ -170,28 +184,37 @@ module RubyLanguageServer
     # }
 
     def scan_all_project_files
-      project_ruby_files = Dir.glob('/project/**/*.rb')
-      RubyLanguageServer.logger.debug("scan_all_project_files: #{project_ruby_files * ','}")
+      project_ruby_files = Dir.glob("#{self.class.root_path}**/*.rb")
       Thread.new do
         project_ruby_files.each do |container_path|
           text = File.read(container_path)
-          relative_path = container_path.delete_prefix('/project/')
+          relative_path = container_path.delete_prefix(self.class.root_path)
           host_uri = @root_uri + relative_path
           update_document_content(host_uri, text)
         end
       end
     end
 
+    # returns diagnostic info (if possible)
     def update_document_content(uri, text)
       @update_mutext.synchronize do
         RubyLanguageServer.logger.debug("update_document_content: #{uri}")
         # RubyLanguageServer.logger.error("@root_path: #{@root_path}")
-        code_file = code_file_for_uri(uri, text)
+        code_file = code_file_for_uri(uri)
+        return code_file.diagnostics if code_file.text == text
+
         code_file.text = text
-        diagnostics_ready? ? code_file.diagnostics : []
+        diagnostics_ready? ? updated_diagnostics_for_codefile(code_file) : []
       end
     end
 
+    def updated_diagnostics_for_codefile(code_file)
+      # Maybe we should be sharing this GoodCop across instances
+      @good_cop ||= GoodCop.new
+      project_relative_filename = filename_relative_to_project(code_file.uri)
+      code_file.diagnostics = @good_cop.diagnostics(code_file.text, project_relative_filename)
+    end
+
     # Returns the context of what is being typed in the given line
     def context_at_location(uri, position)
       code_file = code_file_for_uri(uri)
@@ -240,5 +263,17 @@ module RubyLanguageServer
       end
       return_array
     end
+
+    private
+
+    def code_file_for_uri(uri)
+      code_file = @uri_code_file_hash[uri]
+      code_file = @uri_code_file_hash[uri] = CodeFile.new(uri, nil) if code_file.nil?
+      code_file
+    end
+
+    def filename_relative_to_project(filename)
+      filename.gsub(self.class.root_uri, self.class.root_path)
+    end
   end
 end

data/lib/ruby_language_server/scope_parser.rb

@@ -345,8 +345,8 @@ module RubyLanguageServer
       text ||= '' # empty is the same as nil - but it doesn't crash
       begin
         sexp = self.class.sexp(text)
-      rescue TypeError => exception
-        RubyLanguageServer.logger.error("Exception in sexp: #{exception} for text: #{text}")
+      rescue TypeError => e
+        RubyLanguageServer.logger.error("Exception in sexp: #{e} for text: #{text}")
       end
       processor = SEXPProcessor.new(sexp, text.split("\n").length)
       @root_scope = processor.root_scope

data/lib/ruby_language_server/server.rb

@@ -10,7 +10,8 @@ module RubyLanguageServer
     def on_initialize(params)
       RubyLanguageServer.logger.info("on_initialize: #{params}")
       root_path = params['rootPath']
-      @project_manager = ProjectManager.new(root_path)
+      root_uri = params['rootUri']
+      @project_manager = ProjectManager.new(root_path, root_uri)
       gem_string = ENV.fetch('ADDITIONAL_GEMS') {}
       gem_array = (gem_string.split(',').compact.map(&:strip).reject { |string| string == '' } if gem_string && !gem_string.empty?)
       @project_manager.install_additional_gems(gem_array)

data/lib/ruby_language_server/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyLanguageServer
-  VERSION = '0.2.5'
+  VERSION = '0.2.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_language_server
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.8
 platform: ruby
 authors:
 - Kurt Werle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Provide a language server implementation for ruby in ruby.