ruby_language_server 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 403609bb04e3734281518bc6a175b6e839e6b731d684dd5716f31e91bb7e1d98
-  data.tar.gz: b7c597616a85977982dc2ddbcb8b8c7d896a1829904fa19dfbb52951da6895b6
+  metadata.gz: ccce6fdef542a593c6ccc3add4e33f24bce0f612ed5969ee24dddc8e5a806a41
+  data.tar.gz: 630857182e42bca93affb6c591de7c1826812242608c541fd3b42a99458fab0c
 SHA512:
-  metadata.gz: cfbd3c60687d08b1f9e19bc632e9d8f4ceb0f5e579e8d6b9edd7e7cf81403dac9b0c7a795fac403b550950b7c1ef615095ad94bbbefe80662390edbdd16f13b7
-  data.tar.gz: 784a22cdadad7ebdf6f25ce35a78e2cff90aa148dbf62c88e650ba42e7ce522df59e9758e9de166f99308e5226b9100505c73a7f9ee7c470575435072926afae
+  metadata.gz: 9c81f9f115dc34b0506b2094039943c9bea9e8238817eac3ed4e79dd44ee9a0eeda5c010c1fa52accf516b3243feff86e943f51c80cb3d159362540328971187
+  data.tar.gz: fe0d1a52613afb2a890d3621ec500e8b56d0dedc7b793d2f0f1aba3a5d73a6d2c01b075471d65e337d23b6b9c4d7361f50a090a2e0d9c204c6698deced569224

data/CHANGELOG.txt

@@ -1,5 +1,15 @@
 # Changelog
 
+#### 0.2.1 Wed Jan 30 11:46:09 PST 2019
+
+* Convert to Gem
+* Bunch of refactoring
+* More test (fixed stuff)
+* Better block (and other) line start/end setting
+* Better block variable handling
+* Fixed subclass assignment (not that it matters, yet)
+* Added support for object&.method
+
 #### 0.2.0 Mon Dec 24 18:19:55 PST 2018
 
 * Support for rake files

data/FAQ_ROADMAP.md

@@ -1,25 +1,7 @@
-# Why docker?
-
-Docker guarantees me a target environment.  I don't have to wonder which version of ruby you have installed or if you can build all the gems.  I may also scale this thing to multiple processes and a database and a cache server.
-
-One requirement: docker.
-
-# Why not [language_server-ruby](https://github.com/mtsmfm/language_server-ruby)
-
-My goals are not as high.  I just want this stuff working now.  I hope some day there will be merging.
-
-# A little light on tests?
-
-Oh yeah.  Tests are mostly for when you know where you're going.  I'm doing a whole lot of this by the seat of my pants.  OMG, please write tests.
-
 # Next?
 
 * Getting a definition just looks at the tags - but tags do not include parameters passed in a method - which seems like it should.  We are functional, right?
-* Guess a symbol's class.
-  * `def some_method(parent)` should guess that parent is a Parent.
 * Be smarter about context and completions
-* `class << self` is busted.  Fix it.
-* Fix the outline.  Seriously - why isn't it working as expected?
 * Symbol pairs.  If I have typed 'foo.bar' a thousand times in my project, the next time I type 'foo.' the IDE had damn well ought to show me 'bar' as a completion option.
 * It makes me very sad that I could not get this working using sockets.  Tried and tried and failed.
 
@@ -27,4 +9,5 @@ Oh yeah.  Tests are mostly for when you know where you're going.  I'm doing a wh
 
 * Pay special attention to the project's Gemfile.  Install all the gems (we can).  Integrate with gem server?
   * Full scan of installed gems?
+  * Maybe use a database (sqlite?) to store data and do lookups?
 * Integrate class based scope logic.  If I'm in Foo < Bar then I should see Bar's methods at just slightly lower priority than Foo's.

data/Makefile

@@ -19,6 +19,9 @@ continuous_development: build
 console: build
 	docker run -it $(LOCAL_LINK) $(PROJECT_NAME) bin/console
 
+test: build
+	docker run -it $(LOCAL_LINK) $(PROJECT_NAME) rake test && rubocop -c .rubocop_ruby_language_parser.yml
+
 shell: build
 	docker run -it $(LOCAL_LINK) $(PROJECT_NAME) sh
 

data/README.md

@@ -19,9 +19,9 @@ Help wanted.
 
 # Editor Integrations
 
-* You probably want to use one of the developed integrations:
-  * Atom - https://github.com/kwerle/ide-ruby
-  * Theia - https://github.com/kwerle/theia_ruby_language_server
+You probably want to use one of the developed integrations:
+* Atom - https://github.com/kwerle/ide-ruby
+* Theia - https://github.com/kwerle/theia_ruby_language_server
 
 # Running
 
@@ -32,7 +32,7 @@ Help wanted.
 Clone.  I love git [HubFlow](https://datasift.github.io/gitflow/).
 
 Check out the [Makefile](Makefile).  You are going to want to do
-`make guard` and `make continuous_development`.
+`make guard` in one window and `make continuous_development` in another.
 
 * In Atom: install the ide-ruby.  
 * Settings > Packages > ide-ruby > Image Name > local_ruby_language_server

data/lib/ruby_language_server/code_file.rb

@@ -125,5 +125,14 @@ module RubyLanguageServer
       end
       @root_scope
     end
+
+    # Returns the context of what is being typed in the given line
+    def context_at_location(position)
+      lines = text.split("\n")
+      line = lines[position.line]
+      return [] if line.nil? || line.strip.length.zero?
+
+      LineContext.for(line, position.character)
+    end
   end
 end

data/lib/ruby_language_server/completion.rb

@@ -65,10 +65,10 @@ module RubyLanguageServer
       def scope_completions(word, scopes)
         words = {}
         scopes.each_with_object(words) do |scope, words_hash|
-          scope.children.each do |function|
-            words_hash[function.name] ||= {
+          scope.children.select(&:'method?').each do |method_scope|
+            words_hash[method_scope.name] ||= {
               depth: scope.depth,
-              type: function.type
+              type: method_scope.type
             }
           end
           scope.variables.each do |variable|
@@ -78,7 +78,7 @@ module RubyLanguageServer
             }
           end
         end
-        # words = words.sort_by{|word, hash| hash[:depth] }.to_h
+        words = words.sort_by { |_word, hash| hash[:depth] }.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
       end

data/lib/ruby_language_server/good_cop.rb

@@ -6,9 +6,9 @@ module RubyLanguageServer
   class GoodCop < RuboCop::Runner
     CONFIG_PATH = '/project/.rubocop.yml'
     FALLBACK_PATH = '/app/.rubocop.yml'
-    @initialization_error = nil
 
     def initialize
+      @initialization_error = nil
       config_store = RuboCop::ConfigStore.new
       config_store.options_config =
         if File.exist?(CONFIG_PATH)

data/lib/ruby_language_server/line_context.rb

@@ -29,8 +29,9 @@ module RubyLanguageServer
       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]
-      matches = end_match.split('.', -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
       RubyLanguageServer.logger.debug("matches: #{matches}")
       matches

data/lib/ruby_language_server/logger.rb

@@ -3,7 +3,7 @@
 require 'logger'
 
 module RubyLanguageServer
-  level_name = ENV.fetch('LOG_LEVEL') { 'info' }.upcase
+  level_name = ENV.fetch('LOG_LEVEL') { 'error' }.upcase
   # level_name = 'DEBUG'
   level = Logger::Severity.const_get(level_name)
   @logger = ::Logger.new(STDERR, level: level)

data/lib/ruby_language_server/project_manager.rb

@@ -175,14 +175,10 @@ module RubyLanguageServer
       end
     end
 
+    # Returns the context of what is being typed in the given line
     def context_at_location(uri, position)
-      lines = text_for_uri(uri).split("\n")
-      line = lines[position.line]
-      return [] if line.nil? || line.strip.length.zero?
-
-      contexts = LineContext.for(line, position.character)
-      RubyLanguageServer.logger.debug("LineContext.for(line, position.character): #{contexts}")
-      contexts
+      code_file = code_file_for_uri(uri)
+      code_file&.context_at_location(position)
     end
 
     def word_at_location(uri, position)

data/lib/ruby_language_server/scope_data/base.rb

@@ -18,6 +18,12 @@ module RubyLanguageServer
         TYPE_ROOT => '',
         TYPE_VARIABLE => '^'
       }.freeze
+
+      attr_accessor :type # Type of this scope (module, class, block)
+
+      def method?
+        type == TYPE_METHOD
+      end
     end
   end
 end

data/lib/ruby_language_server/scope_data/scope.rb

@@ -3,8 +3,7 @@
 module RubyLanguageServer
   module ScopeData
     # The Scope class is basically a container with context.
-    # It is used to track top & bottom line, variables in this scope, contanst, and children - which could be functions, classes, blocks, etc.  Anything that adds scope.
-    # Remember, this is scope for a file.  It seems reasonabble that this will get used less in the future when we know more about classes.
+    # It is used to track top & bottom line, variables in this scope, constants, and children - which could be functions, classes, blocks, etc.  Anything that adds scope.
     class Scope < Base
       include Enumerable
 
@@ -15,7 +14,6 @@ module RubyLanguageServer
       attr_accessor :variables       # variables declared in this scope
       attr_accessor :constants       # constants declared in this scope
       attr_accessor :children        # child scopes
-      attr_accessor :type            # Type of this scope (module, class, block)
       attr_accessor :name            # method
       attr_accessor :superclass_name # superclass name
 
@@ -26,14 +24,18 @@ module RubyLanguageServer
         @name = name
         @top_line = top_line
         @depth = parent.nil? ? 0 : parent.depth + 1
-        @full_name = [parent ? parent.full_name : nil, @name].compact.join(JoinHash[type]) unless type == TYPE_ROOT
+        if type == TYPE_ROOT
+          @full_name = nil
+        else
+          @full_name = [parent ? parent.full_name : nil, @name].compact.join(JoinHash[type])
+        end
         @children = []
         @variables = []
         @constants = []
       end
 
       def inspect
-        "Scope: #{@name} (#{@full_name}) #{@top_line}-#{@bottom_line} children: #{@children} vars: #{@variables}"
+        "Scope: #{@name} (#{@full_name} - #{@type}) #{@top_line}-#{@bottom_line} children: #{@children} vars: #{@variables}"
       end
 
       def pretty_print(pp) # rubocop:disable Naming/UncommunicativeMethodParamName
@@ -87,9 +89,7 @@ module RubyLanguageServer
 
       # [self, parent, parent.parent...]
       def self_and_ancestors
-        return [self, parent.self_and_ancestors].flatten unless parent.nil?
-
-        [self]
+        [self, parent&.self_and_ancestors].flatten.compact
       end
 
       def set_superclass_name(partial)

data/lib/ruby_language_server/scope_data/variable.rb

@@ -7,7 +7,6 @@ module RubyLanguageServer
       attr_accessor :column          # column
       attr_accessor :name            # name
       attr_accessor :full_name       # Module::Class name
-      attr_accessor :type            # type
 
       def initialize(scope, name, line = 1, column = 1, type = TYPE_VARIABLE)
         @name = name

data/lib/ruby_language_server/scope_parser.rb

@@ -22,6 +22,7 @@ module RubyLanguageServer
     def initialize(sexp, lines = 1)
       @sexp = sexp
       @lines = lines
+      @root_scope = nil
     end
 
     def root_scope
@@ -55,6 +56,8 @@ module RubyLanguageServer
         RubyLanguageServer.logger.debug("We don't do Strings like #{root} with #{args}")
       when NilClass
         process(args)
+      when FalseClass
+        process(args)
       else
         RubyLanguageServer.logger.warn("We don't respond to the likes of #{root} of class #{root.class}")
       end
@@ -91,11 +94,20 @@ module RubyLanguageServer
     end
 
     def on_module(args, rest)
-      add_scope(args.last, rest, ScopeData::Scope::TYPE_MODULE)
+      scope = add_scope(args.last, rest, ScopeData::Scope::TYPE_MODULE)
+      assign_subclass(scope, rest)
     end
 
     def on_class(args, rest)
-      add_scope(args.last, rest, ScopeData::Scope::TYPE_CLASS)
+      scope = add_scope(args.last, rest, ScopeData::Scope::TYPE_CLASS)
+      assign_subclass(scope, rest)
+    end
+
+    def assign_subclass(scope, sexp)
+      return unless !sexp[0].nil? && sexp[0][0] == :var_ref
+
+      (_, (_, name)) = sexp[0]
+      scope.set_superclass_name(name)
     end
 
     def on_method_add_block(args, rest)
@@ -117,11 +129,20 @@ module RubyLanguageServer
       pop_scope
     end
 
-    # Used only to describe subclasses?
-    def on_var_ref(args, _)
+    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
+
+    # Used only to describe subclasses? -- nope
+    def on_var_ref(_args, _rest)
       # [:@const, "Bar", [13, 20]]
-      (_, name) = args
-      @current_scope.set_superclass_name(name)
+      # (_, name) = args
+      # @current_scope.set_superclass_name(name)
     end
 
     def on_assign(args, rest)
@@ -261,9 +282,10 @@ module RubyLanguageServer
 
     def add_scope(args, rest, type)
       (_, name, (line, column)) = args
-      push_scope(type, name, line, column)
+      scope = push_scope(type, name, line, column)
       process(rest)
       pop_scope
+      scope
     end
 
     def type_is_class_or_module(type)
@@ -292,14 +314,8 @@ module RubyLanguageServer
     # This is a very poor man's "end" handler because there is no end handler.
     # The notion is that when you start the next scope, all the previous peers and unclosed descendents of the previous peer should be closed.
     def close_sibling_scopes(line)
-      parent_scope = @current_scope.parent
-      unless parent_scope.nil?
-        last_sibling = parent_scope.children.last
-        until last_sibling.nil?
-          last_sibling.bottom_line = line - 1
-          last_sibling = last_sibling.children.last
-        end
-      end
+      parent_scope = @current_scope
+      parent_scope&.descendants&.each { |scope| scope.bottom_line = [scope.bottom_line, line - 1].compact.min }
     end
 
     def pop_scope
@@ -327,7 +343,7 @@ module RubyLanguageServer
       rescue TypeError => exception
         RubyLanguageServer.logger.error("Exception in sexp: #{exception} for text: #{text}")
       end
-      processor = SEXPProcessor.new(sexp, text.length)
+      processor = SEXPProcessor.new(sexp, text.split("\n").length)
       @root_scope = processor.root_scope
     end
   end

data/lib/ruby_language_server/server.rb

@@ -42,6 +42,10 @@ module RubyLanguageServer
       }
     end
 
+    def on_initialized(_hash)
+      RubyLanguageServer.logger.error("RubyLanguageServer::VERSION #{RubyLanguageServer::VERSION}")
+    end
+
     def on_workspace_didChangeWatchedFiles(params)
       RubyLanguageServer.logger.debug('on_workspace_didChangeWatchedFiles')
       RubyLanguageServer.logger.debug(params)

data/lib/ruby_language_server/version.rb

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

data/ruby_language_server.gemspec

@@ -35,8 +35,8 @@ Gem::Specification.new do |spec|
 
   # Normally the system will have these - but not if it's a stripped down docker image
   spec.add_dependency 'bundler'
-  spec.add_dependency 'json'
   spec.add_dependency 'etc'
+  spec.add_dependency 'json'
 
   # No - do not put these in dev - they are needed for the app
   spec.add_dependency 'rubocop'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_language_server
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kurt Werle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-29 00:00:00.000000000 Z
+date: 2019-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: etc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: etc
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="