solargraph 0.17.3 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e42b128f6b533cce21220f0f3bc674fc2a20157
-  data.tar.gz: 3a9d391b9f2982529a0de8cb038dd593924093c4
+  metadata.gz: 633e0f95c131f673e3c6372233ab7cfa49fe972a
+  data.tar.gz: d934af34ec402bac6d4604dff276e4070e56b3d9
 SHA512:
-  metadata.gz: 987ecb11f32e4b621d734c388d2365b03a2af86b37e2ee6fea5b81fafc2edc63ac37908070fd91ce24aa47772c8772f8be2526ba1ec246edba64a9606fc529d2
-  data.tar.gz: a3f0bc9c84895bf888f6729d7eba91fe078ba946fbdff9f4cc6736546b6a7561dffc084d6339eb258a16f2d1aab0a6eb553f68ea7591fc7b5c1ba71300b731b7
+  metadata.gz: e70e12fa5c2a7daef95b96c7c31dd0b52d2dd7bf4c2ccf7cbafb0f0d86b6fecfc4165c11225f1fa7a6173e5bb09c99a509d669a1726c9f1d4b8db9e13f45fc19
+  data.tar.gz: 3c923301b70d4091fd4c508921ef1a577968183fe117d5a0fb730cddc3c7ee2705779cdc5bbba388abf85b82016d56521079624c39c32a7c8c77fbf72e0fe2b3

data/lib/solargraph/api_map.rb

@@ -32,7 +32,7 @@ module Solargraph
         workspace_files.each do |wf|
           begin
             @@source_cache[wf] ||= Source.load(wf)
-          rescue Parser::SyntaxError => e
+          rescue Parser::SyntaxError, EncodingError => e
             STDERR.puts "Failed to load #{wf}: #{e.message}"
             @@source_cache[wf] = Source.virtual('', wf)
           end
@@ -202,31 +202,27 @@ module Solargraph
     # will include constant variables, classes, and modules.
     #
     # @param namespace [String] The namespace to match
-    # @param root [String] The context to search
+    # @param context [String] The context to search
     # @return [Array<Solargraph::Suggestion>]
-    def get_constants namespace, root = ''
-      result = []
+    def get_constants namespace, context = ''
       skip = []
-      fqns = find_fully_qualified_namespace(namespace, root)
-      return [] if fqns.nil?
-      if fqns.empty?
-        result.concat inner_get_constants('', skip, false, [:public])
+      result = []
+      if context.empty?
+        visi = [:public]
+        visi.push :private if namespace.empty?
+        result.concat inner_get_constants(namespace, visi, skip)
       else
-        parts = fqns.split('::')
-        while parts.length > 0
-          resolved = find_namespace_pins(parts.join('::'))
-          resolved.each do |pin|
-            visi = [:public]
-            visi.push :private if namespace == '' and root != '' and pin.path == fqns
-            result.concat inner_get_constants(pin.path, skip, true, visi)
-          end
+        parts = context.split('::')
+        until parts.empty?
+          subcontext = parts.join('::')
+          fqns = find_fully_qualified_namespace(namespace, subcontext)
+          visi = [:public]
+          visi.push :private if namespace.empty? and subcontext == context
+          result.concat inner_get_constants(fqns, visi, skip)
           parts.pop
-          break unless namespace.empty?
         end
-        result.concat inner_get_constants('', [], false) if namespace.empty?
       end
-      result.concat yard_map.get_constants(fqns)
-      result
+      result.map{|pin| Suggestion.pull(pin)}
     end
 
     # Get a fully qualified namespace name. This method will start the search
@@ -347,7 +343,8 @@ module Solargraph
       return nil if pins.nil?
       pin = pins.select{|p| p.name == var and p.scope == scope}.first
       return nil if pin.nil?
-      type = pin.return_type
+      type = nil
+      type = find_fully_qualified_namespace(pin.return_type, pin.namespace) unless pin.return_type.nil?
       if type.nil?
         zparts = resolve_node_signature(pin.assignment_node).split('.')
         ztype = infer_signature_type(zparts[0..-2].join('.'), namespace, scope: :instance, call_node: pin.assignment_node)
@@ -363,8 +360,8 @@ module Solargraph
       pins = @cvar_pins[fqns]
       return nil if pins.nil?
       pin = pins.select{|p| p.name == var}.first
-      return nil if pin.nil?
-      pin.return_type
+      return nil if pin.nil? or pin.return_type.nil?
+      find_fully_qualified_namespace(pin.return_type, pin.namespace)
     end
 
     # @return [Array<Solargraph::Suggestion>]
@@ -796,12 +793,12 @@ module Solargraph
         @symbol_pins.push Suggestion.new(pin.name, kind: Suggestion::CONSTANT, return_type: 'Symbol')
       end
       source.namespace_includes.each_pair do |ns, i|
-        @namespace_includes[ns] ||= []
-        @namespace_includes[ns].concat(i).uniq!
+        @namespace_includes[ns || ''] ||= []
+        @namespace_includes[ns || ''].concat(i).uniq!
       end
       source.namespace_extends.each_pair do |ns, e|
-        @namespace_extends[ns] ||= []
-        @namespace_extends[ns].concat(e).uniq!
+        @namespace_extends[ns || ''] ||= []
+        @namespace_extends[ns || ''].concat(e).uniq!
       end
       source.superclasses.each_pair do |cls, sup|
         @superclasses[cls] = sup
@@ -849,6 +846,7 @@ module Solargraph
           meths.concat get_instance_methods(e, fqns, visibility: visibility)
         end
       end
+      meths.concat get_instance_methods('', '', visibility: [:public])
       meths.uniq
     end
 
@@ -960,32 +958,21 @@ module Solargraph
       type
     end
 
-    def inner_get_constants here, skip = [], deep = true, visibility = [:public]
-      return [] if skip.include?(here)
-      skip.push here
+    def inner_get_constants fqns, visibility, skip
+      return [] if skip.include?(fqns)
+      skip.push fqns
       result = []
-      cp = @const_pins[here]
-      unless cp.nil?
-        cp.each do |pin|
-          result.push pin_to_suggestion(pin) if pin.visibility == :public or visibility.include?(:private)
-        end
-      end
-      np = @namespace_pins[here]
-      unless np.nil?
-        np.each do |pin|
-          if pin.visibility == :public || visibility.include?(:private)
-            result.push pin_to_suggestion(pin)
-            if deep
-              get_include_strings_from(pin.node).each do |i|
-                result.concat inner_get_constants(i, skip, false, [:public])
-              end
-            end
-          end
+      result.concat @const_pins[fqns] if @const_pins.has_key?(fqns)
+      result.concat @namespace_pins[fqns] if @namespace_pins.has_key?(fqns)
+      result.keep_if{|pin| visibility.include?(pin.visibility)}
+      result.concat yard_map.get_constants(fqns)
+      is = @namespace_includes[fqns]
+      unless is.nil?
+        is.each do |i|
+          here = find_fully_qualified_namespace(i, fqns)
+          result.concat inner_get_constants(here, [:public], skip)
         end
       end
-      get_include_strings_from(*get_namespace_nodes(here)).each do |i|
-        result.concat inner_get_constants(i, skip, false, [:public])
-      end
       result
     end
 
@@ -1011,14 +998,15 @@ module Solargraph
     # @param pin [Solargraph::Pin::Base]
     # @return [Solargraph::Suggestion]
     def pin_to_suggestion pin
-      return_type = pin.return_type
+      return_type = nil
+      return_type = find_fully_qualified_namespace(pin.return_type, pin.namespace) unless pin.return_type.nil?
       if return_type.nil? and pin.is_a?(Solargraph::Pin::Method)
         sc = @superclasses[pin.namespace]
         while return_type.nil? and !sc.nil?
           sc_path = "#{sc}#{pin.scope == :instance ? '#' : '.'}#{pin.name}"
           sugg = get_path_suggestions(sc_path).first
           break if sugg.nil?
-          return_type = sugg.return_type
+          return_type = find_fully_qualified_namespace(sugg.return_type, sugg.namespace) unless sugg.return_type.nil?
           sc = @superclasses[sc]
         end
       end

data/lib/solargraph/api_map/source.rb

@@ -3,6 +3,12 @@ require 'parser/current'
 module Solargraph
   class ApiMap
     class Source
+      class FlawedBuilder < Parser::Builders::Default
+        def string_value(token)
+          value(token)
+        end
+      end
+
       # @return [String]
       attr_reader :code
 
@@ -34,7 +40,7 @@ module Solargraph
         @comments = comments
         @directives = {}
         @path_macros = {}
-        @docstring_hash = associate_comments(node, comments)
+        @docstring_hash = associate_comments(node, comments) || {}
         @filename = filename
         @mtime = (!filename.nil? and File.exist?(filename) ? File.mtime(filename) : nil)
         @namespace_nodes = {}
@@ -189,6 +195,7 @@ module Solargraph
       private
 
       def associate_comments node, comments
+        return nil if comments.nil?
         comment_hash = Parser::Source::Comment.associate_locations(node, comments)
         yard_hash = {}
         comment_hash.each_pair { |k, v|
@@ -381,13 +388,12 @@ module Solargraph
       class << self
         # @return [Solargraph::ApiMap::Source]
         def load filename
-          code = File.read(filename).gsub(/\r/, '')
-          Source.virtual(code, filename)
+          Source.virtual(File.read(filename), filename)
         end
 
         # @return [Solargraph::ApiMap::Source]
         def virtual code, filename = nil
-          node, comments = Parser::CurrentRuby.parse_with_comments(code)
+          node, comments = Source.parse(code, filename)
           Source.new(code, node, comments, filename)
         end
 
@@ -407,6 +413,15 @@ module Solargraph
           [line, col]
         end
 
+        def parse code, filename = nil
+          parser = Parser::CurrentRuby.new(FlawedBuilder.new)
+          parser.diagnostics.all_errors_are_fatal = true
+          parser.diagnostics.ignore_warnings      = true
+          buffer = Parser::Source::Buffer.new(filename, 1)
+          buffer.source = code
+          parser.parse_with_comments(buffer)
+        end  
+
         def fix code, filename = nil, offset = nil
           tries = 0
           code.gsub!(/\r/, '')
@@ -417,7 +432,7 @@ module Solargraph
           fixed_position = false
           tmp = code
           begin
-            node, comments = Parser::CurrentRuby.parse_with_comments(tmp)
+            node, comments = parse(tmp, filename)
             Source.new(code, node, comments, filename, stubs)
           rescue Parser::SyntaxError => e
             if tries < 10
@@ -437,9 +452,9 @@ module Solargraph
               end
               retry
             end
-            STDERR.puts "Unable to parse code: #{e.message}"
-            virt = Source.virtual('', filename)
-            Source.new(code, virt.node, virt.comments, filename)
+            STDERR.puts "Unable to parse file #{filename.nil? ? 'undefined' : filename}: #{e.message}"
+            node, comments = parse(code.gsub(/[^\s]/, ' '), filename)
+            Source.new(code, node, comments, filename)
           end
         end
 

data/lib/solargraph/code_map.rb

@@ -241,6 +241,7 @@ module Solargraph
               result.concat api_map.get_constants('')
               result.concat api_map.get_instance_methods('Kernel', namespace)
               result.concat api_map.get_methods('', namespace)
+              result.concat api_map.get_instance_methods('', namespace)
             else
               result.concat api_map.get_instance_methods(type) unless @code[index - 1] != '.'
             end

data/lib/solargraph/server.rb

@@ -213,12 +213,16 @@ module Solargraph
       end
 
       def run!
-        Thread.new do
-          while true
-            check_workspaces
-            sleep 1
-          end
-        end
+        # @todo The thread for checking workspaces is temporarily disabled due
+        #   to high CPU cost. We need to determine whether the process should
+        #   be optimized or eliminated altogether.
+        #
+        # Thread.new do
+        #   while true
+        #     check_workspaces
+        #     sleep 1
+        #   end
+        # end
         super
       end
 

data/lib/solargraph/suggestion.rb

@@ -146,6 +146,7 @@ module Solargraph
     #
     # @param pin [Solargraph::Pin::Base]
     def self.pull pin, return_type = nil
+      return pin if pin.kind_of?(Suggestion)
       Suggestion.new(pin.name, insert: pin.name.gsub(/=$/, ' = '), kind: pin.kind, docstring: pin.docstring, detail: pin.namespace, arguments: pin.parameters, path: pin.path, return_type: return_type || pin.return_type, location: pin.location)
     end
   end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.17.3'
+  VERSION = '0.17.4'
 end

data/lib/solargraph/yard_map.rb

@@ -330,6 +330,7 @@ module Solargraph
 
     def process_requires
       required.each do |r|
+        next if !workspace.nil? and File.exist?(File.join workspace, 'lib', "#{r}.rb")
         spec = Gem::Specification.find_by_path(r)
         begin
           spec = Gem::Specification.find_by_name(r) if spec.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.17.4
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser