Update on "[compiler][repro] fixtures for fbt plural and macro bugs"

[ghstack-poisoned]
facebook · Jul 30, 2024 · b1b21be · b1b21be
1 parent c9e8bf3
commit b1b21be
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 12 deletions.
diff --git a/..._tests__/fixtures/compiler/fbt/bug-fbt-plural-multiple-function-calls.expect.md b/..._tests__/fixtures/compiler/fbt/bug-fbt-plural-multiple-function-calls.expect.md
@@ -3,6 +3,18 @@
 
 ```javascript
 import fbt from 'fbt';
+
+/**
+ * Similar to error.todo-multiple-fbt-plural
+ *
+ * Evaluator error:
+ *   Found differences in evaluator results
+ *   Non-forget (expected):
+ *   (kind: ok) <div>1 apple and 2 bananas</div>
+ *   Forget:
+ *   (kind: ok) <div>1 apples and 2 bananas</div>
+ */
+
 function useFoo({apples, bananas}) {
   return fbt(
     `${fbt.param('number of apples', apples)} ` +
@@ -25,6 +37,18 @@ export const FIXTURE_ENTRYPOINT = {
 ```javascript
 import { c as _c } from "react/compiler-runtime";
 import fbt from "fbt";
+
+/**
+ * Similar to error.todo-multiple-fbt-plural
+ *
+ * Evaluator error:
+ *   Found differences in evaluator results
+ *   Non-forget (expected):
+ *   (kind: ok) <div>1 apple and 2 bananas</div>
+ *   Forget:
+ *   (kind: ok) <div>1 apples and 2 bananas</div>
+ */
+
 function useFoo(t0) {
   const $ = _c(3);
   const { apples, bananas } = t0;

diff --git a/...ct-compiler/src/__tests__/fixtures/compiler/fbt/bug-fbt-plural-multiple-function-calls.ts b/...ct-compiler/src/__tests__/fixtures/compiler/fbt/bug-fbt-plural-multiple-function-calls.ts
@@ -1,4 +1,16 @@
 import fbt from 'fbt';
+
+/**
+ * Similar to error.todo-multiple-fbt-plural
+ *
+ * Evaluator error:
+ *   Found differences in evaluator results
+ *   Non-forget (expected):
+ *   (kind: ok) <div>1 apple and 2 bananas</div>
+ *   Forget:
+ *   (kind: ok) <div>1 apples and 2 bananas</div>
+ */
+
 function useFoo({apples, bananas}) {
   return fbt(
     `${fbt.param('number of apples', apples)} ` +

diff --git a/..._tests__/fixtures/compiler/fbt/bug-fbt-plural-multiple-mixed-call-tag.expect.md b/..._tests__/fixtures/compiler/fbt/bug-fbt-plural-multiple-mixed-call-tag.expect.md
@@ -4,16 +4,29 @@
 ```javascript
 import fbt from 'fbt';
 
+/**
+ * Similar to error.todo-multiple-fbt-plural, but note that we must
+ * count fbt plurals across both <fbt:plural /> namespaced jsx tags
+ * and fbt.plural(...) call expressions.
+ *
+ * Evaluator error:
+ *   Found differences in evaluator results
+ *   Non-forget (expected):
+ *   (kind: ok) <div>1 apple and 2 bananas</div>
+ *   Forget:
+ *   (kind: ok) <div>1 apples and 2 bananas</div>
+ */
 function useFoo({apples, bananas}) {
   return (
     <div>
-      <fbt desc="Comments ">
+      <fbt desc="Test Description">
         {fbt.param('number of apples', apples)}
         {'  '}
         {fbt.plural('apple', apples)} and
-        {fbt.param('number of bananas', bananas)}
         {'  '}
-        {fbt.plural('banana', bananas)}
+        <fbt:plural name={'number of bananas'} count={bananas} showCount="yes">
+          banana
+        </fbt:plural>
       </fbt>
     </div>
   );
@@ -32,6 +45,18 @@ export const FIXTURE_ENTRYPOINT = {
 import { c as _c } from "react/compiler-runtime";
 import fbt from "fbt";
 
+/**
+ * Similar to error.todo-multiple-fbt-plural, but note that we must
+ * count fbt plurals across both <fbt:plural /> namespaced jsx tags
+ * and fbt.plural(...) call expressions.
+ *
+ * Evaluator error:
+ *   Found differences in evaluator results
+ *   Non-forget (expected):
+ *   (kind: ok) <div>1 apple and 2 bananas</div>
+ *   Forget:
+ *   (kind: ok) <div>1 apples and 2 bananas</div>
+ */
 function useFoo(t0) {
   const $ = _c(3);
   const { apples, bananas } = t0;
@@ -44,17 +69,14 @@ function useFoo(t0) {
             "*": {
               "*": "{number of apples} apples and {number of bananas} bananas",
             },
-            _1: {
-              _1: "{number of apples} apple and {number of bananas} banana",
-            },
+            _1: { _1: "{number of apples} apple and 1 banana" },
           },
           [
             fbt._plural(apples),
-            fbt._plural(bananas),
+            fbt._plural(bananas, "number of bananas"),
             fbt._param("number of apples", apples),
-            fbt._param("number of bananas", bananas),
           ],
-          { hk: "2f5FtZ" },
+          { hk: "2xXrUW" },
         )}
       </div>
     );

diff --git a/...t-compiler/src/__tests__/fixtures/compiler/fbt/bug-fbt-plural-multiple-mixed-call-tag.tsx b/...t-compiler/src/__tests__/fixtures/compiler/fbt/bug-fbt-plural-multiple-mixed-call-tag.tsx
@@ -1,15 +1,28 @@
 import fbt from 'fbt';
 
+/**
+ * Similar to error.todo-multiple-fbt-plural, but note that we must
+ * count fbt plurals across both <fbt:plural /> namespaced jsx tags
+ * and fbt.plural(...) call expressions.
+ *
+ * Evaluator error:
+ *   Found differences in evaluator results
+ *   Non-forget (expected):
+ *   (kind: ok) <div>1 apple and 2 bananas</div>
+ *   Forget:
+ *   (kind: ok) <div>1 apples and 2 bananas</div>
+ */
 function useFoo({apples, bananas}) {
   return (
     <div>
-      <fbt desc="Comments ">
+      <fbt desc="Test Description">
         {fbt.param('number of apples', apples)}
         {'  '}
         {fbt.plural('apple', apples)} and
-        {fbt.param('number of bananas', bananas)}
         {'  '}
-        {fbt.plural('banana', bananas)}
+        <fbt:plural name={'number of bananas'} count={bananas} showCount="yes">
+          banana
+        </fbt:plural>
       </fbt>
     </div>
   );