ruby_language_server 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87d63dcf81f034409b543e9a35073344a614e28aaa6c33ed9803f9fc130e192e
-  data.tar.gz: ab52a3ade63649d48adbbdcc3f03496762d514f5d6ca48b872f5272272ab80bd
+  metadata.gz: b7f8d3e239241819fab0206c27fa63422d46001a58048b52355e3817243b8239
+  data.tar.gz: 8c43b621ee0d3124fb122f725828426d9a9c88dc2a8217a74725c0868dabb4bc
 SHA512:
-  metadata.gz: c36791fa58a5f236d6be05e9600538065ceec7c53efb6bc2375d41120965863fcf739beada15d90ac27633b2a3859afc39a072d0bc96dc94cf5274646cdb0192
-  data.tar.gz: accecbb489f8f461b0c4c1d42d504f6a5339bc8af533522b02ffa6717e9e22367f05f1b42d2bd7ec23ad17f5bf800fd4f56baba1c59f2afec9db74d2fa4075ac
+  metadata.gz: a90bef1450867b3816a091175a7d2a51e25f05972fdce4460c0f0da472e9ba2ae09af7aa23a48a290e5fa53925619af942752e34af390b436fa79256c0198108
+  data.tar.gz: e6d05f5fce1ee700e55e0e863f1731481848cba12ab6e2f6064270e67ae5711da43ea5da1896608389e052b474fd11394fd5ec458288e9b5ad665119ceef39e6

data/CHANGELOG.txt

@@ -1,5 +1,9 @@
 # Changelog
 
+#### 0.3.9 Fri Jan 24 00:19:14 PST 2020
+
+* #55 Some problem with completion
+
 #### 0.3.8 Wed Jan 22 22:22:35 PST 2020
 
 * #54 fix lookup for "something.is_method?" dropping the ?

data/Gemfile.lock

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

data/README.md

@@ -34,7 +34,7 @@ Clone.  I love git [HubFlow](https://datasift.github.io/gitflow/).
 Check out the [Makefile](Makefile).  You are going to want to do
 `make guard` in one window and `make continuous_development` in another.
 
-* In Atom: install the ide-ruby.  
+* In Atom: install the ide-ruby.
 * Settings > Packages > ide-ruby > Image Name > local_ruby_language_server
 * CMD-ALT-CTRL-l (that's an L) will reload the window
 * CMD-ALT-i will show debugging info

data/lib/ruby_language_server/completion.rb

@@ -24,13 +24,13 @@ module RubyLanguageServer
     }.freeze
 
     class << self
-      def completion(context, context_scope, scopes)
-        RubyLanguageServer.logger.debug("completion(#{context}, #{scopes.map(&:name)})")
+      def completion(context, context_scope, position_scopes)
+        RubyLanguageServer.logger.debug("completion(#{context}, #{position_scopes.map(&:name)})")
         completions =
           if context.length < 2
-            scope_completions(context.first, scopes)
+            scope_completions(context.first, position_scopes)
           else
-            scope_completions_in_target_context(context, context_scope, scopes)
+            scope_completions_in_target_context(context, context_scope, position_scopes)
           end
         RubyLanguageServer.logger.debug("completions: #{completions.as_json}")
         {
@@ -55,31 +55,31 @@ 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_scopes = scopes_with_name(context_word, scopes)
+        context_scopes = RubyLanguageServer::ScopeData::Scope.where(name: context_word)
         context_scopes ||= context_scope
         RubyLanguageServer.logger.debug("context_scopes: #{context_scopes.to_json}")
-        scope_completions(context.last, Array(context_scopes) + scopes.includes(:variables))
+        # scope_completions(context.last, Array(context_scopes) + scopes.includes(:variables))
+        (scope_completions(context.last, Array(context_scopes)).to_a + scope_completions(context.last, scopes.includes(:variables)).to_a).uniq.to_h
+      end
+
+      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
       end
 
       def scope_completions(word, scopes)
-        words = {}
-        scopes.each_with_object(words) do |scope, words_hash|
-          scope.children.method_scopes.each do |method_scope|
-            words_hash[method_scope.name] ||= {
-              depth: scope.depth,
-              type: method_scope.class_type
-            }
-          end
-          scope.variables.each do |variable|
-            words_hash[variable.name] ||= {
-              depth: scope.depth,
-              type: variable.variable_type
-            }
-          end
-        end
-        words = words.sort_by { |_word, hash| hash[:depth] }.to_h
+        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.map { |w| [w, words[w]] }.to_h
+        words = good_words.each_with_object({}) { |w, hash| hash[w] = {depth: words[w].depth, type: words[w].class_type} }.to_h
       end
     end
   end

data/lib/ruby_language_server/project_manager.rb

@@ -96,15 +96,12 @@ module RubyLanguageServer
     end
 
     def completion_at(uri, position)
-      relative_position = position.dup
-      relative_position.character = relative_position.character # To get before the . or ::
-      # RubyLanguageServer.logger.debug("relative_position #{relative_position}")
+      context = context_at_location(uri, position)
+      return {} if context.blank?
+
       RubyLanguageServer.logger.debug("scopes_at(uri, position) #{scopes_at(uri, position).map(&:name)}")
       position_scopes = scopes_at(uri, position) || RubyLanguageServer::ScopeData::Scope.where(id: root_scope_for(uri).id)
       context_scope = position_scopes.first
-      context = context_at_location(uri, relative_position)
-      return {} if context.nil? || context == ''
-
       RubyLanguageServer::Completion.completion(context, context_scope, position_scopes)
     end
 

data/lib/ruby_language_server/scope_data/scope.rb

@@ -72,6 +72,11 @@ module RubyLanguageServer
         class_type == TYPE_BLOCK
       end
 
+      # Not a block or root
+      def named_scope?
+        [TYPE_MODULE, TYPE_CLASS, TYPE_METHOD, TYPE_VARIABLE].include?(class_type)
+      end
+
       private
 
       def scope_parts

data/lib/ruby_language_server/scope_data/variable.rb

@@ -10,6 +10,8 @@ module RubyLanguageServer
 
       scope :constant_variables, -> { where("SUBSTR(name, 1, 1) between ('A') and ('Z')") }
 
+      delegate :depth, to: :scope
+
       # attr_accessor :line            # line
       # attr_accessor :column          # column
       # attr_accessor :name            # name

data/lib/ruby_language_server/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_language_server
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Kurt Werle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler