solargraph 0.39.3 → 0.39.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7445b5b059ff10d5ff6b998209d3988a4d9f20b48b0b3e51b8e6b63000f18d1b
-  data.tar.gz: d17e09c8fecf38bb4bff9ca4d6985c898a2256cc6c56e4c54599b4be907e27b9
+  metadata.gz: 17711680892b43f0ee8848707305dfdb801e7fc15f65e3426fab759dc0309c20
+  data.tar.gz: 6e8a9089d203ef9a405da33e449f3c4291d57d741e0bde5d615ecc629276a60a
 SHA512:
-  metadata.gz: 61ed8f3f9f68ce49f2496e5fe07eeefbc1121350c15827bc0d600a2417e041d4f2b5d89c861c2f3b4873c20e02bd8fa708d2697b3e73d8e0ee0c858cb7c0f090
-  data.tar.gz: 6c3646376224f2237e404e4c6fcea9eaf02eaa1cfedebf9a01b6f89896d6454c03b7cbbdc16255549b528243d4c7f73a491f7d94e2d5866c6d15bc18a6db0323
+  metadata.gz: 33685a93c52c6417d88f07a76dd4af8c77bf6446d551615e3a745462c622a7808b200638d0af8dbe269cd41c92cac6ba234bb86c29bf7f385ff9d39dd1155ff7
+  data.tar.gz: a53bfd06eb1d3e56564ca03b434ba48169e2f56e7712d7eda0f26f67a3830741a70729df280cc80414d69e6586034cbdb7eea11bf31ee87a83a1eabe3b04da05

data/lib/.rubocop.yml

@@ -0,0 +1,21 @@
+Layout/EndOfLine:
+  EnforcedStyle: lf
+Style/MethodDefParentheses:
+  Enabled: false
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+

data/lib/solargraph.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+Encoding.default_external = 'UTF-8'
+
+require 'solargraph/compat'
 require 'solargraph/version'
 
 # The top-level namespace for the Solargraph code mapping, documentation,

data/lib/solargraph/api_map.rb

@@ -26,7 +26,6 @@ module Solargraph
     def initialize pins: []
       @source_map_hash = {}
       @cache = Cache.new
-      @mutex = Mutex.new
       @method_alias_stack = []
       index pins
     end
@@ -34,13 +33,11 @@ module Solargraph
     # @param pins [Array<Pin::Base>]
     # @return [self]
     def index pins
-      @mutex.synchronize {
-        @source_map_hash.clear
-        @cache.clear
-        @store = Store.new(pins + YardMap.new.pins)
-        @unresolved_requires = []
-        workspace_filenames.clear
-      }
+      @source_map_hash.clear
+      @cache.clear
+      @store = Store.new(pins + YardMap.new.pins)
+      @unresolved_requires = []
+      workspace_filenames.clear
       self
     end
 
@@ -123,14 +120,14 @@ module Solargraph
       reqs.merge br.keys
       yard_map.change(reqs.to_a, br, bundle.workspace.gemnames)
       new_store = Store.new(pins + yard_map.pins)
-      @mutex.synchronize {
-        @cache.clear
-        @source_map_hash = new_map_hash
-        @store = new_store
-        @unresolved_requires = yard_map.unresolved_requires
-        workspace_filenames.clear
-        workspace_filenames.concat bundle.workspace.filenames
-      }
+      @cache.clear
+      @source_map_hash = new_map_hash
+      @store = new_store
+      @unresolved_requires = yard_map.unresolved_requires
+      workspace_filenames.clear
+      workspace_filenames.concat bundle.workspace.filenames
+      @rebindable_method_names = nil
+      store.block_pins.each { |blk| blk.rebind(self) }
       self
     end
 
@@ -179,6 +176,16 @@ module Solargraph
       store.pins
     end
 
+    def rebindable_method_names
+      @rebindable_method_names ||= begin
+        result = yard_map.rebindable_method_names
+        source_maps.each do |map|
+          result.merge map.rebindable_method_names
+        end
+        result
+      end
+    end
+
     # An array of pins based on Ruby keywords (`if`, `end`, etc.).
     #
     # @return [Array<Solargraph::Pin::Keyword>]
@@ -280,8 +287,7 @@ module Solargraph
 
     # @return [Array<Solargraph::Pin::GlobalVariable>]
     def get_global_variable_pins
-      # @todo Slow version
-      pins.select{ |p| p.is_a?(Pin::GlobalVariable) }
+      store.pins_by_class(Pin::GlobalVariable)
     end
 
     # Get an array of methods available in a particular context.
@@ -535,17 +541,17 @@ module Solargraph
     #
     # @return [Hash{String => SourceMap}]
     def source_map_hash
-      @mutex.synchronize { @source_map_hash }
+      @source_map_hash
     end
 
     # @return [ApiMap::Store]
     def store
-      @mutex.synchronize { @store }
+      @store
     end
 
     # @return [Solargraph::ApiMap::Cache]
     def cache
-      @mutex.synchronize { @cache }
+      @cache
     end
 
     # @param fqns [String] A fully qualified namespace

data/lib/solargraph/api_map/cache.rb

@@ -10,6 +10,7 @@ module Solargraph
         @receiver_definitions = {}
       end
 
+      # @return [Array<Pin::BaseMethod>]
       def get_methods fqns, scope, visibility, deep
         @methods[[fqns, scope, visibility.sort, deep]]
       end
@@ -18,6 +19,7 @@ module Solargraph
         @methods[[fqns, scope, visibility.sort, deep]] = value
       end
 
+      # @return [Array<Pin::Base>]
       def get_constants namespace, context
         @constants[[namespace, context]]
       end
@@ -26,6 +28,7 @@ module Solargraph
         @constants[[namespace, context]] = value
       end
 
+      # @return [String]
       def get_qualified_namespace name, context
         @qualified_namespaces[[name, context]]
       end
@@ -38,6 +41,7 @@ module Solargraph
         @receiver_definitions.key? path
       end
 
+      # @return [Pin::BaseMethod]
       def get_receiver_definition path
         @receiver_definitions[path]
       end

data/lib/solargraph/api_map/store.rb

@@ -99,12 +99,12 @@ module Solargraph
 
       # @return [Array<Solargraph::Pin::Base>]
       def namespace_pins
-        @namespace_pins ||= []
+        pins_by_class(Solargraph::Pin::Namespace)
       end
 
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Array<Solargraph::Pin::BaseMethod>]
       def method_pins
-        @method_pins ||= []
+        pins_by_class(Solargraph::Pin::BaseMethod)
       end
 
       # @param fqns [String]
@@ -133,7 +133,7 @@ module Solargraph
 
       # @return [Array<Pin::Block>]
       def block_pins
-        @block_pins ||= []
+        pins_by_class(Pin::Block)
       end
 
       def inspect
@@ -141,6 +141,12 @@ module Solargraph
         to_s
       end
 
+      # @param klass [Class]
+      # @return [Array<Solargraph::Pin::Base>]
+      def pins_by_class klass
+        @pin_select_cache[klass] ||= @pin_class_hash.select { |key, _| key <= klass }.values.flatten
+      end
+
       private
 
       # @param fqns [String]
@@ -167,7 +173,7 @@ module Solargraph
 
       # @return [Array<Solargraph::Pin::Symbol>]
       def symbols
-        @symbols ||= []
+        pins_by_class(Pin::Symbol)
       end
 
       def superclass_references
@@ -198,7 +204,7 @@ module Solargraph
       end
 
       def all_instance_variables
-        @all_instance_variables ||= []
+        pins_by_class(Pin::InstanceVariable)
       end
 
       def path_pin_hash
@@ -207,48 +213,29 @@ module Solargraph
 
       # @return [void]
       def index
-        namespace_map.clear
-        namespaces.clear
-        namespace_pins.clear
-        method_pins.clear
-        symbols.clear
-        block_pins.clear
-        all_instance_variables.clear
-        path_pin_hash.clear
-        namespace_map[''] = []
-        override_pins = []
-        pins.each do |pin|
-          namespace_map[pin.namespace] ||= []
-          namespace_map[pin.namespace].push pin
-          namespaces.add pin.path if pin.is_a?(Pin::Namespace) && !pin.path.empty?
-          namespace_pins.push pin if pin.is_a?(Pin::Namespace)
-          method_pins.push pin if pin.is_a?(Pin::BaseMethod)
-          symbols.push pin if pin.is_a?(Pin::Symbol)
-          if pin.is_a?(Pin::Reference::Include)
-            include_references[pin.namespace] ||= []
-            include_references[pin.namespace].push pin.name
-          elsif pin.is_a?(Pin::Reference::Prepend)
-            prepend_references[pin.namespace] ||= []
-            prepend_references[pin.namespace].push pin.name
-          elsif pin.is_a?(Pin::Reference::Extend)
-            extend_references[pin.namespace] ||= []
-            extend_references[pin.namespace].push pin.name
-          elsif pin.is_a?(Pin::Reference::Superclass)
-            superclass_references[pin.namespace] ||= []
-            superclass_references[pin.namespace].push pin.name
-          elsif pin.is_a?(Pin::Block)
-            block_pins.push pin
-          elsif pin.is_a?(Pin::InstanceVariable)
-            all_instance_variables.push pin
-          elsif pin.is_a?(Pin::Reference::Override)
-            override_pins.push pin
-          end
-          if pin.path
-            path_pin_hash[pin.path] ||= []
-            path_pin_hash[pin.path].push pin
-          end
+        set = pins.to_set
+        @pin_class_hash = set.classify(&:class).transform_values(&:to_a)
+        @pin_select_cache = {}
+        @namespace_map = set.classify(&:namespace).transform_values(&:to_a)
+        @path_pin_hash = set.classify(&:path).transform_values(&:to_a)
+        @namespaces = @path_pin_hash.keys.compact
+        pins_by_class(Pin::Reference::Include).each do |pin|
+          include_references[pin.namespace] ||= []
+          include_references[pin.namespace].push pin.name
+        end
+        pins_by_class(Pin::Reference::Prepend).each do |pin|
+          prepend_references[pin.namespace] ||= []
+          prepend_references[pin.namespace].push pin.name
+        end
+        pins_by_class(Pin::Reference::Extend).each do |pin|
+          extend_references[pin.namespace] ||= []
+          extend_references[pin.namespace].push pin.name
+        end
+        pins_by_class(Pin::Reference::Superclass).each do |pin|
+          superclass_references[pin.namespace] ||= []
+          superclass_references[pin.namespace].push pin.name
         end
-        override_pins.each do |ovr|
+        pins_by_class(Pin::Reference::Override).each do |ovr|
           pin = get_path_pins(ovr.name).first
           next if pin.nil?
           (ovr.tags.map(&:tag_name) + ovr.delete).uniq.each do |tag|
@@ -261,6 +248,7 @@ module Solargraph
         # @todo This is probably not the best place for these overrides
         superclass_references['Integer'] = ['Numeric']
         superclass_references['Float'] = ['Numeric']
+        superclass_references['File'] = ['IO']
       end
     end
   end

data/lib/solargraph/compat.rb

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

data/lib/solargraph/diagnostics/rubocop.rb

@@ -24,7 +24,8 @@ module Solargraph
       # @return [Array<Hash>]
       def diagnose source, _api_map
         options, paths = generate_options(source.filename, source.code)
-        runner = RuboCop::Runner.new(options, RuboCop::ConfigStore.new)
+        store = RuboCop::ConfigStore.new
+        runner = RuboCop::Runner.new(options, store)
         result = redirect_stdout{ runner.run(paths) }
         make_array JSON.parse(result)
       rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e

data/lib/solargraph/diagnostics/rubocop_helpers.rb

@@ -17,7 +17,8 @@ module Solargraph
         rubocop_file = find_rubocop_file(filename)
         args.push('-c', fix_drive_letter(rubocop_file)) unless rubocop_file.nil?
         args.push filename
-        options, paths = RuboCop::Options.new.parse(args)
+        base_options = RuboCop::Options.new
+        options, paths = base_options.parse(args)
         options[:stdin] = code
         [options, paths]
       end
@@ -27,6 +28,8 @@ module Solargraph
       # @param filename [String]
       # @return [String, nil]
       def find_rubocop_file filename
+        return nil unless File.exist?(filename)
+        filename = File.realpath(filename)
         dir = File.dirname(filename)
         until File.dirname(dir) == dir
           here = File.join(dir, '.rubocop.yml')

data/lib/solargraph/documentor.rb

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

data/lib/solargraph/language_server/host.rb

@@ -99,7 +99,7 @@ module Solargraph
           message = Message.select(request['method']).new(self, request)
           begin
             message.process
-          rescue Exception => e
+          rescue StandardError => e
             logger.warn "Error processing request: [#{e.class}] #{e.message}"
             logger.warn e.backtrace.join("\n")
             message.set_error Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}"

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

@@ -16,11 +16,15 @@ module Solargraph
             # detects the correct configuration
             # the .rb extension is needed for ruby file without extension, else rubocop won't format
             tempfile = File.join(File.dirname(filename), "_tmp_#{SecureRandom.hex(8)}_#{File.basename(filename)}.rb")
+            rubocop_file = Diagnostics::RubocopHelpers.find_rubocop_file(filename)
             original = host.read_text(params['textDocument']['uri'])
             File.write tempfile, original
             begin
-              options, paths = RuboCop::Options.new.parse(['-a', '-f', 'fi', tempfile])
-              redirect_stdout { RuboCop::Runner.new(options, RuboCop::ConfigStore.new).run(paths) }
+              args = ['-a', '-f', 'fi', tempfile]
+              args.unshift('-c', fix_drive_letter(rubocop_file)) unless rubocop_file.nil?
+              options, paths = RuboCop::Options.new.parse(args)
+              store = RuboCop::ConfigStore.new
+              redirect_stdout { RuboCop::Runner.new(options, store).run(paths) }
               result = File.read(tempfile)
               File.unlink tempfile
               format original, result

data/lib/solargraph/language_server/uri_helpers.rb

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

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

@@ -36,6 +36,8 @@ module Solargraph
                 process_prepend
               elsif node.children[1] == :require
                 process_require
+              elsif node.children[1] == :autoload
+                process_autoload
               elsif node.children[1] == :private_constant
                 process_private_constant
               elsif node.children[1] == :alias_method && node.children[2] && node.children[2] && node.children[2].type == :sym && node.children[3] && node.children[3].type == :sym
@@ -138,6 +140,14 @@ module Solargraph
             end
           end
 
+          # @return [void]
+          def process_autoload
+            if node.children[3].is_a?(AST::Node) && node.children[3].type == :str
+              path = node.children[3].children[0].to_s
+              pins.push Pin::Reference::Require.new(get_node_location(node), path)
+            end
+          end
+
           # @return [void]
           def process_module_function
             if node.children[2].nil?