Update: support multiline /*eslint-env*/ directives (fixes #14652) (#14660)

aladdin-add · mdjermanovic · web-flow · commit c5451635b4e8 · 2021-06-04T18:46:53.000+02:00
* Fix: linter ignores multiline /*eslint-env*/ directives (fixes #14652) * Update lib/linter/linter.js Co-authored-by: Milos Djermanovic <milos.djermanovic@gmail.com> * Chore: add more tests Co-authored-by: Milos Djermanovic <milos.djermanovic@gmail.com>
diff --git a/lib/linter/linter.js b/lib/linter/linter.js
@@ -444,7 +444,7 @@ function normalizeEcmaVersion(ecmaVersion) {
     return ecmaVersion >= 2015 ? ecmaVersion - 2009 : ecmaVersion;
 }
 
-const eslintEnvPattern = /\/\*\s*eslint-env\s(.+?)\*\//gu;
+const eslintEnvPattern = /\/\*\s*eslint-env\s(.+?)\*\//gsu;
 
 /**
  * Checks whether or not there is a comment which has "eslint-env *" in a given text.
diff --git a/tests/lib/linter/linter.js b/tests/lib/linter/linter.js
@@ -2973,6 +2973,23 @@ var a = "test2";
             assert.strictEqual(messages.length, 0);
         });
 
+        // https://github.com/eslint/eslint/issues/14652
+        it("should not report a violation", () => {
+            const codes = [
+                "/*eslint-env es6\n */ new Promise();",
+                "/*eslint-env browser,\nes6 */ window;Promise;",
+                "/*eslint-env\nbrowser,es6 */ window;Promise;"
+            ];
+            const config = { rules: { "no-undef": 1 } };
+
+            for (const code of codes) {
+                const messages = linter.verify(code, config, filename);
+
+                assert.strictEqual(messages.length, 0);
+            }
+
+        });
+
         it("should not report a violation", () => {
             const code = `/*${ESLINT_ENV} mocha,node */ require();describe();`;
 

Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,7 @@ function normalizeEcmaVersion(ecmaVersion) {`
`444`	`444`	`return ecmaVersion >= 2015 ? ecmaVersion - 2009 : ecmaVersion;`
`445`	`445`	`}`
`446`	`446`
`447`		`-const eslintEnvPattern = /\/\\seslint-env\s(.+?)\*\//gu;`
	`447`	`+const eslintEnvPattern = /\/\\seslint-env\s(.+?)\*\//gsu;`
`448`	`448`
`449`	`449`	`/**`
`450`	`450`	`* Checks whether or not there is a comment which has "eslint-env *" in a given text.`