solargraph 0.23.2 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d187a64660b1ee9c012163ae7d46c76c4d693f7a5559024cfbfb7a2e935ff946
-  data.tar.gz: 0a399c708b6123c8a5ea4592b13ad9e93facb710a057328f7e909b2f5e36de1d
+  metadata.gz: 37ebc106375480d4721557e69fb312eb21c7ab0d554448e7c71c975cdebc36af
+  data.tar.gz: d9bd5e65e05323ade331a4d864029688bb46f1eac4456a3394e128988651c987
 SHA512:
-  metadata.gz: 9f39a57b1a4c0e3606972305cfab712eab503c742743c0cf88b701db0c9aabd0f2c3cafa79ca29dad5f8661184698ab6818be48be9ee514a7d17fb48cba5e4af
-  data.tar.gz: 00db80b46d3183fc2e6390b37d3b2b1bf9c0673489d837e71295b87faab8b3075409cf43261420b94cad710cd35fa01e8498418c8e3d183d4c0fea917b146f0c
+  metadata.gz: 98be9bd79773d42e69e81cafefa214c9c6f9ea4b0fccb59386433d81dfd4718d69c97a1670c3f006f7fd445f6282a9575cb7a8f74a35b009f5f8b513496ed905
+  data.tar.gz: 99fb8faa39d51725271b6bb92dde96e0b61933bd2350403784cee3aee65ca5179c879d05fe32e745608a14b9f96042d4a29e9245bd77f30b59449827a4db5205

data/lib/solargraph/language_server/host.rb

@@ -22,7 +22,7 @@ module Solargraph
         @stopped = false
         @next_request_id = 0
         @dynamic_capabilities = Set.new
-        @registered_capabilities = []
+        @registered_capabilities = Set.new
         start_change_thread
         start_diagnostics_thread
       end
@@ -252,8 +252,8 @@ module Solargraph
       def register_capabilities methods
         @register_semaphore.synchronize do
           send_request 'client/registerCapability', {
-            registrations: methods.select{|m| @dynamic_capabilities.include?(m) and !@registered_capabilities.include?(m)}.map { |m|
-              @registered_capabilities.push m
+            registrations: methods.select{|m| can_register?(m) and !registered?(m)}.map { |m|
+              @registered_capabilities.add m
               {
                 id: m,
                 method: m,
@@ -272,7 +272,7 @@ module Solargraph
       def unregister_capabilities methods
         @register_semaphore.synchronize do
           send_request 'client/unregisterCapability', {
-            unregisterations: methods.select{|m| @registered_capabilities.include?(m)}.map{ |m|
+            unregisterations: methods.select{|m| registered?(m)}.map{ |m|
               @registered_capabilities.delete m
               {
                 id: m,
@@ -292,16 +292,18 @@ module Solargraph
         end
       end
 
+      # @param method [String]
+      # @return [Boolean]
+      def can_register? method
+        @dynamic_capabilities.include?(method)
+      end
+
       # True if the specified method has been registered.
       #
       # @param method [String] The method name, e.g., 'textDocument/completion'
       # @return [Boolean]
       def registered? method
-        result = nil
-        @register_semaphore.synchronize do
-          result = @registered_capabilities.include?(method)
-        end
-        result
+        @registered_capabilities.include?(method)
       end
 
       # True if the specified file is in the process of changing.
@@ -607,7 +609,7 @@ module Solargraph
           'textDocument/documentSymbol' => {
             documentSymbolProvider: true
           },
-          'workspace/workspaceSymbol' => {
+          'workspace/symbol' => {
             workspaceSymbolProvider: true
           }
         }

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

@@ -105,9 +105,7 @@ module Solargraph
             params['capabilities'][section] and
             params['capabilities'][section][capability] and
             params['capabilities'][section][capability]['dynamicRegistration'])
-          # HACK: Capability for workspace/workspaceSymbol is workspace/symbol
-          adjcap = (section == 'workspace' and capability == 'symbol') ? 'workspaceSymbol' : capability
-          host.allow_registration("#{section}/#{adjcap}") if result
+          host.allow_registration("#{section}/#{capability}") if result
           result
         end
       end

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

@@ -12,7 +12,7 @@ module Solargraph
             textDocument/definition
             textDocument/references
             textDocument/rename
-            workspace/workspaceSymbol
+            workspace/symbol
           ]
         end
       end

data/lib/solargraph/language_server/message/workspace/did_change_configuration.rb

@@ -17,7 +17,7 @@ module Solargraph::LanguageServer::Message::Workspace
       (host.options['hover'] ? y : n).push('textDocument/hover', 'textDocument/signatureHelp')
       (host.options['autoformat'] ? y : n).push('textDocument/onTypeFormatting')
       (host.options['formatting'] ? y : n).push('textDocument/formatting')
-      (host.options['symbols'] ? y : n).push('textDocument/documentSymbol', 'workspace/workspaceSymbol')
+      (host.options['symbols'] ? y : n).push('textDocument/documentSymbol', 'workspace/symbol')
       (host.options['definitions'] ? y : n).push('textDocument/definition')
       (host.options['references'] ? y : n).push('textDocument/references')
       host.register_capabilities y

data/lib/solargraph/library.rb

@@ -96,8 +96,11 @@ module Solargraph
     def overwrite filename, version
       source = source_hash[filename]
       return if source.nil?
-      STDERR.puts "Save out of sync for #{filename}" if source.version > version
-      open filename, File.read(filename), version
+      if source.version > version
+        STDERR.puts "Save out of sync for #{filename} (current #{source.version}, overwrite #{version})" if source.version > version
+      else
+        open filename, File.read(filename), version
+      end
     end
 
     # Get completion suggestions at the specified file and location.

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.23.2'
+  VERSION = '0.23.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.23.2
+  version: 0.23.3
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser