solargraph 0.28.4 → 0.29.0

data/lib/solargraph/source_map/node_processor/sym_node.rb

@@ -0,0 +1,11 @@
+module Solargraph
+  class SourceMap
+    module NodeProcessor
+      class SymNode < Base
+        def process
+          pins.push Solargraph::Pin::Symbol.new(get_node_location(node), ":#{node.children[0]}")
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/source_map/region.rb

@@ -0,0 +1,58 @@
+module Solargraph
+  class SourceMap
+    # Data used by the NodeProcessor library to track context at various
+    # locations in a source.
+    #
+    class Region
+      # @return [String]
+      attr_reader :namespace
+
+      # @return [Symbol]
+      attr_reader :scope
+
+      # @return [Symbol]
+      attr_reader :visibility
+
+      # @return [Solargraph::Source]
+      attr_reader :source
+
+      # @param source [Source]
+      # @param namespace [String]
+      # @param scope [Symbol]
+      # @param visibility [Symbol]
+      def initialize source: Solargraph::Source.load_string(''), namespace: '',
+                     scope: :instance, visibility: :public
+        @source = source
+        @namespace = namespace
+        @scope = scope
+        @visibility = visibility
+      end
+
+      # @return [String]
+      def filename
+        source.filename
+      end
+
+      # Generate a new Region with the provided attribute changes.
+      #
+      # @param namespace [String, nil]
+      # @param scope [Symbol, nil]
+      # @param visibility [Symbol, nil]
+      # @return [Region]
+      def update namespace: nil, scope: nil, visibility: nil
+        Region.new(
+          source: source,
+          namespace: namespace || self.namespace,
+          scope: scope || self.scope,
+          visibility: visibility || self.visibility
+        )
+      end
+
+      # @param node [Parser::AST::Node]
+      # @return [String]
+      def code_for node
+        source.code_for(node)
+      end
+    end
+  end
+end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.28.4'
+  VERSION = '0.29.0'
 end

data/lib/solargraph/yard_map.rb

@@ -23,10 +23,14 @@ module Solargraph
     # @return [Array<String>]
     attr_reader :required
 
+    attr_writer :with_dependencies
+
     # @param required [Array<String>]
-    def initialize(required: [])
+    # @param skip_dependencies [Boolean]
+    def initialize(required: [], with_dependencies: true)
       # HACK: YardMap needs its own copy of this array
       @required = required.clone
+      @with_dependencies = with_dependencies
       @gem_paths = {}
       @stdlib_namespaces = []
       process_requires
@@ -38,6 +42,11 @@ module Solargraph
       @pins ||= []
     end
 
+    def with_dependencies?
+      @with_dependencies ||= true unless @with_dependencies == false
+      @with_dependencies
+    end
+
     # @param new_requires [Array<String>]
     # @return [Boolean]
     def change new_requires
@@ -176,8 +185,7 @@ module Solargraph
             unless yardocs.include?(yd)
               yardocs.unshift yd
               result.concat process_yardoc yd
-              # @todo Testing performance
-              # result.concat add_gem_dependencies spec
+              result.concat add_gem_dependencies(spec) if with_dependencies?
             end
           end
         rescue Gem::LoadError => e
@@ -231,17 +239,16 @@ module Solargraph
       (spec.dependencies - spec.development_dependencies).each do |dep|
         begin
           depspec = Gem::Specification.find_by_name(dep.name)
-          @gem_paths[depspec.name] = depspec.full_gem_path unless depspec.nil?
+          next if depspec.nil? || @gem_paths.key?(depspec.name)
+          @gem_paths[depspec.name] = depspec.full_gem_path
           gy = YARD::Registry.yardoc_file_for_gem(dep.name)
           if gy.nil?
             unresolved_requires.push dep.name
           else
-            unless yardocs.include?(gy)
-              yardocs.unshift gy
-              result.concat process_yardoc gy
-              # @todo Trying only one level of dependencies
-              # result.concat add_gem_dependencies(depspec)
-            end
+            next if yardocs.include?(gy)
+            yardocs.unshift gy
+            result.concat process_yardoc gy
+            result.concat add_gem_dependencies(depspec)
           end
         rescue Gem::LoadError
           # This error probably indicates a bug in an installed gem

data/lib/yard-solargraph.rb

@@ -1,6 +1,4 @@
 require 'yard'
-require 'yard/templates/helpers/markup_helper'
-require 'yard/templates/helpers/html_helper'
 
 # Define a @type tag for documenting variables
 YARD::Tags::Library.define_tag("Type", :type, :with_types_and_name)

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.28.4
+  version: 0.29.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: coderay
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
@@ -324,6 +310,7 @@ files:
 - lib/solargraph/pin/local_variable.rb
 - lib/solargraph/pin/localized.rb
 - lib/solargraph/pin/method.rb
+- lib/solargraph/pin/method_alias.rb
 - lib/solargraph/pin/method_parameter.rb
 - lib/solargraph/pin/namespace.rb
 - lib/solargraph/pin/plugin/method.rb
@@ -371,6 +358,25 @@ files:
 - lib/solargraph/source_map/clip.rb
 - lib/solargraph/source_map/completion.rb
 - lib/solargraph/source_map/mapper.rb
+- lib/solargraph/source_map/node_processor.rb
+- lib/solargraph/source_map/node_processor/alias_node.rb
+- lib/solargraph/source_map/node_processor/args_node.rb
+- lib/solargraph/source_map/node_processor/base.rb
+- lib/solargraph/source_map/node_processor/begin_node.rb
+- lib/solargraph/source_map/node_processor/block_node.rb
+- lib/solargraph/source_map/node_processor/casgn_node.rb
+- lib/solargraph/source_map/node_processor/cvasgn_node.rb
+- lib/solargraph/source_map/node_processor/def_node.rb
+- lib/solargraph/source_map/node_processor/defs_node.rb
+- lib/solargraph/source_map/node_processor/gvasgn_node.rb
+- lib/solargraph/source_map/node_processor/ivasgn_node.rb
+- lib/solargraph/source_map/node_processor/lvasgn_node.rb
+- lib/solargraph/source_map/node_processor/namespace_node.rb
+- lib/solargraph/source_map/node_processor/orasgn_node.rb
+- lib/solargraph/source_map/node_processor/sclass_node.rb
+- lib/solargraph/source_map/node_processor/send_node.rb
+- lib/solargraph/source_map/node_processor/sym_node.rb
+- lib/solargraph/source_map/region.rb
 - lib/solargraph/version.rb
 - lib/solargraph/views/_method.erb
 - lib/solargraph/views/_name_type_tag.erb