Fix passing argument lists across compilations (#298)

sass-contrib · Mar 11, 2025 · 0378284 · 0378284
1 parent f1ff432
commit 0378284
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 41 deletions.
diff --git a/lib/sass/compiler/host/protofier.rb b/lib/sass/compiler/host/protofier.rb
@@ -35,14 +35,21 @@ def to_proto(obj)
               )
             )
           when Sass::Value::ArgumentList
-            EmbeddedProtocol::Value.new(
-              argument_list: EmbeddedProtocol::Value::ArgumentList.new(
-                id: obj.instance_variable_get(:@id),
-                contents: obj.to_a.map { |element| to_proto(element) },
-                keywords: obj.keywords.each_with_object({}) { |(key, value), hash| hash[key.to_s] = to_proto(value) },
-                separator: ListSeparator.to_proto(obj.separator)
+            if obj.instance_variable_get(:@environment) == @function_registry.environment
+              EmbeddedProtocol::Value.new(
+                argument_list: EmbeddedProtocol::Value::ArgumentList.new(
+                  id: obj.instance_variable_get(:@id)
+                )
               )
-            )
+            else
+              EmbeddedProtocol::Value.new(
+                argument_list: EmbeddedProtocol::Value::ArgumentList.new(
+                  contents: obj.to_a.map { |element| to_proto(element) },
+                  keywords: obj.keywords.each_with_object({}) { |(key, value), hash| hash[key.to_s] = to_proto(value) },
+                  separator: ListSeparator.to_proto(obj.separator)
+                )
+              )
+            end
           when Sass::Value::List
             EmbeddedProtocol::Value.new(
               list: EmbeddedProtocol::Value::List.new(
@@ -125,18 +132,18 @@ def from_proto(proto)
               obj.has_alpha? ? obj.alpha : nil
             )
           when :argument_list
-            Sass::Value::ArgumentList.new(
-              obj.contents.map do |element|
-                from_proto(element)
-              end,
-              obj.keywords.to_enum.with_object({}) do |(key, value), hash|
-                hash[key.to_sym] = from_proto(value)
-              end,
-              ListSeparator.from_proto(obj.separator)
-            ).instance_eval do
-              @id = obj.id
-              self
-            end
+            compiler_value(
+              Sass::Value::ArgumentList.new(
+                obj.contents.map do |element|
+                  from_proto(element)
+                end,
+                obj.keywords.to_enum.with_object({}) do |(key, value), hash|
+                  hash[key.to_sym] = from_proto(value)
+                end,
+                ListSeparator.from_proto(obj.separator)
+              ),
+              obj.id
+            )
           when :list
             Sass::Value::List.new(
               obj.contents.map do |element|
@@ -152,11 +159,11 @@ def from_proto(proto)
               end
             )
           when :compiler_function
-            compiler_value(Sass::Value::Function, obj.id)
+            compiler_value(Sass::Value::Function.allocate, obj.id)
           when :host_function
             raise Sass::ScriptError, 'The compiler may not send Value.host_function to host'
           when :compiler_mixin
-            compiler_value(Sass::Value::Mixin, obj.id)
+            compiler_value(Sass::Value::Mixin.allocate, obj.id)
           when :calculation
             Calculation.from_proto(obj)
           when :singleton
@@ -185,8 +192,7 @@ def assert_compiler_value(value)
           value
         end
 
-        def compiler_value(klass, id)
-          value = klass.allocate
+        def compiler_value(value, id)
           value.instance_variable_set(:@environment, @function_registry.environment)
           value.instance_variable_set(:@id, id)
           value

diff --git a/lib/sass/value/argument_list.rb b/lib/sass/value/argument_list.rb
@@ -15,7 +15,6 @@ class ArgumentList < List
       def initialize(contents = [], keywords = {}, separator = ',')
         super(contents, separator:)
 
-        @id = 0
         @keywords_accessed = false
         @keywords = keywords.freeze
       end
@@ -25,13 +24,6 @@ def keywords
         @keywords_accessed = true
         @keywords
       end
-
-      private
-
-      def initialize_dup(orig)
-        @id = 0
-        super
-      end
     end
   end
 end
diff --git a/spec/sass_proto_spec.rb b/spec/sass_proto_spec.rb
@@ -4,14 +4,6 @@
 
 RSpec.describe Sass do
   def remote_eq(lhs, rhs)
-    to_host_value = lambda { |value|
-      if value.is_a?(Sass::Value::ArgumentList)
-        value.dup
-      else
-        value
-      end
-    }
-
     result = nil
     Sass.compile_string(
       '$_: yield(lhs()==rhs());',
@@ -21,10 +13,10 @@ def remote_eq(lhs, rhs)
           Sass::Value::Null::NULL
         },
         'lhs()' => lambda { |*|
-          to_host_value.call lhs
+          lhs
         },
         'rhs()' => lambda { |*|
-          to_host_value.call rhs
+          rhs
         }
       }
     )