escape-case: Fix missing characters (#678)

Author: fisker

rules/escape-case.js

@@ -2,67 +2,47 @@
 const getDocumentationUrl = require('./utils/get-documentation-url');
 const replaceTemplateElement = require('./utils/replace-template-element');
 
-const escapeWithLowercase = /(?<=(?:^|[^\\])(?:\\\\)*\\)(?<data>x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|u{[\dA-Fa-f]+})/;
-const escapePatternWithLowercase = /(?<=(?:^|[^\\])(?:\\\\)*\\)(?<data>x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|u{[\dA-Fa-f]+}|c[a-z])/;
+const escapeWithLowercase = /(?<=(?:^|[^\\])(?:\\\\)*\\)(?<data>x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|u{[\dA-Fa-f]+})/g;
+const escapePatternWithLowercase = /(?<=(?:^|[^\\])(?:\\\\)*\\)(?<data>x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|u{[\dA-Fa-f]+}|c[a-z])/g;
 const message = 'Use uppercase characters for the value of the escape sequence.';
 
-const fix = (value, regexp) => {
-	const results = regexp.exec(value);
-
-	if (results) {
-		const {data} = results.groups;
-		const fixedEscape = data.slice(0, 1) + data.slice(1).toUpperCase();
-		return (
-			value.slice(0, results.index) +
-			fixedEscape +
-			value.slice(results.index + data.length)
-		);
-	}
-
-	return value;
-};
-
 const create = context => {
+	const check = ({node, original, regex = escapeWithLowercase, fix}) => {
+		const fixed = original.replace(regex, data => data.slice(0, 1) + data.slice(1).toUpperCase());
+
+		if (fixed !== original) {
+			context.report({
+				node,
+				message,
+				fix: fixer => fix ? fix(fixer, fixed) : fixer.replaceText(node, fixed)
+			});
+		}
+	};
+
 	return {
 		Literal(node) {
 			if (typeof node.value !== 'string') {
 				return;
 			}
 
-			const original = node.raw;
-			const fixed = fix(original, escapeWithLowercase);
-
-			if (fixed !== original) {
-				context.report({
-					node,
-					message,
-					fix: fixer => fixer.replaceText(node, fixed)
-				});
-			}
+			check({
+				node,
+				original: node.raw
+			});
 		},
 		'Literal[regex]'(node) {
-			const original = node.raw;
-			const fixed = fix(original, escapePatternWithLowercase);
-
-			if (fixed !== original) {
-				context.report({
-					node,
-					message,
-					fix: fixer => fixer.replaceText(node, fixed)
-				});
-			}
+			check({
+				node,
+				original: node.raw,
+				regex: escapePatternWithLowercase
+			});
 		},
 		TemplateElement(node) {
-			const original = node.value.raw;
-			const fixed = fix(original, escapePatternWithLowercase);
-
-			if (fixed !== original) {
-				context.report({
-					node,
-					message,
-					fix: fixer => replaceTemplateElement(fixer, node, fixed)
-				});
-			}
+			check({
+				node,
+				original: node.value.raw,
+				fix: (fixer, fixed) => replaceTemplateElement(fixer, node, fixed)
+			});
 		}
 	};
 };

test/escape-case.js

@@ -31,6 +31,7 @@ ruleTester.run('escape-case', rule, {
 		'const foo = "foo\\\\ubarbaz";',
 		'const foo = "foo\\\\\\\\xbar";',
 		'const foo = "foo\\\\\\\\ubarbaz";',
+		'const foo = "\\ca";',
 
 		// TemplateLiteral
 		'const foo = `\\xA9`;',
@@ -46,6 +47,7 @@ ruleTester.run('escape-case', rule, {
 		'const foo = `foo\\\\ubarbaz`;',
 		'const foo = `foo\\\\\\\\xbar`;',
 		'const foo = `foo\\\\\\\\ubarbaz`;',
+		'const foo = `\\ca`;',
 
 		// Literal regex
 		'const foo = /foo\\xA9/',
@@ -63,6 +65,7 @@ ruleTester.run('escape-case', rule, {
 		'const foo = new RegExp("/\\xA9")',
 		'const foo = new RegExp("/\\uD834/")',
 		'const foo = new RegExp("/\\u{1D306}/", "u")',
+		'const foo = new RegExp("/\\ca/")',
 		'const foo = new RegExp("/\\cA/")'
 	],
 	invalid: [
@@ -72,6 +75,7 @@ ruleTester.run('escape-case', rule, {
 			errors,
 			output: 'const foo = "\\xA9";'
 		},
+
 		// Mixed cases
 		{
 			code: 'const foo = "\\xAa";',
@@ -88,6 +92,14 @@ ruleTester.run('escape-case', rule, {
 			errors,
 			output: 'const foo = "\\u{AAAA}";'
 		},
+
+		// Many
+		{
+			code: 'const foo = "\\xAab\\xaab\\xAAb\\uAaAab\\uaaaab\\uAAAAb\\u{AaAa}b\\u{aaaa}b\\u{AAAA}";',
+			errors,
+			output: 'const foo = "\\xAAb\\xAAb\\xAAb\\uAAAAb\\uAAAAb\\uAAAAb\\u{AAAA}b\\u{AAAA}b\\u{AAAA}";'
+		},
+
 		{
 			code: 'const foo = "\\ud834";',
 			errors,
@@ -186,6 +198,30 @@ ruleTester.run('escape-case', rule, {
 			output: 'const foo = `foo \\\\\\uD834`;'
 		},
 
+		// Mixed cases
+		{
+			code: 'const foo = `\\xAa`;',
+			errors,
+			output: 'const foo = `\\xAA`;'
+		},
+		{
+			code: 'const foo = `\\uAaAa`;',
+			errors,
+			output: 'const foo = `\\uAAAA`;'
+		},
+		{
+			code: 'const foo = `\\u{AaAa}`;',
+			errors,
+			output: 'const foo = `\\u{AAAA}`;'
+		},
+
+		// Many
+		{
+			code: 'const foo = `\\xAab\\xaab\\xAA${foo}\\uAaAab\\uaaaab\\uAAAAb\\u{AaAa}${foo}\\u{aaaa}b\\u{AAAA}`;',
+			errors: Array.from({length: 3}, () => errors[0]),
+			output: 'const foo = `\\xAAb\\xAAb\\xAA${foo}\\uAAAAb\\uAAAAb\\uAAAAb\\u{AAAA}${foo}\\u{AAAA}b\\u{AAAA}`;'
+		},
+
 		// Literal regex
 		{
 			code: 'const foo = /\\xa9/;',
@@ -218,6 +254,30 @@ ruleTester.run('escape-case', rule, {
 			output: 'const foo = /foo\\\\\\\\\\xA9/;'
 		},
 
+		// Mixed cases
+		{
+			code: 'const foo = /\\xAa/;',
+			errors,
+			output: 'const foo = /\\xAA/;'
+		},
+		{
+			code: 'const foo = /\\uAaAa/;',
+			errors,
+			output: 'const foo = /\\uAAAA/;'
+		},
+		{
+			code: 'const foo = /\\u{AaAa}/;',
+			errors,
+			output: 'const foo = /\\u{AAAA}/;'
+		},
+
+		// Many
+		{
+			code: 'const foo = /\\xAab\\xaab\\xAAb\\uAaAab\\uaaaab\\uAAAAb\\u{AaAa}b\\u{aaaa}b\\u{AAAA}b\\ca/;',
+			errors,
+			output: 'const foo = /\\xAAb\\xAAb\\xAAb\\uAAAAb\\uAAAAb\\uAAAAb\\u{AAAA}b\\u{AAAA}b\\u{AAAA}b\\cA/;'
+		},
+
 		// RegExp
 		{
 			code: 'const foo = new RegExp("/\\xa9")',