solargraph 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c647321bb57cb5ba859e1762032855324aa967e78a562c0e259508e5c24c22ee
-  data.tar.gz: 057c1a4298f9c4574c0773425cce496216ab60e22165871487d6d77e13733745
+  metadata.gz: 6e4fd079cd97cdd7650d3040d3a9182451f280e8e89c1de91f82d2092dbef840
+  data.tar.gz: '0516619d1947a312eebb8b1caa535c4194bed4a308b4c68467af7d55c705119a'
 SHA512:
-  metadata.gz: ae8cb69f92e2f3ad78959bd8767b78dda5a7d4baa861fa59680be191b7c92944f0df15ff12ccad2ed4a93231afcc55db53bd40cf9b42473387491f4d168f1cef
-  data.tar.gz: 8d02f2a10b1a71579a0b48e9dae4268689cc0ec642c137b1adedf6fc99749ae5a1b04f46b4d9b30448d3316a71b65dfdf79b5066c0af499e2181fcc5a107201f
+  metadata.gz: 4b290e1ed7ecf9b59933abef586de329903c6c9f06d61b233dc71b817b75f7a4e4cae1f246803965779eac8b9eed1107e27263e63a039a282e2ede3da2f2260d
+  data.tar.gz: 7b29c6d72ce773d6ea9a55a5ae9d23398fbe1d4ef9ace42bab1b29723e8c61171bbae1c12900fd4e64f2e1b17193519b4eab202e39ab8428e3a24d691c8c17af

data/lib/solargraph/api_map.rb

@@ -46,10 +46,12 @@ module Solargraph
       self.new(Solargraph::Workspace.new(directory))
     end
 
+    # @return [Array<Solargraph::Pin::Base>]
     def pins
       store.pins
     end
 
+    # @return [Array<String>]
     def domains
       @domains ||= []
     end
@@ -244,6 +246,13 @@ module Solargraph
       globals
     end
 
+    # Get an array of methods available in a particular context.
+    #
+    # @param fqns [String] The fully qualified namespace to search for methods
+    # @param scope [Symbol] :class or :instance
+    # @param visibility [Array<Symbol>] :public, :protected, and/or :private
+    # @param deep [Boolean] True to include superclasses, mixins, etc.
+    # @return [Array<Solargraph::Pin::Base>]
     def get_methods fqns, scope: :instance, visibility: [:public], deep: true
       result = []
       skip = []
@@ -266,6 +275,10 @@ module Solargraph
       result
     end
 
+    # Get a set of available completions for the specified fragment. The
+    # resulting Completion object contains an array of pins and the range of
+    # text to replace in the source.
+    #
     # @param fragment [Solargraph::Source::Fragment]
     # @return [ApiMap::Completion]
     def complete fragment
@@ -318,10 +331,12 @@ module Solargraph
       Completion.new(filtered, fragment.whole_word_range)
     end
 
+    # Get an array of pins that describe the symbol at the specified fragment.
+    #
     # @param fragment [Solargraph::Source::Fragment]
     # @return [Array<Solargraph::Pin::Base>]
     def define fragment
-      return [] if fragment.string? or fragment.comment?
+      return [] if fragment.string? or fragment.comment? or fragment.literal?
       if fragment.base_literal?
         probe.infer_signature_pins fragment.whole_signature, Pin::ProxyMethod.new(fragment.base_literal), fragment.locals
       else
@@ -421,11 +436,11 @@ module Solargraph
       result
     end
 
+    # @return [Solargraph::Pin::Base]
     def locate_pin location
       @sources.each do |source|
         pin = source.locate_pin(location)
         unless pin.nil?
-          # pin.resolve self
           return pin
         end
       end

data/lib/solargraph/api_map/probe.rb

@@ -148,6 +148,9 @@ module Solargraph
         pin
       end
 
+      # @param pin [Solargraph::Pin::Base]
+      # @param locals [Array<Solargraph::Pin::Base>]
+      # @return [String]
       def resolve_pin_type pin, locals
         pin.return_type
         return pin.return_type unless pin.return_type.nil?

data/lib/solargraph/api_map/store.rb

@@ -3,12 +3,13 @@ require 'set'
 module Solargraph
   class ApiMap
     class Store
-      # @param sources [Solargraph::Source]
+      # @param sources [Array<Solargraph::Source>]
       def initialize sources
         update *sources
         index
       end
 
+      # @return [Array<Solargraph::Pin::Base>]
       def pins
         @pins ||= []
       end
@@ -31,6 +32,7 @@ module Solargraph
         index
       end
 
+      # @return [Array<Solargraph::Pin::Base>]
       def get_constants fqns, visibility = [:public]
         namespace_pins(fqns).select { |pin|
           !pin.name.empty? and (pin.kind == Pin::NAMESPACE or pin.kind == Pin::CONSTANT) and visibility.include?(pin.visibility)
@@ -43,10 +45,13 @@ module Solargraph
         }
       end
 
+      # @return [Array<Solargraph::Pin::Base>]
       def get_attrs fqns, scope
         namespace_pins(fqns).select{ |pin| pin.kind == Pin::ATTRIBUTE and pin.scope == scope }
       end
 
+      # @param fqns [String]
+      # @return [String]
       def get_superclass fqns
         fqns_pins(fqns).each do |pin|
           return pin.superclass_reference.name unless pin.superclass_reference.nil?
@@ -54,6 +59,8 @@ module Solargraph
         nil
       end
 
+      # @param fqns [String]
+      # @return [Array<String>]
       def get_includes fqns
         result = []
         fqns_pins(fqns).each do |pin|
@@ -62,6 +69,8 @@ module Solargraph
         result
       end
 
+      # @param fqns [String]
+      # @return [Array<String>]
       def get_extends fqns
         result = []
         fqns_pins(fqns).each do |pin|
@@ -70,28 +79,39 @@ module Solargraph
         result
       end
 
+      # @param path [String]
+      # @return [Array<Solargraph::Pin::Base>]
       def get_path_pins path
         base = path.sub(/(#|\.|::)[a-z0-9_]*(\?|\!)?$/i, '')
         base = '' if base == path
         namespace_pins(base).select{ |pin| pin.path == path }
       end
 
+      # @param fqns [String]
+      # @param scope [Symbol] :class or :instance
+      # @return [Array<Solargraph::Pin::Base>]
       def get_instance_variables(fqns, scope = :instance)
         namespace_pins(fqns).select{|pin| pin.kind == Pin::INSTANCE_VARIABLE and pin.scope == scope}
       end
 
+      # @param fqns [String]
+      # @return [Array<Solargraph::Pin::Base>]
       def get_class_variables(fqns)
         namespace_pins(fqns).select{|pin| pin.kind == Pin::CLASS_VARIABLE}
       end
 
+      # @return [Array<Solargraph::Pin::Base>]
       def get_symbols
         symbols.uniq(&:name)
       end
 
+      # @param fqns [String]
+      # @return [Boolean]
       def namespace_exists?(fqns)
         fqns_pins(fqns).any?
       end
 
+      # @return [Set<String>]
       def namespaces
         @namespaces ||= Set.new
       end

data/lib/solargraph/diagnostics/require_not_found.rb

@@ -3,8 +3,6 @@ module Solargraph
     # RequireNotFound reports required paths that could not be resolved to
     # either a file in the workspace or a gem.
     #
-    # @todo Some stdlib paths can result in false positives.
-    #
     class RequireNotFound < Base
       def diagnose source, api_map
         result = []

data/lib/solargraph/diagnostics/rubocop.rb

@@ -6,6 +6,15 @@ module Solargraph
     # This reporter provides linting through RuboCop.
     #
     class Rubocop < Base
+      # Conversion of RuboCop severity names to LSP constants
+      SEVERITIES = {
+        'refactor' => 4,
+        'convention' => 3,
+        'warning' => 2,
+        'error' => 1,
+        'fatal' => 1
+      }
+
       # The rubocop command
       #
       # @return [String]
@@ -23,11 +32,12 @@ module Solargraph
           text = source.code
           filename = source.filename
           raise DiagnosticsError, 'No command specified' if command.nil? or command.empty?
-          cmd = "#{Shellwords.escape(command)} -f j -s #{Shellwords.escape(filename)}"
+          cmd = "#{Shellwords.escape(command)} -f j"
           unless api_map.workspace.nil? or api_map.workspace.directory.nil?
             rc = File.join(api_map.workspace.directory, '.rubocop.yml')
-            cmd += " -c #{Shellwords.escape(rc)}" if File.file?(rc)
+            cmd += " -c #{Shellwords.escape(fix_drive_letter(rc))}" if File.file?(rc)
           end
+          cmd += " -s #{Shellwords.escape(fix_drive_letter(filename))}"
           o, e, s = Open3.capture3(cmd, stdin_data: text)
           STDERR.puts e unless e.empty?
           raise DiagnosticsError, "Command '#{command}' is not available (gem exception)" if e.include?('Gem::Exception')
@@ -43,14 +53,6 @@ module Solargraph
       private
 
       def make_array resp
-        # Conversion of RuboCop severity names to LSP constants
-        severities = {
-          'refactor' => 4,
-          'convention' => 3,
-          'warning' => 2,
-          'error' => 1,
-          'fatal' => 1
-        }
         diagnostics = []
         resp['files'].each do |file|
           file['offenses'].each do |off|
@@ -73,7 +75,7 @@ module Solargraph
                 }
               },
               # 1 = Error, 2 = Warning, 3 = Information, 4 = Hint
-              severity: severities[off['severity']],
+              severity: SEVERITIES[off['severity']],
               source: off['cop_name'],
               message: off['message'].gsub(/^#{off['cop_name']}\:/, '')
             }
@@ -82,6 +84,16 @@ module Solargraph
         end
         diagnostics
       end
+
+      # RuboCop internally uses capitalized drive letters for Windows paths,
+      # so we need to convert the paths provided to the command.
+      #
+      # @param path [String]
+      # @return [String]
+      def fix_drive_letter path
+        return path unless path.match(/^[a-z]:/)
+        path[0].upcase + path[1..-1]
+      end
     end
   end
 end

data/lib/solargraph/language_server/host.rb

@@ -14,12 +14,15 @@ module Solargraph
         @change_semaphore = Mutex.new
         @cancel_semaphore = Mutex.new
         @buffer_semaphore = Mutex.new
+        @register_semaphore = Mutex.new
         @change_queue = []
         @diagnostics_queue = []
         @cancel = []
         @buffer = ''
         @stopped = false
         @next_request_id = 0
+        @dynamic_capabilities = Set.new
+        @registered_capabilities = []
         start_change_thread
         start_diagnostics_thread
       end
@@ -28,7 +31,8 @@ module Solargraph
       #
       # @param update [Hash]
       def configure update
-        options.merge! update unless update.nil?
+        return if update.nil?
+        options.merge! update
       end
 
       # @return [Hash]
@@ -94,6 +98,11 @@ module Solargraph
         @change_semaphore.synchronize do
           filename = uri_to_file(uri)
           library.delete filename
+          # Remove diagnostics for deleted files
+          send_notification "textDocument/publishDiagnostics", {
+            uri: uri,
+            diagnostics: []
+          }
         end
       end
 
@@ -235,27 +244,64 @@ module Solargraph
         @next_request_id += 1
       end
 
+      # Register the methods as capabilities with the client.
+      # This method will avoid duplicating registrations and ignore methods
+      # that were not flagged for dynamic registration by the client.
+      #
+      # @param methods [Array<String>] The methods to register
       def register_capabilities methods
-        send_request 'client/registerCapability', {
-          registrations: methods.map { |m|
-            {
-              id: m,
-              method: m,
-              registerOptions: dynamic_capability_options[m]
+        @register_semaphore.synchronize do
+          send_request 'client/registerCapability', {
+            registrations: methods.reject{|m| @dynamic_capabilities.include?(m) and @registered_capabilities.include?(m)}.map { |m|
+              @registered_capabilities.push m
+              {
+                id: m,
+                method: m,
+                registerOptions: dynamic_capability_options[m]
+              }
             }
           }
-        }
+        end
       end
 
+      # Unregister the methods with the client.
+      # This method will avoid duplicating unregistrations and ignore methods
+      # that were not flagged for dynamic registration by the client.
+      #
+      # @param methods [Array<String>] The methods to unregister
       def unregister_capabilities methods
-        send_request 'client/unregisterCapability', {
-          unregisterations: methods.map { |m|
-            {
-              id: m,
-              method: m
+        @register_semaphore.synchronize do
+          send_request 'client/unregisterCapability', {
+            unregisterations: methods.select{|m| @registered_capabilities.include?(m)}.map{ |m|
+              @registered_capabilities.delete m
+              {
+                id: m,
+                method: m
+              }
             }
           }
-        }
+        end
+      end
+
+      # Flag a method as available for dynamic registration.
+      #
+      # @param method [String] The method name, e.g., 'textDocument/completion'
+      def allow_registration method
+        @register_semaphore.synchronize do
+          @dynamic_capabilities.add method
+        end
+      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
       end
 
       # True if the specified file is in the process of changing.
@@ -380,6 +426,10 @@ module Solargraph
         {
           'completion' => true,
           'hover' => true,
+          'symbols' => true,
+          'definitions' => true,
+          'rename' => true,
+          'references' => true,
           'autoformat' => false,
           'diagnostics' => false,
           'formatting' => false
@@ -545,6 +595,21 @@ module Solargraph
               # changeNotifications: true
             # }
           # }
+          'textDocument/definition' => {
+            definitionProvider: true
+          },
+          'textDocument/references' => {
+            referencesProvider: true
+          },
+          'textDocument/rename' => {
+            renameProvider: true
+          },
+          'textDocument/documentSymbol' => {
+            documentSymbolProvider: true
+          },
+          'workspace/workspaceSymbol' => {
+            workspaceSymbolProvider: true
+          }
         }
       end
     end

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

@@ -8,24 +8,24 @@ module Solargraph
           result = {
             capabilities: {
               textDocumentSync: 2, # @todo What should this be?
-              definitionProvider: true,
-              documentSymbolProvider: true,
-              workspaceSymbolProvider: true,
-              renameProvider: true,
               workspace: {
                 workspaceFolders: {
                   supported: true,
                   changeNotifications: true
                 }
-              },
-              referencesProvider: true
+              }
             }
           }
-          result[:capabilities].merge! static_completion unless dynamic_completion?
-          result[:capabilities].merge! static_signature_help unless dynamic_signature_help?
-          result[:capabilities].merge! static_on_type_formatting unless dynamic_on_type_formatting?
-          result[:capabilities].merge! static_hover unless dynamic_hover?
-          result[:capabilities].merge! static_document_formatting unless dynamic_document_formatting?
+          result[:capabilities].merge! static_completion unless dynamic_registration_for?('textDocument', 'completion')
+          result[:capabilities].merge! static_signature_help unless dynamic_registration_for?('textDocument', 'signatureHelp')
+          # result[:capabilities].merge! static_on_type_formatting unless dynamic_registration_for?('textDocument', 'onTypeFormatting')
+          result[:capabilities].merge! static_hover unless dynamic_registration_for?('textDocument', 'hover')
+          result[:capabilities].merge! static_document_formatting unless dynamic_registration_for?('textDocument', 'formatting')
+          result[:capabilities].merge! static_document_symbols unless dynamic_registration_for?('textDocument', 'documentSymbol')
+          result[:capabilities].merge! static_definitions unless dynamic_registration_for?('textDocument', 'definition')
+          result[:capabilities].merge! static_rename unless dynamic_registration_for?('textDocument', 'rename')
+          result[:capabilities].merge! static_references unless dynamic_registration_for?('textDocument', 'references')
+          result[:capabilities].merge! static_workspace_symbols unless dynamic_registration_for?('workspace', 'symbol')
           set_result result
         end
 
@@ -40,13 +40,6 @@ module Solargraph
           }
         end
 
-        def dynamic_completion?
-          params['capabilities'] and
-            params['capabilities']['textDocument'] and
-            params['capabilities']['textDocument']['completion'] and
-            params['capabilities']['textDocument']['completion']['dynamicRegistration']
-        end
-
         def static_signature_help
           {
             signatureHelpProvider: {
@@ -55,13 +48,6 @@ module Solargraph
           }
         end
 
-        def dynamic_signature_help?
-          params['capabilities'] and
-            params['capabilities']['textDocument'] and
-            params['capabilities']['textDocument']['signatureHelp'] and
-            params['capabilities']['textDocument']['signatureHelp']['dynamicRegistration']
-        end
-
         def static_on_type_formatting
           {
             documentOnTypeFormattingProvider: {
@@ -71,37 +57,56 @@ module Solargraph
           }
         end
 
-        def dynamic_on_type_formatting?
-          params['capabilities'] and
-            params['capabilities']['textDocument'] and
-            params['capabilities']['textDocument']['onTypeFormatting'] and
-            params['capabilities']['textDocument']['onTypeFormatting']['dynamicRegistration']
-        end
-
         def static_hover
           {
             hoverProvider: true
           }
         end
 
-        def dynamic_hover?
-          params['capabilities'] and
-            params['capabilities']['textDocument'] and
-            params['capabilities']['textDocument']['hover'] and
-            params['capabilities']['textDocument']['hover']['dynamicRegistration']
-        end
-
         def static_document_formatting
           {
             documentFormattingProvider: true
           }
         end
 
-        def dynamic_document_formatting?
-          params['capabilities'] and
-            params['capabilities']['textDocument'] and
-            params['capabilities']['textDocument']['hover'] and
-            params['capabilities']['textDocument']['hover']['dynamicRegistration']
+        def static_document_symbols
+          {
+            documentSymbolProvider: true
+          }
+        end
+
+        def static_workspace_symbols
+          {
+            workspaceSymbolProvider: true
+          }
+        end
+
+        def static_definitions
+          {
+            definitionProvider: true
+          }
+        end
+
+        def static_rename
+          {
+            renameProvider: true
+          }
+        end
+
+        def static_references
+          {
+            referencesProvider: true
+          }
+        end
+
+        # @return [Boolean]
+        def dynamic_registration_for? section, capability
+          result = params['capabilities'] and
+            params['capabilities'][section] and
+            params['capabilities'][section][capability] and
+            params['capabilities'][section][capability]['dynamicRegistration']
+          host.allow_registration "#{section}/#{capability}" if result
+          result
         end
       end
     end

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

@@ -3,13 +3,17 @@ module Solargraph
     module Message
       class Initialized < Base
         def process
-          meths = []
-          meths.push 'textDocument/completion' if host.options['completion']
-          meths.push 'textDocument/hover' if host.options['hover']
-          meths.push 'textDocument/signatureHelp' if host.options['hover']
-          meths.push 'textDocument/onTypeFormatting' if host.options['autoformat']
-          meths.push 'textDocument/formatting' if host.options['formatting']
-          host.register_capabilities meths unless meths.empty?
+          host.register_capabilities %w[
+            textDocument/completion
+            textDocument/hover
+            textDocument/signatureHelp
+            textDocument/formatting
+            textDocument/documentSymbol
+            textDocument/definition
+            textDocument/references
+            textDocument/rename
+            workspace/workspaceSymbol
+          ]
         end
       end
     end

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

@@ -4,14 +4,16 @@ class Solargraph::LanguageServer::Message::TextDocument::DocumentSymbol < Solarg
   def process
     pins = host.file_symbols params['textDocument']['uri']
     info = pins.map do |pin|
-      {
-        name: pin.path,
-        kind: Solargraph::LanguageServer::SymbolKinds::NAMESPACE,
+      result = {
+        name: pin.name,
+        containerName: pin.namespace,
+        kind: pin.symbol_kind,
         location: {
           uri: file_to_uri(pin.location.filename),
           range: pin.location.range.to_hash
         }
       }
+      result
     end
     set_result info
   end

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

@@ -1,4 +1,5 @@
 require 'uri'
+require 'htmlentities'
 
 module Solargraph::LanguageServer::Message::TextDocument
   class Hover < Base
@@ -20,6 +21,7 @@ module Solargraph::LanguageServer::Message::TextDocument
         if !this_path.nil? and this_path != last_path
           parts.push link_documentation(this_path)
         end
+        parts.push HTMLEntities.new.encode(pin.detail) unless pin.kind == Solargraph::Pin::NAMESPACE or 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_path = this_path unless this_path.nil?

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

@@ -4,24 +4,24 @@ module Solargraph::LanguageServer::Message::Workspace
   class DidChangeConfiguration < Solargraph::LanguageServer::Message::Base
     def process
       update = params['settings']['solargraph']
+      host.configure update
+      register_from_options
+    end
 
-      meths = []
-      meths.push 'textDocument/completion' if update.has_key?('completion') and update['completion'] and !host.options['completion']
-      meths.push 'textDocument/hover' if update.has_key?('hover') and update['hover']  and !host.options['hover']
-      meths.push 'textDocument/signatureHelp' if update.has_key?('hover') and update['hover'] and !host.options['hover']
-      meths.push 'textDocument/onTypeFormatting' if update.has_key?('autoformat') and update['autoformat'] and !host.options['autoformat']
-      meths.push "textDocument/formatting" if update.has_key?('formatting') and update['formatting'] and !host.options['formatting']
-      host.register_capabilities meths unless meths.empty?
-
-      meths = []
-      meths.push 'textDocument/completion' if update.has_key?('completion') and !update['completion'] and host.options['completion']
-      meths.push 'textDocument/hover' if update.has_key?('hover') and !update['hover'] and host.options['hover']
-      meths.push 'textDocument/signatureHelp' if update.has_key?('hover') and !update['hover'] and host.options['hover']
-      meths.push 'textDocument/onTypeFormatting' if update.has_key?('autoformat') and !update['autoformat'] and host.options['autoformat']
-      meths.push "textDocument/formatting" if update.has_key?('formatting') and !update['formatting'] and host.options['formatting']
-      host.unregister_capabilities meths unless meths.empty?
+    private
 
-      host.configure update
+    def register_from_options
+      y = []
+      n = []
+      (host.options['completion'] ? y : n).push('textDocument/completion')
+      (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['definitions'] ? y : n).push('textDocument/definition')
+      (host.options['references'] ? y : n).push('textDocument/references')
+      host.register_capabilities y
+      host.unregister_capabilities n
     end
   end
 end

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

@@ -6,8 +6,9 @@ class Solargraph::LanguageServer::Message::Workspace::WorkspaceSymbol < Solargra
     info = pins.map do |pin|
       uri = file_to_uri(pin.location.filename)
       {
-        name: pin.path,
-        kind: Solargraph::LanguageServer::SymbolKinds::NAMESPACE,
+        name: pin.name,
+        containerName: pin.namespace,
+        kind: pin.symbol_kind,
         location: {
           uri: uri,
           range: pin.location.range.to_hash

data/lib/solargraph/language_server/transport.rb

@@ -2,7 +2,8 @@ module Solargraph
   module LanguageServer
     module Transport
       autoload :DataReader, 'solargraph/language_server/transport/data_reader'
-      autoload :Socket, 'solargraph/language_server/transport/socket'
+      autoload :Socket,     'solargraph/language_server/transport/socket'
+      autoload :Stdio,      'solargraph/language_server/transport/stdio'
     end
   end
 end

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

@@ -7,9 +7,6 @@ module Solargraph
       #
       module Socket
         def post_init
-          @in_header = true
-          @content_length = 0
-          @buffer = ''
           @host = Solargraph::LanguageServer::Host.new
           @data_reader = Solargraph::LanguageServer::Transport::DataReader.new
           @data_reader.set_message_handler do |message|

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

@@ -0,0 +1,66 @@
+require 'thread'
+
+module Solargraph
+  module LanguageServer
+    module Transport
+      class Stdio
+        def initialize
+          # binmode is necessary to avoid EOL conversions
+          STDOUT.binmode
+          @host = Solargraph::LanguageServer::Host.new
+          @data_reader = Solargraph::LanguageServer::Transport::DataReader.new
+          @data_reader.set_message_handler do |message|
+            process message
+          end
+        end
+
+        def run
+          start_reader
+          start_timers
+        end
+
+        def self.run
+          std = Stdio.new
+          std.run
+          std
+        end
+
+        private
+
+        def start_reader
+          Thread.new do
+            until @host.stopped?
+              char = STDIN.sysread(1)
+              break if char.nil?
+              @data_reader.receive char
+              STDIN.flush
+            end
+          end
+        end
+
+        def send_data message
+          STDOUT.write message
+          STDOUT.flush
+        end
+
+        def process request
+          Thread.new do
+            message = @host.start(request)
+            message.send_response
+            tmp = @host.flush
+            send_data tmp unless tmp.empty?
+            GC.start unless request['method'] == 'textDocument/didChange'
+          end
+        end
+
+        def start_timers
+          EventMachine.add_periodic_timer 0.1 do
+            tmp = @host.flush
+            send_data tmp unless tmp.empty?
+            EventMachine.stop if @host.stopped?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/pin/attribute.rb

@@ -23,7 +23,7 @@ module Solargraph
       end
 
       def path
-        @path ||= namespace + '#' + name
+        @path ||= namespace + (scope == :instance ? '#' : '.') + name
       end
 
       def return_type

data/lib/solargraph/pin/base.rb

@@ -44,6 +44,11 @@ module Solargraph
         LanguageServer::CompletionItemKinds::KEYWORD
       end
 
+      # @return [Integer]
+      def symbol_kind
+        nil
+      end
+
       def to_s
         name.to_s
       end

data/lib/solargraph/pin/base_variable.rb

@@ -20,6 +20,11 @@ module Solargraph
         Solargraph::LanguageServer::CompletionItemKinds::VARIABLE
       end
 
+      # @return [Integer]
+      def symbol_kind
+        Solargraph::LanguageServer::SymbolKinds::VARIABLE
+      end
+
       def return_type
         if @return_type.nil?
           if !docstring.nil?

data/lib/solargraph/pin/constant.rb

@@ -16,6 +16,11 @@ module Solargraph
         Solargraph::LanguageServer::CompletionItemKinds::CONSTANT
       end
 
+      # @return [Integer]
+      def symbol_kind
+        LanguageServer::SymbolKinds::CONSTANT
+      end
+
       def path
         "#{namespace}::#{name}"
       end

data/lib/solargraph/pin/conversions.rb

@@ -4,10 +4,10 @@ module Solargraph
     module Conversions
       # @return [Hash]
       def completion_item
-        {
+        @completion_item ||= {
           label: name,
           kind: completion_item_kind,
-          detail: completion_item_detail,
+          detail: detail,
           data: {
             path: path,
             return_type: return_type,
@@ -18,50 +18,43 @@ module Solargraph
 
       # @return [Hash]
       def resolve_completion_item
-        extra = {}
-        alldoc = ''
-        alldoc += link_documentation(path) unless path.nil?
-        alldoc += "\n\n" unless alldoc.empty?
-        alldoc += documentation unless documentation.nil?
-        extra[:documentation] = alldoc unless alldoc.empty?
-        completion_item.merge(extra)
-      end
-
-      # @todo Candidate for deprecation
-      # @param api_map [Solargraph::ApiMap]
-      def hover
-        info = ''
-        if self.kind_of?(Solargraph::Pin::BaseVariable)
-          info.concat link_documentation(return_type) unless return_type.nil?
-        else
-          info.concat link_documentation(path) unless path.nil?
+        if @resolve_completion_item.nil?
+          extra = {}
+          alldoc = ''
+          alldoc += link_documentation(path) unless path.nil?
+          alldoc += "\n\n" unless alldoc.empty?
+          alldoc += documentation unless documentation.nil?
+          extra[:documentation] = alldoc unless alldoc.empty?
+          @resolve_completion_item = completion_item.merge(extra)
         end
-        info.concat "\n\n#{documentation}"
-        info
+        @resolve_completion_item
       end
 
       # @return [Hash]
       def signature_help
-        {
+        @signature_help ||= {
           label: name + '(' + parameters.join(', ') + ')',
           documentation: documentation
         }
       end
 
-      private
-
-      def completion_item_detail
-        detail = ''
-        detail += "(#{parameters.join(', ')}) " unless kind != Pin::METHOD or parameters.empty?
-        detail += "=> #{return_type}" unless return_type.nil?
-        return nil if detail.empty?
-        detail
+      # @return [String]
+      def detail
+        if @detail.nil?
+          @detail = ''
+          @detail += "(#{parameters.join(', ')}) " unless kind != Pin::METHOD or parameters.empty?
+          @detail += "=> #{return_type}" unless return_type.nil?
+          @detail.strip!
+        end
+        return nil if @detail.empty?
+        @detail
       end
 
+      private
+
       def link_documentation path
-        uri = "solargraph:/document?query=" + URI.encode(path)
-        "[#{path}](#{uri})"
-      end  
+        @link_documentation ||= "[#{path}](solargraph:/document?query=#{URI.encode(path)})"
+      end
     end
   end
 end

data/lib/solargraph/pin/localized.rb

@@ -6,7 +6,7 @@ module Solargraph
       # @return [Source::Range]
       attr_reader :presence
 
-      # @param other [Pin::Block] The caller's block
+      # @param other [Pin::Base] The caller's block
       # @param position [Source::Position] The caller's position
       # @return [Boolean]
       def visible_from?(other, position)

data/lib/solargraph/pin/method.rb

@@ -24,6 +24,11 @@ module Solargraph
         Solargraph::LanguageServer::CompletionItemKinds::METHOD
       end
 
+      # @return [Integer]
+      def symbol_kind
+        LanguageServer::SymbolKinds::METHOD
+      end
+
       def return_type
         if @return_type.nil? and !docstring.nil?
           tag = docstring.tag(:return)

data/lib/solargraph/pin/namespace.rb

@@ -42,6 +42,11 @@ module Solargraph
         (type == :class ? LanguageServer::CompletionItemKinds::CLASS : LanguageServer::CompletionItemKinds::MODULE)
       end
 
+      # @return [Integer]
+      def symbol_kind
+        (type == :class ? LanguageServer::SymbolKinds::CLASS : LanguageServer::SymbolKinds::MODULE)
+      end
+
       def path
         @path ||= (namespace.empty? ? '' : "#{namespace}::") + name
       end

data/lib/solargraph/shell.rb

@@ -35,6 +35,20 @@ module Solargraph
       end
     end
 
+    desc 'stdio', 'Run a Solargraph stdio server'
+    def stdio
+      EventMachine.run do
+        Signal.trap("INT") do
+          EventMachine.stop
+        end
+        Signal.trap("TERM") do
+          EventMachine.stop
+        end
+        Solargraph::LanguageServer::Transport::Stdio.run
+        STDERR.puts "Solargraph is listening on stdio PID=#{Process.pid}"
+      end
+    end
+
     desc 'suggest', 'Get code suggestions for the provided input'
     long_desc <<-LONGDESC
       Analyze a Ruby file and output a list of code suggestions in JSON format.

data/lib/solargraph/source/fragment.rb

@@ -227,6 +227,18 @@ module Solargraph
         @base_literal
       end
 
+      def literal?
+        !literal.nil?
+      end
+
+      def literal
+        if @literal.nil? and !@calculated_actual_literal
+          @calculated_actual_literal = true
+          pn = @source.node_at(line, column)
+          @literal = infer_literal_node_type(pn)
+        end
+      end
+
       private
 
       # @return [Integer]

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.22.0'
+  VERSION = '0.23.0'
 end

data/lib/solargraph/workspace/config.rb

@@ -88,9 +88,7 @@ module Solargraph
       def process_globs globs
         result = []
         globs.each do |glob|
-          Dir[File.join workspace, glob].each do |f|
-            result.push File.realdirpath(f).gsub(/\\/, '/')
-          end
+          result.concat Dir[File.join workspace, glob].map{ |f| f.gsub(/\\/, '/') }
         end
         result
       end
@@ -98,7 +96,7 @@ module Solargraph
       def process_exclusions globs
         remainder = globs.select do |glob|
           if glob_is_directory?(glob)
-            exdir = File.realdirpath(File.join(workspace, glob_to_directory(glob)))
+            exdir = File.join(workspace, glob_to_directory(glob))
             included.delete_if { |file| file.start_with?(exdir) }
             false
           else

data/lib/solargraph/yard_map.rb

@@ -238,6 +238,8 @@ module Solargraph
     end
 
     def objects path, space = ''
+      cached = cache.get_objects(path, space)
+      return cached unless cached.nil?
       result = []
       yardocs.each { |y|
         yard = load_yardoc(y)
@@ -251,6 +253,7 @@ module Solargraph
       @stdlib_namespaces.each do |ns|
         result.push Pin::YardObject.new(ns, object_location(ns)) if ns.path == path
       end
+      cache.set_objects(path, space, result)
       result
     end
 
@@ -272,6 +275,7 @@ module Solargraph
 
     private
 
+    # @return [Solargraph::YardMap::Cache]
     def cache
       @cache ||= Cache.new
     end

data/lib/solargraph/yard_map/cache.rb

@@ -4,6 +4,7 @@ module Solargraph
       @constants = {}
       @methods = {}
       @instance_methods = {}
+      @objects = {}
     end
 
     def set_constants namespace, scope, suggestions
@@ -30,5 +31,12 @@ module Solargraph
       @instance_methods[[namespace, scope, visibility]]
     end
 
+    def set_objects path, space, pins
+      @objects[[path, space]] = pins
+    end
+
+    def get_objects path, space
+      @objects[[path, space]]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -295,6 +295,7 @@ files:
 - lib/solargraph/language_server/transport.rb
 - lib/solargraph/language_server/transport/data_reader.rb
 - lib/solargraph/language_server/transport/socket.rb
+- lib/solargraph/language_server/transport/stdio.rb
 - lib/solargraph/language_server/uri_helpers.rb
 - lib/solargraph/library.rb
 - lib/solargraph/live_map.rb