klenod-lsp 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d5602eca5221374939807c3f33d43a9ac7794453a73b049e579a77ac229b551
-  data.tar.gz: 8dd3d801a3a62fc2405b84a221afef3a8ca9b2577a0a33bc3ac73a3a26579651
+  metadata.gz: f41f8fc46c0ec27d4ac70f84f6e60f9d3ad44f9fb50fafe7b4c13d71f935e071
+  data.tar.gz: 418a82a7691f2f70927806291379740e789d14795aa6e3afe8e2dbbee1825a74
 SHA512:
-  metadata.gz: cd906ff2ed13c6ab65b62b7215b5d8db1fe2b1999a41a0cd517d9dbe7a44f9ffb0729925c3eed473836f2fab32e61d478d58780445f504e3d13d19a0c10ca829
-  data.tar.gz: 3f3ca9d50efaaae456a5eece277790d95369e5276585d1c13b742dcf4144bf09a919d1eebbab4c7ecbfc2c58f60a829bae584cab42b681473f9ca50cc1c7ccab
+  metadata.gz: 3bfa7e60f2ca9e16b1aa01398a3ef1f44cca62907436cb120e313b3fc79a9fb959f0e560f1a51a4dcc47021371de999a1a4d24755df517e658066815218a3822
+  data.tar.gz: 2bd0c26fe1062883602fc4ff9f91d17730e6327f40c9f33e0cc739833a313cb03a5384724faf88e459e57605809e2e73ff051270ba06ece03bdf60d94b871b77

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

@@ -22,7 +22,7 @@ module Klenod
           SHORTHAND_PREFIX = /\A\s*(?:%[A-Za-z][\w:-]*)?(?:[.#][\w-]+)*\.(?<partial>[\w-]*)\z/
           LOOKUP_PREFIX = /ClassNames\[:(?<partial>[\w-]*)\z/
           STYLE_KINDS = %i[companion_style inline_style].freeze
-          FILTER_HEAD = /\A\s*:\w/
+          FILTER_HEAD = /\A\s*:(?<name>\w+)/
 
           Occurrence = Data.define(:name, :span)
           Definition = Data.define(:module_id, :generated)
@@ -92,14 +92,16 @@ module Klenod
           # Indexes of the lines inside filters: every line after a `:name`
           # line that is blank or indented deeper than it, as Haml reads them.
           # Indentation alone also works while the document does not parse.
-          def filter_body_lines(lines)
+          # Filters named in `except` are left out.
+          def filter_body_lines(lines, except: [])
             filter_indent = nil
             lines.each_with_index.with_object(Set.new) do |(line_text, index), body|
               indent = line_text[/\A\s*/].length
               if filter_indent && (line_text.strip.empty? || indent > filter_indent)
                 body << index
               else
-                filter_indent = line_text.match?(FILTER_HEAD) ? indent : nil
+                head = FILTER_HEAD.match(line_text)
+                filter_indent = (head && !except.include?(head[:name])) ? indent : nil
               end
             end
           end

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

@@ -5,6 +5,7 @@ require "language_server-protocol"
 
 require_relative "../../text"
 require_relative "../imports"
+require_relative "classes"
 require_relative "ruby_regions"
 
 module Klenod
@@ -42,10 +43,13 @@ module Klenod
 
           def diagnostics(analysis, workspace, index)
             lines = analysis.lines
-            bindings = Imports.bindings(lines)
+            bindings = Haml.bindings(lines)
             props_cache = {}
+            filter_body = Classes.filter_body_lines(lines)
 
             lines.each_with_index.flat_map do |line_text, line_index|
+              next [] if filter_body.include?(line_index)
+
               tag = TAG_LINE.match(line_text)
               next [] unless tag
 

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

@@ -2,6 +2,7 @@
 
 require_relative "../../text"
 require_relative "../imports"
+require_relative "classes"
 require_relative "ruby_regions"
 
 module Klenod
@@ -9,9 +10,9 @@ module Klenod
     module Languages
       class Haml
         # Where a bound constant appears in a Haml document: the `%Name` tags
-        # and the whole-word uses inside Ruby, meaning `:ruby` filters, script
-        # lines, tag attributes, and printed tag content. Plain text keeps
-        # its words.
+        # outside filters and the whole-word uses inside Ruby, meaning `:ruby`
+        # filters, script lines, tag attributes, and printed tag content.
+        # Plain text keeps its words.
         module Rename
           module_function
 
@@ -25,7 +26,10 @@ module Klenod
               end
             end
 
+            filter_body = Classes.filter_body_lines(lines)
             lines.each_with_index do |line_text, index|
+              next if filter_body.include?(index)
+
               Text.each_match(line_text, index, Haml::COMPONENT_TAG, group: :name) do |match, span|
                 next unless match[:name].split("::").first == name
 

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

@@ -68,13 +68,22 @@ module Klenod
 
         # `%Details` compiles to the constant `Details`, bound by an import in
         # the leading `:ruby` filter such as `Details = import("/components/Details")`.
+        # Imports in other filters, such as code samples in `:markdown`, are
+        # text.
         def self.bindings(lines)
-          Imports.bindings(lines)
+          text = Classes.filter_body_lines(lines, except: %w[ruby])
+          Imports.bindings(lines.reject.with_index { |_line_text, index| text.include?(index) })
+        end
+
+        def bindings(lines)
+          self.class.bindings(lines)
         end
 
         private
 
         def component_target_at(line_text, position, lines)
+          return nil if Classes.filter_body_lines(lines).include?(position.line)
+
           Text.each_match(line_text, position.line, COMPONENT_TAG, group: :name) do |match, span|
             next unless span.include?(position)
 

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

@@ -218,6 +218,11 @@ module Klenod
           Syntax::Ruby
         end
 
+        # Constant names bound to imports in a document, keyed by name.
+        def bindings(lines)
+          Imports.bindings(lines)
+        end
+
         def definition(analysis, position, workspace, _index = nil)
           target = target_at(analysis, position)
           module_id = target && Imports.resolve(target, analysis, workspace)
@@ -376,11 +381,14 @@ module Klenod
         def usage_spans(importer_id, lines, specifiers)
           return [] unless importer_id.extname == ".haml"
 
-          names = Imports.bindings(lines).select { |_name, specifier| specifiers.include?(specifier) }.keys
+          names = Languages::Haml.bindings(lines).select { |_name, specifier| specifiers.include?(specifier) }.keys
           return [] if names.empty?
 
           spans = []
+          filter_body = Languages::Haml::Classes.filter_body_lines(lines)
           lines.each_with_index do |line_text, index|
+            next if filter_body.include?(index)
+
             Text.each_match(line_text, index, Languages::Haml::COMPONENT_TAG, group: :name) do |match, span|
               spans << span if names.include?(match[:name].split("::").first)
             end
@@ -391,7 +399,7 @@ module Klenod
         # Bindings whose constant is never used in the file. Languages give
         # the spans a constant occupies, the binding included.
         def unused_binding_diagnostics(analysis)
-          Imports.bindings(analysis.lines).filter_map do |name, _specifier|
+          bindings(analysis.lines).filter_map do |name, _specifier|
             spans = rename_spans(analysis, name)
             next if spans.length > 1
 

data/lib/klenod/lsp/version.rb

@@ -2,6 +2,6 @@
 
 module Klenod
   module LSP
-    VERSION = "0.0.31"
+    VERSION = "0.0.32"
   end
 end

metadata

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