solargraph 0.24.1 → 0.25.0

data/lib/solargraph/yard_map/cache.rb

@@ -1,42 +1,17 @@
 module Solargraph
-  class YardMap::Cache
-    def initialize
-      @constants = {}
-      @methods = {}
-      @instance_methods = {}
-      @objects = {}
-    end
-
-    def set_constants namespace, scope, suggestions
-      @constants[[namespace, scope]] = suggestions
-    end
-
-    def get_constants namespace, scope
-      @constants[[namespace, scope]]
-    end
-
-    def set_methods namespace, scope, visibility, suggestions
-      @methods[[namespace, scope, visibility]] = suggestions.uniq{|s| s.path}
-    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.uniq{|s| s.path}
-    end
-
-    def get_instance_methods namespace, scope, visibility
-      @instance_methods[[namespace, scope, visibility]]
-    end
-
-    def set_objects path, space, pins
-      @objects[[path, space]] = pins
-    end
-
-    def get_objects path, space
-      @objects[[path, space]]
+  class YardMap
+    class Cache
+      def initialize
+        @path_pins = {}
+      end
+
+      def set_path_pins path, pins
+        @path_pins[path] = pins
+      end
+
+      def get_path_pins path
+        @path_pins[path]
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.25.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -327,7 +327,11 @@ files:
 - lib/solargraph/pin/proxy_method.rb
 - lib/solargraph/pin/reference.rb
 - lib/solargraph/pin/symbol.rb
-- lib/solargraph/pin/yard_object.rb
+- lib/solargraph/pin/yard_pin.rb
+- lib/solargraph/pin/yard_pin/constant.rb
+- lib/solargraph/pin/yard_pin/method.rb
+- lib/solargraph/pin/yard_pin/namespace.rb
+- lib/solargraph/pin/yard_pin/yard_mixin.rb
 - lib/solargraph/plugin.rb
 - lib/solargraph/plugin/base.rb
 - lib/solargraph/plugin/canceler.rb

data/lib/solargraph/pin/yard_object.rb

@@ -1,119 +0,0 @@
-module Solargraph
-  module Pin
-    class YardObject < Base
-      COMPLETION_ITEM_KIND_MAP = {
-        YARD::CodeObjects::ClassObject => Solargraph::LanguageServer::CompletionItemKinds::CLASS,
-        YARD::CodeObjects::ModuleObject => Solargraph::LanguageServer::CompletionItemKinds::MODULE,
-        YARD::CodeObjects::MethodObject => Solargraph::LanguageServer::CompletionItemKinds::METHOD,
-        YARD::CodeObjects::ConstantObject => Solargraph::LanguageServer::CompletionItemKinds::CONSTANT
-      }
-
-      KIND_MAP = {
-        YARD::CodeObjects::ClassObject => Pin::NAMESPACE,
-        YARD::CodeObjects::ModuleObject => Pin::NAMESPACE,
-        YARD::CodeObjects::MethodObject => Pin::METHOD,
-        YARD::CodeObjects::ConstantObject => Pin::CONSTANT
-      }
-
-      # @return [YARD::CodeObjects::Base]
-      attr_reader :code_object
-
-      def initialize code_object, location
-        # (c.to_s.split('::').last, detail: c.to_s, kind: kind, docstring: c.docstring, return_type: return_type, location: object_location(c))
-        @code_object = code_object
-        @location = location
-      end
-
-      def name
-        # @name ||= code_object.to_s.split('::').last
-        @name ||= code_object.name.to_s
-      end
-
-      def kind
-        @kind ||= KIND_MAP[code_object.class] || Pin::KEYWORD
-      end
-
-      def completion_item_kind
-        @completion_item_kind ||= COMPLETION_ITEM_KIND_MAP[code_object.class] || Solargraph::LanguageServer::CompletionItemKinds::KEYWORD
-      end
-
-      def docstring
-        code_object.docstring
-      end
-
-      def return_type
-        if @return_type.nil?
-          if code_object.kind_of?(YARD::CodeObjects::ClassObject)
-            @return_type ||= "Class<#{path}>"
-            return @return_type
-          end
-          if code_object.kind_of?(YARD::CodeObjects::ModuleObject)
-            @return_type ||= "Module<#{path}>"
-            return @return_type
-          end
-          if Solargraph::CoreFills::CUSTOM_RETURN_TYPES.has_key?(path)
-            @return_type = Solargraph::CoreFills::CUSTOM_RETURN_TYPES[path]
-          else
-            return nil if docstring.nil?
-            tags = docstring.tags(:return)
-            if tags.empty?
-              overload = docstring.tag(:overload)
-              return nil if overload.nil?
-              tags = overload.tags(:return)
-            end
-            return nil if tags.empty?
-            return nil if tags[0].types.nil?
-            @return_type = tags[0].types[0]
-          end
-        end
-        @return_type
-      end
-
-      def location
-        @location
-      end
-
-      def path
-        code_object.path
-      end
-
-      def namespace
-        # @todo Is this right?
-        code_object.namespace.to_s
-      end
-
-      def parameters
-        @parameters ||= get_method_args
-      end
-
-      def parameter_names
-        @parameter_names ||= parameters.map{|p| p.split(/[ =:]/).first}
-      end
-
-      def visibility
-        @visibility ||= (code_object.respond_to?(:visibility) ? code_object.visibility : :public)
-      end
-
-      def scope
-        return nil unless code_object.is_a?(YARD::CodeObjects::MethodObject)
-        code_object.scope
-      end
-
-      private
-
-      def get_method_args
-        return [] unless code_object.kind_of?(YARD::CodeObjects::MethodObject)
-        args = []
-        code_object.parameters.each do |a|
-          p = a[0]
-          unless a[1].nil?
-            p += ' =' unless p.end_with?(':')
-            p += " #{a[1]}"
-          end
-          args.push p
-        end
-        args
-      end
-    end
-  end
-end