solargraph 0.62.0 → 0.62.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b2496884d72c8abed7340388dc6bd09f8be728ba93724c6146366b51a12c595
-  data.tar.gz: b8f1be6afe684fc5a50349958937a12073dab1b7f5ff4574234e3ffaa57fc164
+  metadata.gz: 040b9387759644d50b1d7490a5d49a58f71f7e86e96d318b0754170ab71c6efe
+  data.tar.gz: 8c377973800407a29e98a7273d447eb4cb06d6c1f524c2df757643c434033d11
 SHA512:
-  metadata.gz: 3414b07c09f728a8418bf1fb97d58eeb57a8496819c4a8340595750e6f59d952f77ea0cc3ce2e44705894905f773d3073c793e987d5b0e92aeea8ed4c29e835d
-  data.tar.gz: eb38a46cf34401299101a91be9b1c113dd977784e6c17c25aae78e2554a932bb46ac7d822dd303753e353f2b1daba6cf8186d26807b418d2804e725f60dc2a14
+  metadata.gz: 8447cc0f561b0a17a3612f2cc354d3b8415ef4f4066af608b9b352a45b7c9ec4120622d5a61b81a5a2cd278740185ccec478edec9a7a72321c869be40b6967ce
+  data.tar.gz: 85ab9d988b7e61c63c07814e05e1d0df254fe276f3ccf4ed0adf682730297c6ba52515ab674d07d5b650c08edff87b8590dc814b71728d78f59c7d4f89d21c20

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.62.1 - November 4, 2026
+- Always report completion for workspace mapping progress (#1475)
+- Close attribute directives over their namespace (#1432)
+
 ## 0.62.0 - October 30, 2026
 - Fix false positive: Struct.new(keyword_init: true) members are optional (#1269)
 - Strip nil from or-expression fallbacks in conditional branch values (#1309)

data/lib/solargraph/language_server/host.rb

@@ -878,15 +878,23 @@ module Solargraph
       def sync_library_map library
         total = library.workspace.sources.length
         progress = Progress.new('Mapping workspace')
-        progress.begin "0/#{total} files", 0
-        progress.send self
-        while library.next_map
-          pct = ((library.source_map_hash.keys.length.to_f / total) * 100).to_i
-          progress.report "#{library.source_map_hash.keys.length}/#{total} files", pct
+        begin
+          progress.begin "0/#{total} files", 0
+          progress.send self
+          while library.next_map
+            mapped = library.source_map_hash.length
+            # The workspace can change while it's being mapped, e.g., when the
+            # user opens a file that wasn't included in the original scan. The
+            # progress should never report more than 100%.
+            total = mapped if mapped > total
+            # @sg-ignore Wrong argument type for Integer#/: arg_0 expected BigDecimal, received Integer
+            pct = total.zero? ? 100 : ((mapped * 100) / total).clamp(0, 100)
+            progress.report "#{mapped}/#{total} files", pct
+            progress.send self
+          end
+          progress.finish 'done'
           progress.send self
         end
-        progress.finish 'done'
-        progress.send self
       end
     end
   end

data/lib/solargraph/language_server/progress.rb

@@ -11,6 +11,12 @@ module Solargraph
       CREATED = :created
       FINISHED = :finished
 
+      # The number of seconds an idle notification can go without an update
+      # before it's refreshed. Some hosts dismiss progress notifications that
+      # haven't been updated recently.
+      #
+      KEEP_ALIVE_INTERVAL = 10
+
       # @return [String]
       attr_reader :uuid
 
@@ -43,21 +49,23 @@ module Solargraph
       def begin message, percentage
         @kind = 'begin'
         @message = message
-        @percentage = percentage
+        @percentage = clamp_percentage percentage
       end
 
       # @param message [String]
       # @param percentage [Integer]
       # @return [void]
       def report message, percentage
+        return if finished?
         @kind = 'report'
         @message = message
-        @percentage = percentage
+        @percentage = clamp_percentage percentage
       end
 
       # @param message [String]
       # @return [void]
       def finish message
+        return false if finished?
         @kind = 'end'
         @message = message
         @percentage = 100
@@ -67,13 +75,16 @@ module Solargraph
       # @param host [Solargraph::LanguageServer::Host]
       # @return [void]
       def send host
-        return unless host.client_supports_progress? && !finished?
-
-        message = build
-        create(host)
-        host.send_notification '$/progress', message
-        @status = FINISHED if kind == 'end'
-        keep_alive host
+        return unless host.client_supports_progress?
+        mutex.synchronize do
+          return if finished?
+          message = build
+          create host
+          host.send_notification '$/progress', message
+          @last = Time.now
+          @status = FINISHED if kind == 'end'
+          start_keep_alive host unless finished?
+        end
       end
 
       def created?
@@ -120,20 +131,47 @@ module Solargraph
         end
       end
 
+      # Keep idle notifications alive. Some hosts, including VS Code, stop
+      # responding to progress notifications that haven't been updated for a
+      # while, so a long-running job has to refresh its notification until it
+      # either reports again or finishes.
+      #
+      # The thread is only created once and exits as soon as the progress is
+      # finished or the host shuts down, so a completed notification can never
+      # be resurrected.
+      #
       # @param host [Host]
       # @return [void]
-      def keep_alive host
-        mutex.synchronize { @last = Time.now }
-        @keep_alive ||= Thread.new do
-          until finished?
-            sleep 10
-            break if finished?
-            next if mutex.synchronize { Time.now - @last < 10 }
-            send host
+      def start_keep_alive host
+        return if @keep_alive
+        @keep_alive = Thread.new do
+          loop do
+            sleep KEEP_ALIVE_INTERVAL
+            break if finished? || host.stopped?
+            next if mutex.synchronize { elapsed < KEEP_ALIVE_INTERVAL }
+            begin
+              send host
+            rescue StandardError
+              break
+            end
           end
         end
       end
 
+      # The number of seconds since the last notification was sent.
+      #
+      # @return [Float]
+      def elapsed
+        (Time.now - (@last ||= Time.now)).to_f
+      end
+
+      # @param percentage [Integer, nil]
+      # @return [Integer]
+      def clamp_percentage percentage
+        return 0 if percentage.nil?
+        percentage.to_i.clamp 0, 100
+      end
+
       # @return [Thread::Mutex]
       def mutex
         @mutex ||= Mutex.new

data/lib/solargraph/library.rb

@@ -481,15 +481,12 @@ module Solargraph
     def next_map
       return false if mapped?
       src = workspace.sources.find { |s| !source_map_hash.key?(s.filename) }
-      if src
-        Logging.logger.debug "Mapping #{src.filename}"
-        # @sg-ignore OK if src.filename is nil
-        source_map_hash[src.filename] = Solargraph::SourceMap.map(src)
-        # @sg-ignore OK if src.filename is nil
-        source_map_hash[src.filename]
-      else
-        false
-      end
+      return false if src.nil?
+      Logging.logger.debug "Mapping #{src.filename}"
+      # @sg-ignore OK if src.filename is nil
+      mutex.synchronize { source_map_hash[src.filename] = Solargraph::SourceMap.map(src) }
+      # @sg-ignore OK if src.filename is nil
+      source_map_hash[src.filename]
     end
 
     # @return [self]
@@ -615,6 +612,14 @@ module Solargraph
         end_cache_progress
         catalog
         sync_catalog
+      rescue StandardError => e
+        logger.warn "Error caching gemspec #{spec.name} #{spec.version}"
+        logger.warn e
+      ensure
+        # The progress notification has to be closed even if caching failed.
+        # Clients have no way to dismiss a notification that never receives an
+        # end.
+        end_cache_progress
       end
     end
 

data/lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = ENV.fetch('SOLARGRAPH_FORCE_VERSION', '0.62.0')
+  VERSION = ENV.fetch('SOLARGRAPH_FORCE_VERSION', '0.62.1')
 end

data/lib/solargraph/yard_map/directives/attribute_directive.rb

@@ -57,7 +57,10 @@ module Solargraph
         # @param [Position] position
         # @return [Pin::Closure]
         def closure_at pins, position
-          pins.select { |pin| pin.is_a?(Pin::Closure) and pin.location&.range&.contain?(position) }.last
+          # Skip the method the directive documents; attributes belong to its namespace
+          pins.select do |pin|
+            pin.is_a?(Pin::Closure) && !pin.is_a?(Pin::Method) && pin.location&.range&.contain?(position)
+          end.last
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.62.0
+  version: 0.62.1
 platform: ruby
 authors:
 - Fred Snyder