ruby_language_server 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09def74b7c6889127e52fb6accc2dff24804e22b0f8514beb8d910bb8c43114d'
-  data.tar.gz: 3d1a29a7fe53a601e369826dd2b97383a58bdd8a667b1028cc2be7e882a92886
+  metadata.gz: 87d63dcf81f034409b543e9a35073344a614e28aaa6c33ed9803f9fc130e192e
+  data.tar.gz: ab52a3ade63649d48adbbdcc3f03496762d514f5d6ca48b872f5272272ab80bd
 SHA512:
-  metadata.gz: 5d146ed91de8fc4c6174dec7045ec8b460539ab58cab9b2824646696786a16b95dd3a0bdf914bb5490053d44f5d8a7d5cfe3865ace4ff9eaad726a84dc7fb91c
-  data.tar.gz: 627d091f858a611b16d61bac8930912324cdf5da2379d9618b6807e467b843d55270dcf7a6ebe961bc64ac41d02c89d43e954553e415eb589c2dfbb4f16870c9
+  metadata.gz: c36791fa58a5f236d6be05e9600538065ceec7c53efb6bc2375d41120965863fcf739beada15d90ac27633b2a3859afc39a072d0bc96dc94cf5274646cdb0192
+  data.tar.gz: accecbb489f8f461b0c4c1d42d504f6a5339bc8af533522b02ffa6717e9e22367f05f1b42d2bd7ec23ad17f5bf800fd4f56baba1c59f2afec9db74d2fa4075ac

data/CHANGELOG.txt

@@ -1,5 +1,9 @@
 # Changelog
 
+#### 0.3.8 Wed Jan 22 22:22:35 PST 2020
+
+* #54 fix lookup for "something.is_method?" dropping the ?
+
 #### 0.3.7 Wed Jan 15 22:27:08 PST 2020
 
 * #52 Jump to variable broken on vscode

data/Gemfile.lock

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

data/README.md

@@ -52,7 +52,7 @@ Write tests and guard will run them.  Make changes and reload the window.  Test
 * bump version in [version.rb](lib/ruby_language_server/version.rb) file and [Gemfile.lock](Gemfile.lock)
 * [CHANGELOG.txt](CHANGELOG.txt)
 * merge to master, etc
-* make gem_release
+* `make gem_release`
 
 # Authors
 

data/lib/ruby_language_server/completion.rb

@@ -28,39 +28,37 @@ module RubyLanguageServer
         RubyLanguageServer.logger.debug("completion(#{context}, #{scopes.map(&:name)})")
         completions =
           if context.length < 2
-            scope_completions(context.last, scopes)
+            scope_completions(context.first, scopes)
           else
             scope_completions_in_target_context(context, context_scope, scopes)
           end
+        RubyLanguageServer.logger.debug("completions: #{completions.as_json}")
         {
           isIncomplete: true,
           items: completions.uniq.map do |word, hash|
             {
               label: word,
-              kind: COMPLETION_ITEM_KIND[hash[:type]]
+              kind: COMPLETION_ITEM_KIND[hash[:type]&.to_sym]
             }
           end
         }
       end
 
-      def scope_with_name(name, scopes)
-        return scopes.where(name: name).first if scopes.respond_to?(:where)
+      private
 
-        scopes.detect { |scope| scope.name == name }
+      def scopes_with_name(name, scopes)
+        return scopes.where(name: name) if scopes.respond_to?(:where)
+
+        scopes.select { |scope| scope.name == name }
       end
 
       def scope_completions_in_target_context(context, context_scope, scopes)
         context_word = context[-2]
-        if context_word.match?(/^[A-Z]/)
-          scope = scope_with_name(context_word, scopes)
-        else
-          context_word = context_word.split(/_/).map(&:capitalize).join('')
-          scope = scope_with_name(context_word, scopes)
-          RubyLanguageServer.logger.debug("scope_with_name: #{scope}")
-        end
-        scope ||= context_scope
-        RubyLanguageServer.logger.debug("scope: #{scope.to_json}")
-        scope_completions(context.last, [scope] + scopes.includes(:variables))
+        context_word = context_word.split(/_/).map(&:capitalize).join('') unless context_word.match?(/^[A-Z]/)
+        context_scopes = scopes_with_name(context_word, scopes)
+        context_scopes ||= context_scope
+        RubyLanguageServer.logger.debug("context_scopes: #{context_scopes.to_json}")
+        scope_completions(context.last, Array(context_scopes) + scopes.includes(:variables))
       end
 
       def scope_completions(word, scopes)

data/lib/ruby_language_server/good_cop.rb

@@ -8,6 +8,7 @@ module RubyLanguageServer
       @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)
     rescue Exception => e
       RubyLanguageServer.logger.error(e)
@@ -79,7 +80,7 @@ module RubyLanguageServer
     def diagnostics(text, filename = nil)
       return initialization_offenses unless @initialization_error.nil?
 
-      maximum_severity = (ENV['LINT_LEVEL'] || 4).to_i
+      maximum_severity = 4 # (ENV['LINT_LEVEL'] || 4).to_i
       enabled_offenses = offenses(text, filename).reject { |offense| offense.status == :disabled }
       enabled_offenses.map do |offense|
         {
@@ -99,7 +100,7 @@ module RubyLanguageServer
       if excluded_file?(filename)
         []
       else
-        processed_source = RuboCop::ProcessedSource.new(text, 2.4, filename)
+        processed_source = RuboCop::ProcessedSource.new(text, 2.7, filename)
         offenses = inspect_file(processed_source)
         offenses.compact.flatten
       end

data/lib/ruby_language_server/io.rb

@@ -28,7 +28,7 @@ module RubyLanguageServer
         result: response
       }
       response_body = JSON.unparse(full_response)
-      # RubyLanguageServer.logger.debug "response_body: #{response_body}"
+      RubyLanguageServer.logger.info "return_response body: #{response_body}"
       io.write "Content-Length: #{response_body.length + 0}\r\n"
       io.write "\r\n"
       io.write response_body
@@ -42,7 +42,7 @@ module RubyLanguageServer
         params: params
       }
       body = JSON.unparse(full_response)
-      # RubyLanguageServer.logger.debug "body: #{body}"
+      RubyLanguageServer.logger.info "send_notification body: #{body}"
       io.write "Content-Length: #{body.length + 0}\r\n"
       io.write "\r\n"
       io.write body

data/lib/ruby_language_server/line_context.rb

@@ -17,19 +17,20 @@
 
 module RubyLanguageServer
   module LineContext
+    # 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]
       return nil if line_end.nil?
 
       # Grab the portion of the word that starts at the position toward the end of the line
-      match = line_end.partition(/^(@{0,2}\w+)/)[1]
+      match = line_end.partition(/^(@{0,2}\w+\??)/)[1]
       RubyLanguageServer.logger.debug("match: #{match}")
       # Get the start of the line to the end of the matched word
       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/logger.rb

@@ -7,7 +7,7 @@ module RubyLanguageServer
   # 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
   end

data/lib/ruby_language_server/project_manager.rb

@@ -185,7 +185,7 @@ module RubyLanguageServer
     def scan_all_project_files(mutex)
       project_ruby_files = Dir.glob("#{self.class.root_path}**/*.rb")
       Thread.new do
-        RubyLanguageServer.logger.error('Threading up!')
+        RubyLanguageServer.logger.debug('Threading up!')
         root_uri = @root_uri
         root_uri += '/' unless root_uri.end_with? '/'
         project_ruby_files.each do |container_path|
@@ -219,9 +219,12 @@ 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)
+      RubyLanguageServer.logger.debug("code_file.diagnostics: #{code_file.diagnostics}")
+      code_file.diagnostics
     end
 
     # Returns the context of what is being typed in the given line

data/lib/ruby_language_server/scope_data/scope.rb

@@ -44,16 +44,6 @@ module RubyLanguageServer
         scope_parts.count
       end
 
-      # Return the deepest child scopes of this scope - and on up.
-      # Not done recuresively because we don't really need to.
-      # Normally called on a root scope.
-      # def scopes_at(position)
-      #   line = position.line
-      #   matching_scopes = self_and_descendants.where('top_line <= ?', line).where('bottom_line >= ?', line)
-      #   deepest_scope = matching_scopes.max_by(&:depth)
-      #   deepest_scope&.self_and_ancestors || []
-      # end
-
       # Self and all descendents flattened into array
       def self_and_descendants
         return Scope.all if root_scope?
@@ -65,18 +55,6 @@ module RubyLanguageServer
         Scope.where('path like ?', "#{path}_%")
       end
 
-      # [self, parent, parent.parent...]
-      # def self_and_ancestors
-      #   return [self] if path.blank?
-      #   remaining_path = path.dup
-      #   ancestor_paths = scope_parts.inject([]) do |ary, scope_part|
-      #     ary << remaining_path
-      #     remaining_path =
-      #     ary
-      #   end
-      #   [self, parent&.self_and_ancestors].flatten.compact
-      # end
-
       def set_superclass_name(partial)
         if partial.start_with?('::')
           self.superclass_name = partial.gsub(/^::/, '')

data/lib/ruby_language_server/server.rb

@@ -50,7 +50,7 @@ module RubyLanguageServer
     end
 
     def on_initialized(_hash)
-      RubyLanguageServer.logger.error("RubyLanguageServer::VERSION #{RubyLanguageServer::VERSION}")
+      RubyLanguageServer.logger.info("RubyLanguageServer::VERSION #{RubyLanguageServer::VERSION}")
     end
 
     def on_workspace_didChangeWatchedFiles(params)
@@ -109,7 +109,7 @@ module RubyLanguageServer
       uri = uri_from_params(params)
       position = postition_from_params(params)
       completions = @project_manager.completion_at(uri, position)
-      # RubyLanguageServer.logger.debug("completions: #{completions}")
+      RubyLanguageServer.logger.debug("completions: #{completions}")
       completions
     end
 

data/lib/ruby_language_server/version.rb

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

metadata

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