Merge pull request #90 from grafana/fix/better-variable-avoidance

[fix] Extend variable RegExp (still pretty lose, but not uber lose)
grafana · Nov 17, 2021 · a8c3510 · a8c3510
2 parents 94b40db + ed6b447
commit a8c3510
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 3 deletions.
diff --git a/src/expression.js b/src/expression.js
@@ -3,9 +3,9 @@ const lineBreak = /\n/
 const lineComment = /^\/\//
 const multilineComment = /^\/\*/
 const multilineCommentEnds = /\*\//g
-const variable = /\${([^}]*)}/
-const variables = /\${([^}]*)}/g
-const variableStart = /^\${([^}]*)}/
+const variable = /\${([^}\r\n\t\f\v]*)}/
+const variables = /\${([^}\r\n\t\f\v]*)}/g
+const variableStart = /^\${([^}\r\n\t\f\v]*)}/
 
 module.exports = {
   absoluteUrl,

diff --git a/test/e2e/pass/better-variable-avoidance.har b/test/e2e/pass/better-variable-avoidance.har
diff --git a/test/e2e/pass/better-variable-avoidance.js b/test/e2e/pass/better-variable-avoidance.js