ruby_language_server 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe7ed319d3b5378154def8fd97fb00114b8e593e60a130e8aa4b6effbd387733
-  data.tar.gz: 25db085571e9a0fa2b2b840d9a6ade674bd3dd9f0aa962569c598ef0e2ffef62
+  metadata.gz: 6ab3ea4a4f1a9af05f36ddc55a19dc735a9b3d5b9bb4e63bcf7a5a5f3e281019
+  data.tar.gz: 2de48c7e9b78606a33507ad3439088a42671c3c2eed366708714b14137a968a8
 SHA512:
-  metadata.gz: b021229bda8a598905d36c7c73bfec7a90dc77a75585646d8275ba8082719e67aae9e2229ac7f0b93cfaeb4a66fcfaf6ca46a2269865b14b4ca856de96ff1293
-  data.tar.gz: 30103be3c703c9e7e45c663b6d00077cecb07066a88f796300ee3e88310ef05fb0ab1998ed1d45bce4f6c4dcd7b65cb4e1952d251d8855f18a7a71fd7b1bbb31
+  metadata.gz: 06e256c7dc709ef6343d22a8317b10aaa66175f781e7f08fb44703fbaeaa6c115850f53a557da260856c1c1f688c5403ee971349038a4da1e3b447890c8ea913
+  data.tar.gz: ae4832012bce5be577ad6224b1093a9fd20fb9403b4042444f460b9847004f01711d74e4235951edc9addfcca5ba1ee8c5e2fed7f229b1a3629b3c8a3274e942

data/CHANGELOG.txt

@@ -1,5 +1,9 @@
 # Changelog
 
+#### 0.3.6 Mon Jan 13 22:48:31 PST 2020
+
+* #51 Tweaks to support vs code
+
 #### 0.3.5 Fri Jan 10 08:37:02 PST 2020
 
 * #50 Don't use bundle exec in Dockerfile.

data/Gemfile.lock

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

data/lib/ruby_language_server/completion.rb

@@ -59,7 +59,7 @@ module RubyLanguageServer
           RubyLanguageServer.logger.debug("scope_with_name: #{scope}")
         end
         scope ||= context_scope
-        RubyLanguageServer.logger.debug("scope: #{scope}")
+        RubyLanguageServer.logger.debug("scope: #{scope.to_json}")
         scope_completions(context.last, [scope] + scopes.includes(:variables))
       end
 

data/lib/ruby_language_server/io.rb

@@ -64,10 +64,10 @@ module RubyLanguageServer
         end
         RubyLanguageServer.logger.debug 'UNLocking io'
         exit(true) if response == 'EXIT'
-        return id, response
+        [id, response]
       else
         RubyLanguageServer.logger.warn "SERVER DOES NOT RESPOND TO #{method_name}"
-        return nil
+        nil
       end
     end
 

data/lib/ruby_language_server/location.rb

@@ -3,27 +3,29 @@
 module RubyLanguageServer
   # Hash factories for the language server
   module Location
-    def self.hash(uri, start_line, start_character = 0, end_line = nil, end_character = nil)
-      {
-        uri: uri,
-        range: position_hash(start_line, start_character, end_line, end_character)
-      }
-    end
+    class << self
+      def hash(uri, start_line, start_character = 0, end_line = nil, end_character = nil)
+        {
+          uri: uri,
+          range: position_hash(start_line, start_character, end_line, end_character)
+        }
+      end
 
-    def self.position_hash(start_line, start_character = 0, end_line = nil, end_character = nil)
-      end_line ||= start_line
-      end_character ||= start_character
-      {
-        start:
+      def position_hash(start_line, start_character = 0, end_line = nil, end_character = nil)
+        end_line ||= start_line
+        end_character ||= start_character
         {
-          line: start_line - 1,
-          character: start_character
-        },
-        'end': {
-          line: end_line - 1,
-          character: end_character
+          start:
+          {
+            line: start_line - 1,
+            character: start_character
+          },
+          'end': {
+            line: end_line - 1,
+            character: end_character
+          }
         }
-      }
-    end
+      end
+      end
   end
 end

data/lib/ruby_language_server/project_manager.rb

@@ -186,13 +186,15 @@ module RubyLanguageServer
       project_ruby_files = Dir.glob("#{self.class.root_path}**/*.rb")
       Thread.new do
         RubyLanguageServer.logger.error('Threading up!')
+        root_uri = @root_uri
+        root_uri += '/' unless root_uri.end_with? '/'
         project_ruby_files.each do |container_path|
           # Let's not preload spec/test or vendor - yet..
           next if container_path.match?(/^(.?spec|test|vendor)/)
 
           text = File.read(container_path)
           relative_path = container_path.delete_prefix(self.class.root_path)
-          host_uri = @root_uri + relative_path
+          host_uri = root_uri + relative_path
           RubyLanguageServer.logger.debug "Locking scan for #{container_path}"
           mutex.synchronize do
             RubyLanguageServer.logger.debug("Threading #{host_uri}")
@@ -244,6 +246,8 @@ module RubyLanguageServer
       project_definitions_for(name)
     end
 
+    # Return variables found in the current scope.  After all, those are the important ones.
+    # Should probably be private...
     def scope_definitions_for(name, scope, uri)
       check_scope = scope
       return_array = []
@@ -253,7 +257,7 @@ module RubyLanguageServer
         end
         check_scope = check_scope.parent
       end
-      RubyLanguageServer.logger.debug("scope_definitions_for(#{name}, #{scope}, #{uri}: #{return_array.uniq})")
+      RubyLanguageServer.logger.debug("==============>> scope_definitions_for(#{name}, #{scope.to_json}, #{uri}: #{return_array.uniq})")
       return_array.uniq
     end
 
@@ -261,7 +265,7 @@ module RubyLanguageServer
       scopes = RubyLanguageServer::ScopeData::Scope.where(name: name)
       variables = RubyLanguageServer::ScopeData::Variable.constant_variables.where(name: name)
       (scopes + variables).reject { |scope| scope.code_file.nil? }.map do |scope|
-        Location.hash(scope.code_file.uri.delete_prefix(self.class.root_uri), scope.top_line, 1)
+        Location.hash(scope.code_file.uri, scope.top_line, 1)
       end
     end
 

data/lib/ruby_language_server/scope_data/scope.rb

@@ -14,7 +14,7 @@ module RubyLanguageServer
 
       scope :method_scopes, -> { where(class_type: TYPE_METHOD) }
       scope :for_line, ->(line) { where('top_line <= ? AND bottom_line >= ?', line, line).or(where(parent_id: nil)) }
-      scope :by_path_length, -> { order('length(path) DESC') }
+      scope :by_path_length, -> { order(Arel.sql('length(path) DESC')) }
       # attr_accessor :top_line        # first line
       # attr_accessor :bottom_line     # last line
       # attr_accessor :parent          # parent scope

data/lib/ruby_language_server/version.rb

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

metadata

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