D: Added standard char token (#3196)

RunDevelopment · web-flow · commit dafdbdecf572 · 2021-11-22T13:11:45.000+01:00
diff --git a/components/prism-d.js b/components/prism-d.js
@@ -37,10 +37,6 @@ Prism.languages.d = Prism.languages.extend('clike', {
 				// eslint-disable-next-line regexp/strict
 				/\bq"(.)[\s\S]*?\2"/.source,
 
-				// Characters
-				// 'a', '\\', '\n', '\xFF', '\377', '\uFFFF', '\U0010FFFF', '\quot'
-				/'(?:\\(?:\W|\w+)|[^\\])'/.source,
-
 				// eslint-disable-next-line regexp/strict
 				/(["`])(?:\\[\s\S]|(?!\3)[^\\])*\3[cwd]?/.source
 			].join('|'), 'm'),
@@ -69,6 +65,12 @@ Prism.languages.d = Prism.languages.extend('clike', {
 	'operator': /\|[|=]?|&[&=]?|\+[+=]?|-[-=]?|\.?\.\.|=[>=]?|!(?:i[ns]\b|<>?=?|>=?|=)?|\bi[ns]\b|(?:<[<>]?|>>?>?|\^\^|[*\/%^~])=?/
 });
 
+Prism.languages.insertBefore('d', 'string', {
+	// Characters
+	// 'a', '\\', '\n', '\xFF', '\377', '\uFFFF', '\U0010FFFF', '\quot'
+	'char': /'(?:\\(?:\W|\w+)|[^\\])'/
+});
+
 Prism.languages.insertBefore('d', 'keyword', {
 	'property': /\B@\w*/
 });
diff --git a/components/prism-d.min.js b/components/prism-d.min.js
diff --git a/tests/languages/d/char_feature.test b/tests/languages/d/char_feature.test
@@ -0,0 +1,23 @@
+'a'
+'\''
+'\\'
+'\n'
+'\xFF'
+'\377'
+'\uFFFF'
+'\U0010FFFF'
+'\quot'
+
+----------------------------------------------------
+
+[
+	["char", "'a'"],
+	["char", "'\\''"],
+	["char", "'\\\\'"],
+	["char", "'\\n'"],
+	["char", "'\\xFF'"],
+	["char", "'\\377'"],
+	["char", "'\\uFFFF'"],
+	["char", "'\\U0010FFFF'"],
+	["char", "'\\quot'"]
+]
diff --git a/tests/languages/d/string_feature.test b/tests/languages/d/string_feature.test
@@ -19,8 +19,6 @@ bar/"
 q"|fo"o
 bar|"
 
-'a' '\'' '\\' '\n' '\xFF' '\377' '\uFFFF' '\U0010FFFF' '\quot'
-
 ""
 "foo"c "bar"w "baz"d
 "fo\"o
@@ -50,20 +48,8 @@ q{ q{bar} }
 	["string", "q\"/fo\"o\r\nbar/\""],
 	["string", "q\"|fo\"o\r\nbar|\""],
 
-	["string", "'a'"],
-	["string", "'\\''"],
-	["string", "'\\\\'"],
-	["string", "'\\n'"],
-	["string", "'\\xFF'"],
-	["string", "'\\377'"],
-	["string", "'\\uFFFF'"],
-	["string", "'\\U0010FFFF'"],
-	["string", "'\\quot'"],
-
 	["string", "\"\""],
-	["string", "\"foo\"c"],
-	["string", "\"bar\"w"],
-	["string", "\"baz\"d"],
+	["string", "\"foo\"c"], ["string", "\"bar\"w"], ["string", "\"baz\"d"],
 	["string", "\"fo\\\"o\r\nbar\""],
 	["string", "`foo`"],
 
