expressir 2.3.7 → 2.4.1

data/lib/expressir/express/pretty_formatter.rb

@@ -24,7 +24,7 @@ module Expressir
           @provenance_name = resolve_param(options, :provenance_name,
                                            "EXPRESSIR_PROVENANCE_NAME", "Expressir")
           @provenance_version = resolve_param(options, :provenance_version,
-                                              "EXPRESSIR_PROVENANCE_VERSION", Expressir::VERSION)
+                                              "EXPRESSIR_PROVENANCE_VERSION", Expressir::Version::VERSION)
         end
 
         private
@@ -67,7 +67,7 @@ module Expressir
       # @option options [Boolean] :insert_space Insert spaces for readability (default: true)
       # @option options [Boolean] :provenance Include provenance information (default: true)
       # @option options [String] :provenance_name Tool name for provenance (default: "Expressir")
-      # @option options [String] :provenance_version Tool version for provenance (default: Expressir::VERSION)
+      # @option options [String] :provenance_version Tool version for provenance (default: Expressir::Version::VERSION)
       # @option options [Boolean] :no_remarks Suppress remarks in output (default: false)
       def initialize(options = {})
         @config = Configuration.new(options)
@@ -332,9 +332,12 @@ module Expressir
       def format_exp_file(node)
         result = []
 
-        # Add file-level preamble if present
-        if node.untagged_remarks && !node.untagged_remarks.empty?
-          result.concat(format_preamble(node.untagged_remarks))
+        # Add file-level preamble if present (skip provenance remarks from previous parses)
+        unless @no_remarks
+          source_remarks = (node.untagged_remarks || []).reject do |remark|
+            remark.is_a?(Model::RemarkInfo) && provenance_remark?(remark)
+          end
+          result.concat(format_preamble(source_remarks)) if source_remarks.any?
         end
 
         # Add provenance (only for first file or single file)
@@ -505,6 +508,7 @@ module Expressir
                indent(node.where_rules.map { |x| format(x) }.join("\n")),
              ]
            end,
+          *format_trailing_region_remarks(node, :where_rules).map { |x| indent(x) },
           format_scope_footer("END_RULE", node),
         ].join("\n")
       end
@@ -553,6 +557,11 @@ module Expressir
           *if node.statements&.length&.positive?
              indent(node.statements.map { |x| format(x) }.join("\n"))
            end,
+          # Comments closing the executable body. This formatter overrides
+          # the declaration formatters, so the emitter is repeated here or
+          # trailing remarks would render only in standard output. For a
+          # RULE the body ends at WHERE, which follows this block.
+          *format_trailing_region_remarks(node, :statements).map { |x| indent(x) },
         ]
       end
 
@@ -563,6 +572,15 @@ module Expressir
           format_end_scope_remark(node),
         ].join
       end
+
+      # Check if a remark was generated by this formatter's provenance output.
+      # Prevents provenance comments from accumulating on round-trip re-parses.
+      def provenance_remark?(remark)
+        return false unless remark.is_a?(Model::RemarkInfo)
+
+        text = remark.text.to_s
+        text.match?(/\A\s*(Generated by:|Format parameters:)/)
+      end
     end
   end
 end