solargraph 0.43.1 → 0.43.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48b532bf77bb72b9d2d111605cc86e97a21c372319a041ef5c4dfbd03a2b98d1
-  data.tar.gz: da953eea90b1215a794783723898277abe33a4b74e585eeb710f231b824321b7
+  metadata.gz: e671eddad2fe717ad573954a63154bd89adbc12c9899c3f8762bf38a93160657
+  data.tar.gz: 2224d1457b9e8f7279bfa89b2777fe3d60a0a2283de4047930bebb79034a1ac4
 SHA512:
-  metadata.gz: c3f55a7eb1f0b08247d70f7a2c28422b6444e5102a96c7c9da88b5b9b5f558732f97dc186e6dc53650bd5af20747066dbf53272a15527f000607fca17583e6da
-  data.tar.gz: 7224059b6b2c757049bf27c4140c54063b035b13eeaf93f30c521393c5e8c863b72843c28edbfb9cbe2980fe28f79006195926f9c8bf79b204dd08a9895ec1e8
+  metadata.gz: 76ffe1331d8020eed92c39d2c4886ce7d01e4143a8b8264ac1bf4011335fabfd32a48f16a7099f889fed2e7c485e2e9cbf09714f677cd6e9396381032522f67a
+  data.tar.gz: 9c6da25c26ed209af38be4a0bc8d7a6ce826fb3012bce650089e982f829f4c8b14807ed0f7d1ecdeacd9b737bedd9d682440a9701a864313a83e60182771ade0

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-## 0.43.1
+## 0.43.2 - September 23, 2021
+- Synchronize server requests (#461)
+
+## 0.43.1 - September 20, 2021
 - Complete nested namespaces in open gates
 - SourceMap::Mapper reports filename for encoding errors (#474)
 - Handle request on a specific thread, and cancel completion when there has newer completion request (#459)

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

@@ -23,16 +23,18 @@ module Solargraph
         def stopped?
           @stopped
         end
+
         def stop
           @stopped = true
         end
 
-        # @param message the message should be handle. will pass back to Host#receive
+        # @param message [Hash] The message should be handle. will pass back to Host#receive
+        # @return [void]
         def queue(message)
-          @mutex.synchronize {
+          @mutex.synchronize do
             messages.push(message)
             @resource.signal
-          }
+          end
         end
 
         def start
@@ -42,13 +44,14 @@ module Solargraph
             tick until stopped?
           end
         end
+
         def tick
-          message = @mutex.synchronize {
+          message = @mutex.synchronize do
             @resource.wait(@mutex) if messages.empty?
             messages.shift
-          }
-          message = @host.receive(message)
-          message && message.send_response
+          end
+          handler = @host.receive(message)
+          handler && handler.send_response
         end
       end
     end

data/lib/solargraph/language_server/host.rb

@@ -29,7 +29,7 @@ module Solargraph
       def initialize
         @cancel_semaphore = Mutex.new
         @buffer_semaphore = Mutex.new
-        @register_semaphore = Mutex.new
+        @request_mutex = Mutex.new
         @cancel = []
         @buffer = String.new
         @stopped = true
@@ -92,7 +92,9 @@ module Solargraph
         @cancel_semaphore.synchronize { @cancel.delete id }
       end
 
-      # called by adapter, to handle the request
+      # Called by adapter, to handle the request
+      # @param request [Hash]
+      # @return [void]
       def process request
         message_worker.queue(request)
       end
@@ -363,19 +365,21 @@ module Solargraph
       # @yieldparam [Hash] The result sent by the client
       # @return [void]
       def send_request method, params, &block
-        message = {
-          jsonrpc: "2.0",
-          method: method,
-          params: params,
-          id: @next_request_id
-        }
-        json = message.to_json
-        requests[@next_request_id] = Request.new(@next_request_id, &block)
-        envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
-        queue envelope
-        @next_request_id += 1
-        logger.info "Server sent #{method}"
-        logger.debug params
+        @request_mutex.synchronize do
+          message = {
+            jsonrpc: "2.0",
+            method: method,
+            params: params,
+            id: @next_request_id
+          }
+          json = message.to_json
+          requests[@next_request_id] = Request.new(@next_request_id, &block)
+          envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
+          queue envelope
+          @next_request_id += 1
+          logger.info "Server sent #{method}"
+          logger.debug params
+        end
       end
 
       # Register the methods as capabilities with the client.
@@ -386,20 +390,16 @@ module Solargraph
       # @return [void]
       def register_capabilities methods
         logger.debug "Registering capabilities: #{methods}"
-        registrations = methods.select{|m| can_register?(m) and !registered?(m)}.map { |m|
+        registrations = methods.select { |m| can_register?(m) and !registered?(m) }.map do |m|
           @registered_capabilities.add m
           {
             id: m,
             method: m,
             registerOptions: dynamic_capability_options[m]
           }
-        }
-        return if registrations.empty?
-        @register_semaphore.synchronize do
-          send_request 'client/registerCapability', {
-            registrations: registrations
-          }
         end
+        return if registrations.empty?
+        send_request 'client/registerCapability', { registrations: registrations }
       end
 
       # Unregister the methods with the client.
@@ -418,11 +418,7 @@ module Solargraph
           }
         }
         return if unregisterations.empty?
-        @register_semaphore.synchronize do
-          send_request 'client/unregisterCapability', {
-            unregisterations: unregisterations
-          }
-        end
+        send_request 'client/unregisterCapability', { unregisterations: unregisterations }
       end
 
       # Flag a method as available for dynamic registration.
@@ -430,9 +426,7 @@ module Solargraph
       # @param method [String] The method name, e.g., 'textDocument/completion'
       # @return [void]
       def allow_registration method
-        @register_semaphore.synchronize do
-          @dynamic_capabilities.add method
-        end
+        @dynamic_capabilities.add method
       end
 
       # True if the specified LSP method can be dynamically registered.

data/lib/solargraph/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.43.1
+  version: 0.43.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport