solargraph 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fca7cec06944baee613ea512c26052d002badf1
-  data.tar.gz: 56b786723a5f0b33ae2612d110977f74f1d4bb7f
+  metadata.gz: c0d57ee417fd4007c31d34a555f76701a51a19be
+  data.tar.gz: 8b254f32899b99c3e2faa25361f043d05de235f2
 SHA512:
-  metadata.gz: 3e8e40663cd4629b55a4436a33d8c8606b1087dbabbdd21d0180f1ca8b4cb26b563bd2f4f8076701ccf1fa7148513df4d01a063a04366bbd137df8b6cac5dcf9
-  data.tar.gz: d7bf1113b69a08d74805319918a756f6894810c5397912f68340cf15fb050fac2e989a292b89efb8f7899f56fd5c5d2e502c8d3d35d7a4b042a905993b8dd7bf
+  metadata.gz: 764e250b3ba7f52b0d4dbaaf4b7180cf4094bfc8b7dabf6e4054ddf342c02f9587470823c2629b3b132c83627ace4e8c738c10755e76c373a922d192f4fd6e43
+  data.tar.gz: 0abe5016eb85276abc4d2fc44a8f66c166986630b7dd5ba04878b19062e16b4fc45c2b6f195032cd73792964d1ae5dec3b1f0ff5607b6fb47404c6f31c8c6b74

data/lib/solargraph/api_map/cache.rb

@@ -3,13 +3,24 @@ module Solargraph
     class Cache
       def initialize
         @signature_types = {}
+        @assignment_node_types = {}
       end
+
       def get_signature_type signature, namespace, scope
         @signature_types[[signature, namespace, scope]]
       end
+
       def set_signature_type signature, namespace, scope, value
         @signature_types[[signature, namespace, scope]] = value
       end
+
+      def get_assignment_node_type node, namespace
+        @assignment_node_types[[node, namespace]]
+      end
+
+      def set_assignment_node_type node, namespace, value
+        @assignment_node_types[[node, namespace]] = value
+      end
     end
   end
 end

data/lib/solargraph/api_map/config.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Solargraph
   class ApiMap
     class Config

data/lib/solargraph/api_map.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'parser/current'
-require 'yaml'
 
 module Solargraph
   class ApiMap
@@ -29,7 +28,13 @@ module Solargraph
     include NodeMethods
     include YardMethods
 
+    # The root directory of the project. The ApiMap will search here for
+    # additional files to parse and analyze.
+    #
+    # @return [String]
     attr_reader :workspace
+
+    # @return [Array<String>]
     attr_reader :required
 
     # @param workspace [String]
@@ -46,28 +51,24 @@ module Solargraph
       end
     end
 
-    def clear
-      @file_source = {}
-      @file_nodes = {}
-      @file_comments = {}
-      @parent_stack = {}
-      @namespace_map = {}
-      @namespace_tree = {}
-      @required = []
-    end
-
     # @return [Solargraph::YardMap]
     def yard_map
       @yard_map ||= YardMap.new(required: required, workspace: workspace)
     end
 
+    # Add a file to the map.
+    #
     # @param filename [String]
+    # @return [AST::Node]
     def append_file filename
       append_source File.read(filename), filename
     end
 
+    # Add a string of source code to the map.
+    #
     # @param text [String]
     # @param filename [String]
+    # @return [AST::Node]
     def append_source text, filename = nil
       @file_source[filename] = text
       begin
@@ -79,6 +80,9 @@ module Solargraph
       end
     end
 
+    # Add an AST node to the map.
+    #
+    # @return [AST::Node]
     def append_node node, comments, filename = nil
       @file_comments[filename] = associate_comments(node, comments)
       mapified = reduce(node, @file_comments[filename])
@@ -90,29 +94,21 @@ module Solargraph
       root
     end
 
+    # Get the docstring associated with a node.
+    #
+    # @param node [AST::Node]
+    # @return [YARD::Docstring]
     def get_comment_for node
       filename = get_filename_for(node)
       return nil if @file_comments[filename].nil?
       @file_comments[filename][node.loc]
     end
 
+    # @return [Array<Solargraph::Suggestion>]
     def self.get_keywords
-      result = []
-      keywords = KEYWORDS + ['attr_reader', 'attr_writer', 'attr_accessor', 'private', 'public', 'protected']
-      keywords.each { |k|
-        result.push Suggestion.new(k, kind: Suggestion::KEYWORD, detail: 'Keyword')
-      }
-      result
-    end
-
-    def process_maps
-      @parent_stack = {}
-      @namespace_map = {}
-      @namespace_tree = {}
-      @file_nodes.values.each { |f|
-        map_parents f
-        map_namespaces f
-      }
+      @keyword_suggestions ||= (KEYWORDS + MAPPABLE_METHODS).map{ |s|
+        Suggestion.new(s.to_s, kind: Suggestion::KEYWORD, detail: 'Keyword')
+      }.freeze
     end
 
     def namespaces
@@ -237,18 +233,7 @@ module Solargraph
           break unless vn.nil?
         }
       end
-      unless vn.nil?
-        cmnt = get_comment_for(vn)
-        unless cmnt.nil?
-          tag = cmnt.tag(:type)
-          result = tag.types[0] unless tag.nil? or tag.types.empty?
-        end
-        result = infer_literal_node_type(vn.children[1]) if result.nil?
-        if result.nil?
-          signature = resolve_node_signature(vn.children[1])
-          result = infer_signature_type(signature, namespace)
-        end
-      end
+      result = infer_assignment_node_type(vn, namespace) unless vn.nil?
       result
     end
 
@@ -314,6 +299,32 @@ module Solargraph
       []
     end
 
+    def infer_assignment_node_type node, namespace
+      type = cache.get_assignment_node_type(node, namespace)
+      if type.nil?
+        cmnt = get_comment_for(node)
+        if cmnt.nil?
+          type = infer_literal_node_type(node.children[1])
+          if type.nil?
+            sig = resolve_node_signature(node.children[1])
+            # Avoid infinite loops from variable assignments that reference themselves
+            return nil if node.children[0].to_s == sig.split('.').first
+            type = infer_signature_type(sig, namespace)
+          end
+        else
+          t = cmnt.tag(:type)
+          if t.nil?
+            sig = resolve_node_signature(node.children[1])
+            type = infer_signature_type(sig, namespace)
+          else
+            type = t.types[0]
+          end
+        end
+        cache.set_assignment_node_type(node, namespace, type)
+      end
+      type
+    end
+
     def infer_signature_type signature, namespace, scope: :class
       cached = cache.get_signature_type(signature, namespace, scope)
       return cached unless cached.nil?
@@ -388,6 +399,7 @@ module Solargraph
       end
     end
 
+    # @return [Array<String>]
     def get_method_args node
       list = nil
       args = []
@@ -422,7 +434,7 @@ module Solargraph
         return get_methods(namespace.split('#').first, root, visibility: visibility)
       end
       meths = []
-      meths += inner_get_instance_methods(namespace, root, []) #unless has_yardoc?
+      meths += inner_get_instance_methods(namespace, root, [], visibility) #unless has_yardoc?
       fqns = find_fully_qualified_namespace(namespace, root)
       yard_meths = yard_map.get_instance_methods(fqns, '', visibility: visibility)
       if yard_meths.any?
@@ -493,6 +505,27 @@ module Solargraph
 
     private
 
+    def clear
+      @file_source = {}
+      @file_nodes = {}
+      @file_comments = {}
+      @parent_stack = {}
+      @namespace_map = {}
+      @namespace_tree = {}
+      @required = []
+    end
+
+    def process_maps
+      @parent_stack = {}
+      @namespace_map = {}
+      @namespace_tree = {}
+      @file_nodes.values.each { |f|
+        map_parents f
+        map_namespaces f
+      }
+    end
+
+    # @return [Solargraph::ApiMap::Cache]
     def cache
       @cache ||= Cache.new
     end
@@ -568,12 +601,13 @@ module Solargraph
       meths
     end
 
-    def inner_get_instance_methods(namespace, root, skip)
+    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))
@@ -582,23 +616,22 @@ module Solargraph
               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) unless skip.include?(s)
+              meths += get_instance_methods(s, namespace, visibility: visibility - [:private]) unless skip.include?(s)
             end
-            current_scope = :public
             n.children.each { |c|
               if c.kind_of?(AST::Node) and c.type == :send and [:public, :protected, :private].include?(c.children[1])
-              # TODO: Determine the current scope so we can decide whether to
-              # exclude protected or private methods. Right now we're just
-              # assuming public only
+                current_scope = c.children[1]
               elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :include
                 fqmod = find_fully_qualified_namespace(const_from(c.children[2]), root)
                 meths += get_instance_methods(fqmod) unless fqmod.nil? or skip.include?(fqmod)
-              elsif current_scope == :public
+              else
                 if c.kind_of?(AST::Node) and c.type == :def
-                  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)
+                  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
@@ -610,7 +643,7 @@ module Solargraph
                 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]}=", 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
@@ -619,7 +652,7 @@ module Solargraph
         end
         # This is necessary to get included modules from workspace definitions
         get_include_strings_from(n).each { |i|
-          meths += inner_get_instance_methods(i, fqns, skip)
+          meths += inner_get_instance_methods(i, fqns, skip, visibility)
         }
       }
       meths.uniq
@@ -671,21 +704,8 @@ module Solargraph
           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 = nil
-              cmnt = get_comment_for(c)
-              if cmnt.nil?
-                sig = resolve_node_signature(c.children[1])
-                type = infer_signature_type(sig, namespace)
-              else
-                t = cmnt.tag(:type)
-                if t.nil?
-                  sig = resolve_node_signature(c.children[1])
-                  type = infer_signature_type(sig, namespace)
-                else
-                  type = t.types[0]
-                end
-              end
-              arr.push Suggestion.new(c.children[0], kind: Suggestion::VARIABLE, documentation: cmnt, return_type: type)
+              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
@@ -700,21 +720,8 @@ module Solargraph
         node.children.each { |c|
           next unless c.kind_of?(AST::Node)
           if c.type == :cvasgn
-            type = nil
-            cmnt = get_comment_for(c)
-            if cmnt.nil?
-              sig = resolve_node_signature(c.children[1])
-              type = infer_signature_type(sig, namespace)
-            else
-              t = cmnt.tag(:type)
-              if t.nil?
-                sig = resolve_node_signature(c.children[1])
-                type = infer_signature_type(sig, namespace)
-              else
-                type = t.types[0]
-              end
-            end
-          arr.push Suggestion.new(c.children[0], kind: Suggestion::VARIABLE, documentation: cmnt, return_type: type)
+            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)
         }
@@ -729,6 +736,7 @@ module Solargraph
     # @return [String] The fully qualified namespace for the signature's type
     #   or nil if a type could not be determined
     def inner_infer_signature_type signature, namespace, scope: :instance
+      namespace = clean_namespace_string(namespace)
       return nil if signature.nil?
       signature.gsub!(/\.$/, '')
       if signature.nil? or signature.empty?
@@ -749,7 +757,13 @@ module Solargraph
         p = parts.shift
         next if p.empty?
         if top and scope == :class
-          #next if p == 'new'
+          if p == 'self'
+            top = false
+            return "Class<#{type}>" if parts.empty?
+            sub = inner_infer_signature_type(parts.join('.'), type, scope: :class)
+            return sub unless sub.to_s == ''
+            next
+          end
           if p == 'new'
             scope = :instance
             type = namespace
@@ -758,12 +772,19 @@ module Solargraph
           end
           first_class = find_fully_qualified_namespace(p, namespace)
           sub = nil
-          sub = infer_signature_type(parts.join('.'), first_class, scope: :class) unless first_class.nil?
+          sub = inner_infer_signature_type(parts.join('.'), first_class, scope: :class) unless first_class.nil?
+          return sub unless sub.to_s == ''
+        end
+        if top and scope == :instance and p == 'self'
+          return type if parts.empty?
+          sub = infer_signature_type(parts.join('.'), type, scope: :instance)
           return sub unless sub.to_s == ''
         end
         unless p == 'new' and scope != :instance
           if scope == :instance
-            meths = get_instance_methods(type)
+            visibility = [:public]
+            visibility.push :private, :protected if top
+            meths = get_instance_methods(type, visibility: visibility)
             meths += get_methods('') if top or type.to_s == ''
           else
             meths = get_methods(type)
@@ -772,7 +793,14 @@ module Solargraph
           return nil if meths.empty?
           type = nil
           match = meths[0].return_type
-          type = find_fully_qualified_namespace(match) unless match.nil?
+          unless match.nil?
+            cleaned = clean_namespace_string(match)
+            if cleaned.end_with?('#class')
+              return inner_infer_signature_type(parts.join('.'), cleaned.split('#').first, scope: :class)
+            else
+              type = find_fully_qualified_namespace(cleaned)
+            end
+          end
         end
         scope = :instance
         top = false
@@ -855,7 +883,7 @@ module Solargraph
       result = node.updated(type, children)
       result
     end
-    
+
     def local_path? path
       return false if workspace.nil?
       return true if File.exist?(File.join workspace, 'lib', path)
@@ -908,7 +936,12 @@ module Solargraph
     end
 
     def clean_namespace_string namespace
-      namespace.to_s.gsub(/<.*$/, '')
+      result = namespace.to_s.gsub(/<.*$/, '')
+      if result == 'Class' and namespace.include?('<')
+        subtype = namespace.match(/<([a-z0-9:_]*)/i)[1]
+        result = "#{subtype}#class"
+      end
+      result
     end
   end
 end

data/lib/solargraph/code_map.rb

@@ -2,10 +2,32 @@ require 'parser/current'
 
 module Solargraph
   class CodeMap
+
+    # The root node of the parsed code.
+    #
+    # @return [AST::Node]
     attr_accessor :node
+
+    # The source code being analyzed.
+    #
+    # @return [String]
     attr_reader :code
+
+    # The source code after modification to fix syntax errors during parsing.
+    # This string will match #code if no modifications were made.
+    #
+    # @return [String]
     attr_reader :parsed
+
+    # The filename for the source code.
+    #
+    # @return [String]
     attr_reader :filename
+
+    # The root directory of the project. The ApiMap will search here for
+    # additional files to parse and analyze.
+    #
+    # @return [String]
     attr_reader :workspace
 
     include NodeMethods
@@ -39,7 +61,11 @@ module Solargraph
             if !fixed_cursor and !cursor.nil? and e.message.include?('token $end') and cursor >= 2
               fixed_cursor = true
               spot = cursor - 2
-              repl = '_'
+              if tmp[cursor - 1] == '.'
+                repl = ';'
+              else
+                repl = '#'
+              end
             else
               spot = e.diagnostic.location.begin_pos
               repl = '_'
@@ -402,7 +428,7 @@ module Solargraph
         return api_map.infer_signature_type(remainder.join('.'), type, scope: :instance)
       elsif start.start_with?('@')
         scope = (node.type == :def ? :instance : :scope)
-        type = api_map.infer_instance_variable(start, ns_here, scope: :instance)
+        type = api_map.infer_instance_variable(start, ns_here, scope)
         return nil if type.nil?
         return type if remainder.empty?
         return api_map.infer_signature_type(remainder.join('.'), type, scope: :instance)
@@ -438,13 +464,6 @@ module Solargraph
       inferred
     end
 
-    def suggest_for_signature_at index
-      result = []
-      type = infer_signature_at(index)
-      result.concat api_map.get_instance_methods(type) unless type.nil?
-      result
-    end
-
     def get_type_comment node
       obj = nil
       cmnt = api_map.get_comment_for(node)
@@ -502,21 +521,6 @@ module Solargraph
       signature
     end
 
-    # Build a signature from the specified node. This method returns the node
-    # as an array of strings.
-    #
-    # @return [Array<String>]
-    def build_signature(node, parts)
-      if node.kind_of?(AST::Node)
-        if node.type == :send
-          parts.unshift node.children[1].to_s
-        elsif node.type == :const
-          parts.unshift unpack_name(node)
-        end
-        build_signature(node.children[0], parts)
-      end
-    end
-
     def get_snippets_at(index)
       result = []
       Snippets.definitions.each_pair { |name, detail|
@@ -637,7 +641,8 @@ module Solargraph
       node.children.each { |c|
         if c.kind_of?(AST::Node)
           if c.type == :lvasgn
-            arr.push Suggestion.new(c.children[0], kind: Suggestion::VARIABLE, documentation: api_map.get_comment_for(c))
+            type = api_map.infer_assignment_node_type(c, namespace_from(c))
+            arr.push Suggestion.new(c.children[0], kind: Suggestion::VARIABLE, documentation: api_map.get_comment_for(c), return_type: type)
           else
             arr += get_local_variables_from(c) unless [:class, :module, :def, :defs].include?(c.type)
           end

data/lib/solargraph/node_methods.rb

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

data/lib/solargraph/server.rb

@@ -27,7 +27,7 @@ module Solargraph
         workspace = params['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])
+          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)
           sugg = code_map.suggest_at(offset, with_snippets: params['with_snippets'] == '1' ? true : false, filtered: (params['filtered'] || false))
         }
@@ -46,7 +46,7 @@ module Solargraph
         workspace = params['workspace'] || nil
         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])
+          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)
           sugg = code_map.signatures_at(offset)
         }

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.10.3'
+  VERSION = '0.11.0'
 end

data/lib/solargraph/yard_map/cache.rb

@@ -10,24 +10,25 @@ module Solargraph
       @constants[[namespace, scope]] = suggestions
     end
 
-    def set_methods namespace, scope, visibility, suggestions
-      @methods[[namespace, scope, visibility]] = suggestions
+    def get_constants namespace, scope
+      @constants[[namespace, scope]]
     end
 
-    def set_instance_methods namespace, scope, visibility, suggestions
-      @instance_methods[[namespace, scope, visibility]] = suggestions
+    def set_methods namespace, scope, visibility, suggestions
+      @methods[[namespace, scope, visibility]] = suggestions
     end
 
     def get_methods namespace, scope, visibility
       @methods[[namespace, scope, visibility]]
     end
 
+    def set_instance_methods namespace, scope, visibility, suggestions
+      @instance_methods[[namespace, scope, visibility]] = suggestions
+    end
+
     def get_instance_methods namespace, scope, visibility
       @instance_methods[[namespace, scope, visibility]]
     end
 
-    def get_constants namespace, scope
-      @constants[[namespace, scope]]
-    end
   end
 end

data/lib/solargraph/yard_map.rb

@@ -139,31 +139,6 @@ module Solargraph
       result
     end
 
-    # @param signature [String]
-    def at signature
-      yardocs.each { |y|
-        yard = load_yardoc(y)
-        unless yard.nil?
-          obj = yard.at(signature)
-          return obj unless obj.nil?
-        end
-      }
-      nil
-    end
-
-    # @param signature [String]
-    # @param scope [String]
-    def resolve signature, scope
-      yardocs.each { |y|
-        yard = load_yardoc(y)
-        unless yard.nil?
-          obj = yard.resolve(P(scope), signature)
-          return obj unless obj.nil?
-        end
-      }
-      nil
-    end
-
     # @return [Array<Suggestion>]
     def get_methods namespace, scope = '', visibility: [:public]
       cached = cache.get_methods(namespace, scope, visibility)

data/lib/solargraph.rb

@@ -11,7 +11,6 @@ module Solargraph
   autoload :NodeMethods, 'solargraph/node_methods'
   autoload :Suggestion,  'solargraph/suggestion'
   autoload :Snippets,    'solargraph/snippets'
-  autoload :Mapper,      'solargraph/mapper'
   autoload :Server,      'solargraph/server'
   autoload :YardMap,     'solargraph/yard_map'
   autoload :YardMethods, 'solargraph/yard_methods'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-13 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,6 @@ files:
 - lib/solargraph/api_map/cache.rb
 - lib/solargraph/api_map/config.rb
 - lib/solargraph/code_map.rb
-- lib/solargraph/mapper.rb
 - lib/solargraph/node_methods.rb
 - lib/solargraph/server.rb
 - lib/solargraph/shell.rb
@@ -162,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/solargraph/mapper.rb

@@ -1,31 +0,0 @@
-module Solargraph
-  class Mapper
-    def initialize
-      @default_api_map = Solargraph::ApiMap.new
-      stub = Parser::CurrentRuby.parse(Solargraph::LiveParser.parse(nil))
-      @default_api_map.merge(stub)
-      @default_api_map.freeze
-      @require_nodes = {}
-    end
-
-    def get filename, text
-      workspace = find_workspace(filename)
-      CodeMap.new(text, api_map: @default_api_map, workspace: workspace, require_nodes: @require_nodes)
-    end
-
-    def find_workspace filename
-      dirname = filename
-      lastname = nil
-      result = nil
-      until dirname == lastname
-        if File.file?("#{dirname}/Gemfile")
-          result = dirname
-          break
-        end
-        lastname = dirname
-        dirname = File.dirname(dirname)
-      end
-      result || File.dirname(filename)
-    end
-  end
-end