From 1a632367b75127a34b0e2ac609a8d0827df703e3 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 5 Mar 2024 12:17:32 -0800
Subject: [PATCH] fix: code style in generators for field colour blocks

---
 plugins/field-colour/src/blocks/colourBlend.ts  | 15 +++++----------
 plugins/field-colour/src/blocks/colourRandom.ts |  2 +-
 plugins/field-colour/src/blocks/colourRgb.ts    |  8 ++++----
 plugins/field-colour/test/golden/golden.js      |  2 +-
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/plugins/field-colour/src/blocks/colourBlend.ts b/plugins/field-colour/src/blocks/colourBlend.ts
index 3aaed82d7d..78237c85a8 100644
--- a/plugins/field-colour/src/blocks/colourBlend.ts
+++ b/plugins/field-colour/src/blocks/colourBlend.ts
@@ -92,8 +92,7 @@ function ${generator.FUNCTION_NAME_PLACEHOLDER_}(c1, c2, ratio) {
 }
 `,
   );
-  const code =
-    functionName + '(' + colour1 + ', ' + colour2 + ', ' + ratio + ')';
+  const code = `${functionName}(${colour1}, ${colour2}, ${ratio})`;
   return [code, JavascriptOrder.FUNCTION_CALL];
 }
 
@@ -147,8 +146,7 @@ String ${generator.FUNCTION_NAME_PLACEHOLDER_}(String c1, String c2, num ratio)
 }
 `,
   );
-  const code =
-    functionName + '(' + colour1 + ', ' + colour2 + ', ' + ratio + ')';
+  const code = `${functionName}(${colour1}, ${colour2}, ${ratio})`;
   return [code, DartOrder.UNARY_POSTFIX];
 }
 
@@ -187,8 +185,7 @@ end
   const colour2 =
     generator.valueToCode(block, 'COLOUR2', LuaOrder.NONE) || "'#000000'";
   const ratio = generator.valueToCode(block, 'RATIO', LuaOrder.NONE) || 0;
-  const code =
-    functionName + '(' + colour1 + ', ' + colour2 + ', ' + ratio + ')';
+  const code = `${functionName}(${colour1}, ${colour2}, ${ratio})`;
   return [code, LuaOrder.HIGH];
 }
 
@@ -231,8 +228,7 @@ function ${generator.FUNCTION_NAME_PLACEHOLDER_}($c1, $c2, $ratio) {
 }
 `,
   );
-  const code =
-    functionName + '(' + colour1 + ', ' + colour2 + ', ' + ratio + ')';
+  const code = `${functionName}(${colour1}, ${colour2}, ${ratio})`;
   return [code, PhpOrder.FUNCTION_CALL];
 }
 
@@ -267,8 +263,7 @@ def ${generator.FUNCTION_NAME_PLACEHOLDER_}(colour1, colour2, ratio):
   const colour2 =
     generator.valueToCode(block, 'COLOUR2', PythonOrder.NONE) || "'#000000'";
   const ratio = generator.valueToCode(block, 'RATIO', PythonOrder.NONE) || 0;
-  const code =
-    functionName + '(' + colour1 + ', ' + colour2 + ', ' + ratio + ')';
+  const code = `${functionName}(${colour1}, ${colour2}, ${ratio})`;
   return [code, PythonOrder.FUNCTION_CALL];
 }
 
diff --git a/plugins/field-colour/src/blocks/colourRandom.ts b/plugins/field-colour/src/blocks/colourRandom.ts
index 038ffa5aa1..687ab02168 100644
--- a/plugins/field-colour/src/blocks/colourRandom.ts
+++ b/plugins/field-colour/src/blocks/colourRandom.ts
@@ -45,7 +45,7 @@ export function toJavascript(
     'colourRandom',
     `
 function ${generator.FUNCTION_NAME_PLACEHOLDER_}() {
-  var num = Math.floor(Math.random() * Math.pow(2, 24));
+  var num = Math.floor(Math.random() * 0x1000000);
   return '#' + ('00000' + num.toString(16)).substr(-6);
 }
 `,
diff --git a/plugins/field-colour/src/blocks/colourRgb.ts b/plugins/field-colour/src/blocks/colourRgb.ts
index de602e94ce..46ee55045a 100644
--- a/plugins/field-colour/src/blocks/colourRgb.ts
+++ b/plugins/field-colour/src/blocks/colourRgb.ts
@@ -80,7 +80,7 @@ function ${generator.FUNCTION_NAME_PLACEHOLDER_}(r, g, b) {
 }
 `,
   );
-  const code = functionName + '(' + red + ', ' + green + ', ' + blue + ')';
+  const code = `${functionName}(${red}, ${green}, ${blue})`;
   return [code, JavascriptOrder.FUNCTION_CALL];
 }
 
@@ -125,7 +125,7 @@ String ${generator.FUNCTION_NAME_PLACEHOLDER_}(num r, num g, num b) {
 }
 `,
   );
-  const code = functionName + '(' + red + ', ' + green + ', ' + blue + ')';
+  const code = `${functionName}(${red}, ${green}, ${blue})`;
   return [code, DartOrder.UNARY_POSTFIX];
 }
 
@@ -155,7 +155,7 @@ end
   const red = generator.valueToCode(block, 'RED', LuaOrder.NONE) || 0;
   const green = generator.valueToCode(block, 'GREEN', LuaOrder.NONE) || 0;
   const blue = generator.valueToCode(block, 'BLUE', LuaOrder.NONE) || 0;
-  const code = functionName + '(' + red + ', ' + green + ', ' + blue + ')';
+  const code = `${functionName}(${red}, ${green}, ${blue})`;
   return [code, LuaOrder.HIGH];
 }
 
@@ -189,7 +189,7 @@ function ${generator.FUNCTION_NAME_PLACEHOLDER_}($r, $g, $b) {
 }
 `,
   );
-  const code = functionName + '(' + red + ', ' + green + ', ' + blue + ')';
+  const code = `${functionName}(${red}, ${green}, ${blue})`;
   return [code, PhpOrder.FUNCTION_CALL];
 }
 
diff --git a/plugins/field-colour/test/golden/golden.js b/plugins/field-colour/test/golden/golden.js
index c9354913e7..368b4f101a 100644
--- a/plugins/field-colour/test/golden/golden.js
+++ b/plugins/field-colour/test/golden/golden.js
@@ -1,5 +1,5 @@
 function colourRandom() {
-  var num = Math.floor(Math.random() * Math.pow(2, 24));
+  var num = Math.floor(Math.random() * 0x1000000);
   return '#' + ('00000' + num.toString(16)).substr(-6);
 }