solargraph 0.43.0 → 0.43.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89a1a9d76094688ff7ebe1af3dec4452c379819408ffc458eddcd75f5b66d2eb
-  data.tar.gz: 9b03143ba896ccd2d3bd0a44c9a1e90f06e3ed757a47a08e6b8aaf2a9f56e62e
+  metadata.gz: 48b532bf77bb72b9d2d111605cc86e97a21c372319a041ef5c4dfbd03a2b98d1
+  data.tar.gz: da953eea90b1215a794783723898277abe33a4b74e585eeb710f231b824321b7
 SHA512:
-  metadata.gz: a6d4e99416af96a8a11ca569d096f4ba1491155f3fde1efc734e59c73d1794007d0b7b1e936c1dfb248472df1fa679c7701866176de99119e8f6a0b8eef721d4
-  data.tar.gz: edd612d341e6c9bb421e4bbb8db04badc855e924eca469c47943c374813025810151aca1abdd0da13100597803799a50c7355a362b8a0ae65187c0760464e840
+  metadata.gz: c3f55a7eb1f0b08247d70f7a2c28422b6444e5102a96c7c9da88b5b9b5f558732f97dc186e6dc53650bd5af20747066dbf53272a15527f000607fca17583e6da
+  data.tar.gz: 7224059b6b2c757049bf27c4140c54063b035b13eeaf93f30c521393c5e8c863b72843c28edbfb9cbe2980fe28f79006195926f9c8bf79b204dd08a9895ec1e8

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.43.1
+- Complete nested namespaces in open gates
+- SourceMap::Mapper reports filename for encoding errors (#474)
+- Handle request on a specific thread, and cancel completion when there has newer completion request (#459)
+- Fix namespace links generated by views/_method.erb (#472)
+- Source handles long squiggly heredocs (#460)
+
 ## 0.43.0 - July 25, 2021
 - Correct arity checks when restarg precedes arg (#418)
 - Improve the performance of catalog by 4 times (#457)

data/README.md

@@ -34,7 +34,8 @@ Plug-ins and extensions are available for the following editors:
     * GitHub: https://github.com/autozimu/LanguageClient-neovim
 
 * **Emacs**
-    * GitHub: https://github.com/guskovd/emacs-solargraph
+    * GitHub: `eglot.el`, https://github.com/joaotavora/eglot
+    * GitHub: `lsp-mode.el`, https://github.com/emacs-lsp/lsp-mode
 
 * **Eclipse**
     * Plugin: https://marketplace.eclipse.org/content/ruby-solargraph

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    class Host
+      # A serial worker Thread to handle message.
+      #
+      # this make check pending message possible, and maybe cancelled to speedup process
+      class MessageWorker
+        # @param host [Host]
+        def initialize(host)
+          @host = host
+          @mutex = Mutex.new
+          @resource = ConditionVariable.new
+          @stopped = true
+        end
+
+        # pending handle messages
+        def messages
+          @messages ||= []
+        end
+
+        def stopped?
+          @stopped
+        end
+        def stop
+          @stopped = true
+        end
+
+        # @param message the message should be handle. will pass back to Host#receive
+        def queue(message)
+          @mutex.synchronize {
+            messages.push(message)
+            @resource.signal
+          }
+        end
+
+        def start
+          return unless @stopped
+          @stopped = false
+          Thread.new do
+            tick until stopped?
+          end
+        end
+        def tick
+          message = @mutex.synchronize {
+            @resource.wait(@mutex) if messages.empty?
+            messages.shift
+          }
+          message = @host.receive(message)
+          message && message.send_response
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/language_server/host.rb

@@ -12,10 +12,12 @@ module Solargraph
     # safety for multi-threaded transports.
     #
     class Host
-      autoload :Diagnoser, 'solargraph/language_server/host/diagnoser'
-      autoload :Cataloger, 'solargraph/language_server/host/cataloger'
-      autoload :Sources,   'solargraph/language_server/host/sources'
-      autoload :Dispatch,  'solargraph/language_server/host/dispatch'
+      autoload :Diagnoser,     'solargraph/language_server/host/diagnoser'
+      autoload :Cataloger,     'solargraph/language_server/host/cataloger'
+      autoload :Sources,       'solargraph/language_server/host/sources'
+      autoload :Dispatch,      'solargraph/language_server/host/dispatch'
+      autoload :MessageWorker, 'solargraph/language_server/host/message_worker'
+
 
       include UriHelpers
       include Logging
@@ -45,6 +47,7 @@ module Solargraph
         diagnoser.start
         cataloger.start
         sources.start
+        message_worker.start
       end
 
       # Update the configuration options with the provided hash.
@@ -89,8 +92,13 @@ module Solargraph
         @cancel_semaphore.synchronize { @cancel.delete id }
       end
 
+      # called by adapter, to handle the request
+      def process request
+        message_worker.queue(request)
+      end
+
       # Start processing a request from the client. After the message is
-      # processed, the transport is responsible for sending the response.
+      # processed, caller is responsible for sending the response.
       #
       # @param request [Hash] The contents of the message.
       # @return [Solargraph::LanguageServer::Message::Base] The message handler.
@@ -451,6 +459,7 @@ module Solargraph
       def stop
         return if @stopped
         @stopped = true
+        message_worker.stop
         cataloger.stop
         diagnoser.stop
         sources.stop
@@ -513,6 +522,11 @@ module Solargraph
         library.completions_at uri_to_file(uri), line, column
       end
 
+      # @return [Bool] if has pending completion request
+      def has_pending_completions?
+        message_worker.messages.reverse_each.any? { |req| req['method'] == 'textDocument/completion' }
+      end
+
       # @param uri [String]
       # @param line [Integer]
       # @param column [Integer]
@@ -646,6 +660,11 @@ module Solargraph
 
       private
 
+      # @return [MessageWorker]
+      def message_worker
+        @message_worker ||= MessageWorker.new(self)
+      end
+
       # @return [Diagnoser]
       def diagnoser
         @diagnoser ||= Diagnoser.new(self)

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

@@ -62,10 +62,14 @@ module Solargraph
         def send_response
           return if id.nil?
           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 #{method}"
-            return
+            set_result nil
+            set_error ErrorCodes::REQUEST_CANCELLED, "cancelled by client"
+          else
+            Solargraph::Logging.logger.info "Sending response to #{method}"
           end
-          Solargraph::Logging.logger.info "Sending response to #{method}"
           response = {
             jsonrpc: "2.0",
             id: id,

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

@@ -6,6 +6,8 @@ module Solargraph
       module TextDocument
         class Completion < Base
           def process
+            return set_error(ErrorCodes::REQUEST_CANCELLED, "cancelled by so many request") if host.has_pending_completions?
+
             line = params['position']['line']
             col = params['position']['character']
             begin

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

@@ -41,8 +41,7 @@ module Solargraph
         # @param request [String]
         # @return [void]
         def process request
-          message = @host.receive(request)
-          message && message.send_response
+          @host.process(request)
         end
 
         def shutdown

data/lib/solargraph/parser/comment_ripper.rb

@@ -2,7 +2,7 @@ require 'ripper'
 
 module Solargraph
   module Parser
-    class CommentRipper < Ripper::SexpBuilder
+    class CommentRipper < Ripper::SexpBuilderPP
       def initialize src, filename = '(ripper)', lineno = 0
         super
         @buffer = src

data/lib/solargraph/parser/legacy/class_methods.rb

@@ -103,6 +103,31 @@ module Solargraph
           en = Position.new(node.loc.last_line, node.loc.last_column)
           Range.new(st, en)
         end
+
+        def string_ranges node
+          return [] unless is_ast_node?(node)
+          result = []
+          if node.type == :str
+            result.push Range.from_node(node)
+          elsif node.type == :dstr
+            here = Range.from_node(node)
+            there = Range.from_node(node.children[1])
+            result.push Range.new(here.start, there.start)
+          end
+          node.children.each do |child|
+            result.concat string_ranges(child)
+          end
+          if node.type == :dstr && node.children.last.nil?
+            # result.push Range.new(result.last.ending, result.last.ending)
+            last = node.children[-2]
+            unless last.nil?
+              rng = Range.from_node(last)
+              pos = Position.new(rng.ending.line, rng.ending.column - 1)
+              result.push Range.new(pos, pos)
+            end
+          end
+          result
+        end  
       end
     end
   end

data/lib/solargraph/pin/namespace.rb

@@ -22,12 +22,18 @@ module Solargraph
           @closure = Solargraph::Pin::ROOT_PIN
         end
         @open_gates = gates
-        if @open_gates.one? && @open_gates.first.empty? && @name.include?('::')
+        if @name.include?('::')
           # In this case, a chained namespace was opened (e.g., Foo::Bar)
           # but Foo does not exist.
           parts = @name.split('::')
           @name = parts.pop
-          @closure = Pin::Namespace.new(name: parts.join('::'), gates: [parts.join('::')])
+          closure_name = if [Solargraph::Pin::ROOT_PIN, nil].include?(closure)
+            ''
+          else
+            closure.full_context.namespace + '::'
+          end
+          closure_name += parts.join('::')
+          @closure = Pin::Namespace.new(name: closure_name, gates: [parts.join('::')])
           @context = nil
         end
       end

data/lib/solargraph/source_map/mapper.rb

@@ -204,6 +204,8 @@ module Solargraph
           com_pos = Position.new(line + 1 - comments.lines.length, 0)
           process_comment(src_pos, com_pos, comments)
         end
+      rescue StandardError => e
+        raise e.class, "Error processing comment directives in #{@filename}: #{e.message}"
       end
     end
   end

data/lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.43.0'
+  VERSION = '0.43.1'
 end

data/lib/solargraph/views/_method.erb

@@ -2,7 +2,7 @@
     Namespace:
 </h2>
 <p>
-    <a href="command:solargraph._openDocument?<%= CGI.escape "\"solargraph:/document?query=#{object.namespace}\"" %>"><%= object.namespace %></a>
+    <a href="solargraph:/document?query=<%= CGI.escape object.namespace.path %>"><%= object.namespace %></a>
 </p>
 <h2>
     Overview:

data/lib/solargraph.rb

@@ -57,6 +57,7 @@ module Solargraph
   # A helper method that runs Bundler.with_unbundled_env or falls back to
   # Bundler.with_clean_env for earlier versions of Bundler.
   #
+  # @return [void]
   def self.with_clean_env &block
     meth = if Bundler.respond_to?(:with_unbundled_env)
       :with_unbundled_env

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.43.0
+  version: 0.43.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -350,6 +350,7 @@ files:
 - lib/solargraph/language_server/host/cataloger.rb
 - lib/solargraph/language_server/host/diagnoser.rb
 - lib/solargraph/language_server/host/dispatch.rb
+- lib/solargraph/language_server/host/message_worker.rb
 - lib/solargraph/language_server/host/sources.rb
 - lib/solargraph/language_server/message.rb
 - lib/solargraph/language_server/message/base.rb