solargraph 0.30.1 → 0.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f109fbce413be0100575d4375ff3bd0592626852334dfcb41161f7d7bbe6e67f
-  data.tar.gz: 5fa2251f2b60f03c627add65eef3e42adf16e75cc579c36e581dc7972312b750
+  metadata.gz: 61453319a056f4779bf21c852bb34b5f797207c19ff9266d422d25c724934bc1
+  data.tar.gz: 405c13271fce7df56c5daae95b95430f5933a66728d3e2f6fff11762d4f392d0
 SHA512:
-  metadata.gz: 2017a0eaea2090e26a3f99f0e8d9734e40b6f9692dfcdef8bcb2c424ba3180604807c3cceb49f029fc87fa25e17e6212a79e97e62f6fd570fc2a8f6a8a75652b
-  data.tar.gz: e386dcd357c431214a64e1774097a61827c9d54f70b290313868250a392095a520d87788c0741bc660ceb1ceb114f16c71a54923fbfe3755dd84776c9c64e6a0
+  metadata.gz: 5dcd832eff27b926dd8d244feff2edc37398f0004fa62dd002f07981e325d6f5a88f7c93bc1ad91d1f0ce34954790afc0410ed9581936d5ad57a465f99cc2372
+  data.tar.gz: 246cb5bbb21a7134532512c0321e86633d21adcf4eebd24de3d33427ab3da39663dafba488b8e0a304abd252c874408513ced6370cdc8e88cde18187f1242b79

data/lib/solargraph/api_map.rb

@@ -354,13 +354,7 @@ module Solargraph
     # @param scope [Symbol] :instance or :class
     # @return [Array<Solargraph::Pin::Base>]
     def get_method_stack fqns, name, scope: :instance
-      # @todo This cache is still causing problems, but only when using
-      #   Solargraph on Solargraph itself.
-      # cached = cache.get_method_stack(fqns, name, scope)
-      # return cached unless cached.nil?
-      result = get_methods(fqns, scope: scope, visibility: [:private, :protected, :public]).select{|p| p.name == name}
-      # cache.set_method_stack(fqns, name, scope, result)
-      # result
+      get_methods(fqns, scope: scope, visibility: [:private, :protected, :public]).select{|p| p.name == name}
     end
 
     # Get an array of all suggestions that match the specified path.

data/lib/solargraph/api_map/cache.rb

@@ -3,7 +3,6 @@ module Solargraph
     class Cache
       def initialize
         @methods = {}
-        @method_stacks = {}
         @constants = {}
         @qualified_namespaces = {}
       end
@@ -16,14 +15,6 @@ module Solargraph
         @methods[[fqns, scope, visibility.sort, deep]] = value
       end
 
-      def get_method_stack fqns, name, scope
-        @method_stacks[[fqns, name, scope]]
-      end
-
-      def set_method_stack fqns, name, scope, value
-        @method_stacks[[fqns, name, scope]] = value
-      end
-
       def get_constants namespace, context
         @constants[[namespace, context]]
       end
@@ -43,7 +34,6 @@ module Solargraph
       # @return [void]
       def clear
         @methods.clear
-        @method_stacks.clear
         @constants.clear
         @qualified_namespaces.clear
       end
@@ -51,7 +41,6 @@ module Solargraph
       # @return [Boolean]
       def empty?
         @methods.empty? &&
-          @method_stacks.empty? &&
           @constants.empty? &&
           @qualified_namespaces.empty?
       end

data/lib/solargraph/diagnostics.rb

@@ -6,6 +6,7 @@ module Solargraph
     autoload :Base,            'solargraph/diagnostics/base'
     autoload :Severities,      'solargraph/diagnostics/severities'
     autoload :Rubocop,         'solargraph/diagnostics/rubocop'
+    autoload :RubocopHelpers,  'solargraph/diagnostics/rubocop_helpers'
     autoload :RequireNotFound, 'solargraph/diagnostics/require_not_found'
     autoload :TypeNotDefined,  'solargraph/diagnostics/type_not_defined'
     autoload :UpdateErrors,    'solargraph/diagnostics/update_errors'

data/lib/solargraph/diagnostics/rubocop.rb

@@ -6,6 +6,8 @@ module Solargraph
     # This reporter provides linting through RuboCop.
     #
     class Rubocop < Base
+      include RubocopHelpers
+
       # Conversion of RuboCop severity names to LSP constants
       SEVERITIES = {
         'refactor' => Severities::HINT,
@@ -16,46 +18,23 @@ module Solargraph
       }
 
       # @param source [Solargraph::Source]
-      # @param api_map [Solargraph::ApiMap]
+      # @param _api_map [Solargraph::ApiMap]
       # @return [Array<Hash>]
-      def diagnose source, api_map
+      def diagnose source, _api_map
         options, paths = generate_options(source.filename, source.code)
         runner = RuboCop::Runner.new(options, RuboCop::ConfigStore.new)
         result = redirect_stdout{ runner.run(paths) }
         make_array JSON.parse(result)
+      rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
+        raise DiagnosticsError, "Error in RuboCop configuration: #{e.message}"
       rescue JSON::ParserError
         raise DiagnosticsError, 'RuboCop returned invalid data'
       end
 
       private
 
-      # @param filename [String]
-      # @param code [String]
-      # @return [Array]
-      def generate_options filename, code
-        args = ['-f', 'j']
-        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)
-        options[:stdin] = code
-        [options, paths]
-      end
-
-      # @param filename [String]
-      # @return [String, nil]
-      def find_rubocop_file filename
-        dir = File.dirname(filename)
-        until File.dirname(dir) == dir
-          here = File.join(dir, '.rubocop.yml')
-          return here if File.exist?(here)
-          dir = File.dirname(dir)
-        end
-        nil
-      end
-
-      # @todo This is a smelly way to redirect output, but the RuboCop specs do the
-      #   same thing.
+      # @todo This is a smelly way to redirect output, but the RuboCop specs do
+      #   the same thing.
       # @return [String]
       def redirect_stdout
         redir = StringIO.new
@@ -71,43 +50,48 @@ module Solargraph
         diagnostics = []
         resp['files'].each do |file|
           file['offenses'].each do |off|
-            if off['location']['start_line'] != off['location']['last_line']
-              last_line = off['location']['start_line']
-              last_column = 0
-            else
-              last_line = off['location']['last_line'] - 1
-              last_column = off['location']['last_column']
-            end
-            diag = {
-              range: {
-                start: {
-                  line: off['location']['start_line'] - 1,
-                  character: off['location']['start_column'] - 1
-                },
-                end: {
-                  line: last_line,
-                  character: last_column
-                }
-              },
-              # 1 = Error, 2 = Warning, 3 = Information, 4 = Hint
-              severity: SEVERITIES[off['severity']],
-              source: off['cop_name'],
-              message: off['message'].gsub(/^#{off['cop_name']}\:/, '')
-            }
-            diagnostics.push diag
+            diagnostics.push offense_to_diagnostic(off)
           end
         end
         diagnostics
       end
 
-      # RuboCop internally uses capitalized drive letters for Windows paths,
-      # so we need to convert the paths provided to the command.
+      # Convert a RuboCop offense to an LSP diagnostic
       #
-      # @param path [String]
-      # @return [String]
-      def fix_drive_letter path
-        return path unless path.match(/^[a-z]:/)
-        path[0].upcase + path[1..-1]
+      # @param off [Hash] Offense received from Rubocop
+      # @return [Hash] LSP diagnostic
+      def offense_to_diagnostic off
+        {
+          range: offense_range(off).to_hash,
+          # 1 = Error, 2 = Warning, 3 = Information, 4 = Hint
+          severity: SEVERITIES[off['severity']],
+          source: off['cop_name'],
+          message: off['message'].gsub(/^#{off['cop_name']}\:/, '')
+        }
+      end
+
+      # @param off [Hash]
+      # @return [Range]
+      def offense_range off
+        Range.new(offense_start_position(off), offense_ending_position(off))
+      end
+
+      # @param off [Hash]
+      # @return [Position]
+      def offense_start_position off
+        Position.new(off['location']['start_line'] - 1, off['location']['start_column'] - 1)
+      end
+
+      # @param off [Hash]
+      # @return [Position]
+      def offense_ending_position off
+        if off['location']['start_line'] != off['location']['last_line']
+          Position.new(off['location']['start_line'], 0)
+        else
+          Position.new(
+            off['location']['start_line'] - 1, off['location']['last_column']
+          )
+        end
       end
     end
   end

data/lib/solargraph/diagnostics/rubocop_helpers.rb

@@ -0,0 +1,46 @@
+module Solargraph
+  module Diagnostics
+    module RubocopHelpers
+      module_function
+
+      # Generate command-line options for the specified filename and code.
+      #
+      # @param filename [String]
+      # @param code [String]
+      # @return [Array(Array<String>, Array<String>)]
+      def generate_options filename, code
+        args = ['-f', 'j']
+        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)
+        options[:stdin] = code
+        [options, paths]
+      end
+
+      # Find a RuboCop configuration file in a file's directory tree.
+      #
+      # @param filename [String]
+      # @return [String, nil]
+      def find_rubocop_file filename
+        dir = File.dirname(filename)
+        until File.dirname(dir) == dir
+          here = File.join(dir, '.rubocop.yml')
+          return here if File.exist?(here)
+          dir = File.dirname(dir)
+        end
+        nil
+      end
+
+      # RuboCop internally uses capitalized drive letters for Windows paths,
+      # so we need to convert the paths provided to the command.
+      #
+      # @param path [String]
+      # @return [String]
+      def fix_drive_letter path
+        return path unless path.match(/^[a-z]:/)
+        path[0].upcase + path[1..-1]
+      end
+    end
+  end
+end

data/lib/solargraph/language_server/host.rb

@@ -10,6 +10,7 @@ module Solargraph
     class Host
       autoload :Diagnoser, 'solargraph/language_server/host/diagnoser'
       autoload :Cataloger, 'solargraph/language_server/host/cataloger'
+      autoload :Sources,   'solargraph/language_server/host/sources'
 
       include Solargraph::LanguageServer::UriHelpers
       include Logging
@@ -93,14 +94,17 @@ module Solargraph
       end
 
       # Respond to a notification that a file was created in the workspace.
-      # The library will determine whether the file should be added to the
-      # workspace; see Solargraph::Library#create_from_disk.
+      # The libraries will determine whether the file should be merged; see
+      # Solargraph::Library#create_from_disk.
       #
       # @param uri [String] The file uri.
+      # @return [Boolean] True if a library accepted the file.
       def create uri
-        library = library_for(uri)
         filename = uri_to_file(uri)
-        result = library.create_from_disk(filename)
+        result = false
+        libraries.each do |lib|
+          result = true if lib.create_from_disk filename
+        end
         diagnoser.schedule uri if open?(uri)
         result
       end
@@ -109,9 +113,11 @@ module Solargraph
       #
       # @param uri [String] The file uri.
       def delete uri
-        library = library_for(uri)
+        sources.close uri
         filename = uri_to_file(uri)
-        library.delete filename
+        libraries.each do |lib|
+          lib.delete filename
+        end
         send_notification "textDocument/publishDiagnostics", {
           uri: uri,
           diagnostics: []
@@ -124,8 +130,10 @@ module Solargraph
       # @param text [String] The contents of the file.
       # @param version [Integer] A version number.
       def open uri, text, version
-        library = library_for(uri)
-        library.open uri_to_file(uri), text, version
+        src = sources.open(uri, text, version)
+        libraries.each do |lib|
+          lib.merge src
+        end
         diagnoser.schedule uri
       end
 
@@ -140,45 +148,58 @@ module Solargraph
       # @param uri [String]
       # @return [Boolean]
       def open? uri
-        unsafe_open?(uri)
+        sources.include? uri
       end
 
       # Close the file specified by the URI.
       #
       # @param uri [String]
+      # @return [void]
       def close uri
-        library = library_for(uri)
-        library.close uri_to_file(uri)
+        logger.info "Closing #{uri}"
+        sources.close uri
         diagnoser.schedule uri
       end
 
       # @param uri [String]
+      # @return [void]
       def diagnose uri
-        logger.info "Diagnosing #{uri}"
-        library = library_for(uri)
-        begin
-          results = library.diagnose uri_to_file(uri)
-          send_notification "textDocument/publishDiagnostics", {
+        if sources.include?(uri)
+          logger.info "Diagnosing #{uri}"
+          library = library_for(uri)
+          begin
+            results = library.diagnose uri_to_file(uri)
+            send_notification "textDocument/publishDiagnostics", {
+              uri: uri,
+              diagnostics: results
+            }
+          rescue DiagnosticsError => e
+            logger.warn "Error in diagnostics: #{e.message}"
+            options['diagnostics'] = false
+            send_notification 'window/showMessage', {
+              type: LanguageServer::MessageTypes::ERROR,
+              message: "Error in diagnostics: #{e.message}"
+            }
+          end
+        else
+          send_notification 'textDocument/publishDiagnostics', {
             uri: uri,
-            diagnostics: results
-          }
-        rescue DiagnosticsError => e
-          STDERR.puts "Error in diagnostics: #{e.message}"
-          options['diagnostics'] = false
-          send_notification 'window/showMessage', {
-            type: LanguageServer::MessageTypes::ERROR,
-            message: "Error in diagnostics: #{e.message}"
+            diagnostics: []
           }
         end
       end
 
+      # Update a document from the parameters of a textDocument/didChange
+      # method.
+      #
+      # @param params [Hash]
+      # @return [void]
       def change params
-        library = library_for(params['textDocument']['uri'])
         updater = generate_updater(params)
-        library.update updater
-        # @todo Since Library#checkout already catalogs, this cataloging
-        #   might not be necessary.
-        cataloger.ping(library) unless library.synchronized?
+        src = sources.update(params['textDocument']['uri'], updater)
+        libraries.each do |lib|
+          lib.merge src
+        end
         diagnoser.schedule params['textDocument']['uri']
       end
 
@@ -206,8 +227,12 @@ module Solargraph
       # Prepare a library for the specified directory.
       #
       # @param directory [String]
-      # @param name [String]
+      # @param name [String, nil]
+      # @return [void]
       def prepare directory, name = nil
+        # No need to create a library without a directory. The generic library
+        # will handle it.
+        return if directory.nil?
         logger.info "Preparing library for #{directory}"
         path = ''
         path = normalize_separators(directory) unless directory.nil?
@@ -225,20 +250,26 @@ module Solargraph
         cataloger.start
       end
 
+      # Prepare multiple folders.
+      #
+      # @param array [Array<Hash{String => String}>]
+      # @return [void]
       def prepare_folders array
+        return if array.nil?
         array.each do |folder|
           prepare uri_to_file(folder['uri']), folder['name']
         end
       end
 
+      # Remove a directory.
+      #
+      # @param directory [String]
+      # @return [void]
       def remove directory
         logger.info "Removing library for #{directory}"
         # @param lib [Library]
         libraries.delete_if do |lib|
           next false if lib.workspace.directory != directory
-          lib.open_sources.each do |src|
-            orphan_library.open(src.filename, src.code, src.version)
-          end
           true
         end
       end
@@ -299,6 +330,7 @@ module Solargraph
       # that were not flagged for dynamic registration by the client.
       #
       # @param methods [Array<String>] The methods to register
+      # @return [void]
       def register_capabilities methods
         logger.debug "Registering capabilities: #{methods}"
         @register_semaphore.synchronize do
@@ -320,6 +352,7 @@ module Solargraph
       # that were not flagged for dynamic registration by the client.
       #
       # @param methods [Array<String>] The methods to unregister
+      # @return [void]
       def unregister_capabilities methods
         logger.debug "Unregistering capabilities: #{methods}"
         @register_semaphore.synchronize do
@@ -338,6 +371,7 @@ module Solargraph
       # Flag a method as available for dynamic registration.
       #
       # @param method [String] The method name, e.g., 'textDocument/completion'
+      # @return [void]
       def allow_registration method
         @register_semaphore.synchronize do
           @dynamic_capabilities.add method
@@ -364,6 +398,7 @@ module Solargraph
         cataloger.synchronizing?
       end
 
+      # @return [void]
       def stop
         @stopped = true
         cataloger.stop
@@ -454,15 +489,15 @@ module Solargraph
       # @return [Array<Solargraph::Range>]
       def references_from filename, line, column, strip: true
         library = library_for(file_to_uri(filename))
-        result = library.references_from(filename, line, column, strip: strip)
+        library.references_from(filename, line, column, strip: strip)
       end
 
       # @param query [String]
       # @return [Array<Solargraph::Pin::Base>]
       def query_symbols query
         result = []
-        libraries.each { |lib| result.concat lib.query_symbols(query) }
-        result
+        (libraries + [generic_library]).each { |lib| result.concat lib.query_symbols(query) }
+        result.uniq
       end
 
       # @param query [String]
@@ -492,6 +527,7 @@ module Solargraph
       #
       # @param text [String]
       # @param type [Integer] A MessageType constant
+      # @return [void]
       def show_message text, type = LanguageServer::MessageTypes::INFO
         send_notification 'window/showMessage', {
           type: type,
@@ -506,6 +542,7 @@ module Solargraph
       # @param actions [Array<String>] Response options for the client
       # @param &block The block that processes the response
       # @yieldparam [String] The action received from the client
+      # @return [void]
       def show_message_request text, type, actions, &block
         send_request 'window/showMessageRequest', {
           type: type,
@@ -546,6 +583,8 @@ module Solargraph
         lib.catalog
       end
 
+      # @param uri [String]
+      # @return [Array<Range>]
       def folding_ranges uri
         library = library_for(uri)
         file = uri_to_file(uri)
@@ -559,26 +598,56 @@ module Solargraph
         @libraries ||= []
       end
 
+      # @return [Sources]
+      def sources
+        @sources ||= Sources.new
+      end
+
       # @param uri [String]
       # @return [Library]
       def library_for uri
-        return libraries.first if libraries.length == 1
+        explicit_library_for(uri) ||
+          implicit_library_for(uri) ||
+          generic_library_for(uri)
+      end
+
+      # @param uri [String]
+      # @return [Library, nil]
+      def explicit_library_for uri
         filename = uri_to_file(uri)
-        # Find a library with an explicit reference to the file
         libraries.each do |lib|
-          return lib if lib.contain?(filename) || lib.open?(filename)
+          if lib.contain?(filename) #|| lib.open?(filename)
+            lib.attach sources.find(uri) if sources.include?(uri)
+            return lib
+          end
         end
-        # Find a library with a workspace that contains the file
+        nil
+      end
+
+      # @param uri [String]
+      # @return [Library, nil]
+      def implicit_library_for uri
+        filename = uri_to_file(uri)
         libraries.each do |lib|
-          return lib if filename.start_with?(lib.workspace.directory)
+          # return lib if filename.start_with?(lib.workspace.directory)
+          if lib.open?(filename) || filename.start_with?(lib.workspace.directory)
+            lib.attach sources.find(uri)
+            return lib
+          end
         end
-        return orphan_library if orphan_library.open?(filename)
-        raise "No library for #{uri}"
+        nil
+      end
+
+      # @param uri [String]
+      # @return [Library]
+      def generic_library_for uri
+        generic_library.attach sources.find(uri)
+        generic_library
       end
 
       # @return [Library]
-      def orphan_library
-        @orphan_library ||= Solargraph::Library.new
+      def generic_library
+        @generic_library ||= Solargraph::Library.new
       end
 
       # @return [Diagnoser]
@@ -591,11 +660,6 @@ module Solargraph
         @cataloger ||= Cataloger.new(self)
       end
 
-      def unsafe_open? uri
-        library = library_for(uri)
-        library.open?(uri_to_file(uri))
-      end
-
       def requests
         @requests ||= {}
       end

data/lib/solargraph/language_server/host/sources.rb

@@ -0,0 +1,39 @@
+module Solargraph
+  module LanguageServer
+    class Host
+      class Sources
+        include UriHelpers
+
+        def open uri, text, version
+          filename = uri_to_file(uri)
+          source = Solargraph::Source.new(text, filename, version)
+          open_source_hash[uri] = source
+        end
+
+        def update uri, updater
+          src = find(uri)
+          open_source_hash[uri] = src.synchronize(updater)
+        end
+
+        # @return [Source]
+        def find uri
+          open_source_hash[uri] || raise(Solargraph::FileNotFoundError, "Host could not find #{uri}")
+        end
+
+        def close uri
+          open_source_hash.delete uri
+        end
+
+        def include? uri
+          open_source_hash.key? uri
+        end
+
+        private
+
+        def open_source_hash
+          @open_source_hash ||= {}
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,6 @@ module Solargraph
         def process
           host.configure params['initializationOptions']
           if support_workspace_folders?
-            # @todo Prepare multiple folders
             host.prepare_folders params['workspaceFolders']
           elsif params['rootUri']
             host.prepare UriHelpers.uri_to_file(params['rootUri'])
@@ -42,7 +41,8 @@ module Solargraph
         def support_workspace_folders?
           params['capabilities'] &&
             params['capabilities']['workspace'] &&
-            params['capabilities']['workspace']['workspaceFolders']
+            params['capabilities']['workspace']['workspaceFolders'] &&
+            params['workspaceFolders']
         end
 
         def static_completion
@@ -113,12 +113,6 @@ module Solargraph
           }
         end
 
-        def static_references
-          {
-            referencesProvider: true
-          }
-        end
-
         def static_folding_range
           {
             foldingRangeProvider: true

data/lib/solargraph/language_server/uri_helpers.rb

@@ -18,7 +18,7 @@ module Solargraph
       # @param file [String]
       # @return [String]
       def file_to_uri file
-        "file://#{URI.encode(file.gsub(/^([a-z]\:)/i, '/\1'))}"
+        "file://#{URI.encode(file.gsub(/^([a-z]\:)/i, '/\1')).gsub(/\:/, '%3A')}"
       end
     end
   end

data/lib/solargraph/library.rb

@@ -11,6 +11,7 @@ module Solargraph
     attr_reader :name
 
     # @param workspace [Solargraph::Workspace]
+    # @param name [String, nil]
     def initialize workspace = Solargraph::Workspace.new, name = nil
       @workspace = workspace
       @name = name
@@ -30,37 +31,52 @@ module Solargraph
     # Open a file in the library. Opening a file will make it available for
     # checkout and merge it into the workspace if applicable.
     #
+    # @deprecated The library should not be responsible for this. Instead, it
+    #   should accept a source and determine whether or not to merge it.
+    #
     # @param filename [String]
     # @param text [String]
     # @param version [Integer]
     # @return [void]
     def open filename, text, version
-      mutex.synchronize do
-        @synchronized = false
-        source = Solargraph::Source.load_string(text, filename, version)
-        workspace.merge source
-        open_file_hash[filename] = source
-        checkout filename
-      end
+      logger.warn "Library#open is deprecated"
+      source = Solargraph::Source.load_string(text, filename, version)
+      merge source
+      attach source
     end
 
+    # Open a file from disk and try to merge it into the workspace.
+    #
+    # @param filename [String]
+    # @return [Boolean] True if the file was merged into the source.
     def open_from_disk filename
+      source = Solargraph::Source.load(filename)
+      merge source
+    end
+
+    # Attach a source to the library.
+    #
+    # The attached source does not need to be a part of the workspace. The
+    # library will include it in the ApiMap while it's attached. Only one
+    # source can be attached to the library at a time.
+    #
+    # @param source [Source]
+    # @return [void]
+    def attach source
       mutex.synchronize do
-        @synchronized = false
-        source = Solargraph::Source.load(filename)
-        workspace.merge source
-        open_file_hash[filename] = source
-        checkout filename
+        @synchronized = (@current == source) if synchronized?
+        @current = source
       end
     end
 
-    # True if the specified file is currently open.
+    # True if the specified file is currently attached.
     #
     # @param filename [String]
     # @return [Boolean]
-    def open? filename
-      open_file_hash.has_key? filename
+    def attached? filename
+      !@current.nil? && @current.filename == filename
     end
+    alias open? attached?
 
     # True if the specified file is included in the workspace (but not
     # necessarily open).
@@ -84,7 +100,6 @@ module Solargraph
         @synchronized = false
         source = Solargraph::Source.load_string(text, filename)
         workspace.merge(source)
-        catalog
         result = true
       end
       result
@@ -103,9 +118,6 @@ module Solargraph
         @synchronized = false
         source = Solargraph::Source.load_string(File.read(filename), filename)
         workspace.merge(source)
-        open_file_hash[filename] = source if open_file_hash.key?(filename)
-        @current = source if @current && @current.filename == source.filename
-        catalog
         result = true
       end
       result
@@ -120,9 +132,9 @@ module Solargraph
     def delete filename
       mutex.synchronize do
         @synchronized = false
-        open_file_hash.delete filename
+        @current = nil if @current && @current.filename == filename
         workspace.remove filename
-        catalog
+        # catalog
       end
     end
 
@@ -134,7 +146,7 @@ module Solargraph
     def close filename
       mutex.synchronize do
         @synchronized = false
-        open_file_hash.delete filename
+        @current = nil if @current && @current.filename == filename
         catalog
       end
     end
@@ -194,13 +206,13 @@ module Solargraph
       return [] if pins.empty?
       result = []
       pins.uniq.each do |pin|
-        (workspace.sources + open_file_hash.values).uniq.each do |source|
+        (workspace.sources + (@current ? [@current] : [])).uniq.each do |source|
           found = source.references(pin.name)
           found.select! do |loc|
             referenced = definitions_at(loc.filename, loc.range.ending.line, loc.range.ending.character)
             referenced.any?{|r| r == pin}
           end
-          # HACK for language clients that exclude special characters from the start of variable names
+          # HACK: for language clients that exclude special characters from the start of variable names
           if strip && match = cursor.word.match(/^[^a-z0-9_]+/i)
             found.map! do |loc|
               Solargraph::Location.new(loc.filename, Solargraph::Range.from_to(loc.range.start.line, loc.range.start.column + match[0].length, loc.range.ending.line, loc.range.ending.column))
@@ -242,7 +254,7 @@ module Solargraph
     # @return [Source]
     def checkout filename
       checked = read(filename)
-      @synchronized = (checked.filename == @current.filename) if synchronized?
+      @synchronized = (checked == @current) if synchronized?
       @current = checked
       catalog
       @current
@@ -281,7 +293,6 @@ module Solargraph
     # @return [Array<Solargraph::Pin::Base>]
     def document_symbols filename
       checkout filename
-      return [] unless open_file_hash.key?(filename)
       api_map.document_symbols(filename)
     end
 
@@ -297,20 +308,21 @@ module Solargraph
     # @note This method will not update the library's ApiMap. See
     #   Library#synchronized? and Library#catalog for more information.
     #
+    # @deprecated The library should not be responsible for this. Instead, it
+    #   should accept a source and determine whether or not to merge it.
     #
     # @raise [FileNotFoundError] if the updater's file is not available.
     # @param updater [Solargraph::Source::Updater]
     # @return [void]
     def update updater
+      logger.warn 'Library#update is deprecated'
       mutex.synchronize do
         if workspace.has_file?(updater.filename)
           workspace.synchronize!(updater)
-          open_file_hash[updater.filename] = workspace.source(updater.filename) if open?(updater.filename)
-        else
-          raise FileNotFoundError, "Unable to update #{updater.filename}" unless open?(updater.filename)
-          open_file_hash[updater.filename] = open_file_hash[updater.filename].synchronize(updater)
+          @current = workspace.source(updater.filename) if @current && @current.filename == updater.filename
+        elsif @current && @current.filename == updater.filename
+          @current = @current.synchronize(updater)
         end
-        @current = open_file_hash[updater.filename] if @current && @current.filename == updater.filename
         @synchronized = false
       end
     end
@@ -332,7 +344,9 @@ module Solargraph
       # @todo Only open files get diagnosed. Determine whether anything or
       #   everything in the workspace should get diagnosed, or if there should
       #   be an option to do so.
+      #
       return [] unless open?(filename)
+      catalog
       result = []
       source = read(filename)
       workspace.config.reporters.each do |name|
@@ -355,23 +369,45 @@ module Solargraph
       end
     end
 
+    # Get an array of foldable ranges for the specified file.
+    #
+    # @param filename [String]
+    # @return [Array<Range>]
     def folding_ranges filename
       read(filename).folding_ranges
     end
 
+    # @deprecated Libraries are no longer responsible for tracking open files.
+    #
     # @return [Array<Source>]
     def open_sources
-      open_file_hash.values
+      logger.warn 'Library#open_sources is deprecated'
+      @current ? [@current] : []
     end
 
     # Create a library from a directory.
     #
     # @param directory [String] The path to be used for the workspace
+    # @param name [String, nil]
     # @return [Solargraph::Library]
     def self.load directory = '', name = nil
       Solargraph::Library.new(Solargraph::Workspace.new(directory), name)
     end
 
+    # Try to merge a source into the library's workspace. If the workspace is
+    # not configured to include the source, it gets ignored.
+    #
+    # @param source [Source]
+    # @return [Boolean] True if the source was merged into the workspace.
+    def merge source
+      result = nil
+      mutex.synchronize do
+        result = workspace.merge(source)
+        @synchronized = result if synchronized?
+      end
+      result
+    end
+
     private
 
     # @return [Mutex]
@@ -392,14 +428,6 @@ module Solargraph
       )
     end
 
-    # A collection of files that are currently open in the library. Open
-    # files do not need to be in the workspace.
-    #
-    # @return [Hash{String => Source}]
-    def open_file_hash
-      @open_file_hash ||= {}
-    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
@@ -409,7 +437,7 @@ module Solargraph
     # @param filename [String]
     # @return [Solargraph::Source]
     def read filename
-      return open_file_hash[filename] if open_file_hash.key?(filename)
+      return @current if @current && @current.filename == filename
       raise FileNotFoundError, "File not found: #{filename}" unless workspace.has_file?(filename)
       workspace.source(filename)
     end

data/lib/solargraph/pin/conversions.rb

@@ -71,8 +71,8 @@ module Solargraph
       def generate_link
         this_path = path || return_type.tag
         return nil if this_path.nil? || this_path == 'undefined'
-        return this_path if comments.empty?
-        "[#{this_path.gsub('_', '\\\\_')}](solargraph:/document?query=#{URI.encode(this_path)})"
+        # return this_path if comments.empty?
+        "[#{this_path.gsub('_', '\\\\_')}](solargraph:/document?query=#{URI.escape(this_path)})"
       end
     end
   end

data/lib/solargraph/source_map/node_processor/send_node.rb

@@ -5,8 +5,20 @@ module Solargraph
         def process
           if node.children[0].nil?
             if [:private, :public, :protected].include?(node.children[1])
-              # @todo Smelly instance variable access
-              region.instance_variable_set(:@visibility, node.children[1])
+              if (node.children.length > 2)
+                node.children[2..-1].each do |child|
+                  next unless child.is_a?(AST::Node) && (child.type == :sym || child.type == :str)
+                  name = child.children[0].to_s
+                  matches = pins.select{ |pin| [Pin::METHOD, Pin::ATTRIBUTE].include?(pin.kind) && pin.name == name && pin.namespace == region.namespace && pin.context.scope == region.scope }
+                  matches.each do |pin|
+                    # @todo Smelly instance variable access
+                    pin.instance_variable_set(:@visibility, node.children[1])
+                  end
+                end
+              else
+                # @todo Smelly instance variable access
+                region.instance_variable_set(:@visibility, node.children[1])
+              end
             elsif node.children[1] == :module_function
               process_module_function
             elsif [:attr_reader, :attr_writer, :attr_accessor].include?(node.children[1])

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.30.1'
+  VERSION = '0.30.2'
 end

data/lib/solargraph/yard_map/core_docs.rb

@@ -12,7 +12,7 @@ module Solargraph
 
       class << self
         def cache_dir
-          @cache_dir ||= File.join(Dir.home, '.solargraph', 'cache')
+          @cache_dir ||= ENV["SOLARGRAPH_CACHE"] || File.join(Dir.home, '.solargraph', 'cache')
         end
 
         # Ensure installation of minimum documentation.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.30.1
+  version: 0.30.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-28 00:00:00.000000000 Z
+date: 2018-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -227,6 +227,7 @@ files:
 - lib/solargraph/diagnostics/base.rb
 - lib/solargraph/diagnostics/require_not_found.rb
 - lib/solargraph/diagnostics/rubocop.rb
+- lib/solargraph/diagnostics/rubocop_helpers.rb
 - lib/solargraph/diagnostics/severities.rb
 - lib/solargraph/diagnostics/type_not_defined.rb
 - lib/solargraph/diagnostics/update_errors.rb
@@ -236,6 +237,7 @@ files:
 - lib/solargraph/language_server/host.rb
 - lib/solargraph/language_server/host/cataloger.rb
 - lib/solargraph/language_server/host/diagnoser.rb
+- lib/solargraph/language_server/host/sources.rb
 - lib/solargraph/language_server/message.rb
 - lib/solargraph/language_server/message/base.rb
 - lib/solargraph/language_server/message/cancel_request.rb