solargraph 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a227df553c29a37fd42a7e7c1ed0a41f2c064dc2
-  data.tar.gz: f57a9a06b0495086c981cb2f8bbf29ffaab2c3a3
+  metadata.gz: 642ac02a775d6f81c76137c676057b4fefe524c2
+  data.tar.gz: 79357368d35da0297313c3085aa9127f333d14b3
 SHA512:
-  metadata.gz: 9e8831205c0924300465d6b40ed210bfc865ba1315ef98ab2d7bfe74f0b56b0e0386a43e0a17cf131a60e1abe745a4355b463f33e2ae0ec5fec98ab4d7f2bcac
-  data.tar.gz: ee879308f132f039e0721afe9218d51566402227409e7e86034bb918bf0f1ada9503ae1912d0b1b2c733ba922bc8087b52db7177918ff025598147fe8bc69c8b
+  metadata.gz: f4a69583c1cf3962a447cfb2e7e512de1046ca013aab9ebfffed46d87f4551dec1b9aacbcc9d04dc41c9fd61dcdad0383ffeecf8cb6d0818f781d04630b29893
+  data.tar.gz: f47ff7d37744cfba9572aee11539710d886c4e1e7a6299f82a977d1e2d036a7398ad1d0b622fe0f456c355efe1fde94d4774e0493c91ba46202437c50f961351

data/lib/solargraph/api_map.rb

@@ -276,7 +276,7 @@ module Solargraph
     # @param scope [Symbol] :instance or :class
     # @return [Array<Solargraph::Pin::InstanceVariable>]
     def get_instance_variable_pins(namespace, scope = :instance)
-      suggest_unique_variables (@ivar_pins[namespace] || []).select{ |pin| pin.scope == scope }
+      suggest_unique_variables((@ivar_pins[namespace] || []).select{ |pin| pin.scope == scope })
     end
 
     # Get an array of class variable pins for a namespace.
@@ -303,11 +303,11 @@ module Solargraph
 
     # @return [Solargraph::Source]
     def get_source_for(node)
-      matches = []
+      return @virtual_source if !@virtual_source.nil? and @virtual_source.include?(node)
       @sources.each do |source|
-        matches.push source if source.include?(node)
+        return source if source.include?(node)
       end
-      matches.first
+      nil
     end
 
     # @return [Array<Solargraph::Pin::GlobalVariable>]
@@ -399,13 +399,13 @@ module Solargraph
         elsif fragment.signature.start_with?('@')
           result.concat get_instance_variable_pins(fragment.namespace, fragment.scope)
         elsif fragment.signature.start_with?('$')
-          result.concat get_global_variable_pins
+          result.concat suggest_unique_variables(get_global_variable_pins)
         elsif fragment.signature.start_with?(':') and !fragment.signature.start_with?('::')
           result.concat get_symbols
         else
           unless fragment.signature.include?('::')
-            result.concat fragment.local_variable_pins
-            result.concat get_type_methods(fragment.namespace, fragment.namespace)
+            result.concat suggest_unique_variables(fragment.local_variable_pins)
+            result.concat get_type_methods(combine_type(fragment.namespace, fragment.scope), fragment.namespace)
             result.concat ApiMap.keywords
           end
           result.concat get_constants(fragment.base, fragment.namespace)
@@ -425,7 +425,7 @@ module Solargraph
     def define fragment
       return [] if fragment.string? or fragment.comment?
       pins = infer_signature_pins fragment.whole_signature, fragment.namespace, fragment.scope, fragment.node
-      return [] if pins.empty?
+      return pins if pins.empty?
       if pins.first.variable?
         result = []
         pins.select{|pin| pin.variable?}.each do |pin|
@@ -438,13 +438,10 @@ module Solargraph
       end
     end
 
-    # Identify the variable, constant, or method call at the fragment's location.
-    #
-    # @param fragment [Solargraph::Source::Fragment]
-    # @return [Array<Solargraph::Pin::Base>]
-    def identify fragment
-      pins = infer_signature_pins(fragment.whole_signature, fragment.namespace, fragment.scope, fragment.node)
-      pins.each { |pin| pin.resolve self }
+    def signify fragment
+      return [] unless fragment.argument?
+      pins = infer_signature_pins(fragment.recipient.whole_signature, fragment.recipient.namespace, fragment.recipient.scope, fragment.recipient.node)
+      # pins.each{|pin| pin.resolve self}
       pins
     end
 
@@ -480,7 +477,7 @@ module Solargraph
         end
         source = get_source_for(call_node)
         unless source.nil?
-          lvpins = source.local_variable_pins.select{|pin| pin.name == base and pin.visible_from?(call_node)}
+          lvpins = suggest_unique_variables(source.local_variable_pins.select{|pin| pin.name == base and pin.visible_from?(call_node)})
           unless lvpins.empty?
             if rest.nil?
               return lvpins
@@ -886,7 +883,7 @@ module Solargraph
 
     # @todo DRY this method. It's duplicated in CodeMap
     def get_subtypes type
-      return nil if type.nil?
+      return [] if type.nil?
       match = type.match(/<([a-z0-9_:, ]*)>/i)
       return [] if match.nil?
       match[1].split(',').map(&:strip)

data/lib/solargraph/diagnostics/rubocop.rb

@@ -0,0 +1,66 @@
+require 'open3'
+require 'shellwords'
+
+module Solargraph
+  module Diagnostics
+    class Rubocop
+      def initialize
+      end
+
+      # @return [Array<Hash>]
+      def diagnose text, filename
+        begin
+          cmd = "rubocop -f j -s #{Shellwords.escape(filename)}"
+          o, e, s = Open3.capture3(cmd, stdin_data: text)
+          make_array text, JSON.parse(o)
+        rescue Exception => e
+          STDERR.puts "#{e}"
+          STDERR.puts "#{e.backtrace}"
+          nil
+        end
+      end
+
+      private
+
+      def make_array text, resp
+        severities = {
+          'refactor' => 4,
+          'convention' => 3,
+          'warning' => 2,
+          'error' => 1,
+          'fatal' => 1
+        }
+        diagnostics = []
+        resp['files'].each do |file|
+          file['offenses'].each do |off|
+            if off['location']['start_line'] != off['location']['last_line']
+              last_line = off['location']['start_line']
+              last_column = 0
+            else
+              last_line = off['location']['last_line'] - 1
+              last_column = off['location']['last_column']
+            end
+            diag = {
+              range: {
+                start: {
+                  line: off['location']['start_line'] - 1,
+                  character: off['location']['start_column'] - 1
+                },
+                end: {
+                  line: last_line,
+                  character: last_column
+                }
+              },
+              # 1 = Error, 2 = Warning, 3 = Information, 4 = Hint
+              severity: severities[off['severity']],
+              source: off['cop_name'],
+              message: off['message'].gsub(/^#{off['cop_name']}\:/, '')
+            }
+            diagnostics.push diag
+          end
+        end
+        diagnostics
+      end
+    end
+  end
+end

data/lib/solargraph/diagnostics.rb

@@ -0,0 +1,5 @@
+module Solargraph
+  module Diagnostics
+    autoload :Rubocop, 'solargraph/diagnostics/rubocop'
+  end
+end

data/lib/solargraph/language_server/host.rb

@@ -1,5 +1,3 @@
-require 'open3'
-require 'shellwords'
 # require 'rubocop'
 require 'thread'
 require 'set'
@@ -164,6 +162,31 @@ module Solargraph
         library.read_text(filename)
       end
 
+      def completions_at filename, line, column
+        results = nil
+        @change_semaphore.synchronize do
+          results = library.completions_at filename, line, column
+        end
+        results
+      end
+
+      # @return [Array<Solargraph::Pin::Base>]
+      def definitions_at filename, line, column
+        results = nil
+        @change_semaphore.synchronize do
+          results = library.definitions_at(filename, line, column)
+        end
+        results
+      end
+
+      def signatures_at filename, line, column
+        results = nil
+        @change_semaphore.synchronize do
+          results = library.signatures_at(filename, line, column)
+        end
+        results
+      end
+
       private
 
       def start_change_thread
@@ -212,6 +235,7 @@ module Solargraph
 
       def start_diagnostics_thread
         Thread.new do
+          diagnoser = Diagnostics::Rubocop.new
           until stopped?
             if options['diagnostics'] != 'rubocop'
               @change_semaphore.synchronize { @diagnostics_queue.clear }
@@ -228,9 +252,21 @@ module Solargraph
                   already_changing = false
                   @change_semaphore.synchronize { already_changing = (changing?(current) or @diagnostics_queue.include?(current)) }
                   unless already_changing
-                    resp = read_diagnostics(current)
+                    filename = nil
+                    text = nil
+                    @change_semaphore.synchronize do
+                      filename = uri_to_file(current)
+                      text = library.read_text(filename)
+                    end
+                    results = diagnoser.diagnose text, filename
                     @change_semaphore.synchronize { already_changing = (changing?(current) or @diagnostics_queue.include?(current)) }
-                    publish_diagnostics current, resp unless already_changing
+                    # publish_diagnostics current, resp unless already_changing
+                    unless already_changing
+                      send_notification "textDocument/publishDiagnostics", {
+                        uri: current,
+                        diagnostics: results
+                      }
+                    end
                   end
                 end
               rescue Exception => e
@@ -246,60 +282,6 @@ module Solargraph
         return path if File::ALT_SEPARATOR.nil?
         path.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
       end
-
-      def read_diagnostics uri
-        begin
-          filename = nil
-          text = nil
-          @change_semaphore.synchronize do
-            filename = uri_to_file(uri)
-            text = library.read_text(filename)
-          end
-          cmd = "rubocop -f j -s #{Shellwords.escape(filename)}"
-          o, e, s = Open3.capture3(cmd, stdin_data: text)
-          JSON.parse(o)
-        rescue Exception => e
-          STDERR.puts "#{e}"
-          STDERR.puts "#{e.backtrace}"
-          nil
-        end
-      end
-
-      def publish_diagnostics uri, resp
-        severities = {
-          'refactor' => 4,
-          'convention' => 3,
-          'warning' => 2,
-          'error' => 1,
-          'fatal' => 1
-        }
-        diagnostics = []
-        resp['files'].each do |file|
-          file['offenses'].each do |off|
-            diag = {
-              range: {
-                start: {
-                  line: off['location']['start_line'] - 1,
-                  character: off['location']['start_column'] - 1
-                },
-                end: {
-                  line: off['location']['last_line'] - 1,
-                  character: off['location']['last_column']
-                }
-              },
-              # 1 = Error, 2 = Warning, 3 = Information, 4 = Hint
-              severity: severities[off['severity']],
-              source: off['cop_name'],
-              message: off['message'].gsub(/^#{off['cop_name']}\:/, '')
-            }
-            diagnostics.push diag
-          end
-        end
-        send_notification "textDocument/publishDiagnostics", {
-          uri: uri,
-          diagnostics: diagnostics
-        }
-      end
     end
   end
 end

data/lib/solargraph/language_server/message/completion_item/resolve.rb

@@ -9,7 +9,8 @@ module Solargraph
           def process
             pin = host.locate_pin params
             if pin.nil?
-              set_error(Solargraph::LanguageServer::ErrorCodes::INVALID_REQUEST, "Completion item could not be resolved")
+              # set_error(Solargraph::LanguageServer::ErrorCodes::INVALID_REQUEST, "Completion item could not be resolved")
+              set_result params
             else
               set_result(
                 params.merge(pin.resolve_completion_item)

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

@@ -10,24 +10,29 @@ module Solargraph
               start = Time.now
               processed = false
               until processed
-                host.synchronize do
-                  if host.changing?(params['textDocument']['uri'])
-                    # STDERR.puts "Waiting..."
-                    if Time.now - start > 1
-                      set_result empty_result
-                      processed = true
-                    end
-                  else
-                    inner_process
+                if host.changing?(params['textDocument']['uri'])
+                  if Time.now - start > 1
+                    set_error Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, 'Completion request timed out'
                     processed = true
                   end
+                else
+                  inner_process
+                  processed = true
                 end
                 sleep 0.1 unless processed
               end
             rescue Exception => e
               STDERR.puts e.message
               STDERR.puts e.backtrace
-              set_error ErrorCodes::INTERNAL_ERROR, e.message
+              # Ignore 'Invalid offset' errors, since they usually just mean
+              # that the document is in the process of changing.
+              if e.message.include?('Invalid offset')
+                # @todo Should this result be marked as incomplete? It might
+                #   be possible to resolve it after changes are finished.
+                set_result empty_result
+              else
+                set_error ErrorCodes::INTERNAL_ERROR, e.message
+              end
             end
           end
 
@@ -37,7 +42,7 @@ module Solargraph
             filename = uri_to_file(params['textDocument']['uri'])
             line = params['position']['line']
             col = params['position']['character']
-            completion = host.library.completions_at(filename, line, col)
+            completion = host.completions_at(filename, line, col)
             items = []
             idx = 0
             completion.pins.each do |pin|

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

@@ -3,17 +3,46 @@ require 'uri'
 module Solargraph::LanguageServer::Message::TextDocument
   class Hover < Base
     def process
-      filename = uri_to_file(params['textDocument']['uri'])
-      line = params['position']['line']
-      col = params['position']['character']
-      suggestions = host.library.definitions_at(filename, line, col)
-      contents = suggestions.map(&:hover)
-      set_result(
-        contents: {
-          kind: 'markdown',
-          value: contents.join("\n\n")
-        }
-      )
+      begin
+        filename = uri_to_file(params['textDocument']['uri'])
+        line = params['position']['line']
+        col = params['position']['character']
+        suggestions = host.definitions_at(filename, line, col)
+        # contents = suggestions.map(&:hover)
+        contents = []
+        last_path = nil
+        suggestions.each do |pin|
+          parts = []
+          this_path = nil
+          if pin.kind_of?(Solargraph::Pin::BaseVariable)
+            this_path = pin.return_type
+          else
+            this_path = pin.path
+          end
+          if !this_path.nil? and this_path != last_path
+            parts.push link_documentation(this_path)
+          end
+          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?
+        end
+        set_result(
+          contents: {
+            kind: 'markdown',
+            value: contents.join("\n\n")
+          }
+        )
+      rescue Exception => e
+        set_error Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, e.message
+      end
     end
+
+    private
+
+    # @todo: DRY this method. It exists in Conversions
+    def link_documentation path
+      uri = "solargraph:/document?query=" + URI.encode(path)
+      "[#{path}](#{uri})"
+    end  
   end
 end

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

@@ -4,6 +4,9 @@ module Solargraph
       module TextDocument
         class OnTypeFormatting < Base
           def process
+            # @todo Temporarily disabled
+            set_result []
+            return
             src = host.library.checkout(uri_to_file(params['textDocument']['uri']))
             offset = src.get_offset(params['position']['line'], params['position']['character'])
             if src.string_at?(offset-1) and params['ch'] == '{' and src.code[offset-2,2] == '#{'

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

@@ -7,11 +7,8 @@ module Solargraph
             filename = uri_to_file(params['textDocument']['uri'])
             line = params['position']['line']
             col = params['position']['character']
-            suggestions = host.library.signatures_at(filename, line, col)
-            info = []
-            suggestions.each do |s|
-              info.push s.signature_help
-            end
+            suggestions = host.signatures_at(filename, line, col)
+            info = suggestions.map(&:signature_help)
             set_result({
               signatures: info
             })

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

@@ -16,14 +16,22 @@ module Solargraph
             send_data tmp unless tmp.empty?
             EventMachine.stop if @host.stopped?
           end
+          @message_semaphore = Mutex.new
+          @message_stack = 0
         end
       
         def process request
           Thread.new do
+            @message_semaphore.synchronize do
+              @message_stack += 1
+            end
             message = @host.start(request)
             message.send
             tmp = @host.flush
             send_data tmp unless tmp.empty?
+            @message_semaphore.synchronize do
+              @message_stack -= 1
+            end
           end
         end
       

data/lib/solargraph/library.rb

@@ -74,7 +74,7 @@ module Solargraph
       # @type [Solargraph::Source]
       source = nil
       source = read(filename)
-      fragment = Solargraph::Source::Fragment.new(source, source.get_offset(line, column))
+      fragment = source.fragment_at(line, column)
       api_map.complete(fragment)
     end
 
@@ -87,7 +87,7 @@ module Solargraph
     # @return [Array<Solargraph::Pin::Base>]
     def definitions_at filename, line, column
       source = read(filename)
-      fragment = Solargraph::Source::Fragment.new(source, source.get_offset(line, column))
+      fragment = source.fragment_at(line, column)
       result = api_map.define(fragment)
       result
     end
@@ -101,8 +101,8 @@ module Solargraph
     # @return [Array<Solargraph::Pin::Base>]
     def signatures_at filename, line, column
       source = read(filename)
-      fragment = Solargraph::Source::Fragment.new(source, signature_index_before(source, source.get_offset(line, column)))
-      api_map.define(fragment).select{|pin| pin.method?}
+      fragment = source.fragment_at(line, column)
+      api_map.signify(fragment)
     end
 
     # Get the pin at the specified location or nil if the pin does not exist.
@@ -191,12 +191,13 @@ module Solargraph
     def api_map
       @api_map ||= Solargraph::ApiMap.new(workspace)
     end
-    
+
     # @return [Solargraph::Workspace]
     def workspace
       @workspace
     end
 
+    # @param filename [String]
     # @return [Solargraph::Source]
     def read filename
       source = source_hash[filename]
@@ -204,22 +205,5 @@ module Solargraph
       api_map.virtualize source
       source
     end
-
-    def signature_index_before source, index
-      open_parens = 0
-      cursor = index - 1
-      while cursor >= 0
-        break if cursor < 0
-        if source.code[cursor] == ')'
-          open_parens -= 1
-        elsif source.code[cursor] == '('
-          open_parens += 1
-        end
-        break if open_parens == 1
-        cursor -= 1
-      end
-      cursor = 0 if cursor < 0
-      cursor
-    end
   end
 end

data/lib/solargraph/pin/base_variable.rb

@@ -34,7 +34,7 @@ module Solargraph
       end
 
       def nil_assignment?
-        assignment_node.type == :nil
+        assignment_node.nil? or assignment_node.type == :nil
       end
 
       def signature

data/lib/solargraph/pin/conversions.rb

@@ -26,6 +26,7 @@ module Solargraph
         completion_item.merge(extra)
       end
 
+      # @todo Candidate for deprecation
       # @param api_map [Solargraph::ApiMap]
       def hover
         info = ''

data/lib/solargraph/pin/local_variable.rb

@@ -11,8 +11,8 @@ module Solargraph
         end
       end
 
-      def visible_from? node
-        parents = [node] + (source.tree_for(node) || [])
+      def visible_from? n
+        parents = [n] + (source.tree_for(n) || [])
         parents.each do |p|
           return true if @tree[0] == p
           return false if [:def, :defs, :class, :module].include?(p.type)

data/lib/solargraph/source/fragment.rb

@@ -1,51 +1,79 @@
 module Solargraph
   class Source
     class Fragment
-      # @return [Integer]
-      attr_reader :offset
-
       include NodeMethods
 
+      attr_reader :tree
+
+      attr_reader :line
+
+      attr_reader :column
+
       # @param source [Solargraph::Source]
-      # @param offset [Integer]
-      def initialize source, offset
+      # @param line [Integer]
+      # @param column [Integer]
+      def initialize source, line, column, tree
         # @todo Split this object from the source. The source can change; if
         #   it does, this object's data should not.
         @source = source
         @code = source.code
-        @offset = offset
+        @line = line
+        @column = column
+        @tree = tree
       end
 
       # Get the node at the current offset.
       #
       # @return [Parser::AST::Node]
       def node
-        @node ||= @source.node_at(@offset)
+        @node ||= @tree.first
       end
 
       # Get the fully qualified namespace at the current offset.
       #
       # @return [String]
       def namespace
+        # if @namespace.nil?
+        #   base = @source.parent_node_from(line, column, :class, :module, :def, :defs)
+        #   @namespace ||= @source.namespace_for(base)
+        # end
+        # @namespace
         if @namespace.nil?
-          base = @source.parent_node_from(@offset, :class, :module, :def, :defs)
-          @namespace ||= @source.namespace_for(base)
+          parts = []
+          @tree.each do |n|
+            next unless n.kind_of?(AST::Node)
+            if n.type == :class or n.type == :module
+              parts.unshift unpack_name(n.children[0])
+            end
+          end
+          @namespace = parts.join('::')
         end
         @namespace
       end
 
+      # @return [Boolean]
+      def argument?
+        @argument ||= !signature_position.nil?
+      end
+
+      # @return [Fragment]
+      def recipient
+        return nil if signature_position.nil?
+        @recipient ||= @source.fragment_at(*signature_position)
+      end
+
       # Get the scope at the current offset.
       #
       # @return [Symbol] :class or :instance
       def scope
         if @scope.nil?
           @scope = :class
-          tree = @source.tree_at(@offset)
+          tree = @tree.clone
           until tree.empty?
             cursor = tree.shift
             break if cursor.type == :class or cursor.type == :module
             if cursor.type == :def
-              pin = @source.method_pins.select{|pin| pin.contain?(@offset)}.first
+              pin = @source.method_pins.select{|pin| pin.contain?(offset)}.first
               # @todo The pin should never be nil here, but we're guarding it just in case
               @scope = (pin.nil? ? :instance : pin.scope)
             end
@@ -93,7 +121,7 @@ module Solargraph
       #
       # @return [String]
       def remainder
-        @remainder ||= remainder_at(@offset)
+        @remainder ||= remainder_at(offset)
       end
 
       # Get the whole word at the current offset, including the remainder.
@@ -118,28 +146,29 @@ module Solargraph
       #
       # @return [String]
       def phrase
-        @phrase ||= @code[signature_data[0]..@offset]
+        @phrase ||= @code[signature_data[0]..offset]
       end
 
       # Get the word before the current offset. Given the text `foo.bar`, the
       # word at offset 6 is `ba`.
       def word
-        @word ||= word_at(@offset)
+        @word ||= word_at(offset)
       end
 
       # True if the current offset is inside a string.
       #
       # @return [Boolean]
       def string?
-        @string = @source.string_at?(@offset) if @string.nil?
-        @string
+        # @string = @source.string_at?(offset) if @string.nil?
+        # @string
+        @string ||= (node.type == :str or node.type == :dstr)
       end
 
       # True if the current offset is inside a comment.
       #
       # @return [Boolean]
       def comment?
-        @comment = get_comment_at(@offset) if @comment.nil?
+        @comment = get_comment_at(offset) if @comment.nil?
         @comment
       end
 
@@ -147,7 +176,7 @@ module Solargraph
       #
       # @return [Range]
       def word_range
-        @word_range ||= word_range_at(@offset, false)
+        @word_range ||= word_range_at(offset, false)
       end
 
       # Get the range of the whole word at the current offset, including its
@@ -155,7 +184,7 @@ module Solargraph
       #
       # @return [Range]
       def whole_word_range
-        @whole_word_range ||= word_range_at(@offset, true)
+        @whole_word_range ||= word_range_at(offset, true)
       end
 
       # Get an array of all the local variables in the source that are visible
@@ -168,8 +197,23 @@ module Solargraph
 
       private
 
+      # @return [Integer]
+      def offset
+        if @offset.nil?
+          @offset = 0
+          feed = 0
+          @code.lines.each { |l|
+            break if line == feed
+            @offset += l.length
+            feed += 1
+          }
+          @offset += column
+        end
+        @offset
+      end
+
       def signature_data
-        @signature_data ||= get_signature_data_at(@offset)
+        @signature_data ||= get_signature_data_at(offset)
       end
 
       def get_signature_data_at index
@@ -184,7 +228,7 @@ module Solargraph
           unless !in_whitespace and string?
             break if brackets > 0 or parens > 0 or squares > 0
             char = @code[index, 1]
-            if brackets.zero? and parens.zero? and squares.zero? and [' ', "\n", "\t"].include?(char)
+            if brackets.zero? and parens.zero? and squares.zero? and [' ', "\r", "\n", "\t"].include?(char)
               in_whitespace = true
             else
               if brackets.zero? and parens.zero? and squares.zero? and in_whitespace
@@ -224,24 +268,30 @@ module Solargraph
           index -= 1
         end
         if signature.start_with?('.')
-          pn = @source.node_at(index)
-          unless pn.nil?
-            literal = infer_literal_node_type(pn)
-            unless literal.nil?
-              signature = "#{literal}.new#{signature}"
-              # @todo Determine the index from the beginning of the literal node?
+          # @todo Smelly exceptional case for arrays
+          if signature.start_with?('.[].')
+            signature.sub!(/^\.\[\]/, 'Array.new')
+          else
+            line, col = get_position_at(index - 1)
+            pn = @source.node_at(line, col)
+            unless pn.nil?
+              literal = infer_literal_node_type(pn)
+              unless literal.nil?
+                signature = "#{literal}.new#{signature}"
+                # @todo Determine the index from the beginning of the literal node?
+              end
             end
           end
         end
         [index + 1, signature]
-      end  
+      end
 
       # Determine if the specified index is inside a comment.
       #
       # @return [Boolean]
       def get_comment_at(index)
         return false if string?
-        line, col = Solargraph::Source.get_position_at(@source.code, index)
+        # line, col = get_position_at(index)
         @source.comments.each do |c|
           return true if index > c.location.expression.begin_pos and index <= c.location.expression.end_pos
         end
@@ -298,8 +348,8 @@ module Solargraph
         end
         end_offset = cursor
         end_offset = start_offset if end_offset < start_offset
-        start_pos = Solargraph::Source.get_position_at(@code, start_offset)
-        end_pos = Solargraph::Source.get_position_at(@code, end_offset)
+        start_pos = get_position_at(start_offset)
+        end_pos = get_position_at(end_offset)
         Solargraph::Source::Range.from_to(start_pos[0], start_pos[1], end_pos[0], end_pos[1])
       end
 
@@ -314,6 +364,56 @@ module Solargraph
         @code[index..cursor-1]
       end
 
+      def get_position_at(offset)
+        cursor = 0
+        line = 0
+        col = nil
+        @code.lines.each do |l|
+          if cursor + l.length > offset
+            col = offset - cursor
+            break
+          end
+          if cursor + l.length == offset
+            if l.end_with?("\n")
+              col = 0
+              line += 1
+              break
+            else
+              col = l.length
+              break
+            end
+          end
+          if cursor + l.length - 1 == offset and !l.end_with?("\n")
+            col = l.length - 1
+            break
+          end
+          cursor += l.length
+          line += 1
+        end
+        raise "Invalid offset" if col.nil?
+        [line, col]
+      end
+
+      def signature_position
+        if @signature_position.nil?
+          open_parens = 0
+          cursor = offset - 1
+          while cursor >= 0
+            break if cursor < 0
+            if @code[cursor] == ')'
+              open_parens -= 1
+            elsif @code[cursor] == '('
+              open_parens += 1
+            end
+            break if open_parens == 1
+            cursor -= 1
+          end
+          if cursor >= 0
+            @signature_position = get_position_at(cursor)
+          end
+        end
+        @signature_position
+      end
     end
   end
 end

data/lib/solargraph/source.rb

@@ -142,20 +142,12 @@ module Solargraph
       @node_tree[node] || []
     end
 
-    # Determine if the specified index is inside a string.
-    #
-    # @return [Boolean]
-    def string_at?(index)
-      n = node_at(index)
-      n.kind_of?(AST::Node) and (n.type == :str or n.type == :dstr)
-    end
-
     # Get the nearest node that contains the specified index.
     #
     # @param index [Integer]
     # @return [AST::Node]
-    def node_at(index)
-      tree_at(index).first
+    def node_at(line, column)
+      tree_at(line, column).first
     end
 
     # Get an array of nodes containing the specified index, starting with the
@@ -163,11 +155,22 @@ module Solargraph
     #
     # @param index [Integer]
     # @return [Array<AST::Node>]
-    def tree_at(index)
-      arr = []
-      arr.push @node
-      inner_node_at(index, @node, arr)
-      arr
+    def tree_at(line, column)
+      offset = get_parsed_offset(line, column)
+      @all_nodes.reverse.each do |n|
+        if n.respond_to?(:loc)
+          if n.respond_to?(:begin) and n.respond_to?(:end)
+            if offset >= n.begin.begin_pos and offset < n.end.end_pos
+              return [n] + @node_tree[n]
+            end
+          elsif !n.loc.expression.nil?
+            if offset >= n.loc.expression.begin_pos and offset < n.loc.expression.end_pos
+              return [n] + @node_tree[n]
+            end
+          end
+        end
+      end
+      [@node]
     end
 
     # Find the nearest parent node from the specified index. If one or more
@@ -176,8 +179,8 @@ module Solargraph
     # @param index [Integer]
     # @param types [Array<Symbol>]
     # @return [AST::Node]
-    def parent_node_from(index, *types)
-      arr = tree_at(index)
+    def parent_node_from(line, column, *types)
+      arr = tree_at(line, column)
       arr.each { |a|
         if a.kind_of?(AST::Node) and (types.empty? or types.include?(a.type))
           return a
@@ -219,20 +222,6 @@ module Solargraph
       self
     end
 
-    def get_offset line, col
-      Source.get_offset(code, line, col)
-    end
-
-    def self.get_offset text, line, col
-      offset = 0
-      if line > 0
-        text.lines[0..line - 1].each { |l|
-          offset += l.length
-        }
-      end
-      offset + col
-    end
-
     def overwrite text
       reparse({'text' => text})
     end
@@ -242,7 +231,7 @@ module Solargraph
       down = query.downcase
       all_symbols.select{|p| p.path.downcase.include?(down)}
     end
-    
+
     def all_symbols
       result = []
       result.concat namespace_pins
@@ -258,43 +247,44 @@ module Solargraph
 
     # @return [Solargraph::Source::Fragment]
     def fragment_at line, column
-      Fragment.new(self, get_offset(line, column))
+      # Fragment.new(self, line, column)
+      Fragment.new(self, line, column, tree_at(line, column))
     end
 
     private
 
-    def inner_node_at(index, node, arr)
-      node.children.each do |c|
-        if c.kind_of?(AST::Node) and c.respond_to?(:loc)
-          unless c.loc.expression.nil?
-            if index >= c.loc.expression.begin_pos
-              if c.respond_to?(:end)
-                if index < c.end.end_pos
-                  arr.unshift c
-                end
-              elsif index < c.loc.expression.end_pos
-                arr.unshift c
-              end
-            end
-          end
-          inner_node_at(index, c, arr)
-        end
+    def get_offset line, column, parsed
+      offset = 0
+      feed = 0
+      (parsed ? @code.gsub(/\r\n/, "\n") : @code).lines.each do |l|
+        break if line == feed
+        offset += l.length
+        feed += 1
       end
+      offset + column
+    end
+
+    def get_original_offset line, column
+      get_offset line, column, false
+    end
+
+    def get_parsed_offset line, column
+      get_offset line, column, true
     end
 
     def reparse change
       if change['range']
-        start_offset = Source.get_offset(@code, change['range']['start']['line'], change['range']['start']['character'])
-        end_offset = Source.get_offset(@code, change['range']['end']['line'], change['range']['end']['character'])
+        start_offset = get_original_offset(change['range']['start']['line'], change['range']['start']['character'])
+        end_offset = get_original_offset(change['range']['end']['line'], change['range']['end']['character'])
         rewrite = (start_offset == 0 ? '' : @code[0..start_offset-1].to_s) + change['text'].force_encoding('utf-8') + @code[end_offset..-1].to_s
         # return if @code == rewrite
         again = true
-        if change['text'].match(/^[^a-z0-9\s]+?$/i)
-          tmp = (start_offset == 0 ? '' : @fixed[0..start_offset-1].to_s) + change['text'].gsub(/[^\s]/, ' ') + @fixed[end_offset..-1].to_s
-          again = false
-        else
+        # if change['text'].match(/^[^a-z0-9\s]+?$/i)
+        #   tmp = (start_offset == 0 ? '' : @fixed[0..start_offset-1].to_s) + change['text'].gsub(/[^\s]/, ' ') + @fixed[end_offset..-1].to_s
+        #   again = false
+        # else
           tmp = rewrite
-        end
+        # end
         @code = rewrite
         begin
           node, comments = Source.parse(tmp, filename)
@@ -623,35 +613,35 @@ module Solargraph
         end
       end
 
-      def get_position_at(code, offset)
-        cursor = 0
-        line = 0
-        col = nil
-        code.each_line do |l|
-          if cursor + l.length > offset
-            col = offset - cursor
-            break
-          end
-          if cursor + l.length == offset
-            if l.end_with?("\n")
-              col = 0
-              line += 1
-              break
-            else
-              col = l.length
-              break
-            end
-          end
-          # if cursor + l.length - 1 == offset and !l.end_with?("\n")
-          #   col = l.length - 1
-          #   break
-          # end
-          cursor += l.length
-          line += 1
-        end
-        raise "Invalid offset" if col.nil?
-        [line, col]
-      end
+      # def get_position_at(code, offset)
+      #   cursor = 0
+      #   line = 0
+      #   col = nil
+      #   code.each_line do |l|
+      #     if cursor + l.length > offset
+      #       col = offset - cursor
+      #       break
+      #     end
+      #     if cursor + l.length == offset
+      #       if l.end_with?("\n")
+      #         col = 0
+      #         line += 1
+      #         break
+      #       else
+      #         col = l.length
+      #         break
+      #       end
+      #     end
+      #     # if cursor + l.length - 1 == offset and !l.end_with?("\n")
+      #     #   col = l.length - 1
+      #     #   break
+      #     # end
+      #     cursor += l.length
+      #     line += 1
+      #   end
+      #   raise "Invalid offset" if col.nil?
+      #   [line, col]
+      # end
 
       def parse code, filename = nil
         parser = Parser::CurrentRuby.new(FlawedBuilder.new)

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.18.1'
+  VERSION = '0.18.2'
 end

data/lib/solargraph.rb

@@ -19,6 +19,7 @@ module Solargraph
   autoload :Workspace,      'solargraph/workspace'
   autoload :Page,           'solargraph/page'
   autoload :Library,        'solargraph/library'
+  autoload :Diagnostics,    'solargraph/diagnostics'
 
   YARDOC_PATH = File.join(File.realpath(File.dirname(__FILE__)), '..', 'yardoc')
   YARD_EXTENSION_FILE = File.join(File.realpath(File.dirname(__FILE__)), 'yard-solargraph.rb')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -287,6 +287,8 @@ files:
 - lib/solargraph/api_map/completion.rb
 - lib/solargraph/api_map/source_to_yard.rb
 - lib/solargraph/core_fills.rb
+- lib/solargraph/diagnostics.rb
+- lib/solargraph/diagnostics/rubocop.rb
 - lib/solargraph/language_server.rb
 - lib/solargraph/language_server/completion_item_kinds.rb
 - lib/solargraph/language_server/error_codes.rb