ruby_language_server 0.3.9 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7f8d3e239241819fab0206c27fa63422d46001a58048b52355e3817243b8239
-  data.tar.gz: 8c43b621ee0d3124fb122f725828426d9a9c88dc2a8217a74725c0868dabb4bc
+  metadata.gz: 1fdf50a580011d2f07140cf07fdc61118f002ecc8e59fb62646316b6141ada95
+  data.tar.gz: 5cc56793731893e50c390274dbec4e28f6b7066624f8df7202732a4139ba5a2a
 SHA512:
-  metadata.gz: a90bef1450867b3816a091175a7d2a51e25f05972fdce4460c0f0da472e9ba2ae09af7aa23a48a290e5fa53925619af942752e34af390b436fa79256c0198108
-  data.tar.gz: e6d05f5fce1ee700e55e0e863f1731481848cba12ab6e2f6064270e67ae5711da43ea5da1896608389e052b474fd11394fd5ec458288e9b5ad665119ceef39e6
+  metadata.gz: 4f355accf5116abd9cad0a0d9ee5f30e0853821d2860df3d4394d62ead5cea50cd5acfcb0187bd3fafefb7752bfc78d6dd8b5cc347ec29df2d3095c3c8a9917b
+  data.tar.gz: ab2415c7d9ad243730380ebd7b808c4d8c4911f725f5505e658de3439880755e86b7f50ea57ae21ca506c38ddf86e99d6a877958a6c2ba2d4a56d219d7c30a36

data/CHANGELOG.txt

@@ -1,5 +1,29 @@
 # Changelog
 
+#### 0.3.14 Sat Apr 24 21:09:07 PDT 2021
+
+* Update rails activerecord to 6.1
+* Update ruby to 3
+* Fix some tests, docs, etc
+
+#### 0.3.13 Fri Feb 14 00:55:28 PST 2020
+
+* More stabbing at goodcop gemfile issues
+* Hopefully much higher performance and better completions
+
+#### 0.3.12 Thu Feb  6 06:18:33 UTC 2020
+
+* #58 Change the way additional gems are installed so there are not conflicts
+
+#### 0.3.11 Wed Jan 29 06:48:37 UTC 2020
+
+* #57 rubocop gemfiles mismatch
+* #56 .rubocop.yml changes do not rerun rubocop validations
+
+#### 0.3.10 Fri Jan 24 00:19:14 PST 2020
+
+* botched the 0.3.9 release
+
 #### 0.3.9 Fri Jan 24 00:19:14 PST 2020
 
 * #55 Some problem with completion

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ruby_language_server (0.3.9)
-      activerecord (~> 5.2)
+    ruby_language_server (0.3.14)
+      activerecord (~> 6.1)
       amatch
       bundler
       etc
@@ -16,30 +16,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activerecord (5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
-      arel (>= 9.0)
-    activesupport (5.2.4.1)
+    activemodel (6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activerecord (6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     amatch (0.4.0)
       mize
       tins (~> 1.0)
-    arel (9.0.0)
-    ast (2.4.0)
-    byebug (11.0.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    etc (1.1.0)
-    ffi (1.11.1)
+    ansi (1.5.0)
+    ast (2.4.2)
+    builder (3.2.4)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    etc (1.2.0)
+    ffi (1.15.0)
     formatador (0.2.5)
     fuzzy_match (2.1.0)
-    guard (2.15.0)
+    guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -52,80 +53,88 @@ GEM
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    guard-rubocop (1.3.0)
+    guard-rubocop (1.4.0)
       guard (~> 2.0)
-      rubocop (~> 0.20)
-    i18n (1.8.1)
+      rubocop (< 2.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.3)
-    json (2.3.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
-    method_source (0.9.2)
-    minitest (5.11.3)
-    minitest-color (0.0.2)
-      minitest (~> 5)
+    json (2.5.1)
+    listen (3.5.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    minitest-reporters (1.4.3)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
     mize (0.4.0)
       protocol (~> 2.0)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
+    parallel (1.20.1)
+    parser (3.0.1.0)
+      ast (~> 2.4.1)
     protocol (2.0.0)
       ruby_parser (~> 3.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
+      pry (~> 0.13.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rake (13.0.3)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rubocop (0.74.0)
-      jaro_winkler (~> 1.5.1)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rubocop (1.13.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    rubocop-rspec (1.37.1)
-      rubocop (>= 0.68.1)
-    ruby-progressbar (1.10.1)
-    ruby_dep (1.5.0)
-    ruby_parser (3.14.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.11.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby_parser (3.15.1)
       sexp_processor (~> 4.9)
-    sexp_processor (4.12.1)
+    sexp_processor (4.15.2)
     shellany (0.0.1)
     sqlite3 (1.4.2)
     sync (0.5.0)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tins (1.24.0)
+    thor (1.1.0)
+    tins (1.28.0)
       sync
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-linux-musl
 
 DEPENDENCIES
   guard
   guard-minitest
   guard-rubocop
-  minitest (~> 5.11)
-  minitest-color
+  minitest
+  minitest-reporters
   pry
   pry-byebug
   rake
@@ -133,4 +142,4 @@ DEPENDENCIES
   sexp_processor
 
 BUNDLED WITH
-   2.1.3
+   2.2.16

data/Makefile

@@ -1,15 +1,15 @@
 PROJECT_NAME=ruby_language_server
 LOCAL_LINK=-v $(PWD):/tmp/src -w /tmp/src
 
-build:
+image:
 	docker build -t $(PROJECT_NAME) .
 
-guard: build
+guard: image
 	echo > active_record.log
 	docker run -it --rm $(LOCAL_LINK) -e LOG_LEVEL=DEBUG $(PROJECT_NAME) bundle exec guard
 	echo > active_record.log
 
-continuous_development: build
+continuous_development: image
 	docker build -t local_ruby_language_server .
 	echo "You are going to want to set the ide-ruby 'Image Name' to local_ruby_language_server"
 	sleep 15
@@ -19,20 +19,20 @@ continuous_development: build
 	  sleep 2 ; \
 	done
 
-console: build
+console: image
 	docker run -it --rm $(LOCAL_LINK) $(PROJECT_NAME)  bin/console
 
-test: build
+test: image
 	docker run -it --rm $(LOCAL_LINK) $(PROJECT_NAME) sh -c 'bundle exec rake test && bundle exec rubocop'
 
-shell: build
+shell: image
 	docker run -it --rm $(LOCAL_LINK) $(PROJECT_NAME) sh
 
 # Just to make sure it works.
-server: build
+server: image
 	docker run -it --rm $(LOCAL_LINK) $(PROJECT_NAME)
 
-gem: build
+gem: image
 	rm -f $(PROJECT_NAME)*.gem
 	docker run $(LOCAL_LINK) $(PROJECT_NAME) gem build $(PROJECT_NAME)
 

data/README.md

@@ -1,3 +1,4 @@
+![Build Status](https://github.com/kwerle/ruby_language_server/actions/workflows/test.yml/badge.svg)
 # Overview
 
 https://github.com/kwerle/ruby_language_server
@@ -6,9 +7,9 @@ The goal of this project is to provide a [language server](https://microsoft.git
 
 # Status
 
-Beta.  It does some stuff.  Pretty stable.  Used day-to-day.
+Used day-to-day.
 
-Help wanted.
+Help welcome.
 
 # Features
 
@@ -20,6 +21,7 @@ Help wanted.
 # Editor Integrations
 
 You probably want to use one of the developed integrations:
+* VSCode - https://github.com/kwerle/vscode_ruby_language_server
 * Atom - https://github.com/kwerle/ide-ruby
 * Theia - https://github.com/kwerle/theia_ruby_language_server
 

data/lib/config/initializers/active_record.rb

@@ -8,12 +8,17 @@ ActiveRecord::Base.establish_connection(
   checkout_timeout: 30.seconds # does not seem to help
 )
 
+database = ActiveRecord::Base.connection.instance_variable_get :@connection
+database.enable_load_extension(1)
+database.load_extension('/usr/local/lib/liblevenshtein.so.0.0.0')
+database.enable_load_extension(0)
+
 if ENV['LOG_LEVEL'] == 'DEBUG'
   begin
-    warn('Turning on active record logging')
+    warn('Turning on active record logging to active_record.log')
     ActiveRecord::Base.logger = Logger.new(File.open('active_record.log', 'w'))
   rescue Exception => e
-    ActiveRecord::Base.logger = Logger.new(STDERR)
+    ActiveRecord::Base.logger = Logger.new($stderr)
     ActiveRecord::Base.logger.error(e)
   end
 end

data/lib/resources/fallback_rubocop.yml

@@ -1 +1,2 @@
-# This is a blank rubocop file just to have a handle to make rubocop happy
+# This is a blank rubocop file just to have a handle to make rubocop happy.
+# It is used if the project does not have a rubocop file.

data/lib/ruby_language_server/code_file.rb

@@ -20,28 +20,16 @@ module RubyLanguageServer
     def self.build(uri, text)
       RubyLanguageServer.logger.debug("CodeFile initialize #{uri}")
 
-      new_code_file = create!(uri: uri, text: text)
-      new_code_file
+      create!(uri: uri, text: text)
     end
 
-    # def text=(new_text)
-    #   RubyLanguageServer.logger.debug("text= for #{uri}")
-    #   if @text == new_text
-    #     RubyLanguageServer.logger.debug('IT WAS THE SAME!!!!!!!!!!!!')
-    #     return
-    #   end
-    #   @text = new_text
-    #   update_attribute(:refresh_root_scope, true)
-    #   root_scope
-    # end
-    #
     SYMBOL_KIND = {
       file: 1,
-      'module': 5, # 2,
+      module: 5, # 2,
       namespace: 3,
       package: 4,
-      'class': 5,
-      'method': 6,
+      class: 5,
+      method: 6,
       'singleton method': 6,
       property: 7,
       field: 8,

data/lib/ruby_language_server/completion.rb

@@ -32,7 +32,7 @@ module RubyLanguageServer
           else
             scope_completions_in_target_context(context, context_scope, position_scopes)
           end
-        RubyLanguageServer.logger.debug("completions: #{completions.as_json}")
+        # RubyLanguageServer.logger.debug("completions: #{completions.as_json}")
         {
           isIncomplete: true,
           items: completions.uniq.map do |word, hash|
@@ -54,7 +54,7 @@ module RubyLanguageServer
 
       def scope_completions_in_target_context(context, context_scope, scopes)
         context_word = context[-2]
-        context_word = context_word.split(/_/).map(&:capitalize).join('') unless context_word.match?(/^[A-Z]/)
+        context_word = context_word.split('_').map(&:capitalize).join unless context_word.match?(/^[A-Z]/)
         context_scopes = RubyLanguageServer::ScopeData::Scope.where(name: context_word)
         context_scopes ||= context_scope
         RubyLanguageServer.logger.debug("context_scopes: #{context_scopes.to_json}")
@@ -64,19 +64,34 @@ module RubyLanguageServer
 
       def module_completions(word)
         class_and_module_types = [RubyLanguageServer::ScopeData::Base::TYPE_CLASS, RubyLanguageServer::ScopeData::Base::TYPE_MODULE]
-        scope_words = RubyLanguageServer::ScopeData::Scope.where(class_type: class_and_module_types).sort_by(&:depth).map { |scope| [scope.name, scope] }
-        words = scope_words.to_h
-        good_words = FuzzyMatch.new(words.keys, threshold: 0.01).find_all(word).slice(0..10) || []
-        words = good_words.each_with_object({}) { |w, hash| hash[w] = {depth: words[w].depth, type: words[w].class_type} }.to_h
+
+        # scope_words = RubyLanguageServer::ScopeData::Scope.where(class_type: class_and_module_types).sort_by(&:depth).map { |scope| [scope.name, scope] }
+        # words = scope_words.to_h
+        # good_words = FuzzyMatch.new(words.keys, threshold: 0.01).find_all(word).slice(0..10) || []
+        # words = good_words.each_with_object({}) { |w, hash| hash[w] = {depth: words[w].depth, type: words[w].class_type} }.to_h
+
+        words = RubyLanguageServer::ScopeData::Scope.where(class_type: class_and_module_types).closest_to(word).limit(20)
+        RubyLanguageServer.logger.error("module_completions: #{words.as_json}")
+        # words.to_a.sort_by(&:depth).each_with_object({}){|a_word, hash| hash[a_word.name] = {depth: a_word.depth, type: a_word.class_type} }
+        good_words = FuzzyMatch.new(words.to_a, read: :name, threshold: 0.01).find_all(word).slice(0..10) || []
+        good_words.each_with_object({}) { |w, hash| hash[w.name] = {depth: w.depth, type: w.class_type} }.to_h
       end
 
       def scope_completions(word, scopes)
         return module_completions(word) if word.match?(/\A[A-Z][a-z]/)
 
+        # scope_ids = scopes.map(&:id)
+        # word_scopes = scopes.to_a + RubyLanguageServer::ScopeData::Scope.where(parent_id: scope_ids)
+        # scope_words = word_scopes.select(&:named_scope?).sort_by(&:depth).map { |scope| [scope.name, scope] }
+        # variable_words = RubyLanguageServer::ScopeData::Variable.where(scope_id: scope_ids).map { |variable| [variable.name, variable.scope] }
+        # words = (scope_words + variable_words).to_h
+        # good_words = FuzzyMatch.new(words.keys, threshold: 0.01).find_all(word).slice(0..10) || []
+        # words = good_words.each_with_object({}) { |w, hash| hash[w] = {depth: words[w].depth, type: words[w].class_type} }.to_h
+
         scope_ids = scopes.map(&:id)
-        word_scopes = scopes.to_a + RubyLanguageServer::ScopeData::Scope.where(parent_id: scope_ids)
+        word_scopes = scopes.to_a + RubyLanguageServer::ScopeData::Scope.where(parent_id: scope_ids).closest_to(word).limit(5)
         scope_words = word_scopes.select(&:named_scope?).sort_by(&:depth).map { |scope| [scope.name, scope] }
-        variable_words = RubyLanguageServer::ScopeData::Variable.where(scope_id: scope_ids).map { |variable| [variable.name, variable.scope] }
+        variable_words = RubyLanguageServer::ScopeData::Variable.where(scope_id: scope_ids).closest_to(word).limit(5).map { |variable| [variable.name, variable.scope] }
         words = (scope_words + variable_words).to_h
         good_words = FuzzyMatch.new(words.keys, threshold: 0.01).find_all(word).slice(0..10) || []
         words = good_words.each_with_object({}) { |w, hash| hash[w] = {depth: words[w].depth, type: words[w].class_type} }.to_h

data/lib/ruby_language_server/gem_installer.rb

@@ -6,18 +6,24 @@ module RubyLanguageServer
   # Sole purpose is to install gems
   module GemInstaller
     class << self
-      def install_gems(gem_names)
-        gem_names&.compact!
-        gem_names&.reject! { |name| name.strip == '' }
-        return if gem_names.nil? || gem_names.empty?
+      def install_gems(additional_gem_names)
+        additional_gem_names&.compact!
+        additional_gem_names&.reject! { |name| name.strip == '' }
+        return if additional_gem_names.nil? || additional_gem_names.empty?
 
-        RubyLanguageServer.logger.info("Trying to install gems #{gem_names}")
-        rubocop_gem = Gem::Specification.find_by_name 'rubocop'
+        RubyLanguageServer.logger.info("Trying to install gems #{additional_gem_names}")
+        gems_already_installed = []
         gemfile do
           source 'https://rubygems.org'
-          gem 'rubocop', rubocop_gem.version.to_s
-          gem_names.each do |gem_name|
-            gem gem_name
+          # Lock all the gems we already have installed to the versions we have installed
+          # For some reason, installing bundler makes it unhappy.  Whatever.
+          Gem::Specification.reject { |s| s.name == 'bundler' }.each do |specification|
+            gem_name = specification.name
+            gem(gem_name, specification.version.to_s)
+            gems_already_installed << gem_name
+          end
+          additional_gem_names.each do |gem_name|
+            gem gem_name unless gems_already_installed.include?(gem_name)
           end
         end
       end

data/lib/ruby_language_server/good_cop.rb

@@ -4,12 +4,14 @@ require 'rubocop'
 
 module RubyLanguageServer
   class GoodCop < RuboCop::Runner
-    def initialize
-      @initialization_error = nil
-      config_store = RuboCop::ConfigStore.new
-      config_store.options_config = config_path
-      RubyLanguageServer.logger.debug("Rubocop config_path: #{config_path}")
-      super({}, config_store)
+    def initialize(config_path, initialization_error = nil)
+      @initialization_error = initialization_error
+      unless @initialization_error
+        initialize_rubocop_ivars
+        @config_store.options_config = config_path
+        RubyLanguageServer.logger.debug("Rubocop config_path: #{config_path}")
+        super({}, @config_store)
+      end
     rescue Exception => e
       RubyLanguageServer.logger.error(e)
       @initialization_error = "There was an issue loading the rubocop configuration file: #{e}.  Maybe you need to add some additional gems to the ide-ruby settings?"
@@ -100,12 +102,25 @@ module RubyLanguageServer
       if excluded_file?(filename)
         []
       else
-        processed_source = RuboCop::ProcessedSource.new(text, 2.7, filename)
+        ruby_version = 2.7
+        processed_source = RuboCop::ProcessedSource.new(text, ruby_version, filename)
         offenses = inspect_file(processed_source)
-        offenses.compact.flatten
+        offenses.compact.flatten.reject(&:blank?) # reject blank because some are `false`
       end
     end
 
+    def initialize_rubocop_ivars
+      @config_store ||= RuboCop::ConfigStore.new
+      @options ||= {}
+      @errors ||= []
+      @warnings ||= []
+    end
+
+    def inspect_file(source)
+      initialize_rubocop_ivars
+      super
+    end
+
     def initialization_offenses
       [
         {
@@ -119,17 +134,35 @@ module RubyLanguageServer
       ]
     end
 
-    def config_path
-      my_path = __FILE__
-      pathname = Pathname.new(my_path)
-      my_directory = pathname.dirname
-      fallback_pathname = my_directory + '../resources/fallback_rubocop.yml'
-      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) }
+    class << self
+      def instance
+        @config_path ||= config_path
+        config_path_timestamp = File.mtime(@config_path)
+        if @cached_config_path_timestamp.nil? || @cached_config_path_timestamp < config_path_timestamp
+          @cached_config_path_timestamp = config_path_timestamp
+          @instance = new(@config_path)
+        else
+          @instance
+        end
+      rescue StandardError => e
+        @instance = new(@config_path, e.to_s)
+      end
+
+      private
+
+      def config_path
+        my_path = __FILE__
+        pathname = Pathname.new(my_path)
+        my_directory = pathname.dirname
+        fallback_pathname = "#{my_directory}/../resources/fallback_rubocop.yml"
+        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
     end
 
     def excluded_file?(filename)
+      initialize_rubocop_ivars
       file_config = @config_store.for(filename)
       file_config.file_to_exclude?(filename)
     end

data/lib/ruby_language_server/io.rb

@@ -9,8 +9,8 @@ module RubyLanguageServer
       @mutex = mutex
       server.io = self
       loop do
-        (id, response) = process_request(STDIN)
-        return_response(id, response, STDOUT) unless id.nil?
+        (id, response) = process_request($stdin)
+        return_response(id, response, $stdout) unless id.nil?
       rescue SignalException => e
         RubyLanguageServer.logger.error "We received a signal.  Let's bail: #{e}"
         exit(true)
@@ -21,7 +21,7 @@ module RubyLanguageServer
       end
     end
 
-    def return_response(id, response, io = STDOUT)
+    def return_response(id, response, io = $stdout)
       full_response = {
         jsonrpc: '2.0',
         id: id,
@@ -35,7 +35,7 @@ module RubyLanguageServer
       io.flush
     end
 
-    def send_notification(message, params, io = STDOUT)
+    def send_notification(message, params, io = $stdout)
       full_response = {
         jsonrpc: '2.0',
         method: message,
@@ -49,7 +49,7 @@ module RubyLanguageServer
       io.flush
     end
 
-    def process_request(io = STDIN)
+    def process_request(io = $stdin)
       request_body = get_request(io)
       # RubyLanguageServer.logger.debug "request_body: #{request_body}"
       request_json = JSON.parse request_body
@@ -71,7 +71,7 @@ module RubyLanguageServer
       end
     end
 
-    def get_request(io = STDIN)
+    def get_request(io = $stdin)
       initial_line = get_initial_request_line(io)
       RubyLanguageServer.logger.debug "initial_line: #{initial_line}"
       length = get_length(initial_line)
@@ -89,7 +89,7 @@ module RubyLanguageServer
       content
     end
 
-    def get_initial_request_line(io = STDIN)
+    def get_initial_request_line(io = $stdin)
       io.gets
     end
 
@@ -99,7 +99,7 @@ module RubyLanguageServer
       string.match(/Content-Length: (\d+)/)[1].to_i
     end
 
-    def get_content(size, io = STDIN)
+    def get_content(size, io = $stdin)
       io.read(size)
     end
 

data/lib/ruby_language_server/line_context.rb

@@ -20,7 +20,7 @@ module RubyLanguageServer
     # This will not work if the search starts on the ending ? of "method?".  Bummer.
     def self.for(line, position)
       # Grab just the last part of the line - from the index onward
-      line_end = line[position..-1]
+      line_end = line[position..]
       return nil if line_end.nil?
 
       # Grab the portion of the word that starts at the position toward the end of the line
@@ -30,7 +30,7 @@ module RubyLanguageServer
       line_start = line[0..(position + match.length - 1)]
       RubyLanguageServer.logger.debug("line_start: #{line_start}")
       # Match as much as we can to the end of the line - which is now the end of the word
-      end_match = line_start.partition(/(@{0,2}[:&\.\w]+\??)$/)[1]
+      end_match = line_start.partition(/(@{0,2}[:&.\w]+\??)$/)[1]
       matches = end_match.split('&.', -1)
       matches = matches.map { |m| m.length.positive? ? m.split('.', -1) : m }.flatten
       matches = matches.map { |m| m.length.positive? ? m.split('::', -1) : m }.flatten

data/lib/ruby_language_server/location.rb

@@ -20,7 +20,7 @@ module RubyLanguageServer
             line: start_line - 1,
             character: start_character
           },
-          'end': {
+          end: {
             line: end_line - 1,
             character: end_character
           }

data/lib/ruby_language_server/logger.rb

@@ -3,12 +3,12 @@
 require 'logger'
 
 module RubyLanguageServer
-  level_name = ENV.fetch('LOG_LEVEL') { 'error' }.upcase
+  level_name = ENV.fetch('LOG_LEVEL', 'error').upcase
   # level_name = 'DEBUG'
   level = Logger::Severity.const_get(level_name)
-  @logger = ::Logger.new(STDERR, level: level)
-  @logger.log(level, "Logger started at level #{level_name} -> #{level}")
-  def self.logger
-    @logger
+  class << self
+    attr_accessor :logger
   end
+  @logger = ::Logger.new($stderr, level: level)
+  @logger.log(level, "Logger started at level #{level_name} -> #{level}")
 end

data/lib/ruby_language_server/project_manager.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'fuzzy_match'
-require 'amatch' # note that you have to require this... fuzzy_match won't require it for you
+require 'amatch' # NOTE: that you have to require this... fuzzy_match won't require it for you
 FuzzyMatch.engine = :amatch # This should be in a config somewhere
 
 module RubyLanguageServer
@@ -62,7 +62,7 @@ module RubyLanguageServer
         RubyLanguageServer::GemInstaller.install_gems(gem_names)
         @additional_gem_mutex.synchronize { @additional_gems_installed = true }
       rescue StandardError => e
-        RubyLanguageServer.logger.error("Issue installing rubocop gems: #{e}")
+        RubyLanguageServer.logger.error("Issue installing rubocop gems: #{e} #{e.backtrace}")
       end
     end
 
@@ -217,9 +217,8 @@ module RubyLanguageServer
     def updated_diagnostics_for_codefile(code_file)
       # Maybe we should be sharing this GoodCop across instances
       RubyLanguageServer.logger.debug("updated_diagnostics_for_codefile: #{code_file.uri}")
-      @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)
+      code_file.diagnostics = GoodCop.instance.diagnostics(code_file.text, project_relative_filename)
       RubyLanguageServer.logger.debug("code_file.diagnostics: #{code_file.diagnostics}")
       code_file.diagnostics
     end
@@ -272,8 +271,7 @@ module RubyLanguageServer
     private
 
     def code_file_for_uri(uri)
-      code_file = CodeFile.find_by_uri(uri) || CodeFile.build(uri, nil)
-      code_file
+      CodeFile.find_by_uri(uri) || CodeFile.build(uri, nil)
     end
 
     def filename_relative_to_project(filename)

data/lib/ruby_language_server/scope_data/base.rb

@@ -27,6 +27,15 @@ module RubyLanguageServer
 
       attr_accessor :type # Type of this scope (module, class, block)
 
+      # bar should be closer to Bar than Far.  Adding the UPPER version accomplishes this.
+      scope :with_distance_from, lambda { |word|
+        sanitized_word = sanitize_sql(word)
+        where("LENGTH(name) >= LENGTH('#{sanitized_word}')").select("*, LEVENSHTEIN(SUBSTR(name, 1, #{word.length}), '#{sanitized_word}') + LEVENSHTEIN(SUBSTR(UPPER(name), 1, #{word.length}), UPPER('#{sanitized_word}')) as levenshtein_distance")
+      }
+      scope :closest_to, ->(word) { with_distance_from(word).order(:levenshtein_distance) }
+
+      # RubyLanguageServer::ScopeData::Scope.connection.exec_query("SELECT LEVENSHTEIN( 'This is not correct', 'This is correct' )")
+
       def method?
         type == TYPE_METHOD
       end

data/lib/ruby_language_server/scope_data/scope.rb

@@ -8,7 +8,7 @@ module RubyLanguageServer
     # It is used to track top & bottom line, variables in this scope, constants, and children - which could be functions, classes, blocks, etc.  Anything that adds scope.
     class Scope < Base
       has_many :variables, dependent: :destroy
-      belongs_to :code_file
+      belongs_to :code_file # , optional: false
       belongs_to :parent, class_name: 'Scope', optional: true
       has_many :children, class_name: 'Scope', foreign_key: :parent_id
 

data/lib/ruby_language_server/scope_data/variable.rb

@@ -12,11 +12,6 @@ module RubyLanguageServer
 
       delegate :depth, to: :scope
 
-      # attr_accessor :line            # line
-      # attr_accessor :column          # column
-      # attr_accessor :name            # name
-      # attr_accessor :path            # Module::Class name
-
       def self.build(scope, name, line = 1, column = 1, type = TYPE_VARIABLE)
         path = [scope.full_name, name].join(JoinHash[TYPE_VARIABLE])
         create!(
@@ -26,12 +21,6 @@ module RubyLanguageServer
           path: path,
           variable_type: type
         )
-        # @name = name
-        # @line = line
-        # @column = column
-        # @full_name =
-        # @type = type
-        # raise "bogus variable #{inspect}" unless @name.instance_of? String
       end
 
       def constant?

data/lib/ruby_language_server/scope_parser.rb

@@ -15,9 +15,7 @@ module RubyLanguageServer
     include ScopeParserCommands::RspecCommands
     include ScopeParserCommands::RailsCommands
     include ScopeParserCommands::RubyCommands
-    attr_reader :sexp
-    attr_reader :lines
-    attr_reader :current_scope
+    attr_reader :sexp, :lines, :current_scope
 
     def initialize(sexp, lines = 1)
       @sexp = sexp
@@ -54,9 +52,7 @@ module RubyLanguageServer
       when String
         # We really don't do anything with it!
         RubyLanguageServer.logger.debug("We don't do Strings like #{root} with #{args}")
-      when NilClass
-        process(args)
-      when FalseClass
+      when NilClass, FalseClass
         process(args)
       else
         RubyLanguageServer.logger.warn("We don't respond to the likes of #{root} of class #{root.class}")
@@ -154,7 +150,7 @@ module RubyLanguageServer
     # def self.something(par)...
     # [:var_ref, [:@kw, "self", [28, 14]]], [[:@period, ".", [28, 18]], [:@ident, "something", [28, 19]], [:paren, [:params, [[:@ident, "par", [28, 23]]], nil, nil, nil, nil, nil, nil]], [:bodystmt, [[:assign, [:var_field, [:@ident, "pax", [29, 12]]], [:var_ref, [:@ident, "par", [29, 18]]]]], nil, nil, nil]]
     def on_defs(args, rest)
-      on_def(rest[1], rest[2..-1]) if args[1][1] == 'self' && rest[0][1] == '.'
+      on_def(rest[1], rest[2..]) if args[1][1] == 'self' && rest[0][1] == '.'
     end
 
     # Multiple left hand side
@@ -269,7 +265,11 @@ module RubyLanguageServer
     private
 
     def add_variable(name, line, column, scope = @current_scope)
-      scope.variables.where(name: name).first_or_create(line: line, column: column)
+      newvar = scope.variables.where(name: name).first_or_create!(
+        line: line,
+        column: column,
+        code_file: scope.code_file
+      )
       if scope.top_line.blank?
         scope.top_line = line
         scope.save!
@@ -278,6 +278,7 @@ module RubyLanguageServer
       # # blocks don't declare their first line in the parser
       # scope.top_line ||= line
       # scope.variables << new_variable unless scope.has_variable_or_constant?(new_variable)
+      newvar
     end
 
     def add_ivar(name, line, column)

data/lib/ruby_language_server/scope_parser_commands/ruby_commands.rb

@@ -44,8 +44,7 @@ module RubyLanguageServer
       private
 
       def ruby_command_names(rest)
-        names = rest.flatten.select { |o| o.instance_of? String }
-        names
+        rest.flatten.select { |o| o.instance_of? String }
       end
 
       def ruby_command_column(args)

data/lib/ruby_language_server/server.rb

@@ -18,7 +18,7 @@ module RubyLanguageServer
       root_uri = params['rootUri']
       @project_manager = ProjectManager.new(root_path, root_uri)
       @project_manager.scan_all_project_files(@mutex)
-      gem_string = ENV.fetch('ADDITIONAL_GEMS') {}
+      gem_string = ENV.fetch('ADDITIONAL_GEMS', nil)
       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.3.9'
+  VERSION = '0.3.14'
 end

data/ruby_language_server.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'See https://microsoft.github.io/language-server-protocol/ "A Language Server is meant to provide the language-specific smarts and communicate with development tools over a protocol that enables inter-process communication."'
   spec.homepage      = 'https://github.com/kwerle/ruby_language_server'
   spec.license       = 'MIT'
+  spec.required_ruby_version = '>=2.7.0'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -46,14 +47,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'amatch'      # in c
   spec.add_dependency 'fuzzy_match' # completion matching
 
-  spec.add_dependency 'activerecord', '~>5.2'
+  spec.add_dependency 'activerecord', '~>6.1'
   spec.add_dependency 'sqlite3'
 
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'guard-rubocop'
-  spec.add_development_dependency 'minitest', '~>5.11'
-  spec.add_development_dependency 'minitest-color'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake' # required by guard :-(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_language_server
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.14
 platform: ruby
 authors:
 - Kurt Werle
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2021-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -196,18 +196,18 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-color
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -332,7 +332,7 @@ metadata:
   homepage_uri: https://github.com/kwerle/ruby_language_server
   source_code_uri: https://github.com/kwerle/ruby_language_server
   changelog_uri: https://github.com/kwerle/ruby_language_server/blob/develop/CHANGELOG.txt
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -340,15 +340,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Provide a language server implementation for ruby in ruby.
 test_files: []