solargraph 0.39.15 → 0.40.2

data/solargraph.gemspec

@@ -17,18 +17,18 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.executables = ['solargraph']
 
-  s.required_ruby_version = '>= 2.1'
+  s.required_ruby_version = '>= 2.4'
 
   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'
-  s.add_runtime_dependency 'parser', '~> 2.3'
+  s.add_runtime_dependency 'kramdown', '~> 2.3'
+  s.add_runtime_dependency 'kramdown-parser-gfm', '~> 1.1'
+  s.add_runtime_dependency 'parser', '~> 3.0'
   s.add_runtime_dependency 'reverse_markdown', '>= 1.0.5', '< 3'
-  s.add_runtime_dependency 'rubocop', '~> 0.52'
+  s.add_runtime_dependency 'rubocop', '>= 0.52'
   s.add_runtime_dependency 'thor', '~> 1.0'
   s.add_runtime_dependency 'tilt', '~> 2.0'
   s.add_runtime_dependency 'yard', '~> 0.9', '>= 0.9.24'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.39.15
+  version: 0.40.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -81,59 +81,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: maruku
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
@@ -158,14 +146,14 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.52'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.52'
 - !ruby/object:Gem::Dependency
@@ -303,6 +291,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -316,7 +305,7 @@ files:
 - lib/solargraph/api_map/cache.rb
 - lib/solargraph/api_map/source_to_yard.rb
 - lib/solargraph/api_map/store.rb
-- lib/solargraph/bundle.rb
+- lib/solargraph/bench.rb
 - lib/solargraph/compat.rb
 - lib/solargraph/complex_type.rb
 - lib/solargraph/complex_type/type_methods.rb
@@ -330,7 +319,6 @@ files:
 - lib/solargraph/converters/dl.rb
 - lib/solargraph/converters/dt.rb
 - lib/solargraph/converters/misc.rb
-- lib/solargraph/core_fills.rb
 - lib/solargraph/diagnostics.rb
 - lib/solargraph/diagnostics/base.rb
 - lib/solargraph/diagnostics/require_not_found.rb
@@ -460,9 +448,7 @@ files:
 - lib/solargraph/parser/rubyvm/node_processors/sym_node.rb
 - lib/solargraph/parser/snippet.rb
 - lib/solargraph/pin.rb
-- lib/solargraph/pin/attribute.rb
 - lib/solargraph/pin/base.rb
-- lib/solargraph/pin/base_method.rb
 - lib/solargraph/pin/base_variable.rb
 - lib/solargraph/pin/block.rb
 - lib/solargraph/pin/class_variable.rb
@@ -492,11 +478,6 @@ files:
 - lib/solargraph/pin/reference/superclass.rb
 - lib/solargraph/pin/singleton.rb
 - lib/solargraph/pin/symbol.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/position.rb
 - lib/solargraph/range.rb
 - lib/solargraph/server_methods.rb
@@ -524,7 +505,6 @@ files:
 - lib/solargraph/source_map/clip.rb
 - lib/solargraph/source_map/completion.rb
 - lib/solargraph/source_map/mapper.rb
-- lib/solargraph/stdlib_fills.rb
 - lib/solargraph/type_checker.rb
 - lib/solargraph/type_checker/checks.rb
 - lib/solargraph/type_checker/param_def.rb
@@ -543,12 +523,18 @@ files:
 - lib/solargraph/yard_map.rb
 - lib/solargraph/yard_map/cache.rb
 - lib/solargraph/yard_map/core_docs.rb
+- lib/solargraph/yard_map/core_fills.rb
 - lib/solargraph/yard_map/core_gen.rb
+- lib/solargraph/yard_map/helpers.rb
 - lib/solargraph/yard_map/mapper.rb
+- lib/solargraph/yard_map/mapper/to_constant.rb
+- lib/solargraph/yard_map/mapper/to_method.rb
+- lib/solargraph/yard_map/mapper/to_namespace.rb
 - lib/solargraph/yard_map/rdoc_to_yard.rb
+- lib/solargraph/yard_map/stdlib_fills.rb
+- lib/solargraph/yard_map/to_method.rb
 - lib/yard-solargraph.rb
 - solargraph.gemspec
-- travis-bundler.rb
 - yardoc/2.2.2.tar.gz
 homepage: http://solargraph.org
 licenses:
@@ -562,7 +548,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/solargraph/core_fills.rb

@@ -1,160 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  # Overrides for the Ruby core.
-  #
-  # The YardMap uses this module to add type information to core methods.
-  #
-  module CoreFills
-    Override = Pin::Reference::Override
-
-    KEYWORDS = [
-      '__ENCODING__', '__LINE__', '__FILE__', 'BEGIN', 'END', 'alias', 'and',
-      'begin', 'break', 'case', 'class', 'def', 'defined?', 'do', 'else',
-      'elsif', 'end', 'ensure', 'false', 'for', 'if', 'in', 'module', 'next',
-      'nil', 'not', 'or', 'redo', 'rescue', 'retry', 'return', 'self', 'super',
-      'then', 'true', 'undef', 'unless', 'until', 'when', 'while', 'yield'
-    ].freeze
-
-    methods_with_yieldparam_subtypes = %w[
-      Array#each Array#map Array#map! Array#any? Array#all? Array#index
-      Array#keep_if Array#delete_if
-      Enumerable#each_entry Enumerable#map Enumerable#any? Enumerable#all?
-      Enumerable#select Enumerable#reject
-      Set#each
-    ]
-
-    OVERRIDES = [
-      Override.method_return('Array#keep_if', 'self'),
-      Override.method_return('Array#delete_if', 'self'),
-      Override.from_comment('Array#reject', %(
-@overload reject(&block)
-  @return [self]
-@overload reject()
-  @return [Enumerator]
-              )),
-      Override.method_return('Array#reverse', 'self', delete: ['overload']),
-      Override.from_comment('Array#select', %(
-@overload select(&block)
-  @return [self]
-@overload select()
-  @return [Enumerator]
-      )),
-      Override.from_comment('Array#[]', %(
-@overload [](range)
-  @param range [Range]
-  @return [self]
-@overload [](num1, num2)
-  @param num1 [Integer]
-  @param num2 [Integer]
-  @return [self]
-@overload [](num)
-  @param num [Integer]
-  @return_single_parameter
-@return_single_parameter
-      )),
-      Override.from_comment('Array#first', %(
-@overload first(num)
-  @param num [Integer]
-  @return [self]
-@return_single_parameter
-      )),
-      Override.from_comment('Array#last', %(
-@overload last(num)
-  @param num [Integer]
-  @return [self]
-@return_single_parameter
-      )),
-      Override.method_return('Array#uniq', 'self'),
-      Override.method_return('Array#zip', 'Array, nil'),
-
-      Override.from_comment('BasicObject#==', %(
-@param other [BasicObject]
-@return [Boolean]
-      )),
-      Override.method_return('BasicObject#initialize', 'void'),
-
-      Override.method_return('Class#new', 'self'),
-      Override.method_return('Class.new', 'Class<Object>'),
-      Override.method_return('Class#allocate', 'self'),
-      Override.method_return('Class.allocate', 'Class<Object>'),
-
-      Override.method_return('Enumerable#select', 'self'),
-
-      Override.method_return('File.absolute_path', 'String'),
-      Override.method_return('File.basename', 'String'),
-      Override.method_return('File.dirname', 'String'),
-      Override.method_return('File.extname', 'String'),
-      Override.method_return('File.join', 'String'),
-
-      Override.from_comment('Float#+', %(
-@param y [Numeric]
-@return [Numeric]
-      )),
-
-      Override.from_comment('Hash#[]', %(
-@return_value_parameter
-      )),
-
-      # @todo This override isn't robust enough. It needs to allow for
-      #   parameterized Hash types, e.g., [Hash{Symbol => String}].
-      Override.from_comment('Hash#[]=', %(
-@param_tuple
-      )),
-
-      Override.from_comment('Integer#+', %(
-@param y [Numeric]
-@return [Numeric]
-      )),
-
-      Override.method_return('Kernel#puts', 'nil'),
-
-      # Override.method_return('Module#attr_reader', 'void'),
-      # Override.method_return('Module#attr_writer', 'void'),
-      # Override.method_return('Module#attr_accessor', 'void'),
-
-      Override.from_comment('Numeric#+', %(
-@param y [Numeric]
-@return [Numeric]
-      )),
-
-      Override.method_return('Object#!', 'Boolean'),
-      Override.method_return('Object#clone', 'self', delete: [:overload]),
-      Override.method_return('Object#dup', 'self', delete: [:overload]),
-      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'),
-      Override.from_comment('Object#tap', %(
-@return [self]
-@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>'),
-      Override.from_comment('String#each_line', %(
-@yieldparam [String]
-      ))
-    ].concat(
-      methods_with_yieldparam_subtypes.map do |path|
-        Override.from_comment(path, %(
-@yieldparam_single_parameter
-          ))
-      end
-    )
-  end
-end

data/lib/solargraph/pin/attribute.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    class Attribute < BaseMethod
-      # @return [::Symbol] :reader or :writer
-      attr_reader :access
-
-      # @param access [::Symbol] :reader or :writer
-      def initialize access: :reader, **splat
-        super(**splat)
-        @access = access
-        if access == :writer
-          parameters.push(
-            Pin::Parameter.new(name: 'value', decl: :arg, closure: self)
-          )
-          if return_type.defined?
-            docstring.add_tag YARD::Tags::Tag.new(:param, '', return_type.to_s.split(', '), 'value')
-          end
-        end
-      end
-
-      def completion_item_kind
-        Solargraph::LanguageServer::CompletionItemKinds::PROPERTY
-      end
-
-      def symbol_kind
-        Solargraph::LanguageServer::SymbolKinds::PROPERTY
-      end
-
-      def path
-        @path ||= namespace + (scope == :instance ? '#' : '.') + name
-      end
-
-      def probe api_map
-        types = []
-        varname = "@#{name.gsub(/=$/, '')}"
-        pins = api_map.get_instance_variable_pins(binder.namespace, binder.scope).select { |iv| iv.name == varname }
-        pins.each do |pin|
-          type = pin.typify(api_map)
-          type = pin.probe(api_map) if type.undefined?
-          types.push type if type.defined?
-        end
-        return ComplexType::UNDEFINED if types.empty?
-        ComplexType.try_parse(*types.map(&:tag).uniq)
-      end
-    end
-  end
-end

data/lib/solargraph/pin/base_method.rb

@@ -1,141 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    # The base class for method and attribute pins.
-    #
-    class BaseMethod < Closure
-      # @return [::Symbol] :public, :private, or :protected
-      attr_reader :visibility
-
-      # @return [Parser::AST::Node]
-      attr_reader :node
-
-      # @param visibility [::Symbol] :public, :protected, or :private
-      # @param explicit [Boolean]
-      def initialize visibility: :public, explicit: true, **splat
-        super(**splat)
-        @visibility = visibility
-        @explicit = explicit
-      end
-
-      def return_type
-        @return_type ||= generate_complex_type
-      end
-
-      def path
-        @path ||= "#{namespace}#{(scope == :instance ? '#' : '.')}#{name}"
-      end
-
-      def typify api_map
-        decl = super
-        return decl unless decl.undefined?
-        type = see_reference(api_map) || typify_from_super(api_map)
-        return type.qualify(api_map, namespace) unless type.nil?
-        name.end_with?('?') ? ComplexType::BOOLEAN : ComplexType::UNDEFINED
-      end
-
-      # @return [Array<Pin::Parameter>]
-      def parameters
-        @parameters ||= []
-      end
-
-      # @return [Array<String>]
-      def parameter_names
-        parameters.map(&:name)
-      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
-          return_tags = docstring.tags(:return)
-          unless return_tags.empty?
-            @documentation += "\n\n" unless @documentation.empty?
-            @documentation += "Returns:\n"
-            lines = []
-            return_tags.each do |r|
-              l = "*"
-              l += " [#{escape_brackets(r.types.join(', '))}]" unless r.types.nil? or r.types.empty?
-              l += " #{r.text}"
-              lines.push l
-            end
-            @documentation += lines.join("\n")
-          end
-          @documentation += "\n\n" unless @documentation.empty?
-          @documentation += "Visibility: #{visibility}"
-        end
-        @documentation.to_s
-      end
-
-      def explicit?
-        @explicit
-      end
-
-      private
-
-      # @return [ComplexType]
-      def generate_complex_type
-        tags = docstring.tags(:return).map(&:types).flatten.reject(&:nil?)
-        return ComplexType::UNDEFINED if tags.empty?
-        ComplexType.try_parse *tags
-      end
-
-      # @param api_map [ApiMap]
-      # @return [ComplexType, nil]
-      def see_reference api_map
-        docstring.ref_tags.each do |ref|
-          next unless ref.tag_name == 'return' && ref.owner
-          result = resolve_reference(ref.owner.to_s, api_map)
-          return result unless result.nil?
-        end
-        match = comments.match(/^[ \t]*\(see (.*)\)/m)
-        return nil if match.nil?
-        resolve_reference match[1], api_map
-      end
-
-      # @param api_map [ApiMap]
-      # @return [ComplexType, nil]
-      def typify_from_super api_map
-        stack = api_map.get_method_stack(namespace, name, scope: scope).reject { |pin| pin.path == path }
-        return nil if stack.empty?
-        stack.each do |pin|
-          return pin.return_type unless pin.return_type.undefined?
-        end
-        nil
-      end
-
-      # @param ref [String]
-      # @param api_map [ApiMap]
-      # @return [ComplexType]
-      def resolve_reference ref, api_map
-        parts = ref.split(/[\.#]/)
-        if parts.first.empty? || parts.one?
-          path = "#{namespace}#{ref}"
-        else
-          fqns = api_map.qualify(parts.first, namespace)
-          return ComplexType::UNDEFINED if fqns.nil?
-          path = fqns + ref[parts.first.length] + parts.last
-        end
-        pins = api_map.get_path_pins(path)
-        pins.each do |pin|
-          type = pin.typify(api_map)
-          return type unless type.undefined?
-        end
-        nil
-      end
-    end
-  end
-end