solargraph 0.58.1 → 0.59.0.dev.1

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

@@ -1,112 +1,113 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    class Host
-      # A serial worker Thread to handle incoming messages.
-      #
-      class MessageWorker
-        UPDATE_METHODS = [
-          'textDocument/didChange',
-          'textDocument/didClose',
-          'textDocument/didOpen',
-          'textDocument/didSave',
-          'workspace/didChangeConfiguration',
-          'workspace/didChangeWatchedFiles',
-          'workspace/didCreateFiles',
-          'workspace/didChangeWorkspaceFolders',
-          'workspace/didDeleteFiles',
-          'workspace/didRenameFiles'
-        ].freeze
-
-        # @param host [Host]
-        def initialize(host)
-          @host = host
-          @mutex = Mutex.new
-          @resource = ConditionVariable.new
-          @stopped = true
-        end
-
-        # pending handle messages
-        # @return [Array<Hash>]
-        def messages
-          @messages ||= []
-        end
-
-        def stopped?
-          @stopped
-        end
-
-        # @return [void]
-        def stop
-          @stopped = true
-        end
-
-        # @param message [Hash] The message to handle. Will be forwarded to Host#receive
-        # @return [void]
-        def queue(message)
-          @mutex.synchronize do
-            messages.push(message)
-            @resource.signal
-          end
-        end
-
-        # @return [void]
-        def start
-          return unless @stopped
-          @stopped = false
-          Thread.new do
-            tick until stopped?
-          end
-        end
-
-        # @return [void]
-        def tick
-          message = @mutex.synchronize do
-            @resource.wait(@mutex) if messages.empty?
-            next_message
-          end
-          handler = @host.receive(message)
-          handler&.send_response
-        end
-
-        private
-
-        # @return [Hash, nil]
-        def next_message
-          cancel_message || next_priority
-        end
-
-        # @return [Hash, nil]
-        def cancel_message
-          # Handle cancellations first
-          idx = messages.find_index { |msg| msg['method'] == '$/cancelRequest' }
-          return unless idx
-
-          msg = messages[idx]
-          messages.delete_at idx
-          msg
-        end
-
-        # @return [Hash, nil]
-        def next_priority
-          # Prioritize updates and version-dependent messages for performance
-          idx = messages.find_index do |msg|
-            UPDATE_METHODS.include?(msg['method']) || version_dependent?(msg)
-          end
-          idx ? messages.delete_at(idx) : messages.shift
-        end
-
-        # True if the message requires a previous update to have executed in
-        # order to work correctly.
-        #
-        # @param msg [Hash{String => Object}]
-        # @todo need boolish type from RBS
-        # @return [Object]
-        def version_dependent? msg
-          msg['textDocument'] && msg['position']
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    class Host
+      # A serial worker Thread to handle incoming messages.
+      #
+      class MessageWorker
+        UPDATE_METHODS = [
+          'textDocument/didChange',
+          'textDocument/didClose',
+          'textDocument/didOpen',
+          'textDocument/didSave',
+          'workspace/didChangeConfiguration',
+          'workspace/didChangeWatchedFiles',
+          'workspace/didCreateFiles',
+          'workspace/didChangeWorkspaceFolders',
+          'workspace/didDeleteFiles',
+          'workspace/didRenameFiles'
+        ].freeze
+
+        # @param host [Host]
+        def initialize(host)
+          @host = host
+          @mutex = Mutex.new
+          @resource = ConditionVariable.new
+          @stopped = true
+        end
+
+        # pending handle messages
+        # @return [Array<Hash{String => undefined}>]
+        def messages
+          @messages ||= []
+        end
+
+        def stopped?
+          @stopped
+        end
+
+        # @return [void]
+        def stop
+          @stopped = true
+        end
+
+        # @param message [Hash] The message to handle. Will be forwarded to Host#receive
+        # @return [void]
+        def queue(message)
+          @mutex.synchronize do
+            messages.push(message)
+            @resource.signal
+          end
+        end
+
+        # @return [void]
+        def start
+          return unless @stopped
+          @stopped = false
+          Thread.new do
+            tick until stopped?
+          end
+        end
+
+        # @return [void]
+        def tick
+          message = @mutex.synchronize do
+            @resource.wait(@mutex) if messages.empty?
+            next_message
+          end
+          # @sg-ignore Need to add nil check here
+          handler = @host.receive(message)
+          handler&.send_response
+        end
+
+        private
+
+        # @return [Hash, nil]
+        def next_message
+          cancel_message || next_priority
+        end
+
+        # @return [Hash, nil]
+        def cancel_message
+          # Handle cancellations first
+          idx = messages.find_index { |msg| msg['method'] == '$/cancelRequest' }
+          return unless idx
+
+          msg = messages[idx]
+          messages.delete_at idx
+          msg
+        end
+
+        # @return [Hash, nil]
+        def next_priority
+          # Prioritize updates and version-dependent messages for performance
+          idx = messages.find_index do |msg|
+            UPDATE_METHODS.include?(msg['method']) || version_dependent?(msg)
+          end
+          idx ? messages.delete_at(idx) : messages.shift
+        end
+
+        # True if the message requires a previous update to have executed in
+        # order to work correctly.
+        #
+        # @param msg [Hash{String => Object}]
+        # @todo need boolish type from RBS
+        # @return [Object]
+        def version_dependent? msg
+          msg['textDocument'] && msg['position']
+        end
+      end
+    end
+  end
+end

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

@@ -1,99 +1,100 @@
-# frozen_string_literal: true
-
-require 'observer'
-
-module Solargraph
-  module LanguageServer
-    class Host
-      # A Host class for managing sources.
-      #
-      class Sources
-        include Observable
-        include UriHelpers
-
-        # @param uri [String]
-        # @return [void]
-        def add_uri(uri)
-          queue.push(uri)
-        end
-
-        # Open a source.
-        #
-        # @param uri [String]
-        # @param text [String]
-        # @param version [Integer]
-        # @return [Source]
-        def open uri, text, version
-          filename = uri_to_file(uri)
-          source = Solargraph::Source.new(text, filename, version)
-          open_source_hash[uri] = source
-        end
-
-        # @param uri [String]
-        # @return [void]
-        def open_from_disk uri
-          source = Solargraph::Source.load(UriHelpers.uri_to_file(uri))
-          open_source_hash[uri] = source
-        end
-
-        # Update an existing source.
-        #
-        # @raise [FileNotFoundError] if the URI does not match an open source.
-        #
-        # @param uri [String]
-        # @param updater [Source::Updater]
-        # @return [void]
-        def update uri, updater
-          src = find(uri)
-          open_source_hash[uri] = src.synchronize(updater)
-          changed
-          notify_observers uri
-        end
-
-        # Find the source with the given URI.
-        #
-        # @raise [FileNotFoundError] if the URI does not match an open source.
-        #
-        # @param uri [String]
-        # @return [Solargraph::Source]
-        def find uri
-          open_source_hash[uri] || raise(Solargraph::FileNotFoundError, "Host could not find #{uri}")
-        end
-
-        # Close the source with the given URI.
-        #
-        # @param uri [String]
-        # @return [void]
-        def close uri
-          open_source_hash.delete uri
-        end
-
-        # True if a source with given URI is currently open.
-        # @param uri [String]
-        # @return [Boolean]
-        def include? uri
-          open_source_hash.key? uri
-        end
-
-        # @return [void]
-        def clear
-          open_source_hash.clear
-        end
-
-        private
-
-        # @return [Hash{String => Solargraph::Source}]
-        def open_source_hash
-          @open_source_hash ||= {}
-        end
-
-        # An array of source URIs that are waiting to finish synchronizing.
-        #
-        # @return [::Array<String>]
-        def queue
-          @queue ||= []
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'observer'
+
+module Solargraph
+  module LanguageServer
+    class Host
+      # A Host class for managing sources.
+      #
+      class Sources
+        include Observable
+        include UriHelpers
+
+        # @param uri [String]
+        # @return [void]
+        def add_uri(uri)
+          queue.push(uri)
+        end
+
+        # Open a source.
+        #
+        # @param uri [String]
+        # @param text [String]
+        # @param version [Integer]
+        # @return [Source]
+        def open uri, text, version
+          filename = uri_to_file(uri)
+          source = Solargraph::Source.new(text, filename, version)
+          open_source_hash[uri] = source
+        end
+
+        # @param uri [String]
+        # @return [void]
+        def open_from_disk uri
+          source = Solargraph::Source.load(UriHelpers.uri_to_file(uri))
+          open_source_hash[uri] = source
+        end
+
+        # Update an existing source.
+        #
+        # @raise [FileNotFoundError] if the URI does not match an open source.
+        #
+        # @param uri [String]
+        # @param updater [Source::Updater]
+        # @return [void]
+        def update uri, updater
+          src = find(uri)
+          open_source_hash[uri] = src.synchronize(updater)
+          changed
+          notify_observers uri
+        end
+
+        # Find the source with the given URI.
+        #
+        # @raise [FileNotFoundError] if the URI does not match an open source.
+        #
+        # @param uri [String]
+        # @sg-ignore flow ensitive typing should understand raise
+        # @return [Solargraph::Source]
+        def find uri
+          open_source_hash[uri] || raise(Solargraph::FileNotFoundError, "Host could not find #{uri}")
+        end
+
+        # Close the source with the given URI.
+        #
+        # @param uri [String]
+        # @return [void]
+        def close uri
+          open_source_hash.delete uri
+        end
+
+        # True if a source with given URI is currently open.
+        # @param uri [String]
+        # @return [Boolean]
+        def include? uri
+          open_source_hash.key? uri
+        end
+
+        # @return [void]
+        def clear
+          open_source_hash.clear
+        end
+
+        private
+
+        # @return [Hash{String => Solargraph::Source}]
+        def open_source_hash
+          @open_source_hash ||= {}
+        end
+
+        # An array of source URIs that are waiting to finish synchronizing.
+        #
+        # @return [::Array<String>]
+        def queue
+          @queue ||= []
+        end
+      end
+    end
+  end
+end