F#: Added char token (#3271)

PrismJS · Dec 6, 2021 · b58cd72 · b58cd72
1 parent bee6ad5
commit b58cd72
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 24 deletions.
diff --git a/components/prism-fsharp.js b/components/prism-fsharp.js
@@ -2,15 +2,17 @@ Prism.languages.fsharp = Prism.languages.extend('clike', {
 	'comment': [
 		{
 			pattern: /(^|[^\\])\(\*(?!\))[\s\S]*?\*\)/,
-			lookbehind: true
+			lookbehind: true,
+			greedy: true
 		},
 		{
 			pattern: /(^|[^\\:])\/\/.*/,
-			lookbehind: true
+			lookbehind: true,
+			greedy: true
 		}
 	],
 	'string': {
-		pattern: /(?:"""[\s\S]*?"""|@"(?:""|[^"])*"|"(?:\\[\s\S]|[^\\"])*")B?|'(?:[^\\']|\\(?:.|\d{3}|x[a-fA-F\d]{2}|u[a-fA-F\d]{4}|U[a-fA-F\d]{8}))'B?/,
+		pattern: /(?:"""[\s\S]*?"""|@"(?:""|[^"])*"|"(?:\\[\s\S]|[^\\"])*")B?/,
 		greedy: true
 	},
 	'class-name': {
@@ -53,6 +55,7 @@ Prism.languages.insertBefore('fsharp', 'punctuation', {
 Prism.languages.insertBefore('fsharp', 'string', {
 	'annotation': {
 		pattern: /\[<.+?>\]/,
+		greedy: true,
 		inside: {
 			'punctuation': /^\[<|>\]$/,
 			'class-name': {
@@ -64,5 +67,9 @@ Prism.languages.insertBefore('fsharp', 'string', {
 				inside: Prism.languages.fsharp
 			}
 		}
+	},
+	'char': {
+		pattern: /'(?:[^\\']|\\(?:.|\d{3}|x[a-fA-F\d]{2}|u[a-fA-F\d]{4}|U[a-fA-F\d]{8}))'B?/,
+		greedy: true
 	}
 });
diff --git a/components/prism-fsharp.min.js b/components/prism-fsharp.min.js
diff --git a/tests/languages/fsharp/char_feature.test b/tests/languages/fsharp/char_feature.test
@@ -0,0 +1,21 @@
+'a'
+'a'B
+'\''
+'\\'
+'\231'
+'\x41'
+'\u0041'
+'\U0001F47D'
+
+----------------------------------------------------
+
+[
+	["char", "'a'"],
+	["char", "'a'B"],
+	["char", "'\\''"],
+	["char", "'\\\\'"],
+	["char", "'\\231'"],
+	["char", "'\\x41'"],
+	["char", "'\\u0041'"],
+	["char", "'\\U0001F47D'"]
+]
diff --git a/tests/languages/fsharp/string_feature.test b/tests/languages/fsharp/string_feature.test
@@ -14,15 +14,6 @@ bar"
 bar"""
 """foo"""B
 
-'a'
-'a'B
-'\''
-'\\'
-'\231'
-'\x41'
-'\u0041'
-'\U0001F47D'
-
 ----------------------------------------------------
 
 [
@@ -38,18 +29,9 @@ bar"""
 
 	["string", "\"\"\"\"\"\""],
 	["string", "\"\"\"fo\"\"o\"\r\nbar\"\"\""],
-	["string", "\"\"\"foo\"\"\"B"],
-
-	["string", "'a'"],
-	["string", "'a'B"],
-	["string", "'\\''"],
-	["string", "'\\\\'"],
-	["string", "'\\231'"],
-	["string", "'\\x41'"],
-	["string", "'\\u0041'"],
-	["string", "'\\U0001F47D'"]
+	["string", "\"\"\"foo\"\"\"B"]
 ]
 
 ----------------------------------------------------
 
-Checks for normal strings, verbatim strings, triple-quoted strings and character literals.
+Checks for normal strings, verbatim strings, and triple-quoted strings.