solargraph 0.38.1 → 0.38.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dbf36f40f7b87b541abe48c7e624999b44730cd5165f53ca8e7878311da7dcd
-  data.tar.gz: 0c12fa0cc1008eaf172fb964e6fac8fbc0b46333247b273b0e4ea9d840a81862
+  metadata.gz: 389f64ff08e6e1eda0eb13d13e7ff3a8c41650436b02d693995b15dbc3d955c7
+  data.tar.gz: eaffccfef362bbb580ea5c57a3bc99d0fb576ec422b11963e8b7490ea035a578
 SHA512:
-  metadata.gz: b7d4bb938698bf682bbb418a6489b4544451ad91039d0fe0e0720339d8b2f9e6c394cc7d8354cc1b2cf6b5505867e93ca26071c177ecae69eab2cf5c1e2e601d
-  data.tar.gz: 368ad36e47cc109a9e3c428a743617771a69e14ce7730e4889bb7bab44c3c3aa13643608d6286497f7ea38b99c1f6da130a3401ae0a167a31cf07fb96197fac0
+  metadata.gz: 0d9779fe5645a9ad1d6375795875219405cc637de5fcd28c51c11ead54838ce4a5a22f49993d91d0649a6153b045eacb97f079f44ffaa888a33513c8de639573
+  data.tar.gz: 53dfdef740ad7d4a5fc5c80798f7cca2116b7ae5960878357e1a0516f4cc4783f3ed521a2ba86959d044e1588b2492b3f3751d7812454b37c8d6597e51bc266b

data/.travis.yml

@@ -10,12 +10,16 @@ rvm:
   - jruby-head
 matrix:
   include:
-    - rvm: 2.5
+    - rvm: 2.4
       os: osx
     - rvm: 2.6
       os: osx
+    - rvm: 2.7
+      os: osx
   allow_failures:
-    - rvm: jruby-head
+    - rvm: 2.7
+      os: osx
+      
 # Update RubyGems and Bundler due to error with Bundler 1.16.1 and RubyGems 2.7.3
 # See https://github.com/travis-ci/travis-ci/issues/8978
 before_install:

data/lib/solargraph.rb

@@ -51,4 +51,16 @@ module Solargraph
   def self.logger
     Solargraph::Logging.logger
   end
+
+  # A helper method that runs Bundler.with_unbundled_env or falls back to
+  # Bundler.with_clean env for earlier versions of Bundler.
+  #
+  def self.with_clean_env &block
+    meth = if Bundler.respond_to?(:with_unbundled_env)
+      :with_unbundled_env
+    else
+      :with_clean_env
+    end
+    Bundler.send meth, &block
+  end
 end

data/lib/solargraph/api_map.rb

@@ -603,14 +603,14 @@ module Solargraph
     # @param skip [Array<String>]
     # @return [Array<Pin::Base>]
     def inner_get_constants fqns, visibility, skip
-      return [] if skip.include?(fqns)
+      return [] if fqns.nil? || skip.include?(fqns)
       skip.push fqns
-      result = []
-      result.concat store.get_constants(fqns, visibility).sort{ |a, b| a.name <=> b.name }
+      result = store.get_constants(fqns, visibility)
+                    .sort { |a, b| a.name <=> b.name }
       store.get_includes(fqns).each do |is|
-        fqis = qualify(is, fqns)
-        result.concat inner_get_constants(fqis, [:public], skip) unless fqis.nil?
+        result.concat inner_get_constants(qualify(is, fqns), [:public], skip)
       end
+      result.concat inner_get_constants(store.get_superclass(fqns), [:public], skip)
       result
     end
 

data/lib/solargraph/convention/base.rb

@@ -7,6 +7,8 @@ module Solargraph
 
       # True if the source qualifies for this convention.
       # Subclasses should override this method.
+      #
+      # @param source [Source]
       def match? source
         false
       end

data/lib/solargraph/core_fills.rb

@@ -90,6 +90,7 @@ module Solargraph
       Override.method_return('Object#clone', 'self', delete: [:overload]),
       Override.method_return('Object#dup', 'self'),
       Override.method_return('Object#freeze', 'self', delete: [:overload]),
+      Override.method_return('Object#inspect', 'String'),
       Override.method_return('Object#taint', 'self'),
       Override.method_return('Object#to_s', 'String'),
       Override.method_return('Object#untaint', 'self'),
@@ -98,16 +99,27 @@ module Solargraph
 @yieldparam [self]
       )),
 
+      Override.from_comment('STDERR', %(
+@type [IO]
+      )),
+
+      Override.from_comment('STDIN', %(
+@type [IO]
+      )),
+
+      Override.from_comment('STDOUT', %(
+@type [IO]
+      )),
+
       Override.method_return('String#freeze', 'self'),
       Override.method_return('String#split', 'Array<String>'),
       Override.method_return('String#lines', 'Array<String>')
-      ].concat(
-        methods_with_yieldparam_subtypes.map do |path|
-          Override.from_comment(path, %(
+    ].concat(
+      methods_with_yieldparam_subtypes.map do |path|
+        Override.from_comment(path, %(
 @yieldparam_single_parameter
           ))
-        end
-      )
+      end
+    )
   end
 end
-

data/lib/solargraph/documentor.rb

@@ -53,7 +53,7 @@ module Solargraph
     end
 
     def self.specs_from_bundle directory
-      Bundler.with_clean_env do
+      Solargraph.with_clean_env do
         Dir.chdir directory do
           cmd = [
             'bundle', 'exec', 'ruby', '-e',

data/lib/solargraph/language_server/host.rb

@@ -473,7 +473,8 @@ module Solargraph
         if params['data']['path']
           result.concat library.path_pins(params['data']['path'])
         end
-        result.uniq
+        # Selecting by both location and path can result in duplicate pins
+        result.uniq { |p| [p.path, p.location] }
       end
 
       # @param uri [String]

data/lib/solargraph/language_server/message.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'solargraph'
-require 'uri'
 
 module Solargraph
   module LanguageServer

data/lib/solargraph/language_server/message/completion_item/resolve.rb

@@ -20,7 +20,6 @@ module Solargraph
             return params if pins.empty?
             docs = pins
                    .reject { |pin| pin.documentation.empty? && pin.return_type.undefined? }
-            # docs = filt.map { |pin| pin.resolve_completion_item[:documentation] }
             result = params
               .merge(pins.first.resolve_completion_item)
               .merge(documentation: markup_content(join_docs(docs)))

data/lib/solargraph/language_server/message/text_document/definition.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'uri'
-
 module Solargraph::LanguageServer::Message::TextDocument
   class Definition < Base
     def process

data/lib/solargraph/language_server/message/text_document/hover.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'uri'
-
 module Solargraph
   module LanguageServer
     module Message
@@ -20,7 +18,7 @@ module Solargraph
                 parts.push this_link
               end
               parts.push pin.detail.gsub(':', '\\:') unless pin.is_a?(Pin::Namespace) || pin.detail.nil?
-              parts.push pin.documentation unless pin.documentation.nil? or pin.documentation.empty?
+              parts.push pin.documentation unless pin.documentation.nil? || pin.documentation.empty?
               contents.push parts.join("\n\n") unless parts.empty?
               last_link = this_link unless this_link.nil?
             end

data/lib/solargraph/language_server/message/workspace/did_change_configuration.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'uri'
-
 module Solargraph::LanguageServer::Message::Workspace
   class DidChangeConfiguration < Solargraph::LanguageServer::Message::Base
     def process

data/lib/solargraph/language_server/message/workspace/did_change_watched_files.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'uri'
-
 module Solargraph::LanguageServer::Message::Workspace
   class DidChangeWatchedFiles < Solargraph::LanguageServer::Message::Base
     CREATED = 1

data/lib/solargraph/language_server/message/workspace/did_change_workspace_folders.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'uri'
-
 module Solargraph::LanguageServer::Message::Workspace
   class DidChangeWorkspaceFolders < Solargraph::LanguageServer::Message::Base
     def process

data/lib/solargraph/language_server/uri_helpers.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'uri'
+
 module Solargraph
   module LanguageServer
     # Methods to handle conversions between file URIs and paths.

data/lib/solargraph/pin/base_method.rb

@@ -40,6 +40,28 @@ module Solargraph
         []
       end
 
+      def documentation
+        if @documentation.nil?
+          @documentation ||= super || ''
+          param_tags = docstring.tags(:param)
+          unless param_tags.nil? or param_tags.empty?
+            @documentation += "\n\n" unless @documentation.empty?
+            @documentation += "Params:\n"
+            lines = []
+            param_tags.each do |p|
+              l = "* #{p.name}"
+              l += " [#{escape_brackets(p.types.join(', '))}]" unless p.types.nil? or p.types.empty?
+              l += " #{p.text}"
+              lines.push l
+            end
+            @documentation += lines.join("\n")
+          end
+          @documentation += "\n\n" unless @documentation.empty?
+          @documentation += "Visibility: #{visibility}"
+        end
+        @documentation.to_s
+      end
+
       private
 
       # @return [ComplexType]

data/lib/solargraph/pin/conversions.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'cgi'
+
 module Solargraph
   module Pin
     # @todo Move this stuff. It should be the responsibility of the language server.
@@ -81,7 +83,7 @@ module Solargraph
         this_path = path || return_type.tag
         return nil if this_path == 'undefined'
         return nil if this_path.nil? || this_path == 'undefined'
-        "[#{escape_brackets(this_path).gsub('_', '\\\\_')}](solargraph:/document?query=#{URI.escape(this_path)})"
+        "[#{escape_brackets(this_path).gsub('_', '\\\\_')}](solargraph:/document?query=#{CGI.escape(this_path)})"
       end
 
       # @param text [String]

data/lib/solargraph/pin/method.rb

@@ -32,26 +32,6 @@ module Solargraph
         LanguageServer::SymbolKinds::METHOD
       end
 
-      def documentation
-        if @documentation.nil?
-          @documentation ||= super || ''
-          param_tags = docstring.tags(:param)
-          unless param_tags.nil? or param_tags.empty?
-            @documentation += "\n\n" unless @documentation.empty?
-            @documentation += "Params:\n"
-            lines = []
-            param_tags.each do |p|
-              l = "* #{p.name}"
-              l += " [#{escape_brackets(p.types.join(', '))}]" unless p.types.nil? or p.types.empty?
-              l += " #{p.text}"
-              lines.push l
-            end
-            @documentation += lines.join("\n")
-          end
-        end
-        @documentation.to_s
-      end
-
       def nearly? other
         return false unless super
         parameters == other.parameters and

data/lib/solargraph/version.rb

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

data/lib/solargraph/views/_method.erb

@@ -2,7 +2,7 @@
     Namespace:
 </h2>
 <p>
-    <a href="command:solargraph._openDocument?<%= URI.escape "\"solargraph:/document?query=#{object.namespace}\"" %>"><%= object.namespace %></a>
+    <a href="command:solargraph._openDocument?<%= CGI.escape "\"solargraph:/document?query=#{object.namespace}\"" %>"><%= object.namespace %></a>
 </p>
 <h2>
     Overview:

data/lib/solargraph/views/_namespace.erb

@@ -8,7 +8,7 @@
 <ul class="doc-list">
     <% object.meths(scope: :class).sort{|a, b| a.name <=> b.name}.each do |meth| %>
         <li>
-            <a href="solargraph:/document?query=<%= URI.escape(meth.path) %>"><%= meth.name %></a>
+            <a href="solargraph:/document?query=<%= CGI.escape(meth.path) %>"><%= meth.name %></a>
         </li>
     <% end %>
 </ul>
@@ -18,7 +18,7 @@
 <ul class="doc-list">
     <% object.meths(scope: :instance).sort{|a, b| a.name <=> b.name}.each do |meth| %>
         <li>
-            <a href="solargraph:/document?query=<%= URI.escape(meth.path) %>"><%= meth.name %></a>
+            <a href="solargraph:/document?query=<%= CGI.escape(meth.path) %>"><%= meth.name %></a>
         </li>
     <% end %>
 </ul>

data/lib/solargraph/yard_map.rb

@@ -30,8 +30,12 @@ module Solargraph
     # @return [Array<String>]
     attr_reader :required
 
+    # @return [Boolean]
     attr_writer :with_dependencies
 
+    # A hash of gem names and the version numbers to include in the map.
+    #
+    # @return [Hash{String => String}]
     attr_reader :gemset
 
     # @param required [Array<String>]
@@ -59,6 +63,7 @@ module Solargraph
     end
 
     # @param new_requires [Array<String>]
+    # @param new_gemset [Hash{String => String}]
     # @return [Boolean]
     def change new_requires, new_gemset
       if new_requires.uniq.sort == required.uniq.sort && new_gemset == gemset
@@ -145,7 +150,7 @@ module Solargraph
       @cache ||= YardMap::Cache.new
     end
 
-    # @param ns [YARD::CodeObjects::Namespace]
+    # @param ns [YARD::CodeObjects::NamespaceObject]
     # @return [Array<YARD::CodeObjects::Base>]
     def recurse_namespace_object ns
       result = []
@@ -256,6 +261,7 @@ module Solargraph
     end
 
     # @param y [String, nil]
+    # @param spec [Gem::Specification, nil]
     # @return [Array<Pin::Base>]
     def process_yardoc y, spec = nil
       return [] if y.nil?
@@ -270,6 +276,8 @@ module Solargraph
       Mapper.new(YARD::Registry.all, spec).map
     end
 
+    # @param spec [Gem::Specification]
+    # @return [String]
     def yardoc_file_for_spec spec
       cache_dir = File.join(Solargraph::YardMap::CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}", 'yardoc')
       if File.exist?(cache_dir)
@@ -280,6 +288,8 @@ module Solargraph
       end
     end
 
+    # @param path [String]
+    # @return [Gem::Specification]
     def spec_for_require path
       spec = Gem::Specification.find_by_path(path) || Gem::Specification.find_by_name(path.split('/').first)
       if @gemset[spec.name]

data/solargraph.gemspec

@@ -20,7 +20,9 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.1'
 
   s.add_runtime_dependency 'backport', '~> 1.1'
+  s.add_runtime_dependency 'benchmark'
   s.add_runtime_dependency 'bundler', '>= 1.17.2'
+  s.add_runtime_dependency 'e2mmap'
   s.add_runtime_dependency 'jaro_winkler', '~> 1.5'
   s.add_runtime_dependency 'maruku', '~> 0.7', '>= 0.7.3'
   s.add_runtime_dependency 'nokogiri', '~> 1.9', '>= 1.9.1'
@@ -30,9 +32,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'thor', '~> 1.0'
   s.add_runtime_dependency 'tilt', '~> 2.0'
   s.add_runtime_dependency 'yard', '~> 0.9'
-  s.add_runtime_dependency 'e2mmap'
-  s.add_runtime_dependency 'irb', '<= 1.1.0'
-  s.add_runtime_dependency 'benchmark'
 
   s.add_development_dependency 'pry', '~> 0.11.3'
   s.add_development_dependency 'rspec', '~> 3.5', '>= 3.5.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.38.1
+  version: 0.38.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.2
+- !ruby/object:Gem::Dependency
+  name: e2mmap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jaro_winkler
   requirement: !ruby/object:Gem::Requirement
@@ -182,48 +210,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: e2mmap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: irb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: benchmark
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement