solargraph 0.40.4 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eff7d664014ae6d25990957afb4328baafe88ff76ef892db8b3d50791860845e
-  data.tar.gz: 8038c884a63ce269f1a0faaf635e4c295fadd61c456ba2665c84a17b4f03a031
+  metadata.gz: eed08215481576c83b9ff5014648c0fa5fe7e458eb59eabcf86632496e4a9f32
+  data.tar.gz: 8f036f65304ecf1401504a84a49bc34ed6d9be97308be8a1e080be884af100fc
 SHA512:
-  metadata.gz: a7b95e2ba342b191642a1d5ea228243a60b9211f6c05cab2acf09ddcaab3efb25cef488ca910964e0ac1c32edacc2f0ced4eef09fa819b03d2919af4ac734ca7
-  data.tar.gz: 6990c07591d43fdb583484c00fc5221d228850fa75e12b5cd2632413a21c1984f634ce2655371d9be7016a035e23fe622469418779bf3285f03a087a38c394ae
+  metadata.gz: '024920c42f1f1e37f604b616481bca07b91ec52ed9fd315e6e12a6cc0ab7c0a88ef9ecd827866ab52d66d2f43b679a97c68d3877b88adc5092fc9c2dc2dca5a1'
+  data.tar.gz: 02c6de30fdac85feedbee8e8b3cbd35ea846a9cbb3a5cb8c476053208a63ae5781a45382fcca43e760875f3f5f911675bdec3f8ba318b122ef6ea0c42f735a29

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.41.0 - May 30, 2021
+- Chain constant at last double colon with more than two nested namespaces
+- Fill Integer#times return type (#440)
+- Validate included modules in type checks (#424)
+- Faster language server initialization
+  - Server response to initialize is near immediate
+  - Workspace is mapped in a background thread
+  - Supported clients report mapping progress
+- Log RuboCop corrections at info level (#426)
+- Allow configuring the version of RuboCop to require (#430)
+- Fix source of diagnostic (#434)
+- Fix file argument in RuboCop (#435)
+- Config ignores directories with .rb extension (#423)
+
 ## 0.40.4 - March 3, 2021
 - Fix optarg and blockarg ordering
 - Override specialization for #initialize

data/README.md

@@ -79,6 +79,21 @@ Run `bundle install` and use `bundle exec yard gems` to generate the documentati
 
 In order to make sure you're using the correct dependencies, you can start the language server with Bundler. In VS Code, there's a `solargraph.useBundler` option. Other clients will vary, but the command you probably want to run is `bundle exec solargraph socket` or `bundle exec solargraph stdio`.
 
+### Rubocop Version
+
+If you have multiple versions of [`rubocop`](https://rubygems.org/gems/rubocop) installed and you would like to choose a version other than the latest to use, this specific version can be configured.
+
+In `.solargraph.yml`:
+
+```yaml
+---
+reporters:
+- rubocop:version=0.61.0  # diagnostics
+formatter:
+  rubocop:
+    version: 0.61.0       # formatting
+```
+
 ### Integrating Other Editors
 
 The [language server protocol](https://microsoft.github.io/language-server-protocol/specification) is the recommended way for integrating Solargraph into editors and IDEs. Clients can connect using either stdio or TCP. Language client developers should refer to [https://solargraph.org/guides/language-server](https://solargraph.org/guides/language-server).

data/SPONSORS.md

@@ -13,3 +13,4 @@ The following people and organizations provide funding or other resources. [Beco
 - Emily Strickland
 - Tom de Grunt
 - Akira Yamada
+- Jared White

data/lib/.rubocop.yml

@@ -1,5 +1,5 @@
 Layout/EndOfLine:
-  EnforcedStyle: lf
+  Enabled: false
 Style/MethodDefParentheses:
   Enabled: false
 Layout/EmptyLineAfterGuardClause:

data/lib/solargraph.rb

@@ -9,13 +9,14 @@ require 'solargraph/version'
 # static analysis, and language server libraries.
 #
 module Solargraph
-  class InvalidOffsetError <      RangeError;    end
-  class DiagnosticsError <        RuntimeError;  end
-  class FileNotFoundError <       RuntimeError;  end
-  class SourceNotAvailableError < StandardError; end
-  class ComplexTypeError        < StandardError; end
-  class WorkspaceTooLargeError <  RuntimeError;  end
-  class BundleNotFoundError <     StandardError; end
+  class InvalidOffsetError         < RangeError;    end
+  class DiagnosticsError           < RuntimeError;  end
+  class FileNotFoundError          < RuntimeError;  end
+  class SourceNotAvailableError    < StandardError; end
+  class ComplexTypeError           < StandardError; end
+  class WorkspaceTooLargeError     < RuntimeError;  end
+  class BundleNotFoundError        < StandardError; end
+  class InvalidRubocopVersionError < RuntimeError;  end
 
   autoload :Position,         'solargraph/position'
   autoload :Range,            'solargraph/range'

data/lib/solargraph/api_map.rb

@@ -33,7 +33,12 @@ module Solargraph
     # @param pins [Array<Pin::Base>]
     # @return [self]
     def index pins
-      catalog Bench.new(pins: pins)
+      # @todo This implementation is incomplete. It should probably create a
+      #   Bench.
+      @source_map_hash = {}
+      implicit.clear
+      cache.clear
+      @store = Store.new(yard_map.pins + pins)
       self
     end
 
@@ -42,97 +47,55 @@ module Solargraph
     # @param source [Source]
     # @return [self]
     def map source
-      catalog Bench.new(opened: [source])
+      map = Solargraph::SourceMap.map(source)
+      catalog Bench.new(source_maps: [map])
       self
     end
 
-    # @param name [String]
-    # @return [YARD::Tags::MacroDirective, nil]
-    def named_macro name
-      store.named_macros[name]
-    end
-
     # Catalog a bench.
     #
     # @param bench [Bench]
-    # @return [self]
     def catalog bench
-      new_map_hash = {}
-      # Bench always needs to be merged if it adds or removes sources
-      merged = (bench.sources.length == source_map_hash.values.length)
-      bench.sources.each do |source|
-        if source_map_hash.key?(source.filename)
-          if source_map_hash[source.filename].code == source.code &&
-             source_map_hash[source.filename].source.synchronized? &&
-             source.synchronized?
-            new_map_hash[source.filename] = source_map_hash[source.filename]
-          elsif !source.synchronized?
-            new_map_hash[source.filename] = source_map_hash[source.filename]
-            # @todo Smelly instance variable access
-            new_map_hash[source.filename].instance_variable_set(:@source, source)
-          else
-            map = Solargraph::SourceMap.map(source)
-            if source_map_hash[source.filename].try_merge!(map)
-              new_map_hash[source.filename] = source_map_hash[source.filename]
-            else
-              new_map_hash[source.filename] = map
-              merged = false
-            end
-          end
-        else
-          map = Solargraph::SourceMap.map(source)
-          new_map_hash[source.filename] = map
-          merged = false
-        end
-      end
-      return self if bench.pins.empty? && @store && merged
       implicit.clear
+      @cache.clear
+      @source_map_hash = bench.source_maps.map { |s| [s.filename, s] }.to_h
       pins = []
-      reqs = Set.new
-      # @param map [SourceMap]
-      new_map_hash.each_value do |map|
+      @required = Set.new
+      local_path_hash.clear
+      source_map_hash.each_value do |map|
         pins.concat map.pins
-        reqs.merge map.requires.map(&:name)
-      end
-      pins.concat bench.pins
-      reqs.merge bench.workspace.config.required
-      @required = reqs
-      bench.sources.each do |src|
-        implicit.merge new_map_hash[src.filename].environ
+        @required.merge map.requires.map(&:name)
+        implicit.merge map.environ
       end
-      # implicit.merge Convention.for_global(self)
-      local_path_hash.clear
-      unless bench.workspace.require_paths.empty?
-        file_keys = new_map_hash.keys
-        workspace_path = Pathname.new(bench.workspace.directory)
-        reqs.delete_if do |r|
-          bench.workspace.require_paths.any? do |base|
-            pn = workspace_path.join(base, "#{r}.rb").to_s
-            if file_keys.include? pn
-              local_path_hash[r] = pn
-              true
-            else
-              false
-            end
-          end
+      @required.merge implicit.requires
+      external_requires = []
+      @required.each do |req|
+        result = bench.load_paths.find do |path|
+          full = Pathname.new(path).join("#{req}.rb").to_s
+          @source_map_hash.key?(full)
+        end
+        if result
+          local_path_hash[req] = Pathname.new(result).join("#{req}.rb").to_s
+        else
+          external_requires.push req unless result
         end
       end
-      reqs.merge implicit.requires
-      br = reqs.include?('bundler/require') ? require_from_bundle(bench.workspace.directory) : {}
-      reqs.merge br.keys
-      yard_map.change(reqs.to_a, br, bench.workspace.gemnames)
-      new_store = Store.new(yard_map.pins + implicit.pins + pins)
-      @cache.clear
-      @source_map_hash = new_map_hash
-      @store = new_store
+      br = @required.include?('bundler/require') ? bench.gemnames.to_h { |gs| [gs.name, gs] } : {}
+      @required.merge br.keys
+      yard_map.change(external_requires, br, bench.gemnames)
+      @store = Store.new(yard_map.pins + implicit.pins + pins)
       @unresolved_requires = yard_map.unresolved_requires
-      workspace_filenames.clear
-      workspace_filenames.concat bench.workspace.filenames
       @rebindable_method_names = nil
       store.block_pins.each { |blk| blk.rebind(self) }
       self
     end
 
+    # @param name [String]
+    # @return [YARD::Tags::MacroDirective, nil]
+    def named_macro name
+      store.named_macros[name]
+    end
+
     def required
       @required ||= Set.new
     end
@@ -173,7 +136,10 @@ module Solargraph
     def self.load directory
       api_map = new
       workspace = Solargraph::Workspace.new(directory)
-      api_map.catalog Bench.new(workspace: workspace)
+      # api_map.catalog Bench.new(workspace: workspace)
+      library = Library.new(workspace)
+      library.map!
+      api_map.catalog library.bench
       api_map
     end
 
@@ -531,6 +497,15 @@ module Solargraph
       @yard_map ||= YardMap.new
     end
 
+    # Check if the host class includes the specified module.
+    #
+    # @param host [String] The class
+    # @param mod [String] The module
+    # @return [Boolean]
+    def type_include?(host, mod)
+      store.get_includes(host).include?(mod)
+    end
+
     private
 
     # @return [Array<String>]
@@ -544,7 +519,9 @@ module Solargraph
     attr_reader :source_map_hash
 
     # @return [ApiMap::Store]
-    attr_reader :store
+    def store
+      @store ||= Store.new
+    end
 
     # @return [Solargraph::ApiMap::Cache]
     attr_reader :cache

data/lib/solargraph/bench.rb

@@ -1,30 +1,27 @@
 # frozen_string_literal: true
 
+require 'set'
+
 module Solargraph
-  # An aggregation of a workspace and additional sources to be cataloged in an
-  # ApiMap.
+  # A container of source maps and gem specs to be cataloged in an ApiMap.
   #
   class Bench
-    # @return [Workspace]
-    attr_reader :workspace
-
-    # @return [Array<Source>]
-    attr_reader :opened
+    # @return [Set<SourceMap>]
+    attr_reader :source_maps
 
-    # @return [Array<Pin::Base>]
-    attr_reader :pins
+    # @return [Set<String>]
+    attr_reader :load_paths
 
-    # @param workspace [Workspace]
-    # @param opened [Array<Source>]
-    def initialize workspace: Workspace.new, opened: [], pins: []
-      @workspace = workspace
-      @opened = opened
-      @pins = pins
-    end
+    # @return [Set<String>]
+    attr_reader :gemnames
 
-    # @return [Array<Source>]
-    def sources
-      @sources ||= (opened + workspace.sources).uniq(&:filename)
+    # @param source_maps [Array<SourceMap>, Set<SourceMap>]
+    # @param load_paths [Array<String>, Set<String>]
+    # @param gemnames [Array<String>, Set<String>]
+    def initialize source_maps: [], load_paths: [], gemnames: []
+      @source_maps = source_maps.to_set
+      @load_paths = load_paths.to_set
+      @gemnames = gemnames.to_set
     end
   end
 end

data/lib/solargraph/compat.rb

@@ -1,9 +1,23 @@
+unless Hash.method_defined?(:transform_keys)
+  class Hash
+    def transform_keys &block
+      result = {}
+      each_pair do |k, v|
+        result[block.call(k)] = v
+      end
+      result
+    end
+  end
+end
+
 unless Hash.method_defined?(:transform_values)
   class Hash
     def transform_values &block
+      result = {}
       each_pair do |k, v|
-        self[k] = block.call(v)
+        result[k] = block.call(v)
       end
+      result
     end
   end
 end

data/lib/solargraph/diagnostics/rubocop.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'rubocop'
 require 'stringio'
 
 module Solargraph
@@ -23,6 +22,7 @@ module Solargraph
       # @param _api_map [Solargraph::ApiMap]
       # @return [Array<Hash>]
       def diagnose source, _api_map
+        require_rubocop(rubocop_version)
         options, paths = generate_options(source.filename, source.code)
         store = RuboCop::ConfigStore.new
         runner = RuboCop::Runner.new(options, store)
@@ -36,6 +36,13 @@ module Solargraph
 
       private
 
+      # Extracts the rubocop version from _args_
+      #
+      # @return [String]
+      def rubocop_version
+        args.find { |a| a =~ /version=/ }.to_s.split('=').last
+      end
+
       # @param resp [Hash]
       # @return [Array<Hash>]
       def make_array resp
@@ -57,7 +64,8 @@ module Solargraph
           range: offense_range(off).to_hash,
           # 1 = Error, 2 = Warning, 3 = Information, 4 = Hint
           severity: SEVERITIES[off['severity']],
-          source: off['cop_name'],
+          source: 'rubocop',
+          code: off['cop_name'],
           message: off['message'].gsub(/^#{off['cop_name']}\:/, '')
         }
       end

data/lib/solargraph/diagnostics/rubocop_helpers.rb

@@ -7,6 +7,24 @@ module Solargraph
     module RubocopHelpers
       module_function
 
+      # Requires a specific version of rubocop, or the latest installed version
+      # if _version_ is `nil`.
+      #
+      # @param version [String]
+      # @raise [InvalidRubocopVersionError] if _version_ is not installed
+      def require_rubocop(version = nil)
+        begin
+          gem_path = Gem::Specification.find_by_name('rubocop', version).full_gem_path
+          gem_lib_path = File.join(gem_path, 'lib')
+          $LOAD_PATH.unshift(gem_lib_path) unless $LOAD_PATH.include?(gem_lib_path)
+        rescue Gem::MissingSpecVersionError => e
+          raise InvalidRubocopVersionError,
+                "could not find '#{e.name}' (#{e.requirement}) - "\
+                "did find: [#{e.specs.map { |s| s.version.version }.join(', ')}]"
+        end
+        require 'rubocop'
+      end
+
       # Generate command-line options for the specified filename and code.
       #
       # @param filename [String]

data/lib/solargraph/language_server/host.rb

@@ -2,6 +2,7 @@
 
 require 'observer'
 require 'set'
+require 'securerandom'
 
 module Solargraph
   module LanguageServer
@@ -192,7 +193,7 @@ module Solargraph
       def diagnose uri
         if sources.include?(uri)
           library = library_for(uri)
-          if library.synchronized?
+          if library.mapped? && library.synchronized?
             logger.info "Diagnosing #{uri}"
             begin
               results = library.diagnose uri_to_file(uri)
@@ -277,6 +278,7 @@ module Solargraph
         begin
           lib = Solargraph::Library.load(path, name)
           libraries.push lib
+          async_library_map lib
         rescue WorkspaceTooLargeError => e
           send_notification 'window/showMessage', {
             'type' => Solargraph::LanguageServer::MessageTypes::WARNING,
@@ -631,6 +633,7 @@ module Solargraph
 
       # @return [void]
       def catalog
+        return unless libraries.all?(&:mapped?)
         libraries.each(&:catalog)
       end
 
@@ -741,6 +744,71 @@ module Solargraph
       def prepare_rename?
         client_capabilities['rename'] && client_capabilities['rename']['prepareSupport']
       end
+
+      def client_supports_progress?
+        client_capabilities['window'] && client_capabilities['window']['workDoneProgress']
+      end
+
+      # @param library [Library]
+      # @return [void]
+      def async_library_map library
+        return if library.mapped?
+        Thread.new do
+          if client_supports_progress?
+            uuid = SecureRandom.uuid
+            send_request 'window/workDoneProgress/create', {
+              token: uuid
+            } do |response|
+              do_async_library_map library, response.nil? ? uuid : nil
+            end
+          else
+            do_async_library_map library
+          end
+        end
+      end
+
+      def do_async_library_map library, uuid = nil
+        total = library.workspace.sources.length
+        if uuid
+          send_notification '$/progress', {
+            token: uuid,
+            value: {
+              kind: 'begin',
+              title: "Mapping workspace",
+              message: "0/#{total} files",
+              cancellable: false,
+              percentage: 0
+            }
+          }
+        end
+        pct = 0
+        mod = 10
+        while library.next_map
+          next unless uuid
+          cur = ((library.source_map_hash.keys.length.to_f / total.to_f) * 100).to_i
+          if cur > pct && cur % mod == 0
+          pct = cur
+            send_notification '$/progress', {
+              token: uuid,
+              value: {
+                kind: 'report',
+                cancellable: false,
+                message: "#{library.source_map_hash.keys.length}/#{total} files",
+                percentage: pct
+              }
+            }
+          end
+        end
+        if uuid
+          send_notification '$/progress', {
+            token: uuid,
+            value: {
+              kind: 'end',
+              message: 'Mapping complete'
+            }
+          }
+        end
+      end
     end
   end
 end

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

@@ -21,6 +21,7 @@ module Solargraph
             docs = pins
                    .reject { |pin| pin.documentation.empty? && pin.return_type.undefined? }
             result = params
+              .transform_keys(&:to_sym)
               .merge(pins.first.resolve_completion_item)
               .merge(documentation: markup_content(join_docs(docs)))
             result[:detail] = pins.first.detail

data/lib/solargraph/language_server/message/extended/environment.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-# Make sure the environment page can report RuboCop's version
-require 'rubocop'
-
 module Solargraph
   module LanguageServer
     module Message
@@ -12,6 +9,9 @@ module Solargraph
         #
         class Environment < Base
           def process
+            # Make sure the environment page can report RuboCop's version
+            require 'rubocop'
+
             page = Solargraph::Page.new(host.options['viewsPath'])
             content = page.render('environment', layout: true, locals: { config: host.options, folders: host.folders })
             set_result(

data/lib/solargraph/language_server/message/initialize.rb

@@ -1,49 +1,44 @@
 # frozen_string_literal: true
 
-require 'benchmark'
-
 module Solargraph
   module LanguageServer
     module Message
       class Initialize < Base
         def process
-          bm = Benchmark.measure {
-            host.configure params['initializationOptions']
-            host.client_capabilities = params['capabilities']
-            if support_workspace_folders?
-              host.prepare_folders params['workspaceFolders']
-            elsif params['rootUri']
-              host.prepare UriHelpers.uri_to_file(params['rootUri'])
-            else
-              host.prepare params['rootPath']
-            end
-            result = {
-              capabilities: {
-                textDocumentSync: 2, # @todo What should this be?
-                workspace: {
-                  workspaceFolders: {
-                    supported: true,
-                    changeNotifications: true
-                  }
+          host.configure params['initializationOptions']
+          host.client_capabilities = params['capabilities']
+          if support_workspace_folders?
+            host.prepare_folders params['workspaceFolders']
+          elsif params['rootUri']
+            host.prepare UriHelpers.uri_to_file(params['rootUri'])
+          else
+            host.prepare params['rootPath']
+          end
+          result = {
+            capabilities: {
+              textDocumentSync: 2, # @todo What should this be?
+              workspace: {
+                workspaceFolders: {
+                  supported: true,
+                  changeNotifications: true
                 }
               }
             }
-            result[:capabilities].merge! static_completion unless dynamic_registration_for?('textDocument', 'completion')
-            result[:capabilities].merge! static_signature_help unless dynamic_registration_for?('textDocument', 'signatureHelp')
-            # result[:capabilities].merge! static_on_type_formatting unless dynamic_registration_for?('textDocument', 'onTypeFormatting')
-            result[:capabilities].merge! static_hover unless dynamic_registration_for?('textDocument', 'hover')
-            result[:capabilities].merge! static_document_formatting unless dynamic_registration_for?('textDocument', 'formatting')
-            result[:capabilities].merge! static_document_symbols unless dynamic_registration_for?('textDocument', 'documentSymbol')
-            result[:capabilities].merge! static_definitions unless dynamic_registration_for?('textDocument', 'definition')
-            result[:capabilities].merge! static_rename unless dynamic_registration_for?('textDocument', 'rename')
-            result[:capabilities].merge! static_references unless dynamic_registration_for?('textDocument', 'references')
-            result[:capabilities].merge! static_workspace_symbols unless dynamic_registration_for?('workspace', 'symbol')
-            result[:capabilities].merge! static_folding_range unless dynamic_registration_for?('textDocument', 'foldingRange')
-            # @todo Temporarily disabled
-            # result[:capabilities].merge! static_code_action unless dynamic_registration_for?('textDocument', 'codeAction')
-            set_result result
           }
-          Solargraph.logger.unknown "Solargraph initialized (#{bm.real} seconds)"
+          result[:capabilities].merge! static_completion unless dynamic_registration_for?('textDocument', 'completion')
+          result[:capabilities].merge! static_signature_help unless dynamic_registration_for?('textDocument', 'signatureHelp')
+          # result[:capabilities].merge! static_on_type_formatting unless dynamic_registration_for?('textDocument', 'onTypeFormatting')
+          result[:capabilities].merge! static_hover unless dynamic_registration_for?('textDocument', 'hover')
+          result[:capabilities].merge! static_document_formatting unless dynamic_registration_for?('textDocument', 'formatting')
+          result[:capabilities].merge! static_document_symbols unless dynamic_registration_for?('textDocument', 'documentSymbol')
+          result[:capabilities].merge! static_definitions unless dynamic_registration_for?('textDocument', 'definition')
+          result[:capabilities].merge! static_rename unless dynamic_registration_for?('textDocument', 'rename')
+          result[:capabilities].merge! static_references unless dynamic_registration_for?('textDocument', 'references')
+          result[:capabilities].merge! static_workspace_symbols unless dynamic_registration_for?('workspace', 'symbol')
+          result[:capabilities].merge! static_folding_range unless dynamic_registration_for?('textDocument', 'foldingRange')
+          # @todo Temporarily disabled
+          # result[:capabilities].merge! static_code_action unless dynamic_registration_for?('textDocument', 'codeAction')
+          set_result result
         end
 
         private

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'rubocop'
 require 'securerandom'
 require 'tmpdir'
 
@@ -11,21 +10,22 @@ module Solargraph
         class Formatting < Base
           include Solargraph::Diagnostics::RubocopHelpers
 
-          class BlankRubocopFormatter < ::RuboCop::Formatter::BaseFormatter; end
-
           def process
             file_uri = params['textDocument']['uri']
             config = config_for(file_uri)
             original = host.read_text(file_uri)
             args = cli_args(file_uri, config)
 
+            require_rubocop(config['version'])
             options, paths = RuboCop::Options.new.parse(args)
             options[:stdin] = original
-            redirect_stdout do
+            corrections = redirect_stdout do
               RuboCop::Runner.new(options, RuboCop::ConfigStore.new).run(paths)
             end
             result = options[:stdin]
 
+            log_corrections(corrections)
+
             format original, result
           rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
             set_error(Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}")
@@ -33,6 +33,17 @@ module Solargraph
 
           private
 
+          def log_corrections(corrections)
+            corrections = corrections&.strip
+            return if corrections&.empty?
+
+            Solargraph.logger.info('Formatting result:')
+            corrections.each_line do |line|
+              next if line.strip.empty?
+              Solargraph.logger.info(line.strip)
+            end
+          end
+
           def config_for(file_uri)
             conf = host.formatter_config(file_uri)
             return {} unless conf.is_a?(Hash)
@@ -40,12 +51,12 @@ module Solargraph
             conf['rubocop'] || {}
           end
 
-          def cli_args file, config
+          def cli_args file_uri, config
+            file = UriHelpers.uri_to_file(file_uri)
             args = [
               config['cops'] == 'all' ? '--auto-correct-all' : '--auto-correct',
               '--cache', 'false',
-              '--format', 'Solargraph::LanguageServer::Message::' \
-                          'TextDocument::Formatting::BlankRubocopFormatter',
+              '--format', formatter_class(config).name,
             ]
 
             ['except', 'only'].each do |arg|
@@ -57,6 +68,16 @@ module Solargraph
             args + [file]
           end
 
+          def formatter_class(config)
+            if self.class.const_defined?('BlankRubocopFormatter')
+              BlankRubocopFormatter
+            else
+              require_rubocop(config['version'])
+              klass = Class.new(::RuboCop::Formatter::BaseFormatter)
+              self.class.const_set 'BlankRubocopFormatter', klass
+            end
+          end
+
           def cop_list(value)
             value = value.join(',') if value.respond_to?(:join)
             return nil if value == '' || !value.is_a?(String)

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

@@ -17,7 +17,7 @@ module Solargraph
               if !this_link.nil? && this_link != last_link
                 parts.push this_link
               end
-              parts.push pin.detail.gsub(':', '\\:') unless pin.is_a?(Pin::Namespace) || pin.detail.nil?
+              parts.push "`" + pin.detail.gsub(':', '\\:') + "`" unless pin.is_a?(Pin::Namespace) || pin.detail.nil?
               parts.push pin.documentation unless pin.documentation.nil? || pin.documentation.empty?
               unless parts.empty?
                 data = parts.join("\n\n")

data/lib/solargraph/library.rb

@@ -20,9 +20,7 @@ module Solargraph
     def initialize workspace = Solargraph::Workspace.new, name = nil
       @workspace = workspace
       @name = name
-      api_map.catalog bench
-      @synchronized = true
-      @catalog_mutex = Mutex.new
+      @synchronized = false
     end
 
     def inspect
@@ -48,9 +46,13 @@ module Solargraph
     # @return [void]
     def attach source
       mutex.synchronize do
-        @synchronized = (@current == source) if synchronized?
+        if @current && @current.filename != source.filename && source_map_hash.key?(@current.filename) && !workspace.has_file?(@current.filename)
+          source_map_hash.delete @current.filename
+          @synchronized = false
+        end
         @current = source
-        catalog
+        maybe_map @current
+        api_map.catalog bench unless synchronized?
       end
     end
 
@@ -110,9 +112,9 @@ module Solargraph
       mutex.synchronize do
         next if File.directory?(filename) || !File.exist?(filename)
         next unless contain?(filename) || open?(filename) || workspace.would_merge?(filename)
-        @synchronized = false
         source = Solargraph::Source.load_string(File.read(filename), filename)
         workspace.merge(source)
+        maybe_map source
         result = true
       end
       result
@@ -158,6 +160,8 @@ module Solargraph
       position = Position.new(line, column)
       cursor = Source::Cursor.new(read(filename), position)
       api_map.clip(cursor).complete
+    rescue FileNotFoundError => e
+      handle_file_not_found filename, e
     end
 
     # Get definition suggestions for the expression at the specified file and
@@ -186,6 +190,8 @@ module Solargraph
       else
         api_map.clip(cursor).define.map { |pin| pin.realize(api_map) }
       end
+    rescue FileNotFoundError => e
+      handle_file_not_found(filename, e)
     end
 
     # Get signature suggestions for the method at the specified file and
@@ -260,14 +266,12 @@ module Solargraph
     # @param query [String]
     # @return [Array<YARD::CodeObjects::Base>]
     def document query
-      catalog
       api_map.document query
     end
 
     # @param query [String]
     # @return [Array<String>]
     def search query
-      catalog
       api_map.search query
     end
 
@@ -276,7 +280,6 @@ module Solargraph
     # @param query [String]
     # @return [Array<Pin::Base>]
     def query_symbols query
-      catalog
       api_map.query_symbols query
     end
 
@@ -295,10 +298,13 @@ module Solargraph
     # @param path [String]
     # @return [Array<Solargraph::Pin::Base>]
     def path_pins path
-      catalog
       api_map.get_path_suggestions(path)
     end
 
+    def source_maps
+      source_map_hash.values
+    end
+
     # Get the current text of a file in the library.
     #
     # @param filename [String]
@@ -318,7 +324,6 @@ module Solargraph
       #   be an option to do so.
       #
       return [] unless open?(filename)
-      catalog
       result = []
       source = read(filename)
       repargs = {}
@@ -346,7 +351,7 @@ module Solargraph
     #
     # @return [void]
     def catalog
-      @catalog_mutex.synchronize do
+      mutex.synchronize do
         break if synchronized?
         logger.info "Cataloging #{workspace.directory.empty? ? 'generic workspace' : workspace.directory}"
         api_map.catalog bench
@@ -355,6 +360,16 @@ module Solargraph
       end
     end
 
+    def bench
+      source_maps = @current ? [@current] : []
+      source_maps.concat source_map_hash.values
+      Bench.new(
+        source_maps: source_maps,
+        load_paths: workspace.require_paths,
+        gemnames: workspace.gemnames
+      )
+    end
+
     # Get an array of foldable ranges for the specified file.
     #
     # @deprecated The library should not need to handle folding ranges. The
@@ -381,14 +396,49 @@ module Solargraph
     # @param source [Source]
     # @return [Boolean] True if the source was merged into the workspace.
     def merge source
+      Logging.logger.debug "Merging source: #{source.filename}"
       result = false
       mutex.synchronize do
         result = workspace.merge(source)
-        @synchronized = !result if synchronized?
+        maybe_map source
       end
+      # catalog
       result
     end
 
+    def source_map_hash
+      @source_map_hash ||= {}
+    end
+
+    def mapped?
+      (workspace.filenames - source_map_hash.keys).empty?
+    end
+
+    def next_map
+      return false if mapped?
+      mutex.synchronize do
+        @synchronized = false
+        src = workspace.sources.find { |s| !source_map_hash.key?(s.filename) }
+        if src
+          Logging.logger.debug "Mapping #{src.filename}"
+          source_map_hash[src.filename] = Solargraph::SourceMap.map(src)
+        else
+          false
+        end
+      end
+    end
+
+    def map!
+      workspace.sources.each do |src|
+        source_map_hash[src.filename] = Solargraph::SourceMap.map(src)
+      end
+      self
+    end
+
+    def pins
+      @pins ||= []
+    end
+
     private
 
     # @return [Mutex]
@@ -401,14 +451,6 @@ module Solargraph
       @api_map ||= Solargraph::ApiMap.new
     end
 
-    # @return [Bench]
-    def bench
-      Bench.new(
-        workspace: workspace,
-        opened: @current ? [@current] : []
-      )
-    end
-
     # Get the source for an open file or create a new source if the file
     # exists on disk. Sources created from disk are not added to the open
     # workspace files, i.e., the version on disk remains the authoritative
@@ -422,5 +464,35 @@ module Solargraph
       raise FileNotFoundError, "File not found: #{filename}" unless workspace.has_file?(filename)
       workspace.source(filename)
     end
+
+    def handle_file_not_found filename, error
+      if workspace.source(filename)
+        Solargraph.logger.debug "#{filename} is not cataloged in the ApiMap"
+        nil
+      else
+        raise error
+      end
+    end
+
+    def maybe_map source
+      if source_map_hash.key?(source.filename)
+        return if source_map_hash[source.filename].code == source.code && 
+          source_map_hash[source.filename].source.synchronized? &&
+          source.synchronized?
+        if source.synchronized?
+          new_map = Solargraph::SourceMap.map(source)
+          unless source_map_hash[source.filename].try_merge!(new_map)
+            source_map_hash[source.filename] = new_map
+            @synchronized = false
+          end
+        else
+          # @todo Smelly instance variable access
+          source_map_hash[source.filename].instance_variable_set(:@source, source)
+        end
+      else
+        source_map_hash[source.filename] = Solargraph::SourceMap.map(source)
+        @synchronized = false
+      end
+    end
   end
 end

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

@@ -109,7 +109,6 @@ module Solargraph
         end
 
         def node_to_argchains node
-          # @todo Process array, splat, argscat
           return [] unless Parser.is_ast_node?(node)
           if [:ZARRAY, :ARRAY, :LIST].include?(node.type)
             node.children[0..-2].map { |c| NodeChainer.chain(c) }

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

@@ -32,7 +32,6 @@ module Solargraph
                   region.closure.parameters.push locals.last
                 end
               end
-              # @todo Optional args, keyword args, etc.
               if node.children[6]
                 locals.push Solargraph::Pin::Parameter.new(
                   location: region.closure.location,

data/lib/solargraph/source/chain/head.rb

@@ -13,22 +13,6 @@ module Solargraph
           # return super_pins(api_map, name_pin) if word == 'super'
           []
         end
-
-        # @todo This is temporary. Chain heads need to handle arguments to
-        #   `super`.
-        # def arguments
-        #   []
-        # end
-
-        private
-
-        # # @param api_map [ApiMap]
-        # # @param name_pin [Pin::Base]
-        # # @return [Array<Pin::Base>]
-        # def super_pins api_map, name_pin
-        #   pins = api_map.get_method_stack(name_pin.namespace, name_pin.name, scope: name_pin.scope)
-        #   pins.reject{|p| p.path == name_pin.path}
-        # end
       end
     end
   end

data/lib/solargraph/source/source_chainer.rb

@@ -34,6 +34,7 @@ module Solargraph
         # Special handling for files that end with an integer and a period
         return Chain.new([Chain::Literal.new('Integer'), Chain::UNDEFINED_CALL]) if phrase =~ /^[0-9]+\.$/
         return Chain.new([Chain::Literal.new('Symbol')]) if phrase.start_with?(':') && !phrase.start_with?('::')
+        return SourceChainer.chain(source, Position.new(position.line, position.character + 1)) if end_of_phrase.strip == '::' && source.code[Position.to_offset(source.code, position)].to_s.match?(/[a-z]/i)
         begin
           return Chain.new([]) if phrase.end_with?('..')
           node = nil
@@ -64,7 +65,7 @@ module Solargraph
           elsif end_of_phrase.strip == '::'
             chain.links.push Chain::UNDEFINED_CONSTANT
           end
-        elsif chain.links.last.is_a?(Source::Chain::Constant) && end_of_phrase.strip == '::' && !source.code[Position.to_offset(source.code, position)].match?(/[a-z]/i)
+        elsif chain.links.last.is_a?(Source::Chain::Constant) && end_of_phrase.strip == '::'
           chain.links.push Source::Chain::UNDEFINED_CONSTANT
         end
         chain

data/lib/solargraph/source_map/mapper.rb

@@ -71,11 +71,6 @@ module Solargraph
           pos = Solargraph::Position.new(comment_position.line + line_num - 1, comment_position.column)
           process_directive(source_position, pos, d)
           last_line = line_num + 1
-          # @todo The below call assumes the topmost comment line. The above
-          #   process occasionally emits incorrect comment positions due to
-          #   blank lines in comment blocks, but at least it processes all the
-          #   directives.
-          # process_directive(source_position, comment_position, d)
         end
       end
 

data/lib/solargraph/type_checker/checks.rb

@@ -75,7 +75,7 @@ module Solargraph
         true
       end
 
-      # @param type [ComplexType]
+      # @param type [ComplexType::UniqueType]
       # @return [String]
       def fuzz type
         if type.parameters?
@@ -86,13 +86,13 @@ module Solargraph
       end
 
       # @param api_map [ApiMap]
-      # @param cls1 [ComplexType]
-      # @param cls2 [ComplexType]
+      # @param cls1 [ComplexType::UniqueType]
+      # @param cls2 [ComplexType::UniqueType]
       # @return [Boolean]
       def either_way?(api_map, cls1, cls2)
         f1 = fuzz(cls1)
         f2 = fuzz(cls2)
-        api_map.super_and_sub?(f1, f2) || api_map.super_and_sub?(f2, f1)
+        api_map.type_include?(f1, f2) || api_map.super_and_sub?(f1, f2) || api_map.super_and_sub?(f2, f1)
       end
     end
   end

data/lib/solargraph/version.rb

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

data/lib/solargraph/workspace/config.rb

@@ -170,9 +170,10 @@ module Solargraph
       # @param globs [Array<String>]
       # @return [Array<String>]
       def process_globs globs
-        result = []
-        globs.each do |glob|
-          result.concat Dir[File.join directory, glob].map{ |f| f.gsub(/\\/, '/') }
+        result = globs.flat_map do |glob|
+          Dir[File.join directory, glob]
+            .map{ |f| f.gsub(/\\/, '/') }
+            .select { |f| File.file?(f) }
         end
         result
       end

data/lib/solargraph/yard_map/core_fills.rb

@@ -111,6 +111,7 @@ module Solargraph
 @param y [Numeric]
 @return [Numeric]
         )),
+        Override.method_return('Integer#times', 'Enumerator', delete: [:overload]),
 
         Override.method_return('Kernel#puts', 'nil'),
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.40.4
+  version: 0.41.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport