Use instance_variable_get instead of instance_eval when possible

Author: ntkme

lib/sass/compiler/host/function_registry.rb

@@ -57,8 +57,8 @@ def function_call(function_call_request)
 
           success = protofier.to_proto(function.call(arguments))
           accessed_argument_lists = arguments.filter_map do |argument|
-            if argument.is_a?(Sass::Value::ArgumentList) && argument.instance_eval { @keywords_accessed }
-              argument.instance_eval { @id }
+            if argument.is_a?(Sass::Value::ArgumentList) && argument.instance_variable_get(:@keywords_accessed)
+              argument.instance_variable_get(:@id)
             end
           end
 

lib/sass/compiler/host/importer_registry.rb

@@ -35,7 +35,7 @@ def register(importer)
           if importer.is_a?(Sass::NodePackageImporter)
             EmbeddedProtocol::InboundMessage::CompileRequest::Importer.new(
               node_package_importer: EmbeddedProtocol::NodePackageImporter.new(
-                entry_point_directory: importer.instance_eval { @entry_point_directory }
+                entry_point_directory: importer.instance_variable_get(:@entry_point_directory)
               )
             )
           else
@@ -76,7 +76,7 @@ def canonicalize(canonicalize_request)
           EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
             id: canonicalize_request.id,
             url:,
-            containing_url_unused: canonicalize_context.instance_eval { @containing_url_unused }
+            containing_url_unused: canonicalize_context.instance_variable_get(:@containing_url_unused)
           )
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
@@ -118,7 +118,7 @@ def file_import(file_import_request)
           EmbeddedProtocol::InboundMessage::FileImportResponse.new(
             id: file_import_request.id,
             file_url:,
-            containing_url_unused: canonicalize_context.instance_eval { @containing_url_unused }
+            containing_url_unused: canonicalize_context.instance_variable_get(:@containing_url_unused)
           )
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::FileImportResponse.new(

lib/sass/compiler/host/protofier.rb

@@ -37,7 +37,7 @@ def to_proto(obj)
           when Sass::Value::ArgumentList
             EmbeddedProtocol::Value.new(
               argument_list: EmbeddedProtocol::Value::ArgumentList.new(
-                id: obj.instance_eval { @id },
+                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)
@@ -63,10 +63,10 @@ def to_proto(obj)
               )
             )
           when Sass::Value::Function
-            if obj.instance_eval { @id }
+            if obj.instance_variable_defined?(:@id)
               EmbeddedProtocol::Value.new(
                 compiler_function: EmbeddedProtocol::Value::CompilerFunction.new(
-                  id: obj.instance_eval { @id }
+                  id: obj.instance_variable_get(:@id)
                 )
               )
             else
@@ -80,7 +80,7 @@ def to_proto(obj)
           when Sass::Value::Mixin
             EmbeddedProtocol::Value.new(
               compiler_mixin: EmbeddedProtocol::Value::CompilerMixin.new(
-                id: obj.instance_eval { @id }
+                id: obj.instance_variable_get(:@id)
               )
             )
           when Sass::Value::Calculation
@@ -148,14 +148,14 @@ def from_proto(proto)
               end
             )
           when :compiler_function
-            Sass::Value::Function.new(nil).instance_eval do
+            Sass::Value::Function.allocate.instance_eval do
               @id = obj.id
               self
             end
           when :host_function
             raise Sass::ScriptError, 'The compiler may not send Value.host_function to host'
           when :compiler_mixin
-            Sass::Value::Mixin.send(:new).instance_eval do
+            Sass::Value::Mixin.allocate.instance_eval do
               @id = obj.id
               self
             end

lib/sass/embedded.rb

@@ -54,9 +54,7 @@ def compiler
         return @compiler if @compiler
 
         compiler = Compiler.allocate
-        compiler.instance_eval do
-          @channel = Compiler.const_get(:Channel).new(idle_timeout: 10)
-        end
+        compiler.instance_variable_set(:@channel, Compiler.const_get(:Channel).new(idle_timeout: 10))
 
         at_exit do
           compiler.close

lib/sass/value/function.rb

@@ -11,8 +11,6 @@ class Function
       # @param signature [::String]
       # @param callback [Proc]
       def initialize(signature, &callback)
-        raise Sass::ScriptError, 'no block given' unless signature.nil? || callback
-
         @signature = signature.freeze
         @callback = callback.freeze
       end