solargraph 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b663346a935bf7a364c828edc3eddfcdeab1702
-  data.tar.gz: 28e58c55f6d542b5a3b4bff0da3f7ce619d8df0c
+  metadata.gz: bc699f1c3abc5198bf2fde325bb4dfde8c6cb384
+  data.tar.gz: 6f676543082c9943d647772d3c4c7f04ab4caefe
 SHA512:
-  metadata.gz: 441b66f057a2ec97b41bc7a76b71c1869a483e61c2494cc2a93e4f9faac4d0e350b4b78096242a2f87ef001454c397447d422c0fba2fd5bbe2caa1ecb3cd2aba
-  data.tar.gz: 2d44127c944bd074ec315dd5e1043eebe5b9b706ef950468318228922655569a42fc2e641771f8e4b497209cff0b9a8852ce7ac49091be424ec9dfd476936846
+  metadata.gz: d519c282a68e56c063068d03a1d7067e98d544714e5b234b5f5da08c6b2e354fcc0067240bf6630eeeeb94b02cf57c1461715054b241febfe73217b53e6e3129
+  data.tar.gz: 57e7b7388f4aca96e654a1997cd8d236227f9ebb76f7b4d118ca2fe5e3e015955c583889693e683e81f37e978b5d8c5781d218b2e18af17e6d88262f7bde5f12

data/lib/solargraph/api_map.rb

@@ -346,7 +346,7 @@ module Solargraph
         unless p == 'new' and scope != :instance
           if scope == :instance
             meths = get_instance_methods(type)
-            meths += get_methods('') if top
+            meths += get_methods('') if top or type.to_s == ''
           else
             meths = get_methods(type)
             #meths += get_methods('') if top
@@ -544,7 +544,9 @@ module Solargraph
           if n.kind_of?(AST::Node)
             if n.type == :class and !n.children[1].nil?
               s = unpack_name(n.children[1])
-              meths += inner_get_instance_methods(s, namespace, skip)
+              # @todo This skip might not work properly. We might need to get a
+              #   fully qualified namespace from it first
+              meths += get_instance_methods(s, namespace) unless skip.include?(s)
             end
             current_scope = :public
             n.children.each { |c|

data/lib/solargraph/code_map.rb

@@ -41,21 +41,34 @@ module Solargraph
           STDERR.puts "Retrying..."
           tries += 1
           spot = e.diagnostic.location.begin_pos
+          #STDERR.puts "CODE>>>>"
+          #STDERR.puts tmp
+          #STDERR.puts "<<<<CODE"
+          #STDERR.puts "Spot #{spot}: #{tmp[spot]}"
+          repl = '_'
           if tmp[spot] == '@' or tmp[spot] == ':'
             # Stub unfinished instance variables and symbols
             spot -= 1
           elsif tmp[spot - 1] == '.'
             # Stub unfinished method calls
+            repl = '#' if spot == tmp.length or tmp[spot] == '\n'
             spot -= 2
           else
             # Stub the whole line
-            spot = beginning_of_line_from(spot)
-          end
-          if spot == 0
-            tmp = '#' + tmp[1..-1]
-          else
-            tmp = tmp[0..spot] + '#' + tmp[spot+2..-1].to_s
+            spot = beginning_of_line_from(tmp, spot)
+            repl = '#'
+            if tmp[spot+1..-1].rstrip == 'end'
+              repl= 'end;end'
+            end
           end
+          #if spot == 0
+          #  tmp = '#' + tmp[1..-1]
+          #else
+            tmp = tmp[0..spot] + repl + tmp[spot+repl.length+1..-1].to_s
+          #end
+          #STDERR.puts "CHNG>>>>"
+          #STDERR.puts tmp
+          #STDERR.puts "<<<<CHNG"
           retry
         end
         raise e
@@ -227,7 +240,7 @@ module Solargraph
           end
         end
       end
-      result = reduce_starting_with(result, word_at(index)) if filtered
+      #result = reduce_starting_with(result, word_at(index)) if filtered
       result.uniq{|s| s.path}
     end
 
@@ -432,10 +445,13 @@ module Solargraph
       nil
     end
 
-    def beginning_of_line_from i
-      while i > 0 and @code[i] != "\n"
+    def beginning_of_line_from str, i
+      while i > 0 and str[i] != "\n"
         i -= 1
       end
+      if i > 0 and str[i..-1].strip == ''
+        i = beginning_of_line_from str, i -1
+      end
       i
     end
   end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end

data/lib/solargraph/yard_map.rb

@@ -21,7 +21,11 @@ module Solargraph
           unless used.include?(g)
             used.push g
             gy = YARD::Registry.yardoc_file_for_gem(g)
-            yardocs.push gy unless gy.nil?
+            if gy.nil?
+              STDERR.puts "Required path not found: #{r}"
+            else
+              yardocs.push gy
+            end
           end
         end
       }
@@ -81,20 +85,10 @@ module Solargraph
       cached = cache.get_constants(namespace, scope)
       return cached unless cached.nil?
       consts = []
-      binds = []
       result = []
       yardocs.each { |y|
         yard = load_yardoc(y)
         unless yard.nil?
-          if namespace == '' and scope == ''
-            # Check for a bind tag in the yardoc root. If it exists, treat
-            # workspace code as a DSL that uses public instance methods in the
-            # specified namespaces.
-            b = yard.root.tag(:bind)
-            unless b.nil?
-              binds.concat b.types
-            end
-          end
           ns = nil
           if scope == ''
             ns = yard.at(namespace)
@@ -116,9 +110,6 @@ module Solargraph
         end
         result.push Suggestion.new(c.to_s.split('::').last, detail: detail, kind: kind)
       }
-      binds.each { |type|
-        result.concat get_instance_methods(type, '', visibility: [:public])
-      }
       cache.set_constants(namespace, scope, result)
       result
     end
@@ -150,11 +141,19 @@ module Solargraph
       cached = cache.get_methods(namespace, scope, visibility)
       return cached unless cached.nil?
       meths = []
+      binds = []
       yardocs.each { |y|
         yard = load_yardoc(y)
         unless yard.nil?
           ns = nil
           ns = find_first_resolved_namespace(yard, namespace, scope)
+          if namespace == '' and scope == ''
+            # Check for a bind tag in the yardoc root. If it exists, treat
+            # workspace code as a DSL that uses public instance methods in the
+            # specified namespaces.
+            b = yard.root.tag(:bind)
+            binds.concat b.types unless b.nil?
+          end
           unless ns.nil?
             ns.meths(scope: :class, visibility: visibility).each { |m|
               n = m.to_s.split(/[\.#]/).last.gsub(/=/, ' = ')
@@ -173,6 +172,9 @@ module Solargraph
           end
         end
       }
+      binds.each { |b|
+        meths += get_instance_methods(b, scope, visibility: [:public])
+      }
       cache.set_methods(namespace, scope, visibility, meths)
       meths
     end
@@ -198,7 +200,9 @@ module Solargraph
               end
             }
             if ns.kind_of?(YARD::CodeObjects::ClassObject) and namespace != 'Object'
-              meths += get_instance_methods('Object')
+              if ns.superclass.kind_of?(YARD::CodeObjects::Proxy)
+                meths += get_instance_methods(ns.superclass.to_s)
+              end
             end
           end
         end
@@ -254,8 +258,8 @@ module Solargraph
     def cache_core
       c = get_constants '', ''
       c.each { |n|
-        get_methods 'n', visibility: :public
-        get_instance_methods 'n', visibility: :public
+        #get_methods n.label, visibility: :public
+        #get_instance_methods n.label, visibility: :public
       }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser