AQL: Differenciate between strings and identifiers (#3183)

PrismJS · Nov 22, 2021 · fa540ab · fa540ab
1 parent 9f5e511
commit fa540ab
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/components/prism-aql.js b/components/prism-aql.js
@@ -6,7 +6,11 @@ Prism.languages.aql = {
 		greedy: true
 	},
 	'string': {
-		pattern: /(["'´`])(?:(?!\1)[^\\\r\n]|\\.)*\1/,
+		pattern: /(["'])(?:(?!\1)[^\\\r\n]|\\.)*\1/,
+		greedy: true
+	},
+	'identifier': {
+		pattern: /([´`])(?:(?!\1)[^\\\r\n]|\\.)*\1/,
 		greedy: true
 	},
 	'variable': /@@?\w+/,

diff --git a/components/prism-aql.min.js b/components/prism-aql.min.js
diff --git a/tests/languages/aql/identifier_feature.test b/tests/languages/aql/identifier_feature.test
@@ -0,0 +1,9 @@
+´filter´
+`sort`
+
+----------------------------------------------------
+
+[
+	["identifier", "´filter´"],
+	["identifier", "`sort`"]
+]
diff --git a/tests/languages/aql/string_feature.test b/tests/languages/aql/string_feature.test
@@ -10,9 +10,6 @@
 'this is a longer string.'
 'the path separator on Windows is \\'
 
-´filter´
-`sort`
-
 ----------------------------------------------------
 
 [
@@ -21,13 +18,12 @@
 	["string", "\"this is a \\\"quoted\\\" word\""],
 	["string", "\"this is a longer string.\""],
 	["string", "\"the path separator on Windows is \\\\\""],
+
 	["string", "'yikes!'"],
 	["string", "'don\\'t know'"],
 	["string", "'this is a \"quoted\" word'"],
 	["string", "'this is a longer string.'"],
-	["string", "'the path separator on Windows is \\\\'"],
-	["string", "´filter´"],
-	["string", "`sort`"]
+	["string", "'the path separator on Windows is \\\\'"]
 ]
 
 ----------------------------------------------------