solargraph 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e47975025923e6fefaa775875a539c14a8ce263b
-  data.tar.gz: 253ceb89deba6b4a3e63a7861a167c7bd24e64eb
+  metadata.gz: e52db6d5b84e35fa182015ad0178c8fde5433534
+  data.tar.gz: 4cb0dbfa89392f8fb4b9b04b506114d1b975fcb9
 SHA512:
-  metadata.gz: b563880f6b352616b38c1accb2d0f07b189e23b25cbcc816c54bf1a3acae1b1e130b0f7f565110008bb4561234ff423bbb553843ffef1aba958164e61dd161a7
-  data.tar.gz: c6dbd8e28a73bf8ce205508b87146d6a189b8c216d42a2c72f1c5ce8d32796fb57a52f967278e36a07f89e8f5e3fa108ee6a0cbd048e8df858b9c032347ba19e
+  metadata.gz: 9f4d6d1f77fb88afb992b1a32eb12e017f74a310e090c0b275d4f5d6546313455c7e5d9230322007d1e15acc9686bc88f744e3cb18512b2ba6be5d356adb147e
+  data.tar.gz: 74cd777945f475843b629de0613cd10949b9aed887a30f5a1423825bac943df4c4491f9caf98b8d3f231df12f22a4e09cb6c62836cc5047003a4a665a2f5a8fd

data/lib/solargraph/api_map.rb

@@ -10,7 +10,7 @@ module Solargraph
       'begin', 'break', 'case', 'class', 'def', 'defined?', 'do', 'else',
       'elsif', 'end', 'ensure', 'false', 'for', 'if', 'in', 'module', 'next',
       'nil', 'not', 'or', 'redo', 'rescue', 'retry', 'return', 'self', 'super',
-      'then', 'true', 'undef', 'unless', 'until', 'when', 'while', 'yield',
+      'then', 'true', 'undef', 'unless', 'until', 'when', 'while', 'yield'
     ]
 
     MAPPABLE_METHODS = [
@@ -97,6 +97,7 @@ module Solargraph
       @file_comments[filename][node.loc]
     end
 
+
     def self.get_keywords
       result = []
       keywords = KEYWORDS + ['attr_reader', 'attr_writer', 'attr_accessor', 'private', 'public', 'protected']
@@ -510,14 +511,16 @@ module Solargraph
             docstring = get_comment_for(c)
             label = "#{c.children[1]}"
             args = get_method_args(c)
-            meths.push Suggestion.new(label, insert: c.children[1].to_s.gsub(/=/, ' = '), kind: Suggestion::METHOD, detail: 'Method', documentation: docstring, arguments: args) if c.children[1].to_s[0].match(/[a-z_]/i) and c.children[1] != :def
+            if (c.children[1].to_s[0].match(/[a-z_]/i) and c.children[1] != :def)
+              meths.push Suggestion.new(label, insert: c.children[1].to_s.gsub(/=/, ' = '), kind: Suggestion::METHOD, detail: 'Method', documentation: docstring, arguments: args)
+            end
           elsif c.type == :send and c.children[1] == :include
             # TODO: This might not be right. Should we be getting singleton methods
             # from an include, or only from an extend?
             i = unpack_name(c.children[2])
-            meths += inner_get_methods(i, root, skip) unless i == 'Kernel'
+            meths.concat inner_get_methods(i, root, skip) unless i == 'Kernel'
           else
-            meths += inner_get_methods_from_node(c, root, skip)
+            meths.concat inner_get_methods_from_node(c, root, skip)
           end
         end
       }
@@ -554,16 +557,16 @@ module Solargraph
                   meths.push Suggestion.new(label, insert: c.children[0].to_s.gsub(/=/, ' = '), kind: Suggestion::METHOD, documentation: cmnt, detail: fqns, arguments: args) if c.children[0].to_s[0].match(/[a-z]/i)
                 elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_reader
                   c.children[2..-1].each { |x|
-                    meths.push Suggestion.new(x.children[0], kind: Suggestion::METHOD) if x.type == :sym
+                    meths.push Suggestion.new(x.children[0], kind: Suggestion::FIELD) if x.type == :sym
                   }
                 elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_writer
                   c.children[2..-1].each { |x|
-                    meths.push Suggestion.new("#{x.children[0]}=", kind: Suggestion::METHOD) if x.type == :sym
+                    meths.push Suggestion.new("#{x.children[0]}=", kind: Suggestion::FIELD) if x.type == :sym
                   }
                 elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_accessor
                   c.children[2..-1].each { |x|
-                    meths.push Suggestion.new(x.children[0], kind: Suggestion::METHOD) if x.type == :sym
-                    meths.push Suggestion.new("#{x.children[0]}=", kind: Suggestion::METHOD) if x.type == :sym
+                    meths.push Suggestion.new(x.children[0], kind: Suggestion::FIELD) if x.type == :sym
+                    meths.push Suggestion.new("#{x.children[0]}=", kind: Suggestion::FIELD) if x.type == :sym
                   }
                 end
               end
@@ -589,7 +592,7 @@ module Solargraph
         false
       end
     end
-    
+
     def reduce node, comment_hash
       return node unless node.kind_of?(AST::Node)
       mappable = get_mappable_nodes(node.children, comment_hash)
@@ -680,7 +683,7 @@ module Solargraph
         cursor = cursor[t.to_s]
       }
     end
-    
+
     def map_namespaces node, tree = []
       if node.kind_of?(AST::Node)
         if node.type == :class or node.type == :module
@@ -698,6 +701,6 @@ module Solargraph
           map_namespaces c, tree
         }
       end
-    end    
+    end
   end
 end

data/lib/solargraph/code_map.rb

@@ -181,7 +181,7 @@ module Solargraph
     end
 
     def suggest_at index, filtered: false, with_snippets: false
-      return [] if string_at?(index)
+      return [] if string_at?(index) or string_at?(index - 1)
       result = []
       phrase = phrase_at(index)
       signature = get_signature_at(index)
@@ -213,7 +213,7 @@ module Solargraph
           ns = parts[0..-2].join('::') + '::' + parts.last[0..parts.last.index('.')-1]
           result = api_map.get_methods(ns)
         else
-          result = api_map.namespaces_in(ns)
+          result = api_map.namespaces_in(ns, namespace)
         end
       else
         current_namespace = namespace_at(index)
@@ -223,7 +223,7 @@ module Solargraph
         result += ApiMap.get_keywords
         while parts.length > 0
           ns = parts.join('::')
-          result += api_map.namespaces_in(ns)
+          result += api_map.namespaces_in(ns, namespace)
           parts.pop
         end
         result += api_map.namespaces_in('')
@@ -301,6 +301,7 @@ module Solargraph
       parts = signature.split('.')
       ns_here = namespace_from(node)
       start = parts[0]
+      return nil if start.nil?
       remainder = parts[1..-1]
       scope = :instance
       var = find_local_variable_node(start, node)
@@ -460,7 +461,7 @@ module Solargraph
       args = node.children[1]
       args.children.each do |arg|
         name = arg.children[0].to_s
-        result.push Suggestion.new(name, kind: Suggestion::VARIABLE, insert: name)
+        result.push Suggestion.new(name, kind: Suggestion::PROPERTY, insert: name)
       end
       result
     end

data/lib/solargraph/suggestion.rb

@@ -8,6 +8,8 @@ module Solargraph
     MODULE = 'Module'
     METHOD = 'Method'
     VARIABLE = 'Variable'
+    PROPERTY = 'Property'
+    FIELD = 'Field'
     SNIPPET = 'Snippet'
 
     attr_reader :label, :kind, :insert, :detail, :documentation, :code_object, :location, :arguments

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/lib/solargraph/yard_map.rb

@@ -148,7 +148,8 @@ module Solargraph
               n = m.to_s.split(/[\.#]/).last.gsub(/=/, ' = ')
               label = "#{n}"
               args = get_method_args(m)
-              meths.push Suggestion.new(label, insert: "#{n.gsub(/=/, ' = ')}", kind: Suggestion::METHOD, documentation: m.docstring, code_object: m, detail: "#{ns}", location: "#{m.file}:#{m.line}", arguments: args)
+              kind = (m.is_attribute? ? Suggestion::FIELD : Suggestion::METHOD)
+              meths.push Suggestion.new(label, insert: "#{n.gsub(/=/, ' = ')}", kind: kind, documentation: m.docstring, code_object: m, detail: "#{ns}", location: "#{m.file}:#{m.line}", arguments: args)
             }
             # Collect superclass methods
             if ns.kind_of?(YARD::CodeObjects::ClassObject) and !ns.superclass.nil?
@@ -191,7 +192,8 @@ module Solargraph
               if n.to_s.match(/^[a-z]/i) and (namespace == 'Kernel' or !m.to_s.start_with?('Kernel#')) and !m.docstring.to_s.include?(':nodoc:')
                 label = "#{n}"
                 args = get_method_args(m)
-                meths.push Suggestion.new(label, insert: "#{n.gsub(/=/, ' = ')}", kind: Suggestion::METHOD, documentation: m.docstring, code_object: m, detail: m.namespace, location: "#{m.file}:#{m.line}", arguments: args)
+                kind = (m.is_attribute? ? Suggestion::FIELD : Suggestion::METHOD)
+                meths.push Suggestion.new(label, insert: "#{n.gsub(/=/, ' = ')}", kind: kind, documentation: m.docstring, code_object: m, detail: m.namespace, location: "#{m.file}:#{m.line}", arguments: args)
               end
             }
             if ns.kind_of?(YARD::CodeObjects::ClassObject) and namespace != 'Object'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser