solargraph 0.44.1 → 0.47.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 346926f891270e103d6c7170fe5897587c1d5da45ea33b2a7f4238914b38b236
-  data.tar.gz: 451b09bf70dc9d760ebfdeb726821e6e653f196bd867da8c7638888803e33a72
+  metadata.gz: 9d35030ae56f6aaff108a24e4fb06713f911ba4366feb2223b24ad0ea4568522
+  data.tar.gz: a9eeaee16171bc762922ac55d10c61d53bcfe6ef1df0b20623c81e0978a80c7d
 SHA512:
-  metadata.gz: 624d1de49ef2762477d7a413adf282a058143a71689ea8cdfcc91177db94c765b997fca00fefd8d0d4915e44e6cd4ae1867297671611ba6d119d610116c5b80a
-  data.tar.gz: 9f146a371e075407cb8be7b96de08ff24583cf18eb1a29310c1a711c1bd347715d07b0ff6603e9a98b71be7406148e17c907abdcf3bd1a2aba58bd5aeff14685
+  metadata.gz: 0b13ae6284def50f72c9aaed3cad6f89e879306dc8421b1c13f622e18181e6d9aaecf4f57ffa56601a00c92066557bb798d3e8ee6a397920ff0072f909e05463
+  data.tar.gz: 9a0366309ebe9a4a784c2933a8452e2084c376ff9aa3cd6c3bf555f4d6ce046f11245679c688bef43c6c1e67d94b70afb4250149c9b01b80fc525b80a80b6486

data/.github/workflows/rspec.yml

@@ -0,0 +1,41 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with rspec.
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: RSpec
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.4', '2.5', '2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@2b019609e2b0f1ea1a2bc8ca11cb82ab46ada124
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: false
+    - run: bundle install
+    - name: Set up yardocs
+      run: bundle exec yard gems
+    - name: Run tests
+      run: bundle exec rspec

data/CHANGELOG.md

@@ -1,3 +1,49 @@
+## 0.47.2 - September 30, 2022
+- Fix complex type inference (#578)
+- Off-by-one diagnostic (#595)
+
+## 0.47.1 - September 27, 2022
+- Remove debug code from release (#600)
+
+## 0.47.0 - September 25, 2022
+- Completion candidates for union types (#507)
+- Nullify Hover object instead of contents value (#583)
+- Mapping workspace stuck in 0 (#587)
+- Fix parsing of nested subtypes (#589)
+- Update YARD tags on Pin::Block methods (#588)
+- @!visibility directive support (#566)
+
+## 0.46.0 - August 22, 2022
+- Ignore typecheck errors with @sg-ignore tag (#419)
+- Strict checks report undefined method calls on variables (#553)
+- Infer type from method arguments (#554)
+- Return nil value for empty hover contents (#543)
+
+## 0.45.0 - May 23, 2022
+- Basic support for RSpec #describe and #it
+- fix: domain can complete private method (#490)
+- Update README.md (#533)
+- Doc: update readme.md for add solargraph support (#536)
+- Process DASGN node in Ruby 3
+- File.open core fill
+- replace with_unbundled_env with with_original_env (#489)
+- Require specific version of gem (#509)
+- Support URIs prefixed with single slashed file scheme (#529)
+- Fix typo in README.md (#549)
+- details on config behavior (#556)
+- Consider overloads in arity checks
+- ENV core fill for Hash-like methods (#537)
+- Fix string ranges with substitutions (#463)
+
+## 0.44.3 - January 22, 2022
+- TypeChecker validates aliased namespaces (#497)
+- Always use reference YARD tags when resolving param types (#515) (#516)
+- Skip method aliases in strict type checking
+
+## 0.44.2 - November 23, 2021
+- Scope local variables in class_eval blocks (#503)
+- Fix invalid UTF-8 in node comments (#504)
+
 ## 0.44.1 - November 18, 2021
 - Chain nil safety navigation operator (#420)
 - Update closure and context for class_eval receiver (#487)

data/README.md

@@ -1,5 +1,7 @@
 # Solargraph
 
+[![RSpec](https://github.com/castwide/solargraph/actions/workflows/rspec.yml/badge.svg)](https://github.com/castwide/solargraph/actions/workflows/rspec.yml)
+
 ## A Ruby Language Server
 
 Solargraph provides a comprehensive suite of tools for Ruby programming: intellisense, diagnostics, inline documentation, and type checking.
@@ -31,7 +33,9 @@ Plug-ins and extensions are available for the following editors:
     * GitHub: https://github.com/castwide/atom-solargraph
 
 * **Vim**
-    * GitHub: https://github.com/autozimu/LanguageClient-neovim
+    * GitHub: `LanguageClient-neovim`, https://github.com/autozimu/LanguageClient-neovim
+    * GitHub: `coc`, https://github.com/neoclide/coc-solargraph
+    * GitHub: `Vim-EasyComplete`, https://github.com/jayli/vim-easycomplete
 
 * **Emacs**
     * GitHub: `eglot.el`, https://github.com/joaotavora/eglot
@@ -41,13 +45,17 @@ Plug-ins and extensions are available for the following editors:
     * Plugin: https://marketplace.eclipse.org/content/ruby-solargraph
     * GitHub: https://github.com/PyvesB/eclipse-solargraph
 
+### Configuration
+
+Solargraph's behavior can be controlled via optional [configuration](https://solargraph.org/guides/configuration) files. The highest priority file is a `.solargraph.yml` file at the root of the project. If not present, any global configuration at `~/.config/solargraph/config.yml` will apply. The path to the global configuration can be overridden with the `SOLARGRAPH_GLOBAL_CONFIG` environment variable.
+
 ### Gem Support
 
 Solargraph is capable of providing code completion and documentation for gems that have YARD documentation. You can make sure your gems are documented by running `yard gems` from the command line. (YARD is included as one of Solargraph's gem dependencies. The first time you run it might take a while if you have a lot of gems installed).
 
 When editing code, a `require` call that references a gem will pull the documentation into the code maps and include the gem's API in code completion and intellisense.
 
-If your project automatically requires bundled gems (e.g., `require 'bundler/require'`), Solargraph will add all of the Gemfile's default dependecies to the map.
+If your project automatically requires bundled gems (e.g., `require 'bundler/require'`), Solargraph will add all of the Gemfile's default dependencies to the map.
 
 ### Type Checking
 

data/SPONSORS.md

@@ -10,6 +10,8 @@ The following people and organizations provide funding or other resources. [Beco
 
 ## Named Sponsors
 
-- Emily Strickland
 - Tom de Grunt
 - Akira Yamada
+- Erlend Finvåg
+- Matt Massicotte
+- Oscar Rivas

data/lib/solargraph/api_map.rb

@@ -21,6 +21,9 @@ module Solargraph
     # @return [Array<String>]
     attr_reader :unresolved_requires
 
+    # @return [Array<String>]
+    attr_reader :missing_docs
+
     # @param pins [Array<Solargraph::Pin::Base>]
     def initialize pins: []
       @source_map_hash = {}
@@ -68,6 +71,7 @@ module Solargraph
       yard_map.change(external_requires, bench.workspace.directory, bench.workspace.source_gems)
       @store = Store.new(yard_map.pins + implicit.pins + pins)
       @unresolved_requires = yard_map.unresolved_requires
+      @missing_docs = yard_map.missing_docs
       @rebindable_method_names = nil
       store.block_pins.each { |blk| blk.rebind(self) }
       self
@@ -255,7 +259,7 @@ module Solargraph
         implicit.domains.each do |domain|
           type = ComplexType.try_parse(domain)
           next if type.undefined?
-          result.concat inner_get_methods(type.name, type.scope, [:public], deep, skip)
+          result.concat inner_get_methods(type.name, type.scope, visibility, deep, skip)
         end
         result.concat inner_get_methods(fqns, :class, visibility, deep, skip)
         result.concat inner_get_methods(fqns, :instance, visibility, deep, skip)
@@ -281,33 +285,33 @@ module Solargraph
     #   type = Solargraph::ComplexType.parse('String')
     #   api_map.get_complex_type_methods(type)
     #
-    # @param type [Solargraph::ComplexType] The complex type of the namespace
+    # @param complex_type [Solargraph::ComplexType] The complex type of the namespace
     # @param context [String] The context from which the type is referenced
     # @param internal [Boolean] True to include private methods
     # @return [Array<Solargraph::Pin::Base>]
-    def get_complex_type_methods type, context = '', internal = false
+    def get_complex_type_methods complex_type, context = '', internal = false
       # This method does not qualify the complex type's namespace because
       # it can cause conflicts between similar names, e.g., `Foo` vs.
       # `Other::Foo`. It still takes a context argument to determine whether
       # protected and private methods are visible.
-      return [] if type.undefined? || type.void?
-      result = []
-      if type.duck_type?
-        type.select(&:duck_type?).each do |t|
-          result.push Pin::DuckMethod.new(name: t.tag[1..-1])
-        end
-        result.concat get_methods('Object')
-      else
-        unless type.nil? || type.name == 'void'
-          visibility = [:public]
-          if type.namespace == context || super_and_sub?(type.namespace, context)
-            visibility.push :protected
-            visibility.push :private if internal
+      return [] if complex_type.undefined? || complex_type.void?
+      result = Set.new
+      complex_type.each do |type|
+        if type.duck_type?
+          result.add Pin::DuckMethod.new(name: type.to_s[1..-1])
+          result.merge get_methods('Object')
+        else
+          unless type.nil? || type.name == 'void'
+            visibility = [:public]
+            if type.namespace == context || super_and_sub?(type.namespace, context)
+              visibility.push :protected
+              visibility.push :private if internal
+            end
+            result.merge get_methods(type.namespace, scope: type.scope, visibility: visibility)
           end
-          result.concat get_methods(type.namespace, scope: type.scope, visibility: visibility)
         end
       end
-      result
+      result.to_a
     end
 
     # Get a stack of method pins for a method name in a namespace. The order
@@ -383,9 +387,10 @@ module Solargraph
     # @param query [String]
     # @return [Array<Pin::Base>]
     def query_symbols query
-      result = []
-      source_map_hash.each_value { |s| result.concat s.query_symbols(query) }
-      result
+      Pin::Search.new(
+        source_map_hash.values.flat_map(&:document_symbols),
+        query
+      ).results
     end
 
     # @param location [Solargraph::Location]
@@ -525,7 +530,7 @@ module Solargraph
         end
         store.domains(fqns).each do |d|
           dt = ComplexType.try_parse(d)
-          result.concat inner_get_methods(dt.namespace, dt.scope, [:public], deep, skip)
+          result.concat inner_get_methods(dt.namespace, dt.scope, visibility, deep, skip)
         end
       end
       result

data/lib/solargraph/complex_type.rb

@@ -74,6 +74,10 @@ module Solargraph
       @items.all? &block
     end
 
+    def any? &block
+      @items.any? &block
+    end
+
     def selfy?
       @items.any?(&:selfy?)
     end
@@ -154,9 +158,9 @@ module Solargraph
                 subtype_string.clear
                 next
               else
+                raise ComplexTypeError, "Invalid close in type #{type_string}" if point_stack == 0
                 point_stack -= 1
-                subtype_string += char if point_stack == 0
-                raise ComplexTypeError, "Invalid close in type #{type_string}" if point_stack < 0
+                subtype_string += char
               end
               next
             elsif char == '{'

data/lib/solargraph/convention/rspec.rb

@@ -8,14 +8,23 @@ module Solargraph
         @environ ||= Environ.new(
           requires: ['rspec'],
           domains: ['RSpec::Matchers', 'RSpec::ExpectationGroups'],
-          # This override is necessary due to an erroneous @return tag in
-          # rspec's YARD documentation.
-          # @todo The return types have been fixed (https://github.com/rspec/rspec-expectations/pull/1121)
           pins: [
+            # This override is necessary due to an erroneous @return tag in
+            # rspec's YARD documentation.
+            # @todo The return types have been fixed (https://github.com/rspec/rspec-expectations/pull/1121)
             Solargraph::Pin::Reference::Override.method_return('RSpec::Matchers#expect', 'RSpec::Expectations::ExpectationTarget')
-          ]
+          ].concat(extras)
         )
       end
+
+      private
+
+      def extras
+        @@extras ||= SourceMap.load_string(%(
+          def describe(*args); end
+          def it(*args); end
+        )).pins
+      end
     end
   end
 end

data/lib/solargraph/diagnostics/require_not_found.rb

@@ -12,6 +12,10 @@ module Solargraph
         refs = {}
         map = api_map.source_map(source.filename)
         map.requires.each { |ref| refs[ref.name] = ref }
+        api_map.missing_docs.each do |r|
+          next unless refs.key?(r)
+          result.push docs_error(r, refs[r].location)
+        end
         api_map.unresolved_requires.each do |r|
           next unless refs.key?(r)
           result.push require_error(r, refs[r].location)
@@ -21,6 +25,18 @@ module Solargraph
 
       private
 
+      # @param path [String]
+      # @param location [Location]
+      # @return [Hash]
+      def docs_error path, location
+        {
+          range: location.range.to_hash,
+          severity: Diagnostics::Severities::WARNING,
+          source: 'RequireNotFound',
+          message: "YARD docs not found for #{path}"
+        }
+      end
+
       # @param path [String]
       # @param location [Location]
       # @return [Hash]

data/lib/solargraph/diagnostics/rubocop.rb

@@ -89,7 +89,7 @@ module Solargraph
           Position.new(off['location']['start_line'], 0)
         else
           Position.new(
-            off['location']['start_line'] - 1, off['location']['last_column']
+            off['location']['start_line'] - 1, off['location']['last_column'] - 1
           )
         end
       end

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

@@ -27,16 +27,28 @@ module Solargraph
               last_link = this_link unless this_link.nil?
             end
             set_result(
-              contents: {
-                kind: 'markdown',
-                value: contents.join("\n\n")
-              }
+              contents_or_nil(contents)
             )
           rescue FileNotFoundError => e
             Logging.logger.warn "[#{e.class}] #{e.message}"
             Logging.logger.warn e.backtrace.join("\n")
             set_result nil
           end
+
+          private
+
+          def contents_or_nil contents
+            stripped = contents
+              .map(&:strip)
+              .reject { |c| c.empty? }
+            return nil if stripped.empty?
+            {
+              contents: {
+                kind: 'markdown',
+                value: stripped.join("\n\n")
+              }
+            }
+          end
         end
       end
     end

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

@@ -8,7 +8,7 @@ class Solargraph::LanguageServer::Message::Workspace::WorkspaceSymbol < Solargra
     info = pins.map do |pin|
       uri = file_to_uri(pin.location.filename)
       {
-        name: pin.name,
+        name: pin.path,
         containerName: pin.namespace,
         kind: pin.symbol_kind,
         location: {

data/lib/solargraph/language_server/uri_helpers.rb

@@ -14,7 +14,7 @@ module Solargraph
       # @param uri [String]
       # @return [String]
       def uri_to_file 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.

data/lib/solargraph/parser/legacy/class_methods.rb

@@ -48,10 +48,16 @@ module Solargraph
         end
 
         def references source, name
+          if name.end_with?("=")
+            reg = /#{Regexp.escape name[0..-2]}\s*=/
+            extract_offset = ->(code, offset) { reg.match(code, offset).offset(0) }
+          else
+            extract_offset = ->(code, offset) { [soff = code.index(name, offset), soff + name.length] }
+          end
           inner_node_references(name, source.node).map do |n|
-            offset = Position.to_offset(source.code, NodeMethods.get_node_start_position(n))
-            soff = source.code.index(name, offset)
-            eoff = soff + name.length
+            rng = Range.from_node(n)
+            offset = Position.to_offset(source.code, rng.start)
+            soff, eoff = extract_offset[source.code, offset]
             Location.new(
               source.filename,
               Range.new(
@@ -109,16 +115,11 @@ module Solargraph
           result = []
           if node.type == :str
             result.push Range.from_node(node)
-          elsif node.type == :dstr
-            here = Range.from_node(node)
-            there = Range.from_node(node.children[1])
-            result.push Range.new(here.start, there.start)
           end
           node.children.each do |child|
             result.concat string_ranges(child)
           end
           if node.type == :dstr && node.children.last.nil?
-            # result.push Range.new(result.last.ending, result.last.ending)
             last = node.children[-2]
             unless last.nil?
               rng = Range.from_node(last)

data/lib/solargraph/parser/legacy/node_processors/block_node.rb

@@ -8,17 +8,24 @@ module Solargraph
           include Legacy::NodeMethods
 
           def process
-            if other_class_eval?
-              other_class = Solargraph::Pin::Namespace.new(
+            location = get_node_location(node)
+            parent = if other_class_eval?
+              Solargraph::Pin::Namespace.new(
+                location: location,
                 type: :class,
                 name: unpack_name(node.children[0].children[0])
               )
-              make_block_in other_class.context
-              process_children region.update(closure: other_class)
             else
-              make_block_in nil
-              process_children region.update(closure: pins.last)
+              region.closure
             end
+            pins.push Solargraph::Pin::Block.new(
+              location: location,
+              closure: parent,
+              receiver: node.children[0],
+              comments: comments_for(node),
+              scope: region.scope || region.closure.context.scope
+            )
+            process_children region.update(closure: pins.last)
           end
 
           private
@@ -28,17 +35,6 @@ module Solargraph
               node.children[0].children[1] == :class_eval &&
               [:cbase, :const].include?(node.children[0].children[0]&.type)
           end
-
-          def make_block_in context
-            pins.push Solargraph::Pin::Block.new(
-              location: get_node_location(node),
-              context: context,
-              closure: region.closure,
-              receiver: node.children[0],
-              comments: comments_for(node),
-              scope: region.scope || region.closure.context.scope
-            )
-          end
         end
       end
     end

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

@@ -29,16 +29,6 @@ module Solargraph
           NodeProcessor.process(source.node, Region.new(source: source))
         end
 
-        # def returns_from node
-        #   return [] unless Parser.is_ast_node?(node)
-        #   if node.type == :SCOPE
-        #     # node.children.select { |n| n.is_a?(RubyVM::AbstractSyntaxTree::Node) }.map { |n| DeepInference.get_return_nodes(n) }.flatten
-        #     DeepInference.get_return_nodes(node.children[2])
-        #   else
-        #     DeepInference.get_return_nodes(node)
-        #   end
-        # end
-
         def references source, name
           if name.end_with?("=")
             reg = /#{Regexp.escape name[0..-2]}\s*=/
@@ -97,7 +87,7 @@ module Solargraph
         end
 
         def infer_literal_node_type node
-          # NodeMethods.infer_literal_node_type node
+          NodeMethods.infer_literal_node_type node
         end
 
         def version
@@ -133,13 +123,12 @@ module Solargraph
           elsif node.type == :DSTR
             here = Range.from_node(node)
             there = Range.from_node(node.children[1])
-            result.push Range.new(here.start, there.start)
+            result.push Range.new(here.start, there&.start || here.ending)
           end
           node.children.each do |child|
             result.concat string_ranges(child)
           end
           if node.type == :DSTR && node.children.last.nil?
-            # result.push Range.new(result.last.ending, result.last.ending)
             last = node.children[-2]
             unless last.nil?
               rng = Range.from_node(last)

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

@@ -8,17 +8,24 @@ module Solargraph
           include NodeMethods
 
           def process
-            if other_class_eval?
-              other_class = Solargraph::Pin::Namespace.new(
+            location = get_node_location(node)
+            parent = if other_class_eval?
+              Solargraph::Pin::Namespace.new(
+                location: location,
                 type: :class,
                 name: unpack_name(node.children[0].children[0])
               )
-              make_block_in other_class.context
-              process_children region.update(closure: other_class)
             else
-              make_block_in nil
-              process_children region.update(closure: pins.last)
+              region.closure
             end
+            pins.push Solargraph::Pin::Block.new(
+              location: location,
+              closure: parent,
+              receiver: node.children[0],
+              comments: comments_for(node),
+              scope: region.scope || region.closure.context.scope
+            )
+            process_children region.update(closure: pins.last)
           end
 
           private
@@ -28,17 +35,6 @@ module Solargraph
               node.children[0].children[1] == :class_eval &&
               [:COLON2, :CONST].include?(node.children[0].children[0].type)
           end
-
-          def make_block_in context
-            pins.push Solargraph::Pin::Block.new(
-              location: get_node_location(node),
-              context: context,
-              closure: region.closure,
-              receiver: node.children[0],
-              comments: comments_for(node),
-              scope: region.scope || region.closure.context.scope
-            )
-          end
         end
       end
     end

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

@@ -6,7 +6,6 @@ module Solargraph
       module NodeProcessors
         class DefNode < Parser::NodeProcessor::Base
           def process
-            loc = get_node_location(node)
             methpin = Solargraph::Pin::Method.new(
               location: get_node_location(node),
               closure: region.closure,

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

@@ -11,8 +11,8 @@ module Solargraph
               closure: region.closure,
               comments: comments_for(node),
               name: node.children[0].children[0].to_s,
-              # assignment: require_keyword?(node) ? nil : node.children[0].children[1],
-              asgn_code: require_keyword?(node) ? nil: region.code_for(node.children[0].children[1]),
+              assignment: require_keyword?(node) ? nil : node.children[0].children[1],
+              asgn_code: require_keyword?(node) ? nil : region.code_for(node.children[0].children[1]),
               presence: region.closure.location.range,
               decl: require_keyword?(node) ? :kwarg : :kwoptarg
             )

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

@@ -45,6 +45,7 @@ module Solargraph
       register :IASGN,      Rubyvm::NodeProcessors::IvasgnNode
       register :CVASGN,     Rubyvm::NodeProcessors::CvasgnNode
       register :LASGN,      Rubyvm::NodeProcessors::LvasgnNode
+      register :DASGN,      Rubyvm::NodeProcessors::LvasgnNode
       register :DASGN_CURR, Rubyvm::NodeProcessors::LvasgnNode
       register :GASGN,      Rubyvm::NodeProcessors::GvasgnNode
       register :CDECL,      Rubyvm::NodeProcessors::CasgnNode

data/lib/solargraph/pin/block.rb

@@ -8,6 +8,7 @@ module Solargraph
       # @return [Parser::AST::Node]
       attr_reader :receiver
 
+      # @param args [Array<Parameter>]
       def initialize receiver: nil, args: [], context: nil, **splat
         super(**splat)
         @receiver = receiver
@@ -25,7 +26,7 @@ module Solargraph
         @binder || closure.binder
       end
 
-      # @return [Array<String>]
+      # @return [Array<Parameter>]
       def parameters
         @parameters ||= []
       end

data/lib/solargraph/pin/local_variable.rb

@@ -41,7 +41,7 @@ module Solargraph
       end
 
       def match_named_closure needle, haystack
-        return true if needle == haystack
+        return true if needle == haystack || haystack.is_a?(Pin::Block)
         cursor = haystack
         until cursor.nil?
           return true if needle.path == cursor.path

data/lib/solargraph/pin/namespace.rb

@@ -9,8 +9,8 @@ module Solargraph
       # @return [::Symbol] :class or :module
       attr_reader :type
 
-      # @param type [Symbol] :class or :module
-      # @param visibility [Symbol] :public or :private
+      # @param type [::Symbol] :class or :module
+      # @param visibility [::Symbol] :public or :private
       # @param gates [Array<String>]
       def initialize type: :class, visibility: :public, gates: [''], **splat
         # super(location, namespace, name, comments)

data/lib/solargraph/pin/parameter.rb

@@ -3,8 +3,10 @@
 module Solargraph
   module Pin
     class Parameter < LocalVariable
+      # @return [Symbol]
       attr_reader :decl
 
+      # @return [String]
       attr_reader :asgn_code
 
       def initialize decl: :arg, asgn_code: nil, **splat
@@ -91,10 +93,6 @@ module Solargraph
         true
       end
 
-      def probe api_map
-        typify api_map
-      end
-
       private
 
       # @return [YARD::Tags::Tag]
@@ -145,10 +143,7 @@ module Solargraph
         # meths.shift # Ignore the first one
         meths.each do |meth|
           found = nil
-          params = meth.docstring.tags(:param)
-          if params.empty?
-            params = see_reference(docstring, api_map)
-          end
+          params = meth.docstring.tags(:param) + see_reference(docstring, api_map)
           params.each do |p|
             next unless p.name == name
             found = p

data/lib/solargraph/pin/search.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'jaro_winkler'
+
+module Solargraph
+  module Pin
+    class Search
+      class Result
+        # @return [Float]
+        attr_reader :match
+
+        # @return [Pin::Base]
+        attr_reader :pin
+
+        def initialize match, pin
+          @match = match
+          @pin = pin
+        end
+      end
+
+      # @param pins [Array<Pin::Base>]
+      # @param query [String]
+      def initialize pins, query
+        @pins = pins
+        @query = query
+      end
+
+      # @return [Array<Pin::Base>]
+      def results
+        @results ||= do_query
+      end
+
+      private
+
+      # @return [Array<Pin::Base>]
+      def do_query
+        return @pins if @query.nil? || @query.empty?
+        @pins.map do |pin|
+          match = [fuzzy_string_match(pin.path, @query), fuzzy_string_match(pin.name, @query)].max
+          Result.new(match, pin) if match > 0.7
+        end
+          .compact
+          .sort { |a, b| b.match <=> a.match }
+          .map(&:pin)
+      end
+
+      # @param str1 [String]
+      # @param str2 [String]
+      # @return [Float]
+      def fuzzy_string_match str1, str2
+        return (1.0 + (str2.length.to_f / str1.length.to_f)) if str1.downcase.include?(str2.downcase)
+        JaroWinkler.distance(str1, str2, ignore_case: true)
+      end
+    end
+  end
+end

data/lib/solargraph/pin.rb

@@ -30,6 +30,7 @@ module Solargraph
     autoload :DuckMethod,       'solargraph/pin/duck_method'
     autoload :Singleton,        'solargraph/pin/singleton'
     autoload :KeywordParam,     'solargraph/pin/keyword_param'
+    autoload :Search,           'solargraph/pin/search'
 
     ROOT_PIN = Pin::Namespace.new(type: :class, name: '', closure: nil)
   end

data/lib/solargraph/range.rb

@@ -69,7 +69,7 @@ module Solargraph
         if node.is_a?(RubyVM::AbstractSyntaxTree::Node)
           Solargraph::Range.from_to(node.first_lineno - 1, node.first_column, node.last_lineno - 1, node.last_column)
         end
-      elsif node.loc && node.loc.expression
+      elsif node&.loc && node.loc.expression
         from_expr(node.loc.expression)
       end
     end

data/lib/solargraph/source.rb

@@ -360,7 +360,7 @@ module Solargraph
       skip = nil
       comments.lines.each { |l|
         # Trim the comment and minimum leading whitespace
-        p = l.gsub(/^#+/, '')
+        p = l.force_encoding('UTF-8').encode('UTF-8', invalid: :replace, replace: '?').gsub(/^#+/, '')
         if p.strip.empty?
           next unless started
           ctxt.concat p

data/lib/solargraph/source_map/mapper.rb

@@ -12,7 +12,7 @@ module Solargraph
 
       private_class_method :new
 
-      MACRO_REGEXP = /(@\!method|@\!attribute|@\!domain|@\!macro|@\!parse|@\!override)/.freeze
+      MACRO_REGEXP = /(@\!method|@\!attribute|@\!visibility|@\!domain|@\!macro|@\!parse|@\!override)/.freeze
 
       # Generate the data.
       #
@@ -56,8 +56,10 @@ module Solargraph
         @pins ||= []
       end
 
+      # @param position [Solargraph::Position]
+      # @return [Solargraph::Pin::Closure]
       def closure_at(position)
-        @pins.select{|pin| pin.is_a?(Pin::Closure) and pin.location.range.contain?(position)}.last
+        pins.select{|pin| pin.is_a?(Pin::Closure) and pin.location.range.contain?(position)}.last
       end
 
       def process_comment source_position, comment_position, comment
@@ -147,6 +149,27 @@ module Solargraph
               pins.last.docstring.add_tag YARD::Tags::Tag.new(:param, '', pins.last.return_type.to_s.split(', '), 'value')
             end
           end
+        when 'visibility'
+          begin
+            kind = directive.tag.text&.to_sym
+            return unless [:private, :protected, :public].include?(kind)
+
+            name = directive.tag.name
+            closure = closure_at(source_position) || @pins.first
+            if closure.location.range.start.line < comment_position.line
+              closure = closure_at(comment_position)
+            end
+            if closure.is_a?(Pin::Method) && no_empty_lines?(comment_position.line, source_position.line)
+              # @todo Smelly instance variable access
+              closure.instance_variable_set(:@visibility, kind)
+            else
+              matches = pins.select{ |pin| pin.is_a?(Pin::Method) && pin.name == name && pin.namespace == namespace && pin.context.scope == namespace.is_a?(Pin::Singleton) ? :class : :instance }
+              matches.each do |pin|
+                # @todo Smelly instance variable access
+                pin.instance_variable_set(:@visibility, kind)
+              end
+            end
+          end
         when 'parse'
           begin
             ns = closure_at(source_position)
@@ -176,6 +199,10 @@ module Solargraph
         end
       end
 
+      def no_empty_lines?(line1, line2)
+        @code.lines[line1..line2].none? { |line| line.strip.empty? }
+      end
+
       def remove_inline_comment_hashes comment
         ctxt = ''
         num = nil

data/lib/solargraph/source_map.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'jaro_winkler'
 require 'yard'
 require 'yard-solargraph'
 require 'set'
@@ -76,8 +75,7 @@ module Solargraph
     # @param query [String]
     # @return [Array<Pin::Base>]
     def query_symbols query
-      return document_symbols if query && query.empty?
-      document_symbols.select{ |pin| fuzzy_string_match(pin.path, query) || fuzzy_string_match(pin.name, query) }
+      Pin::Search.new(document_symbols, query).results
     end
 
     # @param position [Position]
@@ -178,12 +176,5 @@ module Solargraph
       # Assuming the root pin is always valid
       found || pins.first
     end
-
-    # @param str1 [String]
-    # @param str2 [String]
-    # @return [Boolean]
-    def fuzzy_string_match str1, str2
-      JaroWinkler.distance(str1, str2) > 0.6
-    end
   end
 end

data/lib/solargraph/type_checker/checks.rb

@@ -61,6 +61,19 @@ module Solargraph
         false
       end
 
+      # @param api_map [ApiMap]
+      # @param inferred [ComplexType]
+      # @param expected [ComplexType]
+      # @return [Boolean]
+      def all_types_match? api_map, inferred, expected
+        return duck_types_match?(api_map, expected, inferred) if expected.duck_type?
+        inferred.each do |inf|
+          next if inf.duck_type?
+          return false unless expected.any? { |exp| exp == inf || either_way?(api_map, inf, exp) }
+        end
+        true
+      end
+
       # @param api_map [ApiMap]
       # @param expected [ComplexType]
       # @param inferred [ComplexType]

data/lib/solargraph/type_checker.rb

@@ -40,10 +40,12 @@ module Solargraph
     # @return [Array<Problem>]
     def problems
       @problems ||= begin
-        method_tag_problems
-          .concat variable_type_tag_problems
-          .concat const_problems
-          .concat call_problems
+        without_ignored(
+          method_tag_problems
+            .concat variable_type_tag_problems
+            .concat const_problems
+            .concat call_problems
+        )
       end
     end
 
@@ -84,12 +86,13 @@ module Solargraph
     # @param pin [Pin::Method]
     # @return [Array<Problem>]
     def method_return_type_problems_for pin
+      return [] if pin.is_a?(Pin::MethodAlias)
       result = []
       declared = pin.typify(api_map).self_to(pin.full_context.namespace)
       if declared.undefined?
         if pin.return_type.undefined? && rules.require_type_tags?
           result.push Problem.new(pin.location, "Missing @return tag for #{pin.path}", pin: pin)
-        elsif pin.return_type.defined?
+        elsif pin.return_type.defined? && !resolved_constant?(pin)
           result.push Problem.new(pin.location, "Unresolved return type #{pin.return_type} for #{pin.path}", pin: pin)
         elsif rules.must_tag_or_infer? && pin.probe(api_map).undefined?
           result.push Problem.new(pin.location, "Untyped method #{pin.path} could not be inferred")
@@ -102,7 +105,7 @@ module Solargraph
               result.push Problem.new(pin.location, "#{pin.path} return type could not be inferred", pin: pin)
             end
           else
-            unless (rules.rank > 1 ? types_match?(api_map, declared, inferred) : any_types_match?(api_map, declared, inferred))
+            unless (rules.rank > 1 ? all_types_match?(api_map, inferred, declared) : any_types_match?(api_map, declared, inferred))
               result.push Problem.new(pin.location, "Declared return type #{declared} does not match inferred type #{inferred} for #{pin.path}", pin: pin)
             end
           end
@@ -111,6 +114,20 @@ module Solargraph
       result
     end
 
+    # @todo This is not optimal. A better solution would probably be to mix
+    #   namespace alias into types at the ApiMap level.
+    #
+    # @param pin [Pin::Base]
+    # @return [Boolean]
+    def resolved_constant? pin
+      api_map.get_constants('', pin.binder.tag)
+        .select { |p| p.name == pin.return_type.namespace }
+        .any? do |p|
+          inferred = p.infer(api_map)
+          ['Class', 'Module'].include?(inferred.name)
+        end
+    end
+
     def virtual_pin? pin
       pin.location && source_map.source.comment_at?(pin.location.range.ending)
     end
@@ -160,7 +177,7 @@ module Solargraph
                   result.push Problem.new(pin.location, "Variable type could not be inferred for #{pin.name}", pin: pin)
                 end
               else
-                unless (rules.rank > 1 ? types_match?(api_map, declared, inferred) : any_types_match?(api_map, declared, inferred))
+                unless any_types_match?(api_map, declared, inferred)
                   result.push Problem.new(pin.location, "Declared type #{declared} does not match inferred type #{inferred} for variable #{pin.name}", pin: pin)
                 end
               end
@@ -225,7 +242,7 @@ module Solargraph
             base = base.base
           end
           closest = found.typify(api_map) if found
-          if !found || (closest.defined? && internal_or_core?(found))
+          if !found || found.is_a?(Pin::BaseVariable) || (closest.defined? && internal_or_core?(found))
             unless ignored_pins.include?(found)
               result.push Problem.new(location, "Unresolved call to #{missing.links.last.word}")
               @marked_ranges.push rng
@@ -402,6 +419,15 @@ module Solargraph
 
     # @param pin [Pin::Method]
     def arity_problems_for(pin, arguments, location)
+      ([pin] + pin.overloads).map do |p|
+        result = pin_arity_problems_for(p, arguments, location)
+        return [] if result.empty?
+        result
+      end.flatten.uniq(&:message)
+    end
+
+    # @param pin [Pin::Method]
+    def pin_arity_problems_for(pin, arguments, location)
       return [] unless pin.explicit?
       return [] if pin.parameters.empty? && arguments.empty?
       if pin.parameters.empty?
@@ -506,5 +532,12 @@ module Solargraph
       args.push Solargraph::Parser.chain_string('&') if with_block
       args
     end
+
+    def without_ignored problems
+      problems.reject do |problem|
+        node = source_map.source.node_at(problem.location.range.start.line, problem.location.range.start.column)
+        source_map.source.comments_for(node)&.include?('@sg-ignore')
+      end
+    end
   end
 end

data/lib/solargraph/version.rb

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

data/lib/solargraph/workspace.rb

@@ -2,6 +2,7 @@
 
 require 'open3'
 require 'rubygems'
+require 'json'
 
 module Solargraph
   # A workspace consists of the files in a project's directory and the

data/lib/solargraph/yard_map/core_fills.rb

@@ -101,6 +101,7 @@ module Solargraph
         Override.method_return('File.dirname', 'String'),
         Override.method_return('File.extname', 'String'),
         Override.method_return('File.join', 'String'),
+        Override.method_return('File.open', 'File'),
 
         Override.from_comment('Float#+', %(
 @param y [Numeric]
@@ -110,14 +111,15 @@ module Solargraph
         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.method_return('Hash#merge', 'Hash'),
+        Override.from_comment('Hash#store', %{
+@overload store(key, value)
+        }),
 
         Override.from_comment('Integer#+', %(
 @param y [Numeric]
@@ -181,6 +183,9 @@ module Solargraph
       )
 
       PINS = [
+        # HACK: Extending Hash is not accurate to the implementation, but
+        # accurate enough to the behavior
+        Pin::Reference::Extend.new(closure: Pin::Namespace.new(name: 'ENV'), name: 'Hash'),
         Pin::Reference::Superclass.new(closure: Pin::Namespace.new(name: 'File'), name: 'IO'),
         Pin::Reference::Superclass.new(closure: Pin::Namespace.new(name: 'Integer'), name: 'Numeric'),
         Pin::Reference::Superclass.new(closure: Pin::Namespace.new(name: 'Float'), name: 'Numeric')

data/lib/solargraph/yard_map.rb

@@ -107,6 +107,11 @@ module Solargraph
       @unresolved_requires ||= []
     end
 
+    # @return [Array<String>]
+    def missing_docs
+      @missing_docs ||= []
+    end
+
     # @param y [String]
     # @return [YARD::Registry]
     def load_yardoc y
@@ -196,10 +201,11 @@ module Solargraph
       required.merge @gemset.keys if required.include?('bundler/require')
       pins.replace core_pins
       unresolved_requires.clear
+      missing_docs.clear
       stdlib_pins.clear
       environ = Convention.for_global(self)
       done = []
-      from_std = []
+      already_errored = []
       (required + environ.requires).each do |r|
         next if r.nil? || r.empty? || done.include?(r)
         done.push r
@@ -219,24 +225,18 @@ module Solargraph
           # YARD detects gems for certain libraries that do not have a yardoc
           # but exist in the stdlib. `fileutils` is an example. Treat those
           # cases as errors and check the stdlib yardoc.
-          raise Gem::LoadError if yd.nil?
+          if yd.nil?
+            process_error(r, result, already_errored, nil)
+            next
+          end
           @gem_paths[spec.name] = spec.full_gem_path
           unless yardocs.include?(yd)
             yardocs.unshift yd
             result.concat process_yardoc yd, spec
             result.concat add_gem_dependencies(spec) if with_dependencies?
           end
-        rescue Gem::LoadError, NoYardocError => e
-          base = r.split('/').first
-          next if from_std.include?(base)
-          from_std.push base
-          stdtmp = load_stdlib_pins(base)
-          if stdtmp.empty?
-            unresolved_requires.push r
-          else
-            stdlib_pins.concat stdtmp
-            result.concat stdtmp
-          end
+        rescue Gem::LoadError, NoYardocError
+          process_error(r, result, already_errored)
         end
         result.delete_if(&:nil?)
         unless result.empty?
@@ -253,6 +253,21 @@ module Solargraph
       pins.concat environ.pins
     end
 
+    def process_error(req, result, already_errored, yd = 1)
+      base = req.split('/').first
+      return if already_errored.include?(base)
+      already_errored.push base
+      stdtmp = load_stdlib_pins(base)
+      if yd.nil?
+        missing_docs.push req
+      elsif stdtmp.empty?
+        unresolved_requires.push req
+      else
+        stdlib_pins.concat stdtmp
+        result.concat stdtmp
+      end
+    end
+
     def process_gemsets
       return {} if directory.empty? || !File.file?(File.join(directory, 'Gemfile'))
       require_from_bundle(directory)
@@ -270,7 +285,7 @@ module Solargraph
           @gem_paths[depspec.name] = depspec.full_gem_path
           gy = yardoc_file_for_spec(depspec)
           if gy.nil?
-            unresolved_requires.push dep.name
+            missing_docs.push dep.name
           else
             next if yardocs.include?(gy)
             yardocs.unshift gy
@@ -343,7 +358,9 @@ module Solargraph
     # @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)
+      name = path.split('/').first
+      spec = Gem::Specification.find_by_name(name, @gemset[name])
+
       # Avoid loading the spec again if it's going to be skipped anyway
       return spec if @source_gems.include?(spec.name)
       # Avoid loading the spec again if it's already the correct version

data/lib/solargraph.rb

@@ -59,8 +59,8 @@ module Solargraph
   #
   # @return [void]
   def self.with_clean_env &block
-    meth = if Bundler.respond_to?(:with_unbundled_env)
-      :with_unbundled_env
+    meth = if Bundler.respond_to?(:with_original_env)
+      :with_original_env
     else
       :with_clean_env
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.44.1
+  version: 0.47.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -301,6 +301,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -491,6 +492,7 @@ files:
 - lib/solargraph/pin/reference/prepend.rb
 - lib/solargraph/pin/reference/require.rb
 - lib/solargraph/pin/reference/superclass.rb
+- lib/solargraph/pin/search.rb
 - lib/solargraph/pin/singleton.rb
 - lib/solargraph/pin/symbol.rb
 - lib/solargraph/position.rb
@@ -572,7 +574,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A Ruby language server