solargraph 0.59.0.dev.1 → 0.59.0.dev.2

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

@@ -1,89 +1,89 @@
-# frozen_string_literal: true
-
-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, nil]
-        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 = mutex.synchronize { queue.shift }
-          return if queue.include?(current)
-          begin
-            host.diagnose current
-          rescue InvalidOffsetError
-            # @todo This error can occur when the Source is out of sync with
-            #   with the ApiMap. It's probably not the best way to handle it,
-            #   but it's quick and easy.
-            Logging.logger.warn "Deferring diagnosis due to invalid offset: #{current}"
-            mutex.synchronize { queue.push current }
-          end
-        end
-
-        private
-
-        # @return [Host]
-        attr_reader :host
-
-        # @return [Mutex]
-        attr_reader :mutex
-
-        # @return [::Array]
-        attr_reader :queue
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+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, nil]
+        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?
+          unless host.options['diagnostics']
+            mutex.synchronize { queue.clear }
+            return
+          end
+          current = mutex.synchronize { queue.shift }
+          return if queue.include?(current)
+          begin
+            host.diagnose current
+          rescue InvalidOffsetError
+            # @todo This error can occur when the Source is out of sync with
+            #   with the ApiMap. It's probably not the best way to handle it,
+            #   but it's quick and easy.
+            Logging.logger.warn "Deferring diagnosis due to invalid offset: #{current}"
+            mutex.synchronize { queue.push current }
+          end
+        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

@@ -45,12 +45,11 @@ module Solargraph
         # @param uri [String]
         # @return [Library]
         def library_for uri
-          result = explicit_library_for(uri) ||
+          explicit_library_for(uri) ||
             implicit_library_for(uri) ||
             generic_library_for(uri)
           # previous library for already call attach. avoid call twice
           # result.attach sources.find(uri) if sources.include?(uri)
-          result
         end
 
         # Find an explicit library match for the given URI. An explicit match
@@ -119,8 +118,8 @@ module Solargraph
                                                   .tap { |lib| lib.add_observer self }
         end
 
-        # @param library [Solargraph::Library]
         # @param progress [Solargraph::LanguageServer::Progress, nil]
+        #
         # @return [void]
         def update progress
           progress&.send(self)

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

@@ -20,7 +20,7 @@ module Solargraph
         ].freeze
 
         # @param host [Host]
-        def initialize(host)
+        def initialize host
           @host = host
           @mutex = Mutex.new
           @resource = ConditionVariable.new
@@ -44,7 +44,7 @@ module Solargraph
 
         # @param message [Hash] The message to handle. Will be forwarded to Host#receive
         # @return [void]
-        def queue(message)
+        def queue message
           @mutex.synchronize do
             messages.push(message)
             @resource.signal

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

@@ -13,7 +13,7 @@ module Solargraph
 
         # @param uri [String]
         # @return [void]
-        def add_uri(uri)
+        def add_uri uri
           queue.push(uri)
         end
 

data/lib/solargraph/language_server/host.rb

@@ -53,7 +53,7 @@ module Solargraph
         logger.level = LOG_LEVELS[options['logLevel']] || DEFAULT_LOG_LEVEL
       end
 
-      # @return [Hash{String => [Boolean, String]}]
+      # @return [Hash{String => Boolean, String}]
       def options
         @options ||= default_configuration
       end
@@ -119,7 +119,7 @@ module Solargraph
             nil
           end
         else
-          logger.warn "Invalid message received."
+          logger.warn 'Invalid message received.'
           logger.debug request
           nil
         end
@@ -154,7 +154,7 @@ module Solargraph
           lib.delete(*filenames)
         end
         uris.each do |uri|
-          send_notification "textDocument/publishDiagnostics", {
+          send_notification 'textDocument/publishDiagnostics', {
             uri: uri,
             diagnostics: []
           }
@@ -209,7 +209,7 @@ module Solargraph
             logger.info "Diagnosing #{uri}"
             begin
               results = library.diagnose uri_to_file(uri)
-              send_notification "textDocument/publishDiagnostics", {
+              send_notification 'textDocument/publishDiagnostics', {
                 uri: uri,
                 diagnostics: results
               }
@@ -354,7 +354,7 @@ module Solargraph
       # @return [void]
       def send_notification method, params
         response = {
-          jsonrpc: "2.0",
+          jsonrpc: '2.0',
           method: method,
           params: params
         }
@@ -377,7 +377,7 @@ module Solargraph
       def send_request method, params, &block
         @request_mutex.synchronize do
           message = {
-            jsonrpc: "2.0",
+            jsonrpc: '2.0',
             method: method,
             params: params,
             id: @next_request_id
@@ -419,13 +419,13 @@ module Solargraph
       # @return [void]
       def unregister_capabilities methods
         logger.debug "Unregistering capabilities: #{methods}"
-        unregisterations = methods.select{|m| registered?(m)}.map{ |m|
+        unregisterations = methods.select { |m| registered?(m) }.map do |m|
           @registered_capabilities.delete m
           {
             id: m,
             method: m
           }
-        }
+        end
         return if unregisterations.empty?
         send_request 'client/unregisterCapability', { unregisterations: unregisterations }
       end
@@ -493,7 +493,7 @@ module Solargraph
               params['data']['location']['range']['end']['character']
             )
           )
-          result.concat library.locate_pins(location).select{ |pin| pin.name == params['label'] }
+          result.concat(library.locate_pins(location).select { |pin| pin.name == params['label'] })
         end
         if params['data']['path']
           result.concat library.path_pins(params['data']['path'])
@@ -547,7 +547,7 @@ module Solargraph
       end
 
       # @return [Bool] if has pending completion request
-      def has_pending_completions?
+      def pending_completions?
         message_worker.messages.reverse_each.any? { |req| req['method'] == 'textDocument/completion' }
       end
 
@@ -648,7 +648,7 @@ module Solargraph
       # @param text [String]
       # @param type [Integer] A MessageType constant
       # @param actions [Array<String>] Response options for the client
-      # @param block The block that processes the response
+      # @param block [Proc] The block that processes the response
       # @yieldparam [String] The action received from the client
       # @return [void]
       def show_message_request text, type, actions, &block
@@ -667,7 +667,7 @@ module Solargraph
         requests.keys
       end
 
-      # @return [Hash{String => [Boolean,String]}]
+      # @return [Hash{String => Boolean,String}]
       def default_configuration
         {
           'completion' => true,
@@ -748,9 +748,12 @@ module Solargraph
         params['contentChanges'].each do |recvd|
           chng = check_diff(params['textDocument']['uri'], recvd)
           changes.push Solargraph::Source::Change.new(
-            (chng['range'].nil? ?
-              nil :
-              Solargraph::Range.from_to(chng['range']['start']['line'], chng['range']['start']['character'], chng['range']['end']['line'], chng['range']['end']['character'])
+            (if chng['range'].nil?
+               nil
+             else
+               Solargraph::Range.from_to(chng['range']['start']['line'], chng['range']['start']['character'],
+                                         chng['range']['end']['line'], chng['range']['end']['character'])
+             end
             ),
             chng['text']
           )
@@ -770,7 +773,7 @@ module Solargraph
         source = sources.find(uri)
         return change if source.code.length + 1 != change['text'].length
         diffs = Diff::LCS.diff(source.code, change['text'])
-        return change if diffs.length.zero? || diffs.length > 1 || diffs.first.length > 1
+        return change if diffs.empty? || diffs.length > 1 || diffs.first.length > 1
         # @type [Diff::LCS::Change]
         diff = diffs.first.first
         return change unless diff.adding? && ['.', ':', '(', ',', ' '].include?(diff.element)
@@ -813,10 +816,10 @@ module Solargraph
           # documentSymbolProvider: true,
           # workspaceSymbolProvider: true,
           # workspace: {
-            # workspaceFolders: {
-              # supported: true,
-              # changeNotifications: true
-            # }
+          # workspaceFolders: {
+          # supported: true,
+          # changeNotifications: true
+          # }
           # }
           'textDocument/definition' => {
             definitionProvider: true
@@ -863,7 +866,7 @@ module Solargraph
       end
 
       # @param library [Library]
-      # @param uuid [String, nil]
+      #
       # @return [void]
       def sync_library_map library
         total = library.workspace.sources.length

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

@@ -1,97 +1,97 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      class Base
-        # @return [Solargraph::LanguageServer::Host]
-        attr_reader :host
-
-        # @return [Integer]
-        attr_reader :id
-
-        # @return [Hash]
-        attr_reader :request
-
-        # @return [String]
-        attr_reader :method
-
-        # @return [Hash{String => undefined}]
-        attr_reader :params
-
-        # @return [Hash, Array, nil]
-        attr_reader :result
-
-        # @return [Hash, nil]
-        attr_reader :error
-
-        # @param host [Solargraph::LanguageServer::Host]
-        # @param request [Hash]
-        def initialize host, request
-          @host = host
-          @id = request['id'].freeze
-          @request = request.freeze
-          @method = request['method'].freeze
-          @params = (request['params'] || {}).freeze
-          post_initialize
-        end
-
-        # @return [void]
-        def post_initialize; end
-
-        # @return [void]
-        def process; end
-
-        # @param data [Hash, Array, nil]
-        # @return [void]
-        def set_result data
-          @result = data
-        end
-
-        # @param code [Integer] See Solargraph::LanguageServer::ErrorCodes
-        # @param message [String]
-        # @return [void]
-        def set_error code, message
-          @error = {
-            code: code,
-            message: message
-          }
-        end
-
-        # @return [void]
-        def send_response
-          return if id.nil?
-
-          accept_or_cancel
-          response = {
-            jsonrpc: '2.0',
-            id: id
-          }
-          response[:result] = result unless result.nil?
-          response[:error] = error unless error.nil?
-          response[:result] = nil if result.nil? and error.nil?
-          json = response.to_json
-          envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
-          Solargraph.logger.debug envelope
-          host.queue envelope
-          host.clear id
-        end
-
-        private
-
-        # @return [void]
-        def accept_or_cancel
-          if host.cancel?(id)
-            # https://microsoft.github.io/language-server-protocol/specifications/specification-current/#cancelRequest
-            # cancel should send response RequestCancelled
-            Solargraph::Logging.logger.info "Cancelled response to ##{id} #{method}"
-            set_result nil
-            set_error ErrorCodes::REQUEST_CANCELLED, 'Cancelled by client'
-          else
-            Solargraph::Logging.logger.info "Sending response to ##{id} #{method}"
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      class Base
+        # @return [Solargraph::LanguageServer::Host]
+        attr_reader :host
+
+        # @return [Integer]
+        attr_reader :id
+
+        # @return [Hash]
+        attr_reader :request
+
+        # @return [String]
+        attr_reader :method
+
+        # @return [Hash{String => undefined}]
+        attr_reader :params
+
+        # @return [Hash, Array, nil]
+        attr_reader :result
+
+        # @return [Hash, nil]
+        attr_reader :error
+
+        # @param host [Solargraph::LanguageServer::Host]
+        # @param request [Hash]
+        def initialize host, request
+          @host = host
+          @id = request['id'].freeze
+          @request = request.freeze
+          @method = request['method'].freeze
+          @params = (request['params'] || {}).freeze
+          post_initialize
+        end
+
+        # @return [void]
+        def post_initialize; end
+
+        # @return [void]
+        def process; end
+
+        # @param data [Hash, Array, nil]
+        # @return [void]
+        def set_result data
+          @result = data
+        end
+
+        # @param code [Integer] See Solargraph::LanguageServer::ErrorCodes
+        # @param message [String]
+        # @return [void]
+        def set_error code, message
+          @error = {
+            code: code,
+            message: message
+          }
+        end
+
+        # @return [void]
+        def send_response
+          return if id.nil?
+
+          accept_or_cancel
+          response = {
+            jsonrpc: '2.0',
+            id: id
+          }
+          response[:result] = result unless result.nil?
+          response[:error] = error unless error.nil?
+          response[:result] = nil if result.nil? && error.nil?
+          json = response.to_json
+          envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
+          Solargraph.logger.debug envelope
+          host.queue envelope
+          host.clear id
+        end
+
+        private
+
+        # @return [void]
+        def accept_or_cancel
+          if host.cancel?(id)
+            # https://microsoft.github.io/language-server-protocol/specifications/specification-current/#cancelRequest
+            # cancel should send response RequestCancelled
+            Solargraph::Logging.logger.info "Cancelled response to ##{id} #{method}"
+            set_result nil
+            set_error ErrorCodes::REQUEST_CANCELLED, 'Cancelled by client'
+          else
+            Solargraph::Logging.logger.info "Sending response to ##{id} #{method}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/language_server/message/client/register_capability.rb

@@ -1,15 +1,13 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module Client
-        class RegisterCapability < Solargraph::LanguageServer::Message::Base
-          def process
-            
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module Client
+        class RegisterCapability < Solargraph::LanguageServer::Message::Base
+          def process; end
+        end
+      end
+    end
+  end
+end