Scheme: Adjusted lookbehind for literals (#2396)

PrismJS · Jun 4, 2020 · 1e3f542 · 1e3f542
1 parent cb6349e
commit 1e3f542
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/components/prism-scheme.js b/components/prism-scheme.js
@@ -48,10 +48,13 @@ Prism.languages.scheme = {
 		// <b.o.x. number>  := <b.o.x. prefix>[+-]?<b.o.x. complex>
 		//
 		// <number>         := <dec number>|<b.o.x. number>
-		pattern: /([\s()])(?:(?:#d(?:#[ei])?|#[ei](?:#d)?)?[+-]?(?:(?:\d*\.?\d+(?:[eE][+-]?\d+)?|\d+\/\d+)(?:[+-](?:\d*\.?\d+(?:[eE][+-]?\d+)?|\d+\/\d+)i)?|(?:\d*\.?\d+(?:[eE][+-]?\d+)?|\d+\/\d+)i)|(?:#[box](?:#[ei])?|#[ei](?:#[box])?)[+-]?(?:[\da-fA-F]+(?:\/[\da-fA-F]+)?(?:[+-][\da-fA-F]+(?:\/[\da-fA-F]+)?i)?|[\da-fA-F]+(?:\/[\da-fA-F]+)?i))(?=[()\s]|$)/,
+		pattern: /(^|[\s()])(?:(?:#d(?:#[ei])?|#[ei](?:#d)?)?[+-]?(?:(?:\d*\.?\d+(?:[eE][+-]?\d+)?|\d+\/\d+)(?:[+-](?:\d*\.?\d+(?:[eE][+-]?\d+)?|\d+\/\d+)i)?|(?:\d*\.?\d+(?:[eE][+-]?\d+)?|\d+\/\d+)i)|(?:#[box](?:#[ei])?|#[ei](?:#[box])?)[+-]?(?:[\da-fA-F]+(?:\/[\da-fA-F]+)?(?:[+-][\da-fA-F]+(?:\/[\da-fA-F]+)?i)?|[\da-fA-F]+(?:\/[\da-fA-F]+)?i))(?=[()\s]|$)/,
+		lookbehind: true
+	},
+	'boolean': {
+		pattern: /(^|[\s()])#[ft](?=[()\s]|$)/,
 		lookbehind: true
 	},
-	'boolean': /#[ft](?=[()\s]|$)/,
 	'operator': {
 		pattern: /(\()(?:[-+*%\/]|[<>]=?|=>?)(?=[()\s]|$)/,
 		lookbehind: true

diff --git a/components/prism-scheme.min.js b/components/prism-scheme.min.js
diff --git a/tests/languages/scheme/number_feature.test b/tests/languages/scheme/number_feature.test
@@ -1,3 +1,5 @@
+123
+
 (foo 42 +42 -42)
 (foo 1e3 +1e3 -1e3)
 (foo 1e+3 1e-3 3.14159 3.14159e-1)
@@ -16,6 +18,8 @@
 ----------------------------------------------------
 
 [
+	["number", "123"],
+
 	["punctuation", "("],
 	["function", "foo"],
 	["number", "42"],