solargraph 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fd196523191df8e781673c9b4f4ec9680132b60
-  data.tar.gz: c341f7ecf19bb780648b125234d411891d6048e7
+  metadata.gz: 9a0cb900eab77f94ad22582f22dc8ea75c249485
+  data.tar.gz: 478c5f05faf26850590f928060b35e61903cb807
 SHA512:
-  metadata.gz: 22635ccfb51ffcff3638ec6cac95dc550824060a74e41aedf4f11e67e2da45b320e801c789fa5d1634614e8f7838a2a4260a24711bd3ee290b2d80365ba6f2b1
-  data.tar.gz: 6767110f8eccb4268f21b73a06f2854fc2b957da3caf3067e9ae0433a4251eb9d252e9d937c27d6926a416777e287911475a97bb8c10a5791954535022749dff
+  metadata.gz: afcd662f413015ece4a315039be1837a8f95b1a10806d75e6ac2ce8d08fa91d3e0720cd67aa1c383f34c6800f5d2c9a3a722c199a093663f6aefec0e93d92480
+  data.tar.gz: 9d9dacf3f53e4a53f69f325e9bd56d42d252cba529a91766515c2e3b9080403bd20f8dbdc801168a5b72164e12f02700b4bdc960845abb2706456391c9214e6a

data/lib/solargraph/api_map/attr_pin.rb

@@ -0,0 +1,37 @@
+module Solargraph
+  class ApiMap
+    class AttrPin
+      attr_reader :node
+
+      def initialize node
+        @node = node
+      end
+
+      def suggestions
+        @suggestions ||= generate_suggestions
+      end
+
+      private
+
+      def generate_suggestions
+        suggestions = []
+        c = node
+        if c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_reader
+          c.children[2..-1].each { |x|
+            suggestions.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|
+            suggestions.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|
+            suggestions.push Suggestion.new(x.children[0], kind: Suggestion::FIELD) if x.type == :sym
+            suggestions.push Suggestion.new("#{x.children[0]}=", insert: "#{x.children[0]} = ", kind: Suggestion::FIELD) if x.type == :sym
+          }
+        end
+        suggestions
+      end
+    end
+  end
+end

data/lib/solargraph/api_map/config.rb

@@ -12,7 +12,7 @@ module Solargraph
         @included = []
         @excluded = []
         include_globs = ['**/*.rb']
-        exclude_globs = ['spec/**/*']
+        exclude_globs = ['spec/**/*', 'test/**/*']
         unless @workspace.nil?
           sfile = File.join(@workspace, '.solargraph.yml')
           if File.file?(sfile)

data/lib/solargraph/api_map/cvar_pin.rb

@@ -0,0 +1,26 @@
+module Solargraph
+  class ApiMap
+    class CvarPin
+      attr_reader :node
+      attr_reader :namespace
+      attr_reader :docstring
+
+      def initialize node, namespace, docstring
+        @node = node
+        @namespace = namespace
+        @docstring = docstring
+      end
+
+      def suggestion(api_map)
+        @suggestion ||= generate_suggestion(api_map)
+      end
+
+      private
+
+      def generate_suggestion(api_map)
+        type = api_map.infer_assignment_node_type(node, namespace)
+        Suggestion.new(node.children[0], kind: Suggestion::VARIABLE, documentation: docstring, return_type: type)
+      end
+    end
+  end
+end

data/lib/solargraph/api_map/ivar_pin.rb

@@ -0,0 +1,28 @@
+module Solargraph
+  class ApiMap
+    class IvarPin
+      attr_reader :node
+      attr_reader :namespace
+      attr_reader :scope
+      attr_reader :docstring
+
+      def initialize node, namespace, scope, docstring
+        @node = node
+        @namespace = namespace
+        @scope = scope
+        @docstring = docstring
+      end
+
+      def suggestion(api_map)
+        @suggestion ||= generate_suggestion(api_map)
+      end
+
+      private
+
+      def generate_suggestion(api_map)
+        type = api_map.infer_assignment_node_type(node, namespace)
+        Suggestion.new(node.children[0], kind: Suggestion::VARIABLE, documentation: docstring, return_type: type)
+      end
+    end
+  end
+end

data/lib/solargraph/api_map/method_pin.rb

@@ -0,0 +1,56 @@
+module Solargraph
+  class ApiMap
+    class MethodPin
+      attr_reader :node
+      attr_reader :namespace
+      attr_reader :scope
+      attr_reader :visibility
+      attr_reader :docstring
+      
+      def initialize node, namespace, scope, visibility, docstring
+        @node = node
+        @namespace = namespace
+        @scope = scope
+        @visibility = visibility
+        @docstring = docstring
+      end
+
+      def suggestion(api_map)
+        @suggestion ||= generate_suggestion(api_map)
+      end
+
+      private
+
+      def generate_suggestion(api_map)
+        i = node.type == :def ? 0 : 1
+        label = "#{node.children[i]}"
+        Suggestion.new(label, insert: node.children[i].to_s.gsub(/=/, ' = '), kind: Suggestion::METHOD, documentation: docstring, detail: namespace, arguments: get_method_args(api_map))
+      end
+
+      # @return [Array<String>]
+      def get_method_args(api_map)
+        list = nil
+        args = []
+        node.children.each { |c|
+          if c.kind_of?(AST::Node) and c.type == :args
+            list = c
+            break
+          end
+        }
+        return args if list.nil?
+        list.children.each { |c|
+          if c.type == :arg
+            args.push c.children[0].to_s
+          elsif c.type == :optarg
+            args.push "#{c.children[0]} = #{api_map.code_for(c.children[1])}"
+          elsif c.type == :kwarg
+            args.push "#{c.children[0]}:"
+          elsif c.type == :kwoptarg
+            args.push "#{c.children[0]}: #{api_map.code_for(c.children[1])}"
+          end
+        }
+        args
+      end
+    end
+  end
+end

data/lib/solargraph/api_map.rb

@@ -1,10 +1,18 @@
 require 'rubygems'
 require 'parser/current'
+require 'thread'
 
 module Solargraph
   class ApiMap
     autoload :Config, 'solargraph/api_map/config'
     autoload :Cache,  'solargraph/api_map/cache'
+    autoload :MethodPin, 'solargraph/api_map/method_pin'
+    autoload :AttrPin, 'solargraph/api_map/attr_pin'
+    autoload :IvarPin, 'solargraph/api_map/ivar_pin'
+    autoload :CvarPin, 'solargraph/api_map/cvar_pin'
+
+    @@yard_map_cache = {}
+    @@semaphore = Mutex.new
 
     KEYWORDS = [
       '__ENCODING__', '__LINE__', '__FILE__', 'BEGIN', 'END', 'alias', 'and',
@@ -15,9 +23,9 @@ module Solargraph
     ].freeze
 
     MAPPABLE_NODES = [
-      :array, :hash, :str, :int, :float, :block, :class, :sclass, :module,
-      :def, :defs, :ivasgn, :gvasgn, :lvasgn, :cvasgn, :casgn, :or_asgn,
-      :const, :lvar, :args, :kwargs
+      :array, :hash, :str, :dstr, :int, :float, :block, :class, :sclass,
+      :module, :def, :defs, :ivasgn, :gvasgn, :lvasgn, :cvasgn, :casgn,
+      :or_asgn, :const, :lvar, :args, :kwargs
     ].freeze
 
     MAPPABLE_METHODS = [
@@ -57,7 +65,10 @@ module Solargraph
 
     # @return [Solargraph::YardMap]
     def yard_map
-      @yard_map ||= YardMap.new(required: required, workspace: workspace)
+      @@semaphore.synchronize {
+        @yard_map ||= @@yard_map_cache[[required, workspace]] || Solargraph::YardMap.new(required: required, workspace: workspace)
+        @@yard_map_cache[[required, workspace]] ||= @yard_map
+      }
     end
 
     # Add a file to the map.
@@ -88,16 +99,21 @@ module Solargraph
     #
     # @return [AST::Node]
     def append_node node, comments, filename = nil
+      @stale = true
       @file_comments[filename] = associate_comments(node, comments)
       mapified = reduce(node, @file_comments[filename])
       root = AST::Node.new(:begin, [filename])
       root = root.append mapified
       @file_nodes[filename] = root
       @required.uniq!
-      process_maps
+      #process_maps
       root
     end
 
+    def refresh force = false
+      process_maps if @stale or force
+    end
+
     # Get the docstring associated with a node.
     #
     # @param node [AST::Node]
@@ -116,6 +132,7 @@ module Solargraph
     end
 
     def namespaces
+      refresh
       @namespace_map.keys
     end
 
@@ -124,6 +141,7 @@ module Solargraph
     end
 
     def namespaces_in name, root = ''
+      refresh
       result = []
       result += inner_namespaces_in(name, root, [])
       result += yard_map.get_constants name, root
@@ -138,6 +156,7 @@ module Solargraph
     end
 
     def find_fully_qualified_namespace name, root = '', skip = []
+      refresh
       return nil if skip.include?(root)
       skip.push root
       if name == ''
@@ -173,25 +192,32 @@ module Solargraph
 
     def get_namespace_nodes(fqns)
       return @file_nodes.values if fqns == '' or fqns.nil?
+      refresh
       @namespace_map[fqns] || []
     end
 
     def get_instance_variables(namespace, scope = :instance)
-      nodes = get_namespace_nodes(namespace) || @file_nodes.values
-      arr = []
-      nodes.each { |n|
-        arr += inner_get_instance_variables(n, namespace, scope)
-      }
-      arr
+      refresh
+      result = []
+      ip = @ivar_pins[namespace]
+      unless ip.nil?
+        ip.select{ |pin| pin.scope == scope }.each do |pin|
+          result.push pin.suggestion(self)
+        end
+      end
+      result
     end
 
     def get_class_variables(namespace)
-      nodes = get_namespace_nodes(namespace) || @file_nodes.values
-      arr = []
-      nodes.each { |n|
-        arr += inner_get_class_variables(n, namespace)
-      }
-      arr
+      refresh
+      result = []
+      ip = @cvar_pins[namespace]
+      unless ip.nil?
+        ip.each do |pin|
+          result.push pin.suggestion(self)
+        end
+      end
+      result
     end
 
     def find_parent(node, *types)
@@ -388,6 +414,7 @@ module Solargraph
     #
     # @return [Array<Solargraph::Suggestion>]
     def get_methods(namespace, root = '', visibility: [:public])
+      refresh
       namespace = clean_namespace_string(namespace)
       meths = []
       meths += inner_get_methods(namespace, root, []) #unless has_yardoc?
@@ -405,36 +432,12 @@ module Solargraph
       end
     end
 
-    # @return [Array<String>]
-    def get_method_args node
-      list = nil
-      args = []
-      node.children.each { |c|
-        if c.kind_of?(AST::Node) and c.type == :args
-          list = c
-          break
-        end
-      }
-      return args if list.nil?
-      list.children.each { |c|
-        if c.type == :arg
-          args.push c.children[0]
-        elsif c.type == :optarg
-          args.push "#{c.children[0]} = #{code_for(c.children[1])}"
-        elsif c.type == :kwarg
-          args.push "#{c.children[0]}:"
-        elsif c.type == :kwoptarg
-          args.push "#{c.children[0]}: #{code_for(c.children[1])}"
-        end
-      }
-      args
-    end
-
     # Get an array of instance methods that are available in the specified
     # namespace.
     #
     # @return [Array<Solargraph::Suggestion>]
     def get_instance_methods(namespace, root = '', visibility: [:public])
+      refresh
       namespace = clean_namespace_string(namespace)
       if namespace.end_with?('#class')
         return get_methods(namespace.split('#').first, root, visibility: visibility)
@@ -468,7 +471,7 @@ module Solargraph
       }
       return nil
     end
-    
+
     def self.current
       if @current.nil?
         @current = ApiMap.new
@@ -476,7 +479,7 @@ module Solargraph
       end
       @current
     end
-    
+
     def get_include_strings_from *nodes
       arr = []
       nodes.each { |node|
@@ -488,7 +491,15 @@ module Solargraph
       }
       arr
     end
-    
+
+    def code_for node
+      src = @file_source[get_filename_for(node)]
+      return nil if src.nil?
+      b = node.location.expression.begin.begin_pos
+      e = node.location.expression.end.end_pos
+      src[b..e].strip.gsub(/,$/, '')
+    end  
+
     # Update the YARD documentation for the current workspace.
     #
     def update_yardoc
@@ -504,12 +515,16 @@ module Solargraph
             STDERR.puts "There was an error processing the workspace yardoc."
           end
         end
-      end
+        @@semaphore.synchronize {
+          @@yard_map_cache.clear
+        }
+        end
     end
 
     private
 
     def clear
+      @stale = false
       @file_source = {}
       @file_nodes = {}
       @file_comments = {}
@@ -517,6 +532,12 @@ module Solargraph
       @namespace_map = {}
       @namespace_tree = {}
       @required = []
+      @ivar_pins = {}
+      @cvar_pins = {}
+      @method_pins = {}
+      @attr_nodes = {}
+      @namespace_includes = {}
+      @superclasses = {}
     end
 
     def process_maps
@@ -527,6 +548,7 @@ module Solargraph
         map_parents f
         map_namespaces f
       }
+      @stale = false
     end
 
     # @return [Solargraph::ApiMap::Cache]
@@ -566,109 +588,42 @@ module Solargraph
       skip.push namespace
       fqns = find_fully_qualified_namespace(namespace, root)
       return meths if fqns.nil?
-      nodes = get_namespace_nodes(fqns)
-      nodes.each { |n|
-        unless yardoc_has_file?(get_filename_for(n))
-          if n.kind_of?(AST::Node)
-            if n.type == :class and !n.children[1].nil?
-              s = unpack_name(n.children[1])
-              meths += inner_get_methods(s, root, skip)
-            end
-            vis = [:public]
-            vis.push :private, :protected if namespace == root
-            meths += inner_get_methods_from_node(n, root, :class, skip, vis)
-          end
+      mn = @method_pins[fqns]
+      unless mn.nil?
+        mn.select{ |pin| pin.scope == :class }.each do |pin|
+          meths.push pin.suggestion(self)
         end
-      }
+      end
       meths.uniq
     end
 
-    def inner_get_methods_from_node node, root, scope, skip, visibility, current_visibility = :public
-      meths = []
-      node.children.each { |c|
-        if c.kind_of?(AST::Node)
-          if c.kind_of?(AST::Node) and c.type == :send and [:public, :protected, :private].include?(c.children[1])
-            current_visibility = c.children[1]
-          elsif (c.type == :defs and scope == :class) or (c.type == :def and scope == :instance)
-            next unless visibility.include?(current_visibility)
-            docstring = get_comment_for(c)
-            child_index = (scope == :class ? 1 : 0)
-            label = "#{c.children[child_index]}"
-            args = get_method_args(c)
-            if (c.children[child_index].to_s[0].match(/[a-z_]/i) and c.children[child_index] != :def)
-              meths.push Suggestion.new(label, insert: c.children[child_index].to_s.gsub(/=/, ' = '), kind: Suggestion::METHOD, detail: 'Method', documentation: docstring, arguments: args)
-            end
-          elsif c.type == :sclass and scope == :class and c.children[0].type == :self
-            meths.concat inner_get_methods_from_node c, root, :instance, skip, visibility
-          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.concat inner_get_methods(i, root, skip) unless i == 'Kernel'
-          else
-            meths.concat inner_get_methods_from_node(c, root, scope, skip, visibility, current_visibility)
-          end
-        end
-      }
-      meths
-    end
-
     def inner_get_instance_methods(namespace, root, skip, visibility = [:public])
       fqns = find_fully_qualified_namespace(namespace, root)
       meths = []
       return meths if skip.include?(fqns)
       skip.push fqns
-      nodes = get_namespace_nodes(fqns)
-      current_scope = :public
-      nodes.each { |n|
-        f = get_filename_for(n)
-        unless yardoc_has_file?(get_filename_for(n))
-          if n.kind_of?(AST::Node)
-            if n.type == :class and !n.children[1].nil?
-              s = unpack_name(n.children[1])
-              # @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, visibility: visibility - [:private]) unless skip.include?(s)
-            end
-            n.children.each { |c|
-              if c.kind_of?(AST::Node) and c.type == :send and [:public, :protected, :private].include?(c.children[1])
-                current_scope = c.children[1]
-              elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :include and n.type == :class
-                fqmod = find_fully_qualified_namespace(const_from(c.children[2]), root)
-                meths += get_instance_methods(fqmod) unless fqmod.nil? or skip.include?(fqmod)
-              else
-                if c.kind_of?(AST::Node) and c.type == :def
-                  if visibility.include?(current_scope)
-                    cmnt = get_comment_for(c)
-                    label = "#{c.children[0]}"
-                    args = get_method_args(c)
-                    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)
-                  end
-                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::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::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::FIELD) if x.type == :sym
-                    meths.push Suggestion.new("#{x.children[0]}=", insert: "#{x.children[0]} = ", kind: Suggestion::FIELD) if x.type == :sym
-                  }
-                end
-              end
-            }
-          end
+      an = @attr_nodes[fqns]
+      unless an.nil?
+        an.each do |pin|
+          meths.concat pin.suggestions
         end
-        # This is necessary to get included modules from workspace definitions
-        if n.type == :class
-          get_include_strings_from(n).each { |i|
-            meths += inner_get_instance_methods(i, fqns, skip, visibility)
-          }
+      end
+      mn = @method_pins[fqns]
+      unless mn.nil?
+        mn.select{|pin| visibility.include?(pin.visibility) and pin.scope == :instance }.each do |pin|
+          meths.push pin.suggestion(self)
         end
-      }
+      end
+      if visibility.include?(:public) or visibility.include?(:protected)
+        sc = @superclasses[fqns]
+        meths.concat inner_get_instance_methods(sc, fqns, skip, visibility - [:private]) unless sc.nil?
+      end
+      im = @namespace_includes[fqns]
+      unless im.nil?
+        im.each do |i|
+          meths.concat inner_get_instance_methods(i, fqns, skip, visibility)
+        end
+      end
       meths.uniq
     end
 
@@ -728,38 +683,6 @@ module Solargraph
       result
     end
 
-    def inner_get_instance_variables(node, namespace, scope)
-      arr = []
-      if node.kind_of?(AST::Node)
-        node.children.each { |c|
-          if c.kind_of?(AST::Node)
-            is_inst = !find_parent(c, :def).nil?
-            if c.type == :ivasgn and c.children[0] and ( (scope == :instance and is_inst) or (scope != :instance and !is_inst) )
-              type = infer_assignment_node_type(c, namespace)
-              arr.push Suggestion.new(c.children[0], kind: Suggestion::VARIABLE, documentation: get_comment_for(c), return_type: type)
-            end
-            arr += inner_get_instance_variables(c, namespace, scope) unless [:class, :module].include?(c.type)
-          end
-        }
-      end
-      arr
-    end
-
-    def inner_get_class_variables(node, namespace)
-      arr = []
-      if node.kind_of?(AST::Node)
-        node.children.each { |c|
-          next unless c.kind_of?(AST::Node)
-          if c.type == :cvasgn
-            type = infer_assignment_node_type(c, namespace)
-            arr.push Suggestion.new(c.children[0], kind: Suggestion::VARIABLE, documentation: get_comment_for(c), return_type: type)
-          end
-          arr += inner_get_class_variables(c, namespace) unless [:class, :module].include?(c.type)
-        }
-      end
-      arr
-    end
-
     # Get a fully qualified namespace for the given signature.
     # The signature should be in the form of a method chain, e.g.,
     # method1.method2
@@ -864,7 +787,7 @@ module Solargraph
       result = node.updated nil, mappable
       result
     end
-    
+
     def get_mappable_nodes arr, comment_hash
       result = []
       arr.each { |n|
@@ -878,7 +801,7 @@ module Solargraph
       }
       result
     end
-    
+
     def minify node, comment_hash
       return node if node.type == :args
       type = node.type
@@ -917,7 +840,7 @@ module Solargraph
         # TODO: The api_map should ignore local variables.
         type = node.children[0].type
         children.push node.children[0].children[0], node.children[1]
-      elsif [:array, :hash, :str, :int, :float].include?(node.type)
+      elsif [:array, :hash, :str, :dstr, :int, :float].include?(node.type)
         # @todo Do we really care about the details?
       end
       result = node.updated(type, children)
@@ -939,7 +862,7 @@ module Solargraph
         }
       end
     end
-    
+
     def add_to_namespace_tree tree
       cursor = @namespace_tree
       tree.each { |t|
@@ -948,9 +871,11 @@ module Solargraph
       }
     end
 
-    def map_namespaces node, tree = []
+    def map_namespaces node, tree = [], visibility = :public, scope = :instance, fqn = nil, local_scope = :class
       if node.kind_of?(AST::Node)
+        return if node.type == :str or node.type == :dstr
         if node.type == :class or node.type == :module
+          visibility = :public
           if node.children[0].kind_of?(AST::Node) and node.children[0].children[0].kind_of?(AST::Node) and node.children[0].children[0].type == :cbase
             tree = pack_name(node.children[0])
           else
@@ -960,21 +885,55 @@ module Solargraph
           fqn = tree.join('::')
           @namespace_map[fqn] ||= []
           @namespace_map[fqn].push node
+          if node.type == :class and !node.children[1].nil?
+            sc = unpack_name(node.children[1])
+            @superclasses[fqn] = sc
+          end
+        end
+        file = get_filename_for(node)
+        in_yardoc = yardoc_has_file?(file)
+        node.children.each do |c|
+          if c.kind_of?(AST::Node)
+            if c.type == :ivasgn
+              @ivar_pins[fqn] ||= []
+              @ivar_pins[fqn].push IvarPin.new(c, fqn, local_scope, get_comment_for(c))
+            elsif c.type == :cvasgn
+              @cvar_pins[fqn] ||= []
+              @cvar_pins[fqn].push CvarPin.new(c, fqn, get_comment_for(c))
+            else
+              unless fqn.nil? or in_yardoc
+                if c.kind_of?(AST::Node)
+                  if c.type == :def and c.children[0].to_s[0].match(/[a-z]/i)
+                    @method_pins[fqn] ||= []
+                    @method_pins[fqn].push MethodPin.new(c, fqn, scope, visibility, get_comment_for(c))
+                    map_namespaces c, tree, visibility, scope, fqn, :instance
+                    next
+                  elsif c.type == :defs
+                    @method_pins[fqn] ||= []
+                    @method_pins[fqn].push MethodPin.new(c, fqn, :class, :public, get_comment_for(c))
+                    map_namespaces c, tree, :public, :class, fqn
+                    next
+                  elsif c.type == :send and [:public, :protected, :private].include?(c.children[1])
+                    visibility = c.children[1]
+                  elsif c.type == :send and c.children[1] == :include and node.type == :class
+                    @namespace_includes[fqn] ||= []
+                    @namespace_includes[fqn].push unpack_name(c.children[2])
+                  elsif c.type == :send and [:attr_reader, :attr_writer, :attr_accessor].include?(c.children[1])
+                    @attr_nodes[fqn] ||= []
+                    @attr_nodes[fqn].push AttrPin.new(c)
+                  elsif c.type == :sclass and c.children[0].type == :self
+                    map_namespaces c, tree, :public, :class, fqn
+                    next
+                  end
+                end
+              end
+              map_namespaces c, tree, visibility, scope, fqn
+            end
+          end
         end
-        node.children.each { |c|
-          map_namespaces c, tree
-        }
       end
     end
 
-    def code_for node
-      src = @file_source[get_filename_for(node)]
-      return nil if src.nil?
-      b = node.location.expression.begin.begin_pos
-      e = node.location.expression.end.end_pos
-      src[b..e].strip.gsub(/,$/, '')
-    end
-
     def clean_namespace_string namespace
       result = namespace.to_s.gsub(/<.*$/, '')
       if result == 'Class' and namespace.include?('<')

data/lib/solargraph/code_map.rb

@@ -263,74 +263,65 @@ module Solargraph
     def suggest_at index, filtered: false, with_snippets: false
       return [] if string_at?(index) or string_at?(index - 1) or comment_at?(index)
       result = []
-      phrase = phrase_at(index)
       signature = get_signature_at(index)
-      namespace = namespace_at(index)
-      if signature.include?('.') or @code[index - signature.length - 1] == '.'
-        # Check for literals first
-        nearest = @code[0, index].rindex('.')
-        revised = signature[0..nearest-index-1]
-        revised = revised[2..-1] if revised.start_with?('[]')
-        cursed = get_signature_index_at(index)
-        frag = @code[cursed..index]
-        literal = nil
-        if frag.start_with?('.')
-          literal = node_at(cursed - 1)
-        else
-          literal = node_at(cursed + 1)
-        end
-        type = infer_literal_node_type(literal)
-        if type.nil?
-          type = infer_signature_at(nearest) unless revised.empty?
-          if !type.nil?
-            result.concat api_map.get_instance_methods(type) unless type.nil?
-          elsif !revised.include?('.')
-            fqns = api_map.find_fully_qualified_namespace(revised, namespace)
-            result.concat api_map.get_methods(fqns) unless fqns.nil?
-          end
+      if index == 0 or @code[index - 1].match(/[\.\s]/)
+        type = infer_signature_at(index)
+      else
+        if signature.include?('.')
+          last_period = @code[0..index].rindex('.')
+          if last_period.nil?
+            type = infer_signature_at(index)
+          else
+            type = infer_signature_at(last_period)
+          end  
         else
-          rest = revised
-          rest = rest[1..-1] if rest.start_with?('.')
-          if rest.nil? or rest.empty?
-            result.concat api_map.get_instance_methods(type)
+          if signature.start_with?('@@')
+            return get_class_variables_at(index)
+          elsif signature.start_with?('@')
+            return get_instance_variables_at(index)
+          elsif signature.start_with?('$')
+            return api_map.get_global_variables
           else
-            intype = api_map.infer_signature_type(rest, type, scope: :instance)
-            result.concat api_map.get_instance_methods(intype)
+            type = infer_signature_at(index)
           end
         end
-      elsif signature.start_with?('@@')
-        result.concat get_class_variables_at(index)
-      elsif signature.start_with?('@')
-        result.concat get_instance_variables_at(index)
-      elsif phrase.start_with?('$')
-        result.concat api_map.get_global_variables
-      elsif phrase.include?('::')
-        parts = phrase.split('::', -1)
-        ns = parts[0..-2].join('::')
-        if parts.last.include?('.')
-          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, namespace)
-        end
-      else
-        type = infer_literal_node_type(node_at(index - 2))
-        if type.nil?
-          current_namespace = namespace_at(index)
-          parts = current_namespace.to_s.split('::')
-          result += get_snippets_at(index) if with_snippets
-          result += get_local_variables_and_methods_at(index)
-          result += ApiMap.get_keywords
-          while parts.length > 0
-            ns = parts.join('::')
-            result += api_map.namespaces_in(ns, namespace)
-            parts.pop
+      end
+      if type.nil?
+        unless signature.include?('.')
+          phrase = phrase_at(index)
+          signature = get_signature_at(index)
+          namespace = namespace_at(index)
+          if phrase.include?('::')
+            parts = phrase.split('::', -1)
+            ns = parts[0..-2].join('::')
+            if parts.last.include?('.')
+              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, namespace)
+            end
+          else
+            type = infer_literal_node_type(node_at(index - 2))
+            if type.nil?
+              current_namespace = namespace_at(index)
+              parts = current_namespace.to_s.split('::')
+              result += get_snippets_at(index) if with_snippets
+              result += get_local_variables_and_methods_at(index)
+              result += ApiMap.get_keywords
+              while parts.length > 0
+                ns = parts.join('::')
+                result += api_map.namespaces_in(ns, namespace)
+                parts.pop
+              end
+              result += api_map.namespaces_in('')
+              result += api_map.get_instance_methods('Kernel')
+            else
+              result.concat api_map.get_instance_methods(type)
+            end
           end
-          result += api_map.namespaces_in('')
-          result += api_map.get_instance_methods('Kernel')
-        else
-          result.concat api_map.get_instance_methods(type)
         end
+      else
+        result.concat api_map.get_instance_methods(type)
       end
       result = reduce_starting_with(result, word_at(index)) if filtered
       result.uniq{|s| s.path}.sort{|a,b| a.label <=> b.label}
@@ -375,7 +366,10 @@ module Solargraph
         end
       end
       return [] if path.nil?
-      return api_map.yard_map.objects(path, ns_here)
+      if path.start_with?('Class<')
+        path.gsub!(/^Class<([a-z0-9_:]*)>#([a-z0-9_]*)$/i, '\\1.\\2')
+      end
+      api_map.yard_map.objects(path, ns_here)
     end
 
     # Infer the type of the signature located at the specified index.
@@ -392,36 +386,67 @@ module Solargraph
     # @return [String]
     def infer_signature_at index
       signature = get_signature_at(index)
-      node = parent_node_from(index, :class, :module, :def, :defs) || @node
-      result = infer_signature_from_node signature, node
-      if result.nil? or result.empty?
-        arg = nil
-        if node.type == :def or node.type == :defs or node.type == :block
-          # Check for method arguments
-          parts = signature.split('.', 2)
-          # @type [Solargraph::Suggestion]
-          arg = get_method_arguments_from(node).keep_if{|s| s.to_s == parts[0] }.first
-          unless arg.nil?
-            if parts[1].nil?
-              result = arg.return_type
-            else
-              result = api_map.infer_signature_type(parts[1], parts[0], :instance)
+      # Check for literals first
+      return 'Integer' if signature.match(/^[0-9]+?\.?$/)
+      literal = nil
+      if (signature.empty? and @code[index - 1] == '.') or signature == '[].'
+        literal = node_at(index - 2)
+      elsif signature.start_with?('.')
+        literal = node_at(index - 1)
+      else
+        beg_sig = get_signature_index_at(index)
+        literal = node_at(1 + beg_sig)
+      end
+      type = infer_literal_node_type(literal)
+      if type.nil?
+        node = parent_node_from(index, :class, :module, :def, :defs) || @node
+        result = infer_signature_from_node signature, node
+        if result.nil? or result.empty?
+          arg = nil
+          if node.type == :def or node.type == :defs or node.type == :block
+            # Check for method arguments
+            parts = signature.split('.', 2)
+            # @type [Solargraph::Suggestion]
+            arg = get_method_arguments_from(node).keep_if{|s| s.to_s == parts[0] }.first
+            unless arg.nil?
+              if parts[1].nil?
+                result = arg.return_type
+              else
+                result = api_map.infer_signature_type(parts[1], parts[0], scope: :instance)
+              end
             end
           end
-        end
-        if arg.nil?
-          # Check for yieldparams
-          parts = signature.split('.', 2)
-          yp = get_yieldparams_at(index).keep_if{|s| s.to_s == parts[0]}.first
-          unless yp.nil?
-            if parts[1].nil? or parts[1].empty?
-              result = yp.return_type
-            else
-              newsig = parts[1..-1].join('.')
-              result = api_map.infer_signature_type(newsig, yp.return_type, scope: :instance)
+          if arg.nil?
+            # Check for yieldparams
+            parts = signature.split('.', 2)
+            yp = get_yieldparams_at(index).keep_if{|s| s.to_s == parts[0]}.first
+            unless yp.nil?
+              if parts[1].nil? or parts[1].empty?
+                result = yp.return_type
+              else
+                newsig = parts[1..-1].join('.')
+                result = api_map.infer_signature_type(newsig, yp.return_type, scope: :instance)
+              end
             end
           end
         end
+      else
+        if signature.empty?
+          result = type
+        else
+          cursed = get_signature_index_at(index)
+          rest = signature[literal.loc.expression.end_pos+(cursed-literal.loc.expression.end_pos)..-1]
+          return type if rest.nil?
+          lit_code = @code[literal.loc.expression.begin_pos..literal.loc.expression.end_pos]
+          rest = rest[lit_code.length..-1] if rest.start_with?(lit_code)
+          rest = rest[1..-1] if rest.start_with?('.')
+          rest = rest[0..-2] if rest.end_with?('.')
+          if rest.empty?
+            result = type
+          else
+            result = api_map.infer_signature_type(rest, type, scope: :instance)
+          end
+        end
       end
       result
     end
@@ -439,6 +464,10 @@ module Solargraph
       inferred = nil
       parts = signature.split('.')
       ns_here = namespace_from(node)
+      unless signature.include?('.')
+        fqns = api_map.find_fully_qualified_namespace(signature, ns_here)
+        return "Class<#{fqns}>" unless fqns.nil?
+      end
       start = parts[0]
       return nil if start.nil?
       remainder = parts[1..-1]

data/lib/solargraph/node_methods.rb

@@ -41,7 +41,7 @@ module Solargraph
 
     def infer_literal_node_type node
       return nil unless node.kind_of?(AST::Node)
-      if node.type == :str
+      if node.type == :str or node.type == :dstr
         return 'String'
       elsif node.type == :array
         return 'Array'

data/lib/solargraph/server.rb

@@ -15,6 +15,11 @@ module Solargraph
       GC.start
     end
 
+    def self.wait
+      @@semaphore.lock
+      @@semaphore.unlock
+    end
+
     post '/prepare' do
       STDERR.puts "Preparing #{params['workspace']}"
       Server.prepare_workspace params['workspace']
@@ -44,7 +49,7 @@ module Solargraph
       begin
         sugg = []
         workspace = params['workspace'] || nil
-        Server.prepare_workspace workspace unless @@api_hash.has_key?(workspace)
+        #Server.prepare_workspace workspace unless @@api_hash.has_key?(workspace)
         @@semaphore.synchronize {
           code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: @@api_hash[workspace], cursor: [params['line'].to_i, params['column'].to_i])
           offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
@@ -63,7 +68,7 @@ module Solargraph
       begin
         sugg = []
         workspace = params['workspace'] || nil
-        Server.prepare_workspace workspace unless @@api_hash.has_key?(workspace)
+        #Server.prepare_workspace workspace unless @@api_hash.has_key?(workspace)
         @@semaphore.synchronize {
           code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: @@api_hash[workspace], cursor: [params['line'].to_i, params['column'].to_i])
           offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
@@ -121,12 +126,14 @@ module Solargraph
       end
 
       def prepare_workspace directory
-        api_map = Solargraph::ApiMap.new(directory)
-        api_map.update_yardoc
-        @@semaphore.synchronize {
-          @@api_hash[directory] = api_map
-        }
-      end
+        Thread.new do
+          @@semaphore.synchronize {
+            api_map = Solargraph::ApiMap.new(directory)
+            api_map.update_yardoc
+            @@api_hash[directory] = api_map
+          }
+        end
+    end
     end
 
     class Helpers

data/lib/solargraph/shell.rb

@@ -86,7 +86,8 @@ module Solargraph
         file.puts "include:",
           "  - ./**/*.rb",
           "exclude:",
-          "  - spec/**/*"
+          "  - spec/**/*",
+          "  - test/**/*"
       end
       STDOUT.puts "Configuration file initialized."
     end

data/lib/solargraph/suggestion.rb

@@ -39,14 +39,9 @@ module Solargraph
     def return_type
       if @return_type.nil?
         if code_object.nil?
-          unless documentation.nil?
-            if documentation.kind_of?(YARD::Docstring)
-              t = documentation.tag(:return)
-              @return_type = t.types[0] unless t.nil? or t.types.nil?
-            else
-              match = documentation.match(/@return \[([a-z0-9:_]*)/i)
-              @return_type = match[1] unless match.nil?
-            end
+          if documentation.kind_of?(YARD::Docstring)
+            t = documentation.tag(:return)
+            @return_type = t.types[0] unless t.nil? or t.types.nil?
           end
         else
           o = code_object.tag(:overload)
@@ -63,8 +58,8 @@ module Solargraph
 
     def documentation
       if @documentation.nil?
-        unless @code_object.nil?
-          @documentation = @code_object.docstring unless @code_object.docstring.nil?
+        unless @code_object.nil? or @code_object.docstring.nil?
+          @documentation = @code_object.docstring
         end
       end
       @documentation

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.11.2'
+  VERSION = '0.12.0'
 end

data/lib/solargraph/yard_map.rb

@@ -1,7 +1,5 @@
-require 'rubygems'
 require 'parser/current'
 require 'yard'
-require 'bundler'
 
 module Solargraph
 
@@ -10,7 +8,7 @@ module Solargraph
 
     attr_reader :workspace
 
-    def initialize required: [], workspace: nil, with_bundled: false
+    def initialize required: [], workspace: nil
       @workspace = workspace
       unless workspace.nil?
         wsy = File.join(workspace, '.yardoc')
@@ -34,26 +32,9 @@ module Solargraph
       }
       yardocs.push File.join(Dir.home, '.solargraph', 'cache', '2.0.0', 'yardoc')
       yardocs.uniq!
-      include_bundled_gems if with_bundled
       cache_core
     end
 
-    def include_bundled_gems
-      return if workspace.nil?
-      lockfile = File.join(workspace, 'Gemfile.lock')
-      return unless File.file?(lockfile)
-      parser = Bundler::LockfileParser.new(Bundler.read_file(lockfile))
-      parser.specs.each do |s|
-        STDERR.puts "Specs include #{s.name}"
-        gy = YARD::Registry.yardoc_file_for_gem(s.name)
-        if gy.nil?
-          STDERR.puts "Bundled gem not found: #{s.name}"
-        else
-          yardocs.unshift gy unless yardocs.include?(gy)
-        end
-      end
-    end
-
     # @return [Array<String>]
     def yardocs
       @yardocs ||= []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -124,30 +124,30 @@ dependencies:
   name: debase
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: ruby-debug-ide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 description: IDE tools for code completion and inline documentation
 email: admin@castwide.com
 executables:
@@ -158,8 +158,12 @@ files:
 - bin/solargraph
 - lib/solargraph.rb
 - lib/solargraph/api_map.rb
+- lib/solargraph/api_map/attr_pin.rb
 - lib/solargraph/api_map/cache.rb
 - lib/solargraph/api_map/config.rb
+- lib/solargraph/api_map/cvar_pin.rb
+- lib/solargraph/api_map/ivar_pin.rb
+- lib/solargraph/api_map/method_pin.rb
 - lib/solargraph/code_map.rb
 - lib/solargraph/node_methods.rb
 - lib/solargraph/server.rb