Fix non-happy-path rem function output expectations

Author: chloerice

polaris-migrator/src/migrations/replace-sass-lengths/tests/replace-sass-lengths.input.scss

@@ -62,8 +62,6 @@
   // Single shorthand rem function (rem(Xpx))
   padding: rem(10px);
   padding: rem(16px);
-  padding: calc(10rem + var(--p-choice-size, #{rem(16px)}));
-  padding: calc(10rem + var(--p-choice-size, #{rem(10px)}));
   gap: rem(10px);
   gap: rem(16px);
 
@@ -93,6 +91,8 @@
   gap: rem($var * 16px);
   gap: calc(16px + 16px);
   gap: 16px + #{16px + 16px};
+  padding: calc(10rem + var(--p-choice-size, #{rem(16px)}));
+  padding: calc(10rem + var(--p-choice-size, #{rem(10px)}));
 
   // Unsupported transforms without comments
   padding: rem(16px);

polaris-migrator/src/migrations/replace-sass-lengths/tests/replace-sass-lengths.output.scss

@@ -62,13 +62,11 @@
   // Single shorthand rem function (rem(Xpx))
   padding: rem(10px);
   padding: var(--p-space-4);
-  padding: calc(10rem + var(--p-choice-size, #{rem(16px)}));
-  padding: calc(10rem + var(--p-choice-size, #{rem(10px)}));
   gap: rem(10px);
   gap: var(--p-space-4);
 
   // Mixed shorthand rem function
-  padding: rem(16px) 16px;
+  padding: rem(16px) var(--p-space-4);
   padding: rem(16px) 4in;
   padding: rem(16px) 1em;
   padding: rem(16px) -16px;
@@ -114,7 +112,7 @@
   /* gap: $var + var(--p-space-4); */
   gap: $var + 16px;
   /* polaris-migrator: Unable to migrate the following expression. Please upgrade manually. */
-  /* gap: var(--p-space-4) + var(--p-space-4); */
+  /* gap: rem(16px) + var(--p-space-4); */
   gap: rem(16px) + 16px;
   /* polaris-migrator: Unable to migrate the following expression. Please upgrade manually. */
   /* gap: rem($var * 16px); */
@@ -125,6 +123,12 @@
   /* polaris-migrator: Unable to migrate the following expression. Please upgrade manually. */
   /* gap: var(--p-space-4) + #{16px + 16px}; */
   gap: 16px + #{16px + 16px};
+  /* polaris-migrator: Unable to migrate the following expression. Please upgrade manually. */
+  /* padding: calc(10rem + var(--p-choice-size, #{rem(16px)})); */
+  padding: calc(10rem + var(--p-choice-size, #{rem(16px)}));
+  /* polaris-migrator: Unable to migrate the following expression. Please upgrade manually. */
+  /* padding: calc(10rem + var(--p-choice-size, #{rem(10px)})); */
+  padding: calc(10rem + var(--p-choice-size, #{rem(10px)}));
 
   // Unsupported transforms without comments
   padding: var(--p-space-4);

polaris-migrator/src/migrations/replace-sass-lengths/tests/with-namespace.input.scss

@@ -63,8 +63,6 @@
   // Single shorthand rem function (rem(Xpx))
   padding: legacy-polaris-v8.rem(10px);
   padding: legacy-polaris-v8.rem(16px);
-  padding: calc(10rem + var(--p-choice-size, #{legacy-polaris-v8.rem(16px)}));
-  padding: calc(10rem + var(--p-choice-size, #{legacy-polaris-v8.rem(10px)}));
   gap: legacy-polaris-v8.rem(10px);
   gap: legacy-polaris-v8.rem(16px);
 
@@ -94,6 +92,8 @@
   gap: legacy-polaris-v8.rem($var * 16px);
   gap: calc(16px + 16px);
   gap: 16px + #{16px + 16px};
+  padding: calc(10rem + var(--p-choice-size, #{legacy-polaris-v8.rem(16px)}));
+  padding: calc(10rem + var(--p-choice-size, #{legacy-polaris-v8.rem(10px)}));
 
   // Unsupported transforms without comments
   padding: legacy-polaris-v8.rem(16px);

polaris-migrator/src/migrations/replace-sass-lengths/tests/with-namespace.output.scss

@@ -61,11 +61,9 @@
   gap: var(--p-space-4) -16px;
 
   // Single shorthand rem function (rem(Xpx))
-  padding: rem(10px);
+  padding: legacy-polaris-v8.rem(10px);
   padding: var(--p-space-4);
-  padding: calc(10rem + var(--p-choice-size, #{legacy-polaris-v8.rem(16px)}));
-  padding: calc(10rem + var(--p-choice-size, #{legacy-polaris-v8.rem(10px)}));
-  gap: rem(10px);
+  gap: legacy-polaris-v8.rem(10px);
   gap: var(--p-space-4);
 
   // Mixed shorthand rem function
@@ -126,6 +124,12 @@
   /* polaris-migrator: Unable to migrate the following expression. Please upgrade manually. */
   /* gap: var(--p-space-4) + #{16px + 16px}; */
   gap: 16px + #{16px + 16px};
+  /* polaris-migrator: Unable to migrate the following expression. Please upgrade manually. */
+  /* padding: calc(10rem + var(--p-choice-size, #{legacy-polaris-v8.rem(16px)})); */
+  padding: calc(10rem + var(--p-choice-size, #{legacy-polaris-v8.rem(16px)}));
+  /* polaris-migrator: Unable to migrate the following expression. Please upgrade manually. */
+  /* padding: calc(10rem + var(--p-choice-size, #{legacy-polaris-v8.rem(10px)})); */
+  padding: calc(10rem + var(--p-choice-size, #{legacy-polaris-v8.rem(10px)}));
 
   // Unsupported transforms without comments
   padding: var(--p-space-4);