Scheme: Added bracket support (#2813)

components/prism-racket.js

@@ -2,58 +2,11 @@ Prism.languages.racket = Prism.languages.extend('scheme', {
 	'lambda-parameter': {
 		// the racket lambda syntax is a lot more complex, so we won't even attempt to capture it.
 		// this will just prevent false positives of the `function` pattern
-		pattern: /(\(lambda\s+\()[^()'\s]+/,
+		pattern: /([(\[]lambda\s+[(\[])[^()\[\]'\s]+/,
 		lookbehind: true
 	}
 });
 
-// Add brackets to racket
-// The basic idea here is to go through all pattens of Scheme and replace all occurrences of "(" with the union of "("
-// and "["; Similar for ")". This is a bit tricky because "(" can be escaped or inside a character set. Both cases
-// have to be handled differently and, of course, we don't want to destroy groups, so we can only replace literal "("
-// and ")".
-// To do this, we use a regular expression which will parse any JS regular expression. It works because regexes are
-// matches from left to right and already matched text cannot be matched again. We use this to first capture all
-// escaped characters (not really, we don't get escape sequences but we don't need them). Because we already captured
-// all escaped characters, we know that any "[" character is the start of a character set, so we match that character
-// set whole.
-// With the regex parsed, we only have to replace all escaped "(" (they cannot be unescaped outside of character sets)
-// with /[([]/ and replace all "(" inside character sets.
-// Note: This method does not work for "(" that are escaped like this /\x28/ or this /\u0028/.
-Prism.languages.DFS(Prism.languages.racket, function (key, value) {
-	if (Prism.util.type(value) === 'RegExp') {
-		var source = value.source.replace(/\\(.)|\[\^?((?:\\.|[^\\\]])*)\]/g, function (m, g1, g2) {
-			if (g1) {
-				if (g1 === '(') {
-					// replace all '(' characters outside character sets
-					return '[([]';
-				}
-				if (g1 === ')') {
-					// replace all ')' characters outside character sets
-					return '[)\\]]';
-				}
-			}
-			if (g2) {
-				var prefix = m[1] === '^' ? '[^' : '[';
-				return prefix + g2.replace(/\\(.)|[()]/g, function (m, g1) {
-					if (m === '(' || g1 === '(') {
-						// replace all '(' characters inside character sets
-						return '([';
-					}
-					if (m === ')' || g1 === ')') {
-						// replace all ')' characters inside character sets
-						return ')\\]';
-					}
-					return m;
-				}) + ']';
-			}
-			return m;
-		});
-
-		this[key] = RegExp(source, value.flags);
-	}
-});
-
 Prism.languages.insertBefore('racket', 'string', {
 	'lang': {
 		pattern: /^#lang.+/m,

components/prism-scheme.js

@@ -5,13 +5,13 @@
 		// and (potentially nested) multiline comments:
 		//   #| comment #| nested |# still comment |#
 		// (only 1 level of nesting is supported)
-		'comment': /;.*|#;\s*\((?:[^()]|\([^()]*\))*\)|#\|(?:[^#|]|#(?!\|)|\|(?!#)|#\|(?:[^#|]|#(?!\|)|\|(?!#))*\|#)*\|#/,
+		'comment': /;.*|#;\s*(?:\((?:[^()]|\([^()]*\))*\)|\[(?:[^\[\]]|\[[^\[\]]*\])*\])|#\|(?:[^#|]|#(?!\|)|\|(?!#)|#\|(?:[^#|]|#(?!\|)|\|(?!#))*\|#)*\|#/,
 		'string': {
 			pattern: /"(?:[^"\\]|\\.)*"/,
 			greedy: true
 		},
 		'symbol': {
-			pattern: /'[^()#'\s]+/,
+			pattern: /'[^()\[\]#'\s]+/,
 			greedy: true
 		},
 		'character': {
@@ -22,25 +22,25 @@
 		'lambda-parameter': [
 			// https://www.cs.cmu.edu/Groups/AI/html/r4rs/r4rs_6.html#SEC30
 			{
-				pattern: /((?:^|[^'`#])\(lambda\s+)(?:[^|()'\s]+|\|(?:[^\\|]|\\.)*\|)/,
+				pattern: /((?:^|[^'`#])[(\[]lambda\s+)(?:[^|()\[\]'\s]+|\|(?:[^\\|]|\\.)*\|)/,
 				lookbehind: true
 			},
 			{
-				pattern: /((?:^|[^'`#])\(lambda\s+\()[^()']+/,
+				pattern: /((?:^|[^'`#])[(\[]lambda\s+[(\[])[^()\[\]']+/,
 				lookbehind: true
 			}
 		],
 		'keyword': {
-			pattern: /((?:^|[^'`#])\()(?:begin|case(?:-lambda)?|cond(?:-expand)?|define(?:-library|-macro|-record-type|-syntax|-values)?|defmacro|delay(?:-force)?|do|else|export|except|guard|if|import|include(?:-ci|-library-declarations)?|lambda|let(?:rec)?(?:-syntax|-values|\*)?|let\*-values|only|parameterize|prefix|(?:quasi-?)?quote|rename|set!|syntax-(?:case|rules)|unless|unquote(?:-splicing)?|when)(?=[()\s]|$)/,
+			pattern: /((?:^|[^'`#])[(\[])(?:begin|case(?:-lambda)?|cond(?:-expand)?|define(?:-library|-macro|-record-type|-syntax|-values)?|defmacro|delay(?:-force)?|do|else|export|except|guard|if|import|include(?:-ci|-library-declarations)?|lambda|let(?:rec)?(?:-syntax|-values|\*)?|let\*-values|only|parameterize|prefix|(?:quasi-?)?quote|rename|set!|syntax-(?:case|rules)|unless|unquote(?:-splicing)?|when)(?=[()\[\]\s]|$)/,
 			lookbehind: true
 		},
 		'builtin': {
 			// all functions of the base library of R7RS plus some of built-ins of R5Rs
-			pattern: /((?:^|[^'`#])\()(?:abs|and|append|apply|assoc|ass[qv]|binary-port\?|boolean=?\?|bytevector(?:-append|-copy|-copy!|-length|-u8-ref|-u8-set!|\?)?|caar|cadr|call-with-(?:current-continuation|port|values)|call\/cc|car|cdar|cddr|cdr|ceiling|char(?:->integer|-ready\?|\?|<\?|<=\?|=\?|>\?|>=\?)|close-(?:input-port|output-port|port)|complex\?|cons|current-(?:error|input|output)-port|denominator|dynamic-wind|eof-object\??|eq\?|equal\?|eqv\?|error|error-object(?:-irritants|-message|\?)|eval|even\?|exact(?:-integer-sqrt|-integer\?|\?)?|expt|features|file-error\?|floor(?:-quotient|-remainder|\/)?|flush-output-port|for-each|gcd|get-output-(?:bytevector|string)|inexact\??|input-port(?:-open\?|\?)|integer(?:->char|\?)|lcm|length|list(?:->string|->vector|-copy|-ref|-set!|-tail|\?)?|make-(?:bytevector|list|parameter|string|vector)|map|max|member|memq|memv|min|modulo|negative\?|newline|not|null\?|number(?:->string|\?)|numerator|odd\?|open-(?:input|output)-(?:bytevector|string)|or|output-port(?:-open\?|\?)|pair\?|peek-char|peek-u8|port\?|positive\?|procedure\?|quotient|raise|raise-continuable|rational\?|rationalize|read-(?:bytevector|bytevector!|char|error\?|line|string|u8)|real\?|remainder|reverse|round|set-c[ad]r!|square|string(?:->list|->number|->symbol|->utf8|->vector|-append|-copy|-copy!|-fill!|-for-each|-length|-map|-ref|-set!|\?|<\?|<=\?|=\?|>\?|>=\?)?|substring|symbol(?:->string|\?|=\?)|syntax-error|textual-port\?|truncate(?:-quotient|-remainder|\/)?|u8-ready\?|utf8->string|values|vector(?:->list|->string|-append|-copy|-copy!|-fill!|-for-each|-length|-map|-ref|-set!|\?)?|with-exception-handler|write-(?:bytevector|char|string|u8)|zero\?)(?=[()\s]|$)/,
+			pattern: /((?:^|[^'`#])[(\[])(?:abs|and|append|apply|assoc|ass[qv]|binary-port\?|boolean=?\?|bytevector(?:-append|-copy|-copy!|-length|-u8-ref|-u8-set!|\?)?|caar|cadr|call-with-(?:current-continuation|port|values)|call\/cc|car|cdar|cddr|cdr|ceiling|char(?:->integer|-ready\?|\?|<\?|<=\?|=\?|>\?|>=\?)|close-(?:input-port|output-port|port)|complex\?|cons|current-(?:error|input|output)-port|denominator|dynamic-wind|eof-object\??|eq\?|equal\?|eqv\?|error|error-object(?:-irritants|-message|\?)|eval|even\?|exact(?:-integer-sqrt|-integer\?|\?)?|expt|features|file-error\?|floor(?:-quotient|-remainder|\/)?|flush-output-port|for-each|gcd|get-output-(?:bytevector|string)|inexact\??|input-port(?:-open\?|\?)|integer(?:->char|\?)|lcm|length|list(?:->string|->vector|-copy|-ref|-set!|-tail|\?)?|make-(?:bytevector|list|parameter|string|vector)|map|max|member|memq|memv|min|modulo|negative\?|newline|not|null\?|number(?:->string|\?)|numerator|odd\?|open-(?:input|output)-(?:bytevector|string)|or|output-port(?:-open\?|\?)|pair\?|peek-char|peek-u8|port\?|positive\?|procedure\?|quotient|raise|raise-continuable|rational\?|rationalize|read-(?:bytevector|bytevector!|char|error\?|line|string|u8)|real\?|remainder|reverse|round|set-c[ad]r!|square|string(?:->list|->number|->symbol|->utf8|->vector|-append|-copy|-copy!|-fill!|-for-each|-length|-map|-ref|-set!|\?|<\?|<=\?|=\?|>\?|>=\?)?|substring|symbol(?:->string|\?|=\?)|syntax-error|textual-port\?|truncate(?:-quotient|-remainder|\/)?|u8-ready\?|utf8->string|values|vector(?:->list|->string|-append|-copy|-copy!|-fill!|-for-each|-length|-map|-ref|-set!|\?)?|with-exception-handler|write-(?:bytevector|char|string|u8)|zero\?)(?=[()\[\]\s]|$)/,
 			lookbehind: true
 		},
 		'operator': {
-			pattern: /((?:^|[^'`#])\()(?:[-+*%/]|[<>]=?|=>?)(?=[()\s]|$)/,
+			pattern: /((?:^|[^'`#])[(\[])(?:[-+*%/]|[<>]=?|=>?)(?=[()\[\]\s]|$)/,
 			lookbehind: true
 		},
 		'number': {
@@ -82,24 +82,24 @@
 				'<complex box>': /<real box>(?:@<real box>|<imaginary box>)?|<imaginary box>/.source,
 				'<num box>': /#[box](?:#[ei])?|(?:#[ei])?#[box]<complex box>/.source,
 
-				'<number>': /(^|[\s()])(?:<num dec>|<num box>)(?=[()\s]|$)/.source,
+				'<number>': /(^|[()\[\]\s])(?:<num dec>|<num box>)(?=[()\[\]\s]|$)/.source,
 			}), 'i'),
 			lookbehind: true
 		},
 		'boolean': {
-			pattern: /(^|[\s()])#(?:[ft]|false|true)(?=[()\s]|$)/,
+			pattern: /(^|[()\[\]\s])#(?:[ft]|false|true)(?=[()\[\]\s]|$)/,
 			lookbehind: true
 		},
 		'function': {
-			pattern: /((?:^|[^'`#])\()(?:[^|()'\s]+|\|(?:[^\\|]|\\.)*\|)(?=[()\s]|$)/,
+			pattern: /((?:^|[^'`#])[(\[])(?:[^|()\[\]'\s]+|\|(?:[^\\|]|\\.)*\|)(?=[()\[\]\s]|$)/,
 			lookbehind: true
 		},
 		'identifier': {
-			pattern: /(^|[\s()])\|(?:[^\\|]|\\.)*\|(?=[()\s]|$)/,
+			pattern: /(^|[()\[\]\s])\|(?:[^\\|]|\\.)*\|(?=[()\[\]\s]|$)/,
 			lookbehind: true,
 			greedy: true
 		},
-		'punctuation': /[()']/
+		'punctuation': /[()\[\]']/
 	};
 
 	/**

tests/languages/scheme/builtin_feature.test

@@ -194,6 +194,10 @@
 (write-u8
 (zero?
 
+; with brackets
+[map
+[max
+
 ----------------------------------------------------
 
 [
@@ -391,7 +395,11 @@
 	["punctuation", "("], ["builtin", "write-char"],
 	["punctuation", "("], ["builtin", "write-string"],
 	["punctuation", "("], ["builtin", "write-u8"],
-	["punctuation", "("], ["builtin", "zero?"]
+	["punctuation", "("], ["builtin", "zero?"],
+
+	["comment", "; with brackets"],
+	["punctuation", "["], ["builtin", "map"],
+	["punctuation", "["], ["builtin", "max"]
 ]
 
 ----------------------------------------------------

tests/languages/scheme/comment_feature.test

@@ -3,6 +3,8 @@
 
 #;(foo bar)
 #; (foo)
+#;[foo bar]
+#; [foo]
 
 #|
  comment
@@ -17,6 +19,8 @@
 
 	["comment", "#;(foo bar)"],
 	["comment", "#; (foo)"],
+	["comment", "#;[foo bar]"],
+	["comment", "#; [foo]"],
 
 	["comment", "#|\r\n comment\r\n #| nested comment |#\r\n|#"]
 ]