solargraph 0.26.1 → 0.27.0

data/lib/solargraph/api_map/store.rb

@@ -3,41 +3,12 @@ require 'set'
 module Solargraph
   class ApiMap
     class Store
-      # @param sources [Array<Solargraph::Source>]
-      # @param yard_pins [Array<Solargraph::Pin::Base>]
-      def initialize sources, yard_pins
-        inner_update sources
-        pins.concat yard_pins
-        index
-      end
-
       # @return [Array<Solargraph::Pin::Base>]
-      def pins
-        @pins ||= []
-      end
+      attr_reader :pins
 
-      # @param *sources [Array<Solargraph::Source>]
-      # @return [void]
-      def remove *sources
-        sources.each do |source|
-          pins.delete_if { |pin| !pin.yard_pin? and pin.filename == source.filename }
-          symbols.delete_if { |pin| pin.filename == source.filename }
-        end
-        index
-      end
-
-      # @param *sources [Array<Solargraph::Source>]
-      # @return [void]
-      def update *sources
-        inner_update sources
-        index
-      end
-
-      # @param yard_pins [Array<Solargraph::Pin::Base>]
-      # @return [void]
-      def update_yard yard_pins
-        pins.delete_if(&:yard_pin?)
-        pins.concat yard_pins
+      # @param pins [Array<Solargraph::Source>]
+      def initialize pins = []
+        @pins = pins
         index
       end
 
@@ -56,17 +27,10 @@ module Solargraph
       # @return [Array<Solargraph::Pin::Base>]
       def get_methods fqns, scope: :instance, visibility: [:public]
         namespace_children(fqns).select{ |pin|
-          pin.kind == Pin::METHOD and (pin.scope == scope or fqns == '') and visibility.include?(pin.visibility)
+          [Pin::METHOD, Pin::ATTRIBUTE].include?(pin.kind) and (pin.scope == scope or fqns == '') and visibility.include?(pin.visibility)
         }
       end
 
-      # @param fqns [String]
-      # @param scope [Symbol]
-      # @return [Array<Solargraph::Pin::Base>]
-      def get_attrs fqns, scope
-        namespace_children(fqns).select{ |pin| pin.kind == Pin::ATTRIBUTE and pin.scope == scope }
-      end
-
       # @param fqns [String]
       # @return [String]
       def get_superclass fqns
@@ -110,7 +74,7 @@ module Solargraph
       # @param scope [Symbol] :class or :instance
       # @return [Array<Solargraph::Pin::Base>]
       def get_instance_variables(fqns, scope = :instance)
-        namespace_children(fqns).select{|pin| pin.kind == Pin::INSTANCE_VARIABLE and pin.scope == scope}
+        namespace_children(fqns).select{|pin| pin.kind == Pin::INSTANCE_VARIABLE and pin.context.scope == scope}
       end
 
       # @param fqns [String]
@@ -145,6 +109,16 @@ module Solargraph
         @method_pins ||= pins.select{|p| p.kind == Pin::METHOD or p.kind == Pin::ATTRIBUTE}
       end
 
+      # @param fqns [String]
+      # @return [Array<String>]
+      def domains(fqns)
+        result = []
+        fqns_pins(fqns).each do |nspin|
+          result.concat nspin.domains
+        end
+        result
+      end
+
       private
 
       # @param fqns [String]
@@ -182,26 +156,17 @@ module Solargraph
       def index
         namespace_map.clear
         namespaces.clear
+        symbols.clear
         namespace_map[''] = []
         pins.each do |pin|
           namespace_map[pin.namespace] ||= []
           namespace_map[pin.namespace].push pin
           namespaces.add pin.path if pin.kind == Pin::NAMESPACE and !pin.path.empty?
+          symbols.push pin if pin.kind == Pin::SYMBOL
         end
         @namespace_pins = nil
         @method_pins = nil
       end
-
-      # @param sources [Array<Solargraph::Source>]
-      # @return [void]
-      def inner_update sources
-        sources.each do |source|
-          pins.delete_if { |pin| !pin.yard_pin? and pin.filename == source.filename }
-          symbols.delete_if { |pin| pin.filename == source.filename }
-          pins.concat source.pins
-          symbols.concat source.symbols
-        end
-      end
     end
   end
 end

data/lib/solargraph/bundle.rb

@@ -0,0 +1,22 @@
+module Solargraph
+  class Bundle
+    # @return [Array<Source>]
+    attr_reader :sources
+
+    # @return [Array<String>]
+    attr_reader :required
+
+    # @return [Array<String>]
+    attr_reader :load_paths
+
+    # @return [YardMap]
+    attr_reader :yard_map
+
+    def initialize sources: [], required: [], load_paths: [], yard_map: YardMap.new
+      @sources = sources
+      @required = required
+      @load_paths = load_paths
+      @yard_map = yard_map
+    end
+  end
+end

data/lib/solargraph/complex_type.rb

@@ -4,8 +4,11 @@ module Solargraph
     #   including the module. One possibility:
     #
     # @!parse
-    #   include BasicTypeMethods
+    #   include TypeMethods
 
+    autoload :TypeMethods, 'solargraph/complex_type/type_methods'
+    autoload :UniqueType,  'solargraph/complex_type/unique_type'
+  
     def initialize types = [ComplexType::UNDEFINED]
       super()
       concat types
@@ -24,7 +27,7 @@ module Solargraph
     end
 
     def respond_to_missing?(name, include_private = false)
-      BasicTypeMethods.public_instance_methods.include?(name) || super
+      TypeMethods.public_instance_methods.include?(name) || super
     end
 
     def to_s
@@ -71,7 +74,7 @@ module Solargraph
                 subtype_string += char
               elsif base.end_with?('=')
                 raise ComplexTypeError, "Invalid hash thing" unless key_types.nil?
-                types.push ComplexType.new([BasicType.new(base[0..-2].strip)])
+                types.push ComplexType.new([UniqueType.new(base[0..-2].strip)])
                 key_types = types
                 types = []
                 base = ''
@@ -99,7 +102,7 @@ module Solargraph
               raise ComplexTypeError, "Invalid close in type #{type_string}" if paren_stack < 0
               next
             elsif char == ',' and point_stack == 0 and curly_stack == 0 and paren_stack == 0
-              types.push ComplexType.new([BasicType.new(base.strip, subtype_string.strip)])
+              types.push ComplexType.new([UniqueType.new(base.strip, subtype_string.strip)])
               base = ''
               subtype_string = ''
               next
@@ -113,7 +116,7 @@ module Solargraph
           base.strip!
           subtype_string.strip!
           raise ComplexTypeError, "Unclosed subtype in #{type_string}" if point_stack != 0 or curly_stack != 0 or paren_stack != 0
-          types.push ComplexType.new([BasicType.new(base, subtype_string)])
+          types.push ComplexType.new([UniqueType.new(base, subtype_string)])
         end
         unless key_types.nil?
           raise ComplexTypeError, "Invalid use of key/value parameters" unless partial
@@ -129,5 +132,6 @@ module Solargraph
     VOID = ComplexType.parse('void')
     UNDEFINED = ComplexType.parse('undefined')
     SYMBOL = ComplexType.parse('Symbol')
+    ROOT = ComplexType.parse('Class<>')
   end
 end

data/lib/solargraph/complex_type/type_methods.rb

@@ -0,0 +1,113 @@
+module Solargraph
+  class ComplexType
+    module TypeMethods
+      # @return [String]
+      attr_reader :name
+
+      # @return [String]
+      attr_reader :substring
+
+      # @return [String]
+      attr_reader :tag
+
+      # @return [Array<ComplexType>]
+      attr_reader :subtypes
+
+      # @return [Boolean]
+      def duck_type?
+        @duck_type ||= name.start_with?('#')
+      end
+
+      # @return [Boolean]
+      def nil_type?
+        @nil_type ||= (name.downcase == 'nil')
+      end
+
+      # @return [Boolean]
+      def parameters?
+        !substring.empty?
+      end
+
+      def void?
+        name == 'void'
+      end
+
+      def defined?
+        !undefined?
+      end
+
+      def undefined?
+        name == 'undefined'
+      end
+
+      # @return [Boolean]
+      def list_parameters?
+        substring.start_with?('<')
+      end
+
+      # @return [Boolean]
+      def fixed_parameters?
+        substring.start_with?('(')
+      end
+
+      # @return [Boolean]
+      def hash_parameters?
+        substring.start_with?('{')
+      end
+
+      # @return [Array<ComplexType>]
+      def value_types
+        @subtypes
+      end
+
+      # @return [Array<ComplexType>]
+      def key_types
+        @key_types
+      end
+
+      # @return [String]
+      def namespace
+        @namespace ||= 'Object' if duck_type?
+        @namespace ||= 'NilClass' if nil_type?
+        @namespace ||= ((name == 'Class' or name == 'Module') and !subtypes.empty?) ? subtypes.first.name : name
+      end
+
+      # @return [Symbol] :class or :instance
+      def scope
+        @scope ||= :instance if duck_type? or nil_type?
+        @scope ||= ((name == 'Class' or name == 'Module') and !subtypes.empty?) ? :class : :instance
+      end
+
+      def == other
+        return false unless self.class == other.class
+        tag == other.tag
+      end
+
+      # Generate a ComplexType that fully qualifies this type's namespaces.
+      #
+      # @param api_map [ApiMap] The ApiMap that performs qualification
+      # @param context [String] The namespace from which to resolve names
+      # @return [ComplexType] The generated ComplexType
+      def qualify api_map, context = ''
+        return ComplexType.parse(tag) if duck_type? or void? or undefined?
+        fqns = api_map.qualify(name, context)
+        return ComplexType::UNDEFINED if fqns.nil?
+        ltypes = key_types.map do |t|
+          t.qualify api_map, context
+        end
+        rtypes = value_types.map do |t|
+          t.qualify api_map, context
+        end
+        if list_parameters?
+          Solargraph::ComplexType.parse("#{fqns}<#{rtypes.map(&:tag).join(', ')}>").first
+        elsif fixed_parameters?
+          Solargraph::ComplexType.parse("#{fqns}(#{rtypes.map(&:tag).join(', ')})").first
+        elsif hash_parameters?
+          Solargraph::ComplexType.parse("#{fqns}{#{ltypes.map(&:tag).join(', ')} => #{rtypes.map(&:tag).join(', ')}}").first
+        else
+          Solargraph::ComplexType.parse(fqns).first
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/complex_type/unique_type.rb

@@ -0,0 +1,35 @@
+module Solargraph
+  class ComplexType
+    class UniqueType
+      include TypeMethods
+
+      # Create a BasicType with the specified name and an optional substring.
+      # The substring is the parameter section of a parametrized type, e.g., for
+      # the type `Array<String>`, the name is `Array` and the substring is
+      # `<String>`.
+      #
+      # @param name [String] The name of the type
+      # @param substring [String] The substring of the type
+      def initialize name, substring = ''
+        @name = name
+        @substring = substring
+        @tag = name + substring
+        @key_types = []
+        @subtypes = []
+        return unless parameters?
+        subs = ComplexType.parse(substring[1..-2], partial: true)
+        if hash_parameters?
+          raise ComplexTypeError, "Bad hash type" unless !subs.is_a?(ComplexType) and subs.length == 2 and !subs[0].is_a?(ComplexType) and !subs[1].is_a?(ComplexType)
+          @key_types.concat subs[0]
+          @subtypes.concat subs[1]
+        else
+          @subtypes.concat subs
+        end
+      end
+
+      def to_s
+        tag
+      end
+    end
+  end
+end

data/lib/solargraph/core_fills.rb

@@ -12,6 +12,7 @@ module Solargraph
       Array#select Array#reject Array#keep_if Array#delete_if
       Enumerable#select
       Object#clone Object#dup Object#freeze Object#taint Object#untaint
+      String#freeze
     ].freeze
 
     METHODS_RETURNING_SUBTYPES = %w[

data/lib/solargraph/diagnostics.rb

@@ -3,11 +3,12 @@ module Solargraph
   # and providing the results to language server clients.
   #
   module Diagnostics
-    autoload :Base, 'solargraph/diagnostics/base'
-    autoload :Severities, 'solargraph/diagnostics/severities'
-    autoload :Rubocop, 'solargraph/diagnostics/rubocop'
+    autoload :Base,            'solargraph/diagnostics/base'
+    autoload :Severities,      'solargraph/diagnostics/severities'
+    autoload :Rubocop,         'solargraph/diagnostics/rubocop'
     autoload :RequireNotFound, 'solargraph/diagnostics/require_not_found'
-    autoload :TypeNotDefined, 'solargraph/diagnostics/type_not_defined'
+    autoload :TypeNotDefined,  'solargraph/diagnostics/type_not_defined'
+    autoload :UpdateErrors,    'solargraph/diagnostics/update_errors'
 
     class << self
       # Add a reporter with a name to identify it in .solargraph.yml files.
@@ -44,5 +45,6 @@ module Solargraph
     register 'rubocop', Rubocop
     register 'require_not_found', RequireNotFound
     register 'type_not_defined', TypeNotDefined
+    register 'update_errors', UpdateErrors
   end
 end

data/lib/solargraph/diagnostics/base.rb

@@ -5,10 +5,13 @@ module Solargraph
       # The result is an array of hash objects that conform to the LSP's
       # Diagnostic specification.
       #
+      # Subclasses should override this method.
+      #
       # @param source [Solargraph::Source]
       # @param api_map [Solargraph::ApiMap]
       # @return [Array<Hash>]
       def diagnose source, api_map
+        []
       end
     end
   end

data/lib/solargraph/diagnostics/require_not_found.rb

@@ -7,7 +7,8 @@ module Solargraph
       def diagnose source, api_map
         result = []
         refs = {}
-        source.requires.each do |ref|
+        map = Solargraph::SourceMap.map(source)
+        map.requires.each do |ref|
           refs[ref.name] = ref
         end
         api_map.unresolved_requires.each do |r|

data/lib/solargraph/diagnostics/rubocop.rb

@@ -20,7 +20,7 @@ module Solargraph
       # @return [Array<Hash>]
       def diagnose source, api_map
         begin
-          options, paths = generate_options(api_map.workspace, source.filename, source.code)
+          options, paths = generate_options(source.filename, source.code)
           runner = RuboCop::Runner.new(options, RuboCop::ConfigStore.new)
           result = redirect_stdout{ runner.run(paths) }
           make_array JSON.parse(result)
@@ -35,18 +35,33 @@ module Solargraph
       # @param filename [String]
       # @param code [String]
       # @return [Array]
-      def generate_options workspace, filename, code
+      # def generate_options workspace, filename, code
+      def generate_options filename, code
         args = ['-f', 'j']
-        unless workspace.nil? or workspace.directory.nil?
-          rc = File.join(workspace.directory, '.rubocop.yml')
-          args.push('-c', fix_drive_letter(rc)) if File.file?(rc)
-        end
+        rubocop_file = find_rubocop_file(filename)
+        args.push('-c', fix_drive_letter(rubocop_file)) unless rubocop_file.nil?
         args.push filename
         options, paths = RuboCop::Options.new.parse(args)
         options[:stdin] = code
         [options, paths]
       end
 
+      def find_rubocop_file filename
+        rcfile = nil
+        dir = File.dirname(filename)
+        while rcfile.nil?
+          here = File.join(dir, '.rubocop.yml')
+          if File.exist?(here)
+            rcfile = here
+            break
+          else
+            break if File.dirname(dir) == dir
+            dir = File.dirname(dir)
+          end
+        end
+        rcfile
+      end
+
       # @todo This is a smelly way to redirect output, but the RuboCop specs do the
       #   same thing.
       # @return [String]