solargraph 0.33.2 → 0.34.0

data/lib/solargraph/language_server/message/text_document/did_open.rb

@@ -1,13 +1,15 @@
-module Solargraph
-  module LanguageServer
-    module Message
-      module TextDocument
-        class DidOpen < Base
-          def process
-            host.open params['textDocument']['uri'], params['textDocument']['text'], params['textDocument']['version']
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module TextDocument
+        class DidOpen < Base
+          def process
+            host.open params['textDocument']['uri'], params['textDocument']['text'], params['textDocument']['version']
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/language_server/message/text_document/did_save.rb

@@ -1,15 +1,17 @@
-module Solargraph
-  module LanguageServer
-    module Message
-      module TextDocument
-        class DidSave < Base
-          def process
-            # @todo The server might not need to do anything in response to
-            #   this notification. See https://github.com/castwide/solargraph/issues/73
-            # host.save params
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module TextDocument
+        class DidSave < Base
+          def process
+            # @todo The server might not need to do anything in response to
+            #   this notification. See https://github.com/castwide/solargraph/issues/73
+            # host.save params
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/language_server/message/text_document/document_symbol.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Solargraph::LanguageServer::Message::TextDocument::DocumentSymbol < Solargraph::LanguageServer::Message::Base
   include Solargraph::LanguageServer::UriHelpers
 

data/lib/solargraph/language_server/message/text_document/folding_range.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open3'
 
 module Solargraph

data/lib/solargraph/language_server/message/text_document/formatting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open3'
 require 'shellwords'
 
@@ -12,7 +14,12 @@ module Solargraph
             original = host.read_text(params['textDocument']['uri'])
             cmd = "rubocop -a -f fi -s #{Shellwords.escape(filename)}"
             o, e, s = Open3.capture3(cmd, stdin_data: original)
-            lines = o.lines
+            return format(original, o) if o && !o.empty?
+            set_error(Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, e)
+          end
+
+          def format original, result
+            lines = result.lines
             index = lines.index{|l| l.start_with?('====================')}
             formatted = lines[index+1..-1].join
             # The response is required to send an explicit range. Text edits

data/lib/solargraph/language_server/message/text_document/hover.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'htmlentities'
 
@@ -18,7 +20,7 @@ module Solargraph
               if !this_link.nil? && this_link != last_link
                 parts.push this_link
               end
-              parts.push HTMLEntities.new.encode(pin.detail) unless pin.kind == Solargraph::Pin::NAMESPACE or pin.detail.nil?
+              parts.push HTMLEntities.new.encode(pin.detail) unless pin.is_a?(Pin::Namespace) || pin.detail.nil?
               parts.push pin.documentation unless pin.documentation.nil? or pin.documentation.empty?
               contents.push parts.join("\n\n") unless parts.empty?
               last_link = this_link unless this_link.nil?

data/lib/solargraph/language_server/message/text_document/on_type_formatting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module LanguageServer
     module Message

data/lib/solargraph/language_server/message/text_document/prepare_rename.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph::LanguageServer::Message::TextDocument
   class PrepareRename < Base
     def process

data/lib/solargraph/language_server/message/text_document/references.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph::LanguageServer::Message::TextDocument
   class References < Base
     def process

data/lib/solargraph/language_server/message/text_document/rename.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph::LanguageServer::Message::TextDocument
   class Rename < Base
     def process

data/lib/solargraph/language_server/message/text_document/signature_help.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module LanguageServer
     module Message
@@ -7,7 +9,11 @@ module Solargraph
             line = params['position']['line']
             col = params['position']['character']
             suggestions = host.signatures_at(params['textDocument']['uri'], line, col)
-            info = suggestions.map(&:signature_help)
+            info = []
+            suggestions.each do |pin|
+              info.concat pin.overloads.map(&:signature_help)
+              info.push pin.signature_help
+            end
             set_result({
               signatures: info
             })

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module LanguageServer
     module Message

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Solargraph::LanguageServer::Message::Workspace

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Solargraph::LanguageServer::Message::Workspace

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Solargraph::LanguageServer::Message::Workspace

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Solargraph::LanguageServer::Message::Workspace::WorkspaceSymbol < Solargraph::LanguageServer::Message::Base
   include Solargraph::LanguageServer::UriHelpers
 

data/lib/solargraph/language_server/message_types.rb

@@ -1,12 +1,14 @@
-module Solargraph
-  module LanguageServer
-    # The MessageType constants from the language server specification.
-    #
-    module MessageTypes
-      ERROR = 1
-      WARNING = 2
-      INFO = 3
-      LOG = 4
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    # The MessageType constants from the language server specification.
+    #
+    module MessageTypes
+      ERROR = 1
+      WARNING = 2
+      INFO = 3
+      LOG = 4
+    end
+  end
+end

data/lib/solargraph/language_server/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module LanguageServer
     class Request

data/lib/solargraph/language_server/symbol_kinds.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module LanguageServer
     # The SymbolKind constants for the language server protocol.

data/lib/solargraph/language_server/transport.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module LanguageServer
     # The Transport namespace contains concrete implementations of

data/lib/solargraph/language_server/transport/adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'backport'
 
 module Solargraph

data/lib/solargraph/language_server/transport/data_reader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module LanguageServer
     module Transport
@@ -5,7 +7,7 @@ module Solargraph
         def initialize
           @in_header = true
           @content_length = 0
-          @buffer = ''
+          @buffer = String.new
         end
 
         # Declare a block to be executed for each message received from the

data/lib/solargraph/language_server/uri_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module LanguageServer
     # Methods to handle conversions between file URIs and paths.

data/lib/solargraph/library.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   # A Library handles coordination between a Workspace and an ApiMap.
   #

data/lib/solargraph/location.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   # A section of text identified by its filename and range.
   #

data/lib/solargraph/logging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 
 module Solargraph

data/lib/solargraph/page.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 require 'tilt'
 require 'kramdown'

data/lib/solargraph/pin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   # The namespace for pins used in maps.
   #
@@ -28,27 +30,8 @@ module Solargraph
     autoload :DuckMethod,       'solargraph/pin/duck_method'
     autoload :YardPin,          'solargraph/pin/yard_pin'
     autoload :Singleton,        'solargraph/pin/singleton'
+    autoload :KeywordParam,     'solargraph/pin/keyword_param'
 
-    ATTRIBUTE = 1
-    CLASS_VARIABLE = 2
-    CONSTANT = 3
-    GLOBAL_VARIABLE = 4
-    INSTANCE_VARIABLE = 5
-    KEYWORD = 6
-    LOCAL_VARIABLE = 7
-    METHOD = 8
-    NAMESPACE = 9
-    SYMBOL = 10
-    BLOCK = 11
-    BLOCK_PARAMETER = 12
-    REQUIRE_REFERENCE = 13
-    SUPERCLASS_REFERENCE = 14
-    INCLUDE_REFERENCE = 15
-    EXTEND_REFERENCE = 16
-    METHOD_ALIAS = 17
-    OVERRIDE_REFERENCE = 18
-
-    # ROOT_PIN = Pin::Namespace.new(nil, '', '', '', :class, :public)
     ROOT_PIN = Pin::Namespace.new(type: :class, name: '', closure: nil)
   end
 end

data/lib/solargraph/pin/attribute.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Attribute < BaseMethod
@@ -10,10 +12,6 @@ module Solargraph
         @access = access
       end
 
-      def kind
-        Solargraph::Pin::ATTRIBUTE
-      end
-
       def completion_item_kind
         Solargraph::LanguageServer::CompletionItemKinds::PROPERTY
       end

data/lib/solargraph/pin/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     # The base class for map pins.
@@ -16,9 +18,6 @@ module Solargraph
       # @return [String]
       attr_reader :name
 
-      # @return [Integer]
-      attr_reader :kind
-
       # @return [String]
       attr_reader :path
 
@@ -27,9 +26,8 @@ module Solargraph
       # @param closure [String]
       # @param name [String]
       # @param comments [String]
-      def initialize location: nil, kind: KEYWORD, closure: nil, name: '', comments: ''
+      def initialize location: nil, closure: nil, name: '', comments: ''
         @location = location
-        @kind = kind
         @closure = closure
         @name = name
         @comments = comments

data/lib/solargraph/pin/base_method.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     # The base class for method and attribute pins.
@@ -43,10 +45,6 @@ module Solargraph
       # @return [ComplexType]
       def generate_complex_type
         tag = docstring.tag(:return)
-        if tag.nil?
-          ol = docstring.tag(:overload)
-          tag = ol.tag(:return) unless ol.nil?
-        end
         return ComplexType::UNDEFINED if tag.nil? or tag.types.nil? or tag.types.empty?
         ComplexType.try_parse *tag.types
       end

data/lib/solargraph/pin/base_variable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class BaseVariable < Base

data/lib/solargraph/pin/block.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Block < Closure
@@ -25,10 +27,6 @@ module Solargraph
         @binder || context
       end
 
-      def kind
-        Pin::BLOCK
-      end
-
       # @return [Array<String>]
       def parameters
         @parameters ||= []

data/lib/solargraph/pin/class_variable.rb

@@ -1,9 +1,8 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class ClassVariable < BaseVariable
-      def kind
-        Pin::CLASS_VARIABLE
-      end
     end
   end
 end

data/lib/solargraph/pin/closure.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Closure < Base
@@ -23,6 +25,13 @@ module Solargraph
       def binder
         @binder || context
       end
+
+      # @return [Array<String>]
+      def gates
+        # @todo This check might not be necessary. There should always be a
+        #   root pin
+        closure ? closure.gates : ['']
+      end
     end
   end
 end