solargraph 0.32.1 → 0.32.2

data/lib/solargraph/api_map/cache.rb

@@ -1,49 +1,49 @@
-module Solargraph
-  class ApiMap
-    class Cache
-      def initialize
-        @methods = {}
-        @constants = {}
-        @qualified_namespaces = {}
-      end
-
-      def get_methods fqns, scope, visibility, deep
-        @methods[[fqns, scope, visibility.sort, deep]]
-      end
-
-      def set_methods fqns, scope, visibility, deep, value
-        @methods[[fqns, scope, visibility.sort, deep]] = value
-      end
-
-      def get_constants namespace, context
-        @constants[[namespace, context]]
-      end
-
-      def set_constants namespace, context, value
-        @constants[[namespace, context]] = value
-      end
-
-      def get_qualified_namespace name, context
-        @qualified_namespaces[[name, context]]
-      end
-
-      def set_qualified_namespace name, context, value
-        @qualified_namespaces[[name, context]] = value
-      end
-
-      # @return [void]
-      def clear
-        @methods.clear
-        @constants.clear
-        @qualified_namespaces.clear
-      end
-
-      # @return [Boolean]
-      def empty?
-        @methods.empty? &&
-          @constants.empty? &&
-          @qualified_namespaces.empty?
-      end
-    end
-  end
-end
+module Solargraph
+  class ApiMap
+    class Cache
+      def initialize
+        @methods = {}
+        @constants = {}
+        @qualified_namespaces = {}
+      end
+
+      def get_methods fqns, scope, visibility, deep
+        @methods[[fqns, scope, visibility.sort, deep]]
+      end
+
+      def set_methods fqns, scope, visibility, deep, value
+        @methods[[fqns, scope, visibility.sort, deep]] = value
+      end
+
+      def get_constants namespace, context
+        @constants[[namespace, context]]
+      end
+
+      def set_constants namespace, context, value
+        @constants[[namespace, context]] = value
+      end
+
+      def get_qualified_namespace name, context
+        @qualified_namespaces[[name, context]]
+      end
+
+      def set_qualified_namespace name, context, value
+        @qualified_namespaces[[name, context]] = value
+      end
+
+      # @return [void]
+      def clear
+        @methods.clear
+        @constants.clear
+        @qualified_namespaces.clear
+      end
+
+      # @return [Boolean]
+      def empty?
+        @methods.empty? &&
+          @constants.empty? &&
+          @qualified_namespaces.empty?
+      end
+    end
+  end
+end

data/lib/solargraph/api_map/source_to_yard.rb

@@ -1,67 +1,67 @@
-module Solargraph
-  class ApiMap
-    module SourceToYard
-
-      # Get the YARD CodeObject at the specified path.
-      #
-      # @param path [String]
-      # @return [YARD::CodeObjects::Base]
-      def code_object_at path
-        code_object_map[path]
-      end
-
-      # @return [Array<String>]
-      def code_object_paths
-        code_object_map.keys
-      end
-
-      # @param store [Array<Store>] ApiMap pin store
-      # @return [void]
-      def rake_yard store
-        code_object_map.clear
-        store.namespace_pins.each do |pin|
-          next if pin.path.nil? or pin.path.empty?
-          if pin.type == :class
-            code_object_map[pin.path] ||= YARD::CodeObjects::ClassObject.new(root_code_object, pin.path)
-          else
-            code_object_map[pin.path] ||= YARD::CodeObjects::ModuleObject.new(root_code_object, pin.path)
-          end
-          code_object_map[pin.path].docstring = pin.docstring
-          code_object_map[pin.path].files.push pin.location.filename unless pin.location.nil?
-        end
-        store.namespace_pins.each do |pin|
-          # pin.include_references.each do |ref|
-          store.get_includes(pin.path).each do |ref|
-            code_object_map[pin.path].instance_mixins.push code_object_map[ref] unless code_object_map[ref].nil? or code_object_map[pin.path].nil?
-          end
-        end
-        store.method_pins.each do |pin|
-          code_object_map[pin.path] ||= YARD::CodeObjects::MethodObject.new(code_object_at(pin.namespace), pin.name, pin.scope)
-          code_object_map[pin.path].docstring = pin.docstring
-          code_object_map[pin.path].visibility = pin.visibility || :public
-          code_object_map[pin.path].files.push pin.location.filename unless pin.location.nil?
-          code_object_map[pin.path].parameters = pin.parameters.map do |p|
-            n = p.match(/^[a-z0-9_]*:?/i)[0]
-            v = nil
-            if p.length > n.length
-              v = p[n.length..-1].gsub(/^ = /, '')
-            end
-            [n, v]
-          end
-        end
-      end
-
-      private
-
-      # @return [Hash]
-      def code_object_map
-        @code_object_map ||= {}
-      end
-
-      # @return [YARD::CodeObjects::RootObject]
-      def root_code_object
-        @root_code_object ||= YARD::CodeObjects::RootObject.new(nil, 'root')
-      end
-    end
-  end
-end
+module Solargraph
+  class ApiMap
+    module SourceToYard
+
+      # Get the YARD CodeObject at the specified path.
+      #
+      # @param path [String]
+      # @return [YARD::CodeObjects::Base]
+      def code_object_at path
+        code_object_map[path]
+      end
+
+      # @return [Array<String>]
+      def code_object_paths
+        code_object_map.keys
+      end
+
+      # @param store [Array<Store>] ApiMap pin store
+      # @return [void]
+      def rake_yard store
+        code_object_map.clear
+        store.namespace_pins.each do |pin|
+          next if pin.path.nil? or pin.path.empty?
+          if pin.type == :class
+            code_object_map[pin.path] ||= YARD::CodeObjects::ClassObject.new(root_code_object, pin.path)
+          else
+            code_object_map[pin.path] ||= YARD::CodeObjects::ModuleObject.new(root_code_object, pin.path)
+          end
+          code_object_map[pin.path].docstring = pin.docstring
+          code_object_map[pin.path].files.push pin.location.filename unless pin.location.nil?
+        end
+        store.namespace_pins.each do |pin|
+          # pin.include_references.each do |ref|
+          store.get_includes(pin.path).each do |ref|
+            code_object_map[pin.path].instance_mixins.push code_object_map[ref] unless code_object_map[ref].nil? or code_object_map[pin.path].nil?
+          end
+        end
+        store.method_pins.each do |pin|
+          code_object_map[pin.path] ||= YARD::CodeObjects::MethodObject.new(code_object_at(pin.namespace), pin.name, pin.scope)
+          code_object_map[pin.path].docstring = pin.docstring
+          code_object_map[pin.path].visibility = pin.visibility || :public
+          code_object_map[pin.path].files.push pin.location.filename unless pin.location.nil?
+          code_object_map[pin.path].parameters = pin.parameters.map do |p|
+            n = p.match(/^[a-z0-9_]*:?/i)[0]
+            v = nil
+            if p.length > n.length
+              v = p[n.length..-1].gsub(/^ = /, '')
+            end
+            [n, v]
+          end
+        end
+      end
+
+      private
+
+      # @return [Hash]
+      def code_object_map
+        @code_object_map ||= {}
+      end
+
+      # @return [YARD::CodeObjects::RootObject]
+      def root_code_object
+        @root_code_object ||= YARD::CodeObjects::RootObject.new(nil, 'root')
+      end
+    end
+  end
+end

data/lib/solargraph/api_map/store.rb

@@ -1,201 +1,201 @@
-require 'set'
-
-module Solargraph
-  class ApiMap
-    class Store
-      # @return [Array<Solargraph::Pin::Base>]
-      attr_reader :pins
-
-      # @param pins [Array<Solargraph::Source>]
-      def initialize pins = []
-        @pins = pins
-        index
-      end
-
-      # @param fqns [String]
-      # @param visibility [Array<Symbol>]
-      # @return [Array<Solargraph::Pin::Base>]
-      def get_constants fqns, visibility = [:public]
-        namespace_children(fqns).select { |pin|
-          !pin.name.empty? and (pin.kind == Pin::NAMESPACE or pin.kind == Pin::CONSTANT) and visibility.include?(pin.visibility)
-        }
-      end
-
-      # @param fqns [String]
-      # @param scope [Symbol]
-      # @param visibility [Array<Symbol>]
-      # @return [Array<Solargraph::Pin::Base>]
-      def get_methods fqns, scope: :instance, visibility: [:public]
-        kinds = [Pin::METHOD, Pin::ATTRIBUTE]
-        namespace_children(fqns).select{ |pin|
-          kinds.include?(pin.kind) && pin.scope == scope && visibility.include?(pin.visibility)
-        }
-      end
-
-      # @param fqns [String]
-      # @return [String]
-      def get_superclass fqns
-        return superclass_references[fqns].first if superclass_references.has_key?(fqns)
-        nil
-      end
-
-      # @param fqns [String]
-      # @return [Array<String>]
-      def get_includes fqns
-        include_references[fqns] || []
-      end
-
-      # @param fqns [String]
-      # @return [Array<String>]
-      def get_extends fqns
-        extend_references[fqns] || []
-      end
-
-      # @param path [String]
-      # @return [Array<Solargraph::Pin::Base>]
-      def get_path_pins path
-        return [] if path.nil? # @todo Should be '' instead?
-        pins.select { |pin| pin.path == path }
-      end
-
-      # @param fqns [String]
-      # @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.context.scope == scope}
-      end
-
-      # @param fqns [String]
-      # @return [Array<Solargraph::Pin::Base>]
-      def get_class_variables(fqns)
-        namespace_children(fqns).select{|pin| pin.kind == Pin::CLASS_VARIABLE}
-      end
-
-      # @return [Array<Solargraph::Pin::Base>]
-      def get_symbols
-        symbols.uniq(&:name)
-      end
-
-      # @param fqns [String]
-      # @return [Boolean]
-      def namespace_exists?(fqns)
-        fqns_pins(fqns).any?
-      end
-
-      # @return [Set<String>]
-      def namespaces
-        @namespaces ||= Set.new
-      end
-
-      # @return [Array<Solargraph::Pin::Base>]
-      def namespace_pins
-        @namespace_pins ||= pins.select{|p| p.kind == Pin::NAMESPACE}
-      end
-
-      # @return [Array<Solargraph::Pin::Base>]
-      def method_pins
-        @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
-
-      # @return [Hash]
-      def named_macros
-        @named_macros ||= begin
-          result = {}
-          pins.each do |pin|
-            pin.macros.select{|m| m.tag.tag_name == 'macro'}.each do |macro|
-              next if macro.tag.name.nil? || macro.tag.name.empty?
-              result[macro.tag.name] = macro
-            end
-          end
-          result
-        end
-      end
-
-      def inspect
-        # Avoid insane dumps in specs
-        to_s
-      end
-
-      private
-
-      # @param fqns [String]
-      # @return [Array<Solargraph::Pin::Namespace>]
-      def fqns_pins fqns
-        return [] if fqns.nil?
-        if fqns.include?('::')
-          parts = fqns.split('::')
-          name = parts.pop
-          base = parts.join('::')
-        else
-          base = ''
-          name = fqns
-        end
-        namespace_children(base).select{|pin| pin.name == name and pin.kind == Pin::NAMESPACE}
-      end
-
-      # @return [Array<Solargraph::Pin::Symbol>]
-      def symbols
-        @symbols ||= []
-      end
-
-      def superclass_references
-        @superclass_references ||= {}
-      end
-
-      def include_references
-        @include_references ||= {}
-      end
-
-      def extend_references
-        @extend_references ||= {}
-      end
-
-      # @param name [String]
-      # @return [Array<Solargraph::Pin::Base>]
-      def namespace_children name
-        namespace_map[name] || []
-      end
-
-      # @return [Hash]
-      def namespace_map
-        @namespace_map ||= {}
-      end
-
-      # @return [void]
-      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
-          if pin.kind == Pin::INCLUDE_REFERENCE
-            include_references[pin.namespace] ||= []
-            include_references[pin.namespace].push pin.name
-          elsif pin.kind == Pin::EXTEND_REFERENCE
-            extend_references[pin.namespace] ||= []
-            extend_references[pin.namespace].push pin.name
-          elsif pin.kind == Pin::SUPERCLASS_REFERENCE
-            superclass_references[pin.namespace] ||= []
-            superclass_references[pin.namespace].push pin.name
-          end
-        end
-        @namespace_pins = nil
-        @method_pins = nil
-      end
-    end
-  end
-end
+require 'set'
+
+module Solargraph
+  class ApiMap
+    class Store
+      # @return [Array<Solargraph::Pin::Base>]
+      attr_reader :pins
+
+      # @param pins [Array<Solargraph::Source>]
+      def initialize pins = []
+        @pins = pins
+        index
+      end
+
+      # @param fqns [String]
+      # @param visibility [Array<Symbol>]
+      # @return [Array<Solargraph::Pin::Base>]
+      def get_constants fqns, visibility = [:public]
+        namespace_children(fqns).select { |pin|
+          !pin.name.empty? and (pin.kind == Pin::NAMESPACE or pin.kind == Pin::CONSTANT) and visibility.include?(pin.visibility)
+        }
+      end
+
+      # @param fqns [String]
+      # @param scope [Symbol]
+      # @param visibility [Array<Symbol>]
+      # @return [Array<Solargraph::Pin::Base>]
+      def get_methods fqns, scope: :instance, visibility: [:public]
+        kinds = [Pin::METHOD, Pin::ATTRIBUTE]
+        namespace_children(fqns).select{ |pin|
+          kinds.include?(pin.kind) && pin.scope == scope && visibility.include?(pin.visibility)
+        }
+      end
+
+      # @param fqns [String]
+      # @return [String]
+      def get_superclass fqns
+        return superclass_references[fqns].first if superclass_references.has_key?(fqns)
+        nil
+      end
+
+      # @param fqns [String]
+      # @return [Array<String>]
+      def get_includes fqns
+        include_references[fqns] || []
+      end
+
+      # @param fqns [String]
+      # @return [Array<String>]
+      def get_extends fqns
+        extend_references[fqns] || []
+      end
+
+      # @param path [String]
+      # @return [Array<Solargraph::Pin::Base>]
+      def get_path_pins path
+        return [] if path.nil? # @todo Should be '' instead?
+        pins.select { |pin| pin.path == path }
+      end
+
+      # @param fqns [String]
+      # @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.context.scope == scope}
+      end
+
+      # @param fqns [String]
+      # @return [Array<Solargraph::Pin::Base>]
+      def get_class_variables(fqns)
+        namespace_children(fqns).select{|pin| pin.kind == Pin::CLASS_VARIABLE}
+      end
+
+      # @return [Array<Solargraph::Pin::Base>]
+      def get_symbols
+        symbols.uniq(&:name)
+      end
+
+      # @param fqns [String]
+      # @return [Boolean]
+      def namespace_exists?(fqns)
+        fqns_pins(fqns).any?
+      end
+
+      # @return [Set<String>]
+      def namespaces
+        @namespaces ||= Set.new
+      end
+
+      # @return [Array<Solargraph::Pin::Base>]
+      def namespace_pins
+        @namespace_pins ||= pins.select{|p| p.kind == Pin::NAMESPACE}
+      end
+
+      # @return [Array<Solargraph::Pin::Base>]
+      def method_pins
+        @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
+
+      # @return [Hash]
+      def named_macros
+        @named_macros ||= begin
+          result = {}
+          pins.each do |pin|
+            pin.macros.select{|m| m.tag.tag_name == 'macro'}.each do |macro|
+              next if macro.tag.name.nil? || macro.tag.name.empty?
+              result[macro.tag.name] = macro
+            end
+          end
+          result
+        end
+      end
+
+      def inspect
+        # Avoid insane dumps in specs
+        to_s
+      end
+
+      private
+
+      # @param fqns [String]
+      # @return [Array<Solargraph::Pin::Namespace>]
+      def fqns_pins fqns
+        return [] if fqns.nil?
+        if fqns.include?('::')
+          parts = fqns.split('::')
+          name = parts.pop
+          base = parts.join('::')
+        else
+          base = ''
+          name = fqns
+        end
+        namespace_children(base).select{|pin| pin.name == name and pin.kind == Pin::NAMESPACE}
+      end
+
+      # @return [Array<Solargraph::Pin::Symbol>]
+      def symbols
+        @symbols ||= []
+      end
+
+      def superclass_references
+        @superclass_references ||= {}
+      end
+
+      def include_references
+        @include_references ||= {}
+      end
+
+      def extend_references
+        @extend_references ||= {}
+      end
+
+      # @param name [String]
+      # @return [Array<Solargraph::Pin::Base>]
+      def namespace_children name
+        namespace_map[name] || []
+      end
+
+      # @return [Hash]
+      def namespace_map
+        @namespace_map ||= {}
+      end
+
+      # @return [void]
+      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
+          if pin.kind == Pin::INCLUDE_REFERENCE
+            include_references[pin.namespace] ||= []
+            include_references[pin.namespace].push pin.name
+          elsif pin.kind == Pin::EXTEND_REFERENCE
+            extend_references[pin.namespace] ||= []
+            extend_references[pin.namespace].push pin.name
+          elsif pin.kind == Pin::SUPERCLASS_REFERENCE
+            superclass_references[pin.namespace] ||= []
+            superclass_references[pin.namespace].push pin.name
+          end
+        end
+        @namespace_pins = nil
+        @method_pins = nil
+      end
+    end
+  end
+end