klenod-lsp 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c19da186ca2391c2bec38dfa3aa24e17458b7925d9dbb92b3f444e5782297a3
-  data.tar.gz: dfda5e93c14feb280fb601d1f0234e5f9c25718e9f30eb644845911e3ebfda6e
+  metadata.gz: 8177f2a77a4e5e7b60ae1c83dc1d5106ad639b1357291987260e1b7915e4bd6f
+  data.tar.gz: 3a84fbf499a587a1592188606bc6be5d354b85f64d8acb8b03fe4eabc77add25
 SHA512:
-  metadata.gz: 427d0cc60eaaafcc8418d3456e23f610806ad12327a56e9ae1f8ab0999c016c6bacc2c22c15cd6ff905e0e18895826218b109c6b851e0b581f5ea232e117f239
-  data.tar.gz: b0b4fac3a4632a9db230f2089b6395a650971cfef7de75b7b7773ac828ad5c3640c571fb924e5dd191c3f0f43ed732f9ce5be36c254f4c2d9651b5382f913a5f
+  metadata.gz: 98dc6548b480686f3b577787663feac6a6a4d3e0315eb71a96962986bdb60de975e4078df05369d670a6455733d1028dc89098983e73a4264fcb6ad43089ba53
+  data.tar.gz: 1ae98c5232a88076529ed9828a0317dc35a532f65ce850abe88c7b2af016270c6f85c87ee9864b49fb0735065addcc6041de155fa485905794f19b2267333b5e

data/lib/klenod/lsp/diagnostics.rb

@@ -58,6 +58,29 @@ module Klenod
         }.uniq { |diagnostic| [diagnostic.range.start.line, diagnostic.message] }
       end
 
+      # A failure the graph index recorded while collecting this module that
+      # analysis alone cannot see, such as a named import of a constant the
+      # target does not define: analysis only transforms and resolves, it never
+      # collects the target's record. The index refreshes on save, so the
+      # diagnostic is only shown while the document still contains the import
+      # it refers to.
+      def index_failure(analysis, index, syntax: Languages::Syntax::Ruby)
+        error = index&.failed&.[](analysis.module_id.to_s)
+        return [] unless error.is_a?(Klenod::Build::MissingExportError)
+        return [] unless error.module_id.to_s == analysis.module_id.to_s
+
+        lines = analysis.lines
+        report = error.cause
+        span = literal_spans(report.dependency.specifier.to_s, lines, syntax: syntax).find do |candidate|
+          named_import_span?(candidate, report.name, lines)
+        end
+        return [] unless span
+
+        message = "#{error.kind}: #{error.detail}"
+        message = "#{message}\n#{error.hints.join("\n")}" unless error.hints.empty?
+        [diagnostic(span, message)]
+      end
+
       def resolve_errors(analysis, lines, syntax)
         analysis.resolve_errors.map do |error|
           diagnostic(resolve_error_span(error, lines, syntax), error.message)
@@ -93,6 +116,14 @@ module Klenod
         spans
       end
 
+      # The same module can be imported more than once with different names.
+      # Match the name immediately following this literal rather than selecting
+      # the first matching specifier and inspecting its whole line.
+      def named_import_span?(span, name, lines)
+        suffix = lines[span.start.line].to_s[span.end.character..]
+        suffix&.match?(%r{\A["']\s*,\s*:#{Regexp.escape(name.to_s)}(?=\s*\))})
+      end
+
       def diagnostic(span, message)
         Interface::Diagnostic.new(
           range: span.to_range,

data/lib/klenod/lsp/languages/haml.rb

@@ -23,6 +23,7 @@ module Klenod
 
         def diagnostics(analysis, workspace = nil, index = nil)
           diagnostics = Diagnostics.for_analysis(analysis)
+          diagnostics.concat(Diagnostics.index_failure(analysis, index))
           diagnostics.concat(Classes.diagnostics(analysis, workspace, index)) if workspace && index
           diagnostics.concat(Props.diagnostics(analysis, workspace, index)) if workspace && index
           diagnostics.concat(unused_binding_diagnostics(analysis))

data/lib/klenod/lsp/languages/ruby.rb

@@ -15,8 +15,8 @@ module Klenod
 
         Interface = LanguageServer::Protocol::Interface
 
-        def diagnostics(analysis, _workspace = nil, _index = nil)
-          Diagnostics.for_analysis(analysis) + unused_binding_diagnostics(analysis)
+        def diagnostics(analysis, _workspace = nil, index = nil)
+          Diagnostics.for_analysis(analysis) + Diagnostics.index_failure(analysis, index) + unused_binding_diagnostics(analysis)
         end
 
         def document_symbols(analysis)

data/lib/klenod/lsp/server.rb

@@ -371,11 +371,11 @@ module Klenod
 
         @pending_collections.delete(document.uri)&.stop
         @pending_collections[document.uri] =
-          @task.async do |task|
-            task.sleep(DIAGNOSTICS_DEBOUNCE)
+          @task.async do
+            Kernel.sleep(DIAGNOSTICS_DEBOUNCE)
             publish_diagnostics(document)
             overlay(document)
-            task.sleep(COLLECTION_DEBOUNCE - DIAGNOSTICS_DEBOUNCE)
+            Kernel.sleep(COLLECTION_DEBOUNCE - DIAGNOSTICS_DEBOUNCE)
             @pending_collections.delete(document.uri)
             @index.ensure_collected(document.module_id, force: true)
           end

data/lib/klenod/lsp/version.rb

@@ -2,6 +2,6 @@
 
 module Klenod
   module LSP
-    VERSION = "0.0.16"
+    VERSION = "0.0.17"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-lsp
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Andrés Alin
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.17
 - !ruby/object:Gem::Dependency
   name: language_server-protocol
   requirement: !ruby/object:Gem::Requirement