From 4b6617f74c614f654d8ffe5c5e52fcf21b63e444 Mon Sep 17 00:00:00 2001 From: Daniele Palombo <387690+DanielePalombo@users.noreply.github.com> Date: Mon, 16 Jun 2025 10:34:37 +0200 Subject: [PATCH] Fix warning string literal After Ruby 3.4 upgrade, there is a new warning for `frozen string literal`. Refactor DSL command extraction to improve comment handling and formatting --- lib/deface/dsl/loader.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/deface/dsl/loader.rb b/lib/deface/dsl/loader.rb index 80b2773..ec4d7c1 100644 --- a/lib/deface/dsl/loader.rb +++ b/lib/deface/dsl/loader.rb @@ -79,9 +79,12 @@ def self.extract_dsl_commands_from_erb(html_file_contents) end comment.gsub('', '').strip.scan(/[^\s"']+|"[^"]*"|'[^']*'/).each do |part| + ends_with_quote = dsl_commands =~ /('|")\z/ + starts_with_non_data_char = part =~ /\A[^\d:='"%]/ - dsl_commands =~ /('|")\z/ || part =~ /\A[^\d:='"%]/ ? dsl_commands << "\n" : dsl_commands << ' ' - dsl_commands << part + divider = ends_with_quote || starts_with_non_data_char ? "\n" : ' ' + + dsl_commands = [dsl_commands, divider, part].join('') end html_file_contents = html_file_contents.gsub(comment, '')