solargraph 0.32.1 → 0.32.2

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

@@ -1,79 +1,54 @@
-module Solargraph
-  module LanguageServer
-    class Host
-      # An asynchronous library cataloging handler.
-      #
-      class Cataloger
-        def initialize host
-          @host = host
-          @mutex = Mutex.new
-          @stopped = true
-          @pings = []
-        end
-
-        # Notify the Cataloger that changes are pending.
-        #
-        # @param lib [Library] The library that needs cataloging
-        # @return [void]
-        def ping lib
-          mutex.synchronize { pings.push lib }
-        end
-        alias schedule ping
-
-        def synchronizing?
-          !pings.empty?
-        end
-
-        # Stop the catalog thread.
-        #
-        # @return [void]
-        def stop
-          @stopped = true
-        end
-
-        # True if the cataloger is stopped.
-        #
-        # @return [Boolean]
-        def stopped?
-          @stopped
-        end
-
-        # Start the catalog thread.
-        #
-        # @return [void]
-        def start
-          return unless stopped?
-          @stopped = false
-          Thread.new do
-            until stopped?
-              tick
-              sleep 0.01
-            end
-          end
-        end
-
-        # Perform cataloging.
-        #
-        # @return [void]
-        def tick
-          return if pings.empty?
-          mutex.synchronize do
-            lib = pings.shift
-            lib.catalog unless pings.include?(lib)
-          end
-        end
-
-        private
-
-        # @return [Host]
-        attr_reader :host
-
-        # @return [Mutex]
-        attr_reader :mutex
-
-        # @return [Array]
-        attr_reader :pings
-      end
-    end
-  end
-end
+module Solargraph
+  module LanguageServer
+    class Host
+      # An asynchronous library cataloging handler.
+      #
+      class Cataloger
+        def initialize host
+          @host = host
+          @stopped = true
+        end
+
+        # Stop the catalog thread.
+        #
+        # @return [void]
+        def stop
+          @stopped = true
+        end
+
+        # True if the cataloger is stopped.
+        #
+        # @return [Boolean]
+        def stopped?
+          @stopped
+        end
+
+        # Start the catalog thread.
+        #
+        # @return [void]
+        def start
+          return unless stopped?
+          @stopped = false
+          Thread.new do
+            until stopped?
+              tick
+              sleep 0.01
+            end
+          end
+        end
+
+        # Perform cataloging.
+        #
+        # @return [void]
+        def tick
+          host.catalog
+        end
+
+        private
+
+        # @return [Host]
+        attr_reader :host
+      end
+    end
+  end
+end

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

@@ -1,80 +1,80 @@
-module Solargraph
-  module LanguageServer
-    class Host
-      # An asynchronous diagnosis reporter.
-      #
-      class Diagnoser
-        # @param host [Host]
-        def initialize host
-          @host = host
-          @mutex = Mutex.new
-          @queue = []
-          @stopped = true
-        end
-
-        # Schedule a file to be diagnosed.
-        #
-        # @param uri [String]
-        # @return [void]
-        def schedule uri
-          mutex.synchronize { queue.push uri }
-        end
-
-        # Stop the diagnosis thread.
-        #
-        # @return [void]
-        def stop
-          @stopped = true
-        end
-
-        # True is the diagnoser is stopped.
-        #
-        # @return [Boolean]
-        def stopped?
-          @stopped
-        end
-
-        # Start the diagnosis thread.
-        #
-        # @return [self]
-        def start
-          return unless @stopped
-          @stopped = false
-          Thread.new do
-            until stopped?
-              tick
-              sleep 0.1
-            end
-          end
-          self
-        end
-
-        # Perform diagnoses.
-        #
-        # @return [void]
-        def tick
-          return if queue.empty? || host.synchronizing?
-          if !host.options['diagnostics']
-            mutex.synchronize { queue.clear }
-            return
-          end
-          current = nil
-          mutex.synchronize { current = queue.shift }
-          return if queue.include?(current)
-          host.diagnose current
-        end
-
-        private
-
-        # @return [Host]
-        attr_reader :host
-
-        # @return [Mutex]
-        attr_reader :mutex
-
-        # @return [Array]
-        attr_reader :queue
-      end
-    end
-  end
-end
+module Solargraph
+  module LanguageServer
+    class Host
+      # An asynchronous diagnosis reporter.
+      #
+      class Diagnoser
+        # @param host [Host]
+        def initialize host
+          @host = host
+          @mutex = Mutex.new
+          @queue = []
+          @stopped = true
+        end
+
+        # Schedule a file to be diagnosed.
+        #
+        # @param uri [String]
+        # @return [void]
+        def schedule uri
+          mutex.synchronize { queue.push uri }
+        end
+
+        # Stop the diagnosis thread.
+        #
+        # @return [void]
+        def stop
+          @stopped = true
+        end
+
+        # True is the diagnoser is stopped.
+        #
+        # @return [Boolean]
+        def stopped?
+          @stopped
+        end
+
+        # Start the diagnosis thread.
+        #
+        # @return [self]
+        def start
+          return unless @stopped
+          @stopped = false
+          Thread.new do
+            until stopped?
+              tick
+              sleep 0.1
+            end
+          end
+          self
+        end
+
+        # Perform diagnoses.
+        #
+        # @return [void]
+        def tick
+          return if queue.empty? || host.synchronizing?
+          if !host.options['diagnostics']
+            mutex.synchronize { queue.clear }
+            return
+          end
+          current = nil
+          mutex.synchronize { current = queue.shift }
+          return if queue.include?(current)
+          host.diagnose current
+        end
+
+        private
+
+        # @return [Host]
+        attr_reader :host
+
+        # @return [Mutex]
+        attr_reader :mutex
+
+        # @return [Array]
+        attr_reader :queue
+      end
+    end
+  end
+end

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

@@ -1,113 +1,112 @@
-module Solargraph
-  module LanguageServer
-    class Host
-      # Methods for associating sources with libraries via URIs.
-      #
-      module Dispatch
-        # @return [Sources]
-        def sources
-          @sources ||= begin
-            src = Sources.new
-            src.add_observer self, :update_libraries
-            src
-          end
-        end
-
-        # @return [Array<Library>]
-        def libraries
-          @libraries ||= []
-        end
-
-        # The Sources observer callback that merges a source into the host's
-        # libraries when it gets updated.
-        #
-        # @param uri [String]
-        # @return [void]
-        def update_libraries uri
-          src = sources.find(uri)
-          # @todo This module should not call cataloger and diagnoser
-          libraries.each do |lib|
-            if lib.contain?(src.filename) || lib.open?(src.filename)
-              lib.merge src
-              cataloger.ping(lib)
-            end
-          end
-          diagnoser.schedule uri if src.synchronized?
-        end
-
-        # Find the best libary match for the given URI.
-        #
-        # @param uri [String]
-        # @return [Library]
-        def library_for uri
-          explicit_library_for(uri) ||
-            implicit_library_for(uri) ||
-            generic_library_for(uri)
-        end
-
-        # Find an explicit library match for the given URI. An explicit match
-        # means the libary's workspace includes the file.
-        #
-        # If a matching library is found, the source corresponding to the URI
-        # gets attached to it.
-        #
-        # @raise [FileNotFoundError] if the source could not be attached.
-        #
-        # @param uri [String]
-        # @return [Library, nil]
-        def explicit_library_for uri
-          filename = UriHelpers.uri_to_file(uri)
-          libraries.each do |lib|
-            if lib.contain?(filename)
-              lib.attach sources.find(uri) if sources.include?(uri)
-              return lib
-            end
-          end
-          nil
-        end
-
-        # Find an implicit library match for the given URI. An implicit match
-        # means the file is located inside the library's workspace directory,
-        # regardless of whether the workspace is configured to include it.
-        #
-        # If a matching library is found, the source corresponding to the URI
-        # gets attached to it.
-        #
-        # @raise [FileNotFoundError] if the source could not be attached.
-        #
-        # @param uri [String]
-        # @return [Library, nil]
-        def implicit_library_for uri
-          filename = UriHelpers.uri_to_file(uri)
-          libraries.each do |lib|
-            # @todo We probably shouldn't depend on attachments to select
-            #   a library.
-            # return lib if lib.open?(filename)
-            if filename.start_with?(lib.workspace.directory)
-              lib.attach sources.find(uri)
-              return lib
-            end
-          end
-          nil
-        end
-
-        # Get a generic library for the given URI and attach the corresponding
-        # source.
-        #
-        # @raise [FileNotFoundError] if the source could not be attached.
-        #
-        # @param uri [String]
-        # @return [Library]
-        def generic_library_for uri
-          generic_library.attach sources.find(uri)
-          generic_library
-        end
-
-        # @return [Library]
-        def generic_library
-          @generic_library ||= Solargraph::Library.new
-        end
-      end
-    end
-  end
-end
+module Solargraph
+  module LanguageServer
+    class Host
+      # Methods for associating sources with libraries via URIs.
+      #
+      module Dispatch
+        # @return [Sources]
+        def sources
+          @sources ||= begin
+            src = Sources.new
+            src.add_observer self, :update_libraries
+            src
+          end
+        end
+
+        # @return [Array<Library>]
+        def libraries
+          @libraries ||= []
+        end
+
+        # The Sources observer callback that merges a source into the host's
+        # libraries when it gets updated.
+        #
+        # @param uri [String]
+        # @return [void]
+        def update_libraries uri
+          src = sources.find(uri)
+          # @todo This module should not call cataloger and diagnoser
+          libraries.each do |lib|
+            if lib.contain?(src.filename) || lib.open?(src.filename)
+              lib.merge src
+            end
+          end
+          diagnoser.schedule uri if src.synchronized?
+        end
+
+        # Find the best libary match for the given URI.
+        #
+        # @param uri [String]
+        # @return [Library]
+        def library_for uri
+          explicit_library_for(uri) ||
+            implicit_library_for(uri) ||
+            generic_library_for(uri)
+        end
+
+        # Find an explicit library match for the given URI. An explicit match
+        # means the libary's workspace includes the file.
+        #
+        # If a matching library is found, the source corresponding to the URI
+        # gets attached to it.
+        #
+        # @raise [FileNotFoundError] if the source could not be attached.
+        #
+        # @param uri [String]
+        # @return [Library, nil]
+        def explicit_library_for uri
+          filename = UriHelpers.uri_to_file(uri)
+          libraries.each do |lib|
+            if lib.contain?(filename)
+              lib.attach sources.find(uri) if sources.include?(uri)
+              return lib
+            end
+          end
+          nil
+        end
+
+        # Find an implicit library match for the given URI. An implicit match
+        # means the file is located inside the library's workspace directory,
+        # regardless of whether the workspace is configured to include it.
+        #
+        # If a matching library is found, the source corresponding to the URI
+        # gets attached to it.
+        #
+        # @raise [FileNotFoundError] if the source could not be attached.
+        #
+        # @param uri [String]
+        # @return [Library, nil]
+        def implicit_library_for uri
+          filename = UriHelpers.uri_to_file(uri)
+          libraries.each do |lib|
+            # @todo We probably shouldn't depend on attachments to select
+            #   a library.
+            # return lib if lib.open?(filename)
+            if filename.start_with?(lib.workspace.directory)
+              lib.attach sources.find(uri)
+              return lib
+            end
+          end
+          nil
+        end
+
+        # Get a generic library for the given URI and attach the corresponding
+        # source.
+        #
+        # @raise [FileNotFoundError] if the source could not be attached.
+        #
+        # @param uri [String]
+        # @return [Library]
+        def generic_library_for uri
+          generic_library.attach sources.find(uri)
+          generic_library
+        end
+
+        # @return [Library]
+        def generic_library
+          @generic_library ||= Solargraph::Library.new
+        end
+      end
+    end
+  end
+end