ruby_language_server 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b2dfa5417b83c47771e2d76120a05b8ed6362154172c26fb62aeb8d191a8a4b
-  data.tar.gz: 4b2e5af2ae686e6c32bd879f943f09dfaf60b28b7bb41de6da08b6005074473f
+  metadata.gz: 60974ac65c0aacc79f9908f9f5afc5dff607ec21122904782f5479a5b266b63a
+  data.tar.gz: cc93e7a695b0dd2d0fae15f9d40d54c7307b388e367773598a1ceb78892bd137
 SHA512:
-  metadata.gz: 91a449cc1d66ed119916fb8128bc7138121df3be540fb41ffeadb95e81d74d9bd27fc784bff45e091bbeb76763fc0cd3a8ce3071070a88eaccc9074041081490
-  data.tar.gz: 6a649291988104f65aaf6f24c61cbf4f24ad98e1223c00a4e0198e62360f06135d1569a4ecbcb52e481992866758b30c890f306f0ed3f86432881080b65dbd70
+  metadata.gz: 35be0584ef0e925aa4cbca2edcd82e015cf19012b969fad1cb1ecd628789ba3e6ca1e0c92991acd934574dc2d33e054141b49bcb73935d0068ed4216d2a58a57
+  data.tar.gz: e86ebb35b637cf6f49894e42720b7e4d46a2f4ec6f126faabe8ae045d9a46838cc3444f5b13c202910f0bfe45b4b836f3d088ec24c915098383797441a07ca04

data/CHANGELOG.txt

@@ -1,5 +1,10 @@
 # Changelog
 
+#### 0.2.3 Wed Jan 30 11:46:09 PST 2019
+
+* Fixed a few bugs having to do with block variables
+* More tests
+
 #### 0.2.1 Wed Jan 30 11:46:09 PST 2019
 
 * Convert to Gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_language_server (0.2.2)
+    ruby_language_server (0.2.4)
       amatch
       bundler
       etc

data/Guardfile

@@ -29,7 +29,7 @@ guard :minitest, all_after_pass: true do
   watch(%r{^spec/spec_helper\.rb$})  { 'spec' }
 end
 
-guard :rubocop, cli: ['-c', '.rubocop_ruby_language_parser.yml'] do
+guard :rubocop, cli: [] do
   watch('.rubocop_ruby_language_parser.yml')
   watch(/.+\.rb$/)
   watch(%r{(?:.+/)?\.rubocop(?:_todo)?\.yml$}) { |m| File.dirname(m[0]) }

data/lib/resources/fallback_rubocop.yml

@@ -0,0 +1 @@
+# This is a blank rubocop file just to have a handle to make rubocop happy

data/lib/ruby_language_server/good_cop.rb

@@ -10,12 +10,8 @@ module RubyLanguageServer
     def initialize
       @initialization_error = nil
       config_store = RuboCop::ConfigStore.new
-      config_store.options_config =
-        if File.exist?(CONFIG_PATH)
-          CONFIG_PATH
-        else
-          FALLBACK_PATH
-        end
+
+      config_store.options_config = config_path
       super({}, config_store)
     rescue Exception => exception
       RubyLanguageServer.logger.error(exception)
@@ -79,7 +75,7 @@ module RubyLanguageServer
       when 'refactor', 'convention'
         3
       else
-        RubyLanguageServer.logger.warn("Could not map severity for #{severity} - returning 2")
+        RubyLanguageServer.logger.error("Could not map severity for #{severity} - returning 2")
         2
       end
     end
@@ -121,5 +117,14 @@ 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'
+      possible_config_paths = [RubyLanguageServer::ProjectManager.root_path, fallback_pathname.to_s]
+      possible_config_paths.detect { |path| File.exist?(path) }
+    end
   end
 end

data/lib/ruby_language_server/project_manager.rb

@@ -8,9 +8,26 @@ module RubyLanguageServer
   class ProjectManager
     attr_reader :uri_code_file_hash
 
-    def initialize(uri)
-      @root_path = uri
-      @root_uri = "file://#{@root_path}"
+    # GoodCop wants to know where to find its config.  So here we are.
+    ROOT_PATH_MUTEX = Mutex.new
+    @_root_path = nil
+
+    class << self
+      def root_path=(path)
+        ROOT_PATH_MUTEX.synchronize do
+          @_root_path = path
+        end
+      end
+
+      def root_path
+        @_root_path
+      end
+    end
+
+    def initialize(path)
+      # Should probably lock for read, but I'm feeling crazy!
+      self.class.root_path = path if self.class.root_path.nil?
+      @root_uri = "file://#{path}"
       # This is {uri: code_file} where content stuff is like
       @uri_code_file_hash = {}
       @update_mutext = Mutex.new

data/lib/ruby_language_server/scope_data/variable.rb

@@ -14,12 +14,7 @@ module RubyLanguageServer
         @column = column
         @full_name = [scope.full_name, @name].join(JoinHash[TYPE_VARIABLE])
         @type = type
-        # rubocop:disable Style/GuardClause
-        unless @name.instance_of? String
-          RubyLanguageServer.logger.error("@name is not a string! #{self}, #{scope.inspect}")
-          @name = @name.to_s
-        end
-        # rubocop:enable Style/GuardClause
+        raise "bogus variable #{inspect}" unless @name.instance_of? String
       end
 
       def constant?

data/lib/ruby_language_server/scope_parser.rb

@@ -130,10 +130,6 @@ module RubyLanguageServer
     end
 
     def on_block_var(args, rest)
-      (_, ((_, name, (line, column)))) = args
-      add_variable(name, line, column)
-      # blocks don't declare their first line in the parser
-      current_scope.top_line ||= line
       process(args)
       process(rest)
     end
@@ -157,7 +153,14 @@ 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]) if args[1][1] == 'self' && rest[0][1] == '.'
+      on_def(rest[1], rest[2..-1]) if args[1][1] == 'self' && rest[0][1] == '.'
+    end
+
+    # Multiple left hand side
+    # (foo, bar) = somethingg...
+    def on_mlhs(args, rest)
+      process(args)
+      process(rest)
     end
 
     # ident is something that gets processed at parameters to a function or block
@@ -266,6 +269,8 @@ module RubyLanguageServer
 
     def add_variable(name, line, column, scope = @current_scope)
       new_variable = ScopeData::Variable.new(scope, name, line, column)
+      # 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)
     end
 

data/lib/ruby_language_server/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_language_server
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Kurt Werle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -242,6 +242,7 @@ files:
 - bin/console
 - bin/setup
 - exe/ruby_language_server
+- lib/resources/fallback_rubocop.yml
 - lib/ruby_language_server.rb
 - lib/ruby_language_server/code_file.rb
 - lib/ruby_language_server/completion.rb