solargraph 0.39.4 → 0.39.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a45c7684317779d321e953079f5da5532f7b7eecc852b73e609ce03dafc81dc
-  data.tar.gz: '08f96cb16887491e334fa276959cd019da3c356656a9a670c6133e491745fa55'
+  metadata.gz: 42d82e12b3dbc74f908e6fd15757e8856c7c3af088ccbfbc6724f390884f878d
+  data.tar.gz: df04fa34d85b0633d05ab8fd216873264a4cdaa148089ffa3af909ec68a227a7
 SHA512:
-  metadata.gz: 5a9d7ec1fb35b5d870d33f16a9bf6b229b1f62a6221f7fac5d1d35e65620ac030cef5bd53c558a1ee007c37b4e187a43315abfa4cecaf146c3746e9b97a46f3f
-  data.tar.gz: 7537aa6bd14209895350f40830dd5986683982609c8e18d257eaca8993b0ab759b2e635ec6c952499a0d8559663b870c1db9b9a3c1955bd8dd096eaedde04d73
+  metadata.gz: d1972e824e94ad830815eb780629ef985a5be4b21247f426b603e209cecc60d6c5c02219c63cdc2c6c9ab184013d72e1798c29ef90b5a91d77a92f8dd35e1295
+  data.tar.gz: 7f5564c3de416999a40e381d853746e759898da6fa09eb6d967735478a24635f1af3cee6695894b7213c8b6746e73d8e3d57d3adc141ab505040e0eb4c8134cd

data/lib/solargraph/documentor.rb

@@ -5,6 +5,7 @@ require 'json'
 require 'open3'
 require 'shellwords'
 require 'yard'
+require 'fileutils'
 
 module Solargraph
   class Documentor
@@ -25,6 +26,7 @@ module Solargraph
       Documentor.specs_from_bundle(@directory).each_pair do |name, version|
         yd = YARD::Registry.yardoc_file_for_gem(name, "= #{version}")
         if !yd || @rebuild
+          FileUtils.safe_unlink File.join(YardMap::CoreDocs.cache_dir, 'gems', "#{name}-#{version}.ser")
           @out.puts "Documenting #{name} #{version}"
           `yard gems #{name} #{version} #{@rebuild ? '--rebuild' : ''}`
           yd = YARD::Registry.yardoc_file_for_gem(name, "= #{version}")

data/lib/solargraph/language_server/uri_helpers.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'uri'
+require 'cgi'
 
 module Solargraph
   module LanguageServer
@@ -14,7 +14,7 @@ module Solargraph
       # @param uri [String]
       # @return [String]
       def uri_to_file uri
-        URI.decode(uri).sub(/^file\:\/\//, '').sub(/^\/([a-z]\:)/i, '\1')
+        decode(uri).sub(/^file\:\/\//, '').sub(/^\/([a-z]\:)/i, '\1')
       end
 
       # Convert a file path to a URI.
@@ -22,7 +22,26 @@ module Solargraph
       # @param file [String]
       # @return [String]
       def file_to_uri file
-        "file://#{URI.encode(file.gsub(/^([a-z]\:)/i, '/\1'))}"
+        "file://#{encode(file.gsub(/^([a-z]\:)/i, '/\1'))}"
+      end
+
+      # Encode text to be used as a URI path component in LSP.
+      #
+      # @param text [String]
+      # @return [String]
+      def encode text
+        CGI.escape(text)
+           .gsub('%3A', ':')
+           .gsub('%5C', '\\')
+           .gsub('%2F', '/')
+      end
+
+      # Decode text from a URI path component in LSP.
+      #
+      # @param text [String]
+      # @return [String]
+      def decode text
+        CGI.unescape(text)
       end
     end
   end

data/lib/solargraph/parser/rubyvm/node_processors.rb

@@ -36,6 +36,7 @@ module Solargraph
       register :RESBODY,    Rubyvm::NodeProcessors::ResbodyNode
       register :DEFN,       Rubyvm::NodeProcessors::DefNode
       register :DEFS,       Rubyvm::NodeProcessors::DefsNode
+      register :CALL,       Rubyvm::NodeProcessors::SendNode
       register :FCALL,      Rubyvm::NodeProcessors::SendNode
       register :VCALL,      Rubyvm::NodeProcessors::SendNode
       register :CLASS,      Rubyvm::NodeProcessors::NamespaceNode

data/lib/solargraph/parser/rubyvm/node_processors/send_node.rb

@@ -43,45 +43,7 @@ module Solargraph
               process_prepend
             elsif node.children[0] == :private_constant
               process_private_constant
-            end
-            process_children
-            return
-            # @todo Get rid of legacy
-            if node.children[0].nil?
-              if [:private, :public, :protected].include?(node.children[1])
-                if (node.children.length > 2)
-                  node.children[2..-1].each do |child|
-                    next unless child.is_a?(AST::Node) && (child.type == :sym || child.type == :str)
-                    name = child.children[0].to_s
-                    matches = pins.select{ |pin| pin.is_a?(Pin::BaseMethod) && pin.name == name && pin.namespace == region.closure.full_context.namespace && pin.context.scope == (region.scope || :instance)}
-                    matches.each do |pin|
-                      # @todo Smelly instance variable access
-                      pin.instance_variable_set(:@visibility, node.children[1])
-                    end
-                  end
-                else
-                  # @todo Smelly instance variable access
-                  region.instance_variable_set(:@visibility, node.children[1])
-                end
-              elsif node.children[1] == :module_function
-                process_module_function
-              elsif [:attr_reader, :attr_writer, :attr_accessor].include?(node.children[1])
-                process_attribute
-              elsif node.children[1] == :include
-                process_include
-              elsif node.children[1] == :extend
-                process_extend
-              elsif node.children[1] == :require
-                process_require
-              elsif node.children[1] == :private_constant
-                process_private_constant
-              elsif node.children[1] == :alias_method && node.children[2] && node.children[2] && node.children[2].type == :sym && node.children[3] && node.children[3].type == :sym
-                process_alias_method
-              elsif node.children[1] == :private_class_method && node.children[2].is_a?(AST::Node)
-                # Processing a private class can potentially handle children on its own
-                return if process_private_class_method
-              end
-            elsif node.children[1] == :require && node.children[0].to_s == '(const nil :Bundler)'
+            elsif node.children[1] == :require && unpack_name(node.children[0]) == 'Bundler'
               pins.push Pin::Reference::Require.new(Solargraph::Location.new(region.filename, Solargraph::Range.from_to(0, 0, 0, 0)), 'bundler/require')
             end
             process_children

data/lib/solargraph/pin/attribute.rb

@@ -8,7 +8,7 @@ module Solargraph
 
       # @param access [::Symbol] :reader or :writer
       def initialize access: :reader, **splat
-        super(splat)
+        super(**splat)
         @access = access
         if access == :writer
           parameters.push(

data/lib/solargraph/pin/base_method.rb

@@ -14,7 +14,7 @@ module Solargraph
       # @param visibility [::Symbol] :public, :protected, or :private
       # @param explicit [Boolean]
       def initialize visibility: :public, explicit: true, **splat
-        super(splat)
+        super(**splat)
         @visibility = visibility
         @explicit = explicit
       end

data/lib/solargraph/pin/base_variable.rb

@@ -11,7 +11,7 @@ module Solargraph
 
       # @param assignment [Parser::AST::Node, nil]
       def initialize assignment: nil, **splat
-        super(splat)
+        super(**splat)
         @assignment = assignment
       end
 

data/lib/solargraph/pin/block.rb

@@ -9,7 +9,7 @@ module Solargraph
       attr_reader :receiver
 
       def initialize receiver: nil, args: [], **splat
-        super(splat)
+        super(**splat)
         @receiver = receiver
         @parameters = args
       end

data/lib/solargraph/pin/closure.rb

@@ -7,7 +7,7 @@ module Solargraph
       attr_reader :scope
 
       def initialize scope: :class, **splat
-        super(splat)
+        super(**splat)
         @scope = scope
       end
 

data/lib/solargraph/pin/constant.rb

@@ -6,7 +6,7 @@ module Solargraph
       attr_reader :visibility
 
       def initialize visibility: :public, **splat
-        super(splat)
+        super(**splat)
         @visibility = visibility
       end
 

data/lib/solargraph/pin/local_variable.rb

@@ -6,7 +6,7 @@ module Solargraph
       include Localized
 
       def initialize assignment: nil, presence: nil, **splat
-        super(splat)
+        super(**splat)
         @assignment = assignment
         @presence = presence
       end

data/lib/solargraph/pin/method.rb

@@ -11,7 +11,7 @@ module Solargraph
       # @param args [Array<String>]
       # @param node [Parser::AST::Node, nil]
       def initialize parameters: [], node: nil, **splat
-        super(splat)
+        super(**splat)
         @parameters = parameters
         @node = node
       end

data/lib/solargraph/pin/method_alias.rb

@@ -14,7 +14,7 @@ module Solargraph
       attr_reader :original
 
       def initialize scope: :instance, original: nil, **splat
-        super(splat)
+        super(**splat)
         @scope = scope
         @original = original
       end

data/lib/solargraph/pin/namespace.rb

@@ -14,7 +14,7 @@ module Solargraph
       # @param gates [Array<String>]
       def initialize type: :class, visibility: :public, gates: [''], **splat
         # super(location, namespace, name, comments)
-        super(splat)
+        super(**splat)
         @type = type
         @visibility = visibility
         if name.start_with?('::')

data/lib/solargraph/pin/parameter.rb

@@ -8,7 +8,7 @@ module Solargraph
       attr_reader :asgn_code
 
       def initialize decl: :arg, asgn_code: nil, **splat
-        super(splat)
+        super(**splat)
         @asgn_code = asgn_code
         @decl = decl
       end

data/lib/solargraph/pin/proxy_type.rb

@@ -5,7 +5,7 @@ module Solargraph
     class ProxyType < Base
       # @param return_type [ComplexType]
       def initialize return_type: ComplexType::UNDEFINED, **splat
-        super(splat)
+        super(**splat)
         @return_type = return_type
       end
 

data/lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.39.4'
+  VERSION = '0.39.5'
 end

data/lib/solargraph/views/_name_type_tag.erb

@@ -2,7 +2,7 @@
 <% unless tag.types.nil? or tag.types.empty? %>
 	[<%= escape(tag.types.join(', ')) %>]
 <% end %>
-<% unless tag.text.empty? %>
+<% unless tag.text.nil? || tag.text.empty? %>
 	<% unless (tag.name.nil? or tag.name.empty?) and (tag.types.nil? or tag.types.empty?) %>
 		-
 	<% end %>

data/lib/solargraph/workspace.rb

@@ -170,7 +170,7 @@ module Solargraph
         Dir.chdir base do
           begin
             # @type [Gem::Specification]
-            spec = eval(File.read(file), binding, file)
+            spec = eval(File.read(file), nil, file)
             next unless Gem::Specification === spec
             @gemnames.push spec.name
             result.concat(spec.require_paths.map { |path| File.join(base, path) })

data/lib/solargraph/yard_map/mapper.rb

@@ -17,6 +17,9 @@ module Solargraph
         @code_objects.each do |co|
           @pins.concat generate_pins co
         end
+        # Some yardocs contain documentation for dependencies that can be
+        # ignored here. The YardMap will load dependencies separately.
+        @pins.keep_if { |pin| pin.location.nil? || File.file?(pin.location.filename) } if @spec
         @pins
       end
 

data/lib/solargraph/yard_map/rdoc_to_yard.rb

@@ -95,6 +95,8 @@ module Solargraph
             FileUtils.mkdir_p cache_dir
             # @todo Should merge be true?
             YARD::Registry.save true, cache_dir
+            # Clear the serialized cache if it exists
+            FileUtils.safe_unlink File.join(CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}.ser")
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.39.4
+  version: 0.39.5
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport