expressir 2.4.62 → 2.4.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a6350cf976e79c6d598aa239dbd2012f476b418b9068e3d8d1c52d27a2aad3
-  data.tar.gz: cabcb127e900323d8fcbea1c846e4233d05524eb802f18eb060ffeae5cb80f06
+  metadata.gz: 1a6f965c957e0d311f33b6ec1736bd51c931dc514b7589ee3f6009bd7e4b3795
+  data.tar.gz: adba741215d339bc1f5bd5c9649878e684df7426068cfef43165cccc51c5fb64
 SHA512:
-  metadata.gz: af9d440389f6af40d4f58f4cf72614a10facfa1bf36366e3666bd085a963e9c35bae2667f6a2e81447a6f2d02fc4567085f58e644c1aa05c31868b5b13c6dfb0
-  data.tar.gz: 751d289260d362523fbab7227dc97e8da401139df8fbb3965c3ee72a6ba13d977fbd1f91c8650c14b874f11fd3c91a43abf28040a27e55eadbfd6b7f33ac1cf3
+  metadata.gz: 6c68628ce8a6f97542bfb0c89e4a5f942e5f01a7a1010c6f2730692f91ce4ed0067c068b719441c13c74e8fe4137030649fd255449d2c2c710de043ca58ee3ab
+  data.tar.gz: b371a0b96ccdba7e5c357c92f62e4d3fa399b445b773886807e3f1ea5c45fb9db24ce53873ee2dd400c2a70412c69eb2aa13e30bc83b5104b242938562dc634f

data/ext/expressir_core/Cargo.toml

@@ -13,7 +13,7 @@ magnus = { version = "0.9" }
 # Pinned core release (M1, TODO.parity-ee/19): the ext never floats
 # main — bump the tag per expressir release, alongside the validation
 # run that pins it.
-expressir-rs = { git = "https://github.com/lutaml/expressir-rs", tag = "v0.1.32" }
+expressir-rs = { git = "https://github.com/lutaml/expressir-rs", tag = "v0.1.33" }
 serde_json = "1.0"
 
 

data/lib/expressir/express/remark_attacher.rb

@@ -211,7 +211,8 @@ module Expressir
 
           line_content = line_content_for(remark.line)
           if end_scope_line?(line_content)
-            matched_node = @node_index.node_for_end_scope_at(remark.line, line_content)
+            matched_node = @node_index.node_for_end_scope_at(remark.line, line_content) ||
+              scope_owner_for_end_line(remark.line, line_content)
             if matched_node
               add_remark(matched_node, remark.text, format: remark.format, tag: nil,
                                                     source_offset: remark.position)
@@ -241,6 +242,34 @@ module Expressir
         line_content =~ /END_(SCHEMA|ENTITY|TYPE|FUNCTION|PROCEDURE|RULE)/i
       end
 
+      # A comment on an END_XXX line belongs to the scope that XXX closes.
+      # Spans can miss on the grammar lane — source strings there are
+      # reconstructions whose lengths undershoot the node's real extent,
+      # so neither the end-window nor containment reaches the END line
+      # (expressir#609 drift) — so this falls back to the scope walk: the
+      # construct open at the START of the END line is the scope being
+      # closed, by construction of the map.
+      def scope_owner_for_end_line(line, line_content)
+        type = case line_content
+               when /END_SCHEMA/i then Model::Declarations::Schema
+               when /END_ENTITY/i then Model::Declarations::Entity
+               when /END_TYPE/i then Model::Declarations::Type
+               when /END_FUNCTION/i then Model::Declarations::Function
+               when /END_PROCEDURE/i then Model::Declarations::Procedure
+               when /END_RULE/i then Model::Declarations::Rule
+               end
+        active = active_scope_map[line]
+        return nil unless type.is_a?(Class) && active.is_a?(Array)
+
+        klass, opener_line = active
+        # ENTITY/TYPE openers are tracked as :other — the walk is
+        # line-accurate, so trust it for those ends.
+        return nil unless klass == type || (klass == :other && [Model::Declarations::Entity, Model::Declarations::Type].include?(type))
+
+        @node_index.starting_at(opener_line)
+          .find { |n| n[:node].is_a?(type) }&.dig(:node)
+      end
+
       # Own-line body comments belong to the next statement in the same
       # statement region (Function body, THEN branch, ELSE branch, loop body):
       # attached there with LEADING placement. A comment with no following
@@ -559,6 +588,19 @@ module Expressir
         # from its closing keyword by an empty line still closes that body.
         while probe <= source_line_count
           content = line_content_for(probe).to_s.strip
+          # Embedded remark blocks (`(*"tag" ... *)`) that the renderer
+          # emits between a trailing comment and the closing keyword:
+          # skip the whole block, the keyword lies beyond it (#609).
+          if content.start_with?("(*")
+            # A single-line block carries its own "*)": only hunt for a
+            # closer when the start line does not have one.
+            unless content.include?("*)")
+              probe += 1
+              probe += 1 while probe <= source_line_count && !line_content_for(probe).to_s.include?("*)")
+            end
+            probe += 1
+            next
+          end
           break unless content.empty? || content.start_with?("--")
 
           probe += 1

data/lib/expressir/version.rb

@@ -3,6 +3,6 @@ module Expressir
   # autoload it (Ruby autoload only works for module/class constants, not
   # for string constants like `Expressir::VERSION`).
   module Version
-    VERSION = "2.4.62".freeze
+    VERSION = "2.4.63".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.62
+  version: 2.4.63
 platform: ruby
 authors:
 - Ribose Inc.