Merge pull request #12 from Maxim-Mazurok/master

shouldFoundAcrossMultilineInTheMiddleOfLineMultipleTimes - Improves the specification of the number of the line of the found error for the final report

Author: gmullerb

lib/rules/invalid-regex-rule.js

@@ -54,7 +54,8 @@ function foundStart(source, nextLine, foundAt) {
     { line: nextLine, column: 0 })
 }
 
-function checkRegex(source, sourceLines, nextLine, nextChar, rootChar, pattern, replace, report) {
+function checkRegex(source, sourceLines, nextLine, nextChar, rootChar, pattern, replace, report, originalSource) {
+  originalSource = originalSource || source
   if (source.length !== 0) {
     const sourceDetail = checkRegexInSource(source, pattern.regex)
     if (sourceDetail.patternIndex !== -1) {
@@ -76,18 +77,19 @@ function checkRegex(source, sourceLines, nextLine, nextChar, rootChar, pattern,
           fix: replace(rootChar, sourceDetail)
         })
         checkRegex(remainingSource, sourceLines, foundDetail.nextLine, foundDetail.nextChar, rootChar + remainingSourceStart,
-          pattern, replace, report)
+          pattern, replace, report, originalSource)
       }
       else {
         report({
-          loc: { start: foundStart(source, nextLine + 1, sourceDetail.patternIndex) },
+          loc: { start: foundStart(originalSource, 1, sourceDetail.patternIndex + rootChar) },
           message: formatReportMessage(
             pattern,
             from => `Invalid regular expression ${from} found`
           ),
           fix: replace(rootChar, sourceDetail)
         })
-        checkRegex(remainingSource, sourceLines, nextLine + 1, nextChar, rootChar + remainingSourceStart, pattern, replace, report)
+        checkRegex(remainingSource, sourceLines, nextLine + 1, nextChar, rootChar + remainingSourceStart, pattern, replace, report,
+          originalSource)
       }
     }
   }

tests/lib/rules/invalid-regex-rule.e2e-test.js

@@ -146,6 +146,37 @@ const shouldFoundAcrossMultilineInTheMiddleOfLine = {
   }]
 }
 
+const shouldFoundAcrossMultilineInTheMiddleOfLineMultipleTimes = {
+  code: [
+    'const one = `{',
+    '    "TotalItems":5,',
+    '}`;',
+    'const two = `{',
+    '    "TotalItems":5,',
+    '}`;',
+    'const three = `{',
+    '    "TotalItems":5,',
+    '}`;'
+  ].join('\n'),
+  filename: 'some.js',
+  options: [
+    ['[`\'"][\\s\\n]*\\{[\\s\\n]*"']
+  ],
+  errors: [{
+    message: 'Invalid regular expression /[`\'"][\\s\\n]*\\{[\\s\\n]*"/gm found',
+    line: 1,
+    column: 13
+  }, {
+    message: 'Invalid regular expression /[`\'"][\\s\\n]*\\{[\\s\\n]*"/gm found',
+    line: 4,
+    column: 13
+  }, {
+    message: 'Invalid regular expression /[`\'"][\\s\\n]*\\{[\\s\\n]*"/gm found',
+    line: 7,
+    column: 15
+  }]
+}
+
 ruleTester.run(
   'invalid',
   invalidRegexRule, {
@@ -161,7 +192,8 @@ ruleTester.run(
       shouldFoundSameMultiline,
       shouldFoundAcrossLines,
       shouldFoundAcrossMultiline,
-      shouldFoundAcrossMultilineInTheMiddleOfLine
+      shouldFoundAcrossMultilineInTheMiddleOfLine,
+      shouldFoundAcrossMultilineInTheMiddleOfLineMultipleTimes
     ]
   }
 )