ruby_language_server 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3c05305f5598c756c440e7a668d1d8a7021f18b079d4ead930e3bac72c0115a
-  data.tar.gz: 9b620bcffca253ef2a464a1be4d39e7864064ac4310acca2a49457a62ab6f33b
+  metadata.gz: d415a25ab3f3a2455b16a935af695c5a79ac358bc56d14a2591086d14f394c07
+  data.tar.gz: f48b3dc86f3e9c9aaa7b84f737e10a44957cba653a701b3a0facbcbea91f16dd
 SHA512:
-  metadata.gz: d3cea5c0f8687fa542916a3e4478f14612d2b1d590be461518d6bcf58ca141360301a0416bd624e7298170c9fc8abda77c16dc119c5f377d550fb0b79c818e11
-  data.tar.gz: 5bc4f5db091bb6257e8eb8b4af3c0e76900b493ec2a4a80ea261380a8a91323e2d25cfc7b6d40cbb1877e96a3b7d673efa6b8795917f6c169e975f6c3f1acf9b
+  metadata.gz: 4981a189d35e2d26fdd8b320077cc3b7dffbc4ad6ad338133de4fdf14a4de6917caa3cf1d3f67c46d11997454fbdcd502455c936f995006a65d37c2130c464fe
+  data.tar.gz: 80f0cb7b6f5b69799d390dee746cd600d5310090c705565192a78658cf071be4f4d6cd14729e77a0d2332fd75148f9088e6903da3bd746647f95374d3abdfd7d

data/CHANGELOG.txt

@@ -1,5 +1,10 @@
 # Changelog
 
+#### 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_language_server (0.3.12)
+    ruby_language_server (0.3.13)
       activerecord (~> 5.2)
       amatch
       bundler

data/lib/config/initializers/active_record.rb

@@ -8,9 +8,14 @@ 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)

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

@@ -12,16 +12,18 @@ module RubyLanguageServer
         return if additional_gem_names.nil? || additional_gem_names.empty?
 
         RubyLanguageServer.logger.info("Trying to install gems #{additional_gem_names}")
-
+        gems_already_installed = []
         gemfile do
           source 'https://rubygems.org'
           # 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(specification.name, specification.version.to_s)
+            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
+            gem gem_name unless gems_already_installed.include?(gem_name)
           end
         end
       end

data/lib/ruby_language_server/good_cop.rb

@@ -7,10 +7,10 @@ module RubyLanguageServer
     def initialize(config_path, initialization_error = nil)
       @initialization_error = initialization_error
       unless @initialization_error
-        config_store = RuboCop::ConfigStore.new
-        config_store.options_config = config_path
+        @config_store = RuboCop::ConfigStore.new
+        @config_store.options_config = config_path
         RubyLanguageServer.logger.debug("Rubocop config_path: #{config_path}")
-        super({}, config_store)
+        super({}, @config_store)
       end
     rescue Exception => e
       RubyLanguageServer.logger.error(e)

data/lib/ruby_language_server/logger.rb

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

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_language_server
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Kurt Werle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler