fix: Update regex in valid-sprintf rule to handle '%%'

WordPress · Dec 24, 2024 · 1963486 · 1963486
1 parent 910c38f
commit 1963486
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/packages/eslint-plugin/rules/__tests__/valid-sprintf.js b/packages/eslint-plugin/rules/__tests__/valid-sprintf.js
@@ -71,6 +71,18 @@ sprintf(
 		{
 			code: `sprintf( '%(greeting)s %(toWhom)s', 'Hello', 'World' )`,
 		},
+		{
+			code: `sprintf( 'Rotated at %d %% degrees', 90 )`,
+		},
+		{
+			code: `sprintf( 'Rotated at %d%% degrees', 90 )`,
+		},
+		{
+			code: `sprintf( __( 'Rotated at %d%% degrees' ), 90 )`,
+		},
+		{
+			code: `sprintf( 'Rotated at %1$d %% degrees, %2$d %% angles', 90, 180 )`,
+		},
 	],
 	invalid: [
 		{

diff --git a/packages/eslint-plugin/utils/constants.js b/packages/eslint-plugin/utils/constants.js
@@ -37,13 +37,13 @@ const TRANSLATION_FUNCTIONS = new Set( [ '__', '_x', '_n', '_nx' ] );
  * @type {RegExp}
  */
 const REGEXP_SPRINTF_PLACEHOLDER =
-	/%(((\d+)\$)|(\(([$_a-zA-Z][$_a-zA-Z0-9]*)\)))?[ +0#-]*\d*(\.(\d+|\*))?(ll|[lhqL])?([cduxXefgsp%])/g;
-//               ▲         ▲                    ▲       ▲  ▲            ▲           ▲ type
-//               │         │                    │       │  │            └ Length (unsupported)
-//               │         │                    │       │  └ Precision / max width
-//               │         │                    │       └ Min width (unsupported)
-//               │         │                    └ Flags (unsupported)
-//               └ Index   └ Name (for named arguments)
+	/(?<!%)%(((\d+)\$)|(\(([$_a-zA-Z][$_a-zA-Z0-9]*)\)))?[ +0#-]*\d*(\.(\d+|\*))?(ll|[lhqL])?([cduxXefgsp])/g;
+//               	  ▲         ▲                    ▲       ▲  ▲            ▲           ▲ type
+//               	  │         │                    │       │  │            └ Length (unsupported)
+//               	  │         │                    │       │  └ Precision / max width
+//               	  │         │                    │       └ Min width (unsupported)
+//               	  │         │                    └ Flags (unsupported)
+//               	  └ Index   └ Name (for named arguments)
 
 /**
  * "Unordered" means there's no position specifier: '%s', not '%2$s'.