prism-rails 1.19.0 → 1.29.0

data/vendor/assets/javascripts/languages/prism-graphql.js

@@ -1,22 +1,40 @@
 Prism.languages.graphql = {
 	'comment': /#.*/,
+	'description': {
+		pattern: /(?:"""(?:[^"]|(?!""")")*"""|"(?:\\.|[^\\"\r\n])*")(?=\s*[a-z_])/i,
+		greedy: true,
+		alias: 'string',
+		inside: {
+			'language-markdown': {
+				pattern: /(^"(?:"")?)(?!\1)[\s\S]+(?=\1$)/,
+				lookbehind: true,
+				inside: Prism.languages.markdown
+			}
+		}
+	},
 	'string': {
-		pattern: /"(?:\\.|[^\\"\r\n])*"/,
+		pattern: /"""(?:[^"]|(?!""")")*"""|"(?:\\.|[^\\"\r\n])*"/,
 		greedy: true
 	},
 	'number': /(?:\B-|\b)\d+(?:\.\d+)?(?:e[+-]?\d+)?\b/i,
-	'boolean': /\b(?:true|false)\b/,
+	'boolean': /\b(?:false|true)\b/,
 	'variable': /\$[a-z_]\w*/i,
 	'directive': {
 		pattern: /@[a-z_]\w*/i,
 		alias: 'function'
 	},
 	'attr-name': {
-		pattern: /[a-z_]\w*(?=\s*(?:\((?:[^()"]|"(?:\\.|[^\\"\r\n])*")*\))?:)/i,
+		pattern: /\b[a-z_]\w*(?=\s*(?:\((?:[^()"]|"(?:\\.|[^\\"\r\n])*")*\))?:)/i,
 		greedy: true
 	},
+	'atom-input': {
+		pattern: /\b[A-Z]\w*Input\b/,
+		alias: 'class-name'
+	},
+	'scalar': /\b(?:Boolean|Float|ID|Int|String)\b/,
+	'constant': /\b[A-Z][A-Z_\d]*\b/,
 	'class-name': {
-		pattern: /(\b(?:enum|implements|interface|on|scalar|type|union)\s+)[a-zA-Z_]\w*/,
+		pattern: /(\b(?:enum|implements|interface|on|scalar|type|union)\s+|&\s*|:\s*|\[)[A-Z_]\w*/,
 		lookbehind: true
 	},
 	'fragment': {
@@ -24,8 +42,170 @@ Prism.languages.graphql = {
 		lookbehind: true,
 		alias: 'function'
 	},
-	'keyword': /\b(?:enum|fragment|implements|input|interface|mutation|on|query|scalar|schema|type|union)\b/,
-	'operator': /[!=|]|\.{3}/,
+	'definition-mutation': {
+		pattern: /(\bmutation\s+)[a-zA-Z_]\w*/,
+		lookbehind: true,
+		alias: 'function'
+	},
+	'definition-query': {
+		pattern: /(\bquery\s+)[a-zA-Z_]\w*/,
+		lookbehind: true,
+		alias: 'function'
+	},
+	'keyword': /\b(?:directive|enum|extend|fragment|implements|input|interface|mutation|on|query|repeatable|scalar|schema|subscription|type|union)\b/,
+	'operator': /[!=|&]|\.{3}/,
+	'property-query': /\w+(?=\s*\()/,
+	'object': /\w+(?=\s*\{)/,
 	'punctuation': /[!(){}\[\]:=,]/,
-	'constant': /\b(?!ID\b)[A-Z][A-Z_\d]*\b/
+	'property': /\w+/
 };
+
+Prism.hooks.add('after-tokenize', function afterTokenizeGraphql(env) {
+	if (env.language !== 'graphql') {
+		return;
+	}
+
+	/**
+	 * get the graphql token stream that we want to customize
+	 *
+	 * @typedef {InstanceType<import("./prism-core")["Token"]>} Token
+	 * @type {Token[]}
+	 */
+	var validTokens = env.tokens.filter(function (token) {
+		return typeof token !== 'string' && token.type !== 'comment' && token.type !== 'scalar';
+	});
+
+	var currentIndex = 0;
+
+	/**
+	 * Returns whether the token relative to the current index has the given type.
+	 *
+	 * @param {number} offset
+	 * @returns {Token | undefined}
+	 */
+	function getToken(offset) {
+		return validTokens[currentIndex + offset];
+	}
+
+	/**
+	 * Returns whether the token relative to the current index has the given type.
+	 *
+	 * @param {readonly string[]} types
+	 * @param {number} [offset=0]
+	 * @returns {boolean}
+	 */
+	function isTokenType(types, offset) {
+		offset = offset || 0;
+		for (var i = 0; i < types.length; i++) {
+			var token = getToken(i + offset);
+			if (!token || token.type !== types[i]) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Returns the index of the closing bracket to an opening bracket.
+	 *
+	 * It is assumed that `token[currentIndex - 1]` is an opening bracket.
+	 *
+	 * If no closing bracket could be found, `-1` will be returned.
+	 *
+	 * @param {RegExp} open
+	 * @param {RegExp} close
+	 * @returns {number}
+	 */
+	function findClosingBracket(open, close) {
+		var stackHeight = 1;
+
+		for (var i = currentIndex; i < validTokens.length; i++) {
+			var token = validTokens[i];
+			var content = token.content;
+
+			if (token.type === 'punctuation' && typeof content === 'string') {
+				if (open.test(content)) {
+					stackHeight++;
+				} else if (close.test(content)) {
+					stackHeight--;
+
+					if (stackHeight === 0) {
+						return i;
+					}
+				}
+			}
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Adds an alias to the given token.
+	 *
+	 * @param {Token} token
+	 * @param {string} alias
+	 * @returns {void}
+	 */
+	function addAlias(token, alias) {
+		var aliases = token.alias;
+		if (!aliases) {
+			token.alias = aliases = [];
+		} else if (!Array.isArray(aliases)) {
+			token.alias = aliases = [aliases];
+		}
+		aliases.push(alias);
+	}
+
+	for (; currentIndex < validTokens.length;) {
+		var startToken = validTokens[currentIndex++];
+
+		// add special aliases for mutation tokens
+		if (startToken.type === 'keyword' && startToken.content === 'mutation') {
+			// any array of the names of all input variables (if any)
+			var inputVariables = [];
+
+			if (isTokenType(['definition-mutation', 'punctuation']) && getToken(1).content === '(') {
+				// definition
+
+				currentIndex += 2; // skip 'definition-mutation' and 'punctuation'
+
+				var definitionEnd = findClosingBracket(/^\($/, /^\)$/);
+				if (definitionEnd === -1) {
+					continue;
+				}
+
+				// find all input variables
+				for (; currentIndex < definitionEnd; currentIndex++) {
+					var t = getToken(0);
+					if (t.type === 'variable') {
+						addAlias(t, 'variable-input');
+						inputVariables.push(t.content);
+					}
+				}
+
+				currentIndex = definitionEnd + 1;
+			}
+
+			if (isTokenType(['punctuation', 'property-query']) && getToken(0).content === '{') {
+				currentIndex++; // skip opening bracket
+
+				addAlias(getToken(0), 'property-mutation');
+
+				if (inputVariables.length > 0) {
+					var mutationEnd = findClosingBracket(/^\{$/, /^\}$/);
+					if (mutationEnd === -1) {
+						continue;
+					}
+
+					// give references to input variables a special alias
+					for (var i = currentIndex; i < mutationEnd; i++) {
+						var varToken = validTokens[i];
+						if (varToken.type === 'variable' && inputVariables.indexOf(varToken.content) >= 0) {
+							addAlias(varToken, 'variable-input');
+						}
+					}
+				}
+			}
+		}
+	}
+});

data/vendor/assets/javascripts/languages/prism-groovy.js

@@ -1,67 +1,65 @@
-Prism.languages.groovy = Prism.languages.extend('clike', {
-	'string': [
-		{
-			pattern: /("""|''')(?:[^\\]|\\[\s\S])*?\1|\$\/(?:\$\/\$|[\s\S])*?\/\$/,
+(function (Prism) {
+
+	var interpolation = {
+		pattern: /((?:^|[^\\$])(?:\\{2})*)\$(?:\w+|\{[^{}]*\})/,
+		lookbehind: true,
+		inside: {
+			'interpolation-punctuation': {
+				pattern: /^\$\{?|\}$/,
+				alias: 'punctuation'
+			},
+			'expression': {
+				pattern: /[\s\S]+/,
+				inside: null // see below
+			}
+		}
+	};
+
+	Prism.languages.groovy = Prism.languages.extend('clike', {
+		'string': {
+			// https://groovy-lang.org/syntax.html#_dollar_slashy_string
+			pattern: /'''(?:[^\\]|\\[\s\S])*?'''|'(?:\\.|[^\\'\r\n])*'/,
 			greedy: true
 		},
-		{
+		'keyword': /\b(?:abstract|as|assert|boolean|break|byte|case|catch|char|class|const|continue|def|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|in|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|strictfp|super|switch|synchronized|this|throw|throws|trait|transient|try|void|volatile|while)\b/,
+		'number': /\b(?:0b[01_]+|0x[\da-f_]+(?:\.[\da-f_p\-]+)?|[\d_]+(?:\.[\d_]+)?(?:e[+-]?\d+)?)[glidf]?\b/i,
+		'operator': {
+			pattern: /(^|[^.])(?:~|==?~?|\?[.:]?|\*(?:[.=]|\*=?)?|\.[@&]|\.\.<|\.\.(?!\.)|-[-=>]?|\+[+=]?|!=?|<(?:<=?|=>?)?|>(?:>>?=?|=)?|&[&=]?|\|[|=]?|\/=?|\^=?|%=?)/,
+			lookbehind: true
+		},
+		'punctuation': /\.+|[{}[\];(),:$]/
+	});
+
+	Prism.languages.insertBefore('groovy', 'string', {
+		'shebang': {
+			pattern: /#!.+/,
+			alias: 'comment',
+			greedy: true
+		},
+		'interpolation-string': {
 			// TODO: Slash strings (e.g. /foo/) can contain line breaks but this will cause a lot of trouble with
 			// simple division (see JS regex), so find a fix maybe?
-			pattern: /(["'/])(?:\\.|(?!\1)[^\\\r\n])*\1/,
-			greedy: true
+			pattern: /"""(?:[^\\]|\\[\s\S])*?"""|(["/])(?:\\.|(?!\1)[^\\\r\n])*\1|\$\/(?:[^/$]|\$(?:[/$]|(?![/$]))|\/(?!\$))*\/\$/,
+			greedy: true,
+			inside: {
+				'interpolation': interpolation,
+				'string': /[\s\S]+/
+			}
 		}
-	],
-	'keyword': /\b(?:as|def|in|abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|strictfp|super|switch|synchronized|this|throw|throws|trait|transient|try|void|volatile|while)\b/,
-	'number': /\b(?:0b[01_]+|0x[\da-f_]+(?:\.[\da-f_p\-]+)?|[\d_]+(?:\.[\d_]+)?(?:e[+-]?[\d]+)?)[glidf]?\b/i,
-	'operator': {
-		pattern: /(^|[^.])(?:~|==?~?|\?[.:]?|\*(?:[.=]|\*=?)?|\.[@&]|\.\.<|\.\.(?!\.)|-[-=>]?|\+[+=]?|!=?|<(?:<=?|=>?)?|>(?:>>?=?|=)?|&[&=]?|\|[|=]?|\/=?|\^=?|%=?)/,
-		lookbehind: true
-	},
-	'punctuation': /\.+|[{}[\];(),.:$]/
-});
-
-Prism.languages.insertBefore('groovy', 'string', {
-	'shebang': {
-		pattern: /#!.+/,
-		alias: 'comment'
-	}
-});
-
-Prism.languages.insertBefore('groovy', 'punctuation', {
-	'spock-block': /\b(?:setup|given|when|then|and|cleanup|expect|where):/
-});
-
-Prism.languages.insertBefore('groovy', 'function', {
-	'annotation': {
-		pattern: /(^|[^.])@\w+/,
-		lookbehind: true,
-		alias: 'punctuation'
-	}
-});
+	});
 
-// Handle string interpolation
-Prism.hooks.add('wrap', function(env) {
-	if (env.language === 'groovy' && env.type === 'string') {
-		var delimiter = env.content[0];
+	Prism.languages.insertBefore('groovy', 'punctuation', {
+		'spock-block': /\b(?:and|cleanup|expect|given|setup|then|when|where):/
+	});
 
-		if (delimiter != "'") {
-			var pattern = /([^\\])(?:\$(?:\{.*?\}|[\w.]+))/;
-			if (delimiter === '$') {
-				pattern = /([^\$])(?:\$(?:\{.*?\}|[\w.]+))/;
-			}
-
-			// To prevent double HTML-encoding we have to decode env.content first
-			env.content = env.content.replace(/&lt;/g, '<').replace(/&amp;/g, '&');
+	Prism.languages.insertBefore('groovy', 'function', {
+		'annotation': {
+			pattern: /(^|[^.])@\w+/,
+			lookbehind: true,
+			alias: 'punctuation'
+		}
+	});
 
-			env.content = Prism.highlight(env.content, {
-				'expression': {
-					pattern: pattern,
-					lookbehind: true,
-					inside: Prism.languages.groovy
-				}
-			});
+	interpolation.inside.expression.inside = Prism.languages.groovy;
 
-			env.classes.push(delimiter === '/' ? 'regex' : 'gstring');
-		}
-	}
-});
+}(Prism));

data/vendor/assets/javascripts/languages/prism-haml.js

@@ -5,25 +5,25 @@
 			code |
 */
 
-(function(Prism) {
+(function (Prism) {
 
 	Prism.languages.haml = {
 		// Multiline stuff should appear before the rest
 
 		'multiline-comment': {
-			pattern: /((?:^|\r?\n|\r)([\t ]*))(?:\/|-#).*(?:(?:\r?\n|\r)\2[\t ]+.+)*/,
+			pattern: /((?:^|\r?\n|\r)([\t ]*))(?:\/|-#).*(?:(?:\r?\n|\r)\2[\t ].+)*/,
 			lookbehind: true,
 			alias: 'comment'
 		},
 
 		'multiline-code': [
 			{
-				pattern: /((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*,[\t ]*(?:(?:\r?\n|\r)\2[\t ]+.*,[\t ]*)*(?:(?:\r?\n|\r)\2[\t ]+.+)/,
+				pattern: /((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*,[\t ]*(?:(?:\r?\n|\r)\2[\t ].*,[\t ]*)*(?:(?:\r?\n|\r)\2[\t ].+)/,
 				lookbehind: true,
 				inside: Prism.languages.ruby
 			},
 			{
-				pattern: /((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*\|[\t ]*(?:(?:\r?\n|\r)\2[\t ]+.*\|[\t ]*)*/,
+				pattern: /((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*\|[\t ]*(?:(?:\r?\n|\r)\2[\t ].*\|[\t ]*)*/,
 				lookbehind: true,
 				inside: Prism.languages.ruby
 			}
@@ -31,12 +31,12 @@
 
 		// See at the end of the file for known filters
 		'filter': {
-			pattern: /((?:^|\r?\n|\r)([\t ]*)):[\w-]+(?:(?:\r?\n|\r)(?:\2[\t ]+.+|\s*?(?=\r?\n|\r)))+/,
+			pattern: /((?:^|\r?\n|\r)([\t ]*)):[\w-]+(?:(?:\r?\n|\r)(?:\2[\t ].+|\s*?(?=\r?\n|\r)))+/,
 			lookbehind: true,
 			inside: {
 				'filter-name': {
 					pattern: /^:[\w-]+/,
-					alias: 'variable'
+					alias: 'symbol'
 				}
 			}
 		},
@@ -52,14 +52,14 @@
 		},
 		'tag': {
 			// Allows for one nested group of braces
-			pattern: /((?:^|\r?\n|\r)[\t ]*)[%.#][\w\-#.]*[\w\-](?:\([^)]+\)|\{(?:\{[^}]+\}|[^}])+\}|\[[^\]]+\])*[\/<>]*/,
+			pattern: /((?:^|\r?\n|\r)[\t ]*)[%.#][\w\-#.]*[\w\-](?:\([^)]+\)|\{(?:\{[^}]+\}|[^{}])+\}|\[[^\]]+\])*[\/<>]*/,
 			lookbehind: true,
 			inside: {
 				'attributes': [
 					{
 						// Lookbehind tries to prevent interpolations from breaking it all
 						// Allows for one nested group of braces
-						pattern: /(^|[^#])\{(?:\{[^}]+\}|[^}])+\}/,
+						pattern: /(^|[^#])\{(?:\{[^}]+\}|[^{}])+\}/,
 						lookbehind: true,
 						inside: Prism.languages.ruby
 					},
@@ -95,7 +95,10 @@
 					pattern: /^#\{|\}$/,
 					alias: 'punctuation'
 				},
-				rest: Prism.languages.ruby
+				'ruby': {
+					pattern: /[\s\S]+/,
+					inside: Prism.languages.ruby
+				}
 			}
 		},
 		'punctuation': {
@@ -104,12 +107,12 @@
 		}
 	};
 
-	var filter_pattern = '((?:^|\\r?\\n|\\r)([\\t ]*)):{{filter_name}}(?:(?:\\r?\\n|\\r)(?:\\2[\\t ]+.+|\\s*?(?=\\r?\\n|\\r)))+';
+	var filter_pattern = '((?:^|\\r?\\n|\\r)([\\t ]*)):{{filter_name}}(?:(?:\\r?\\n|\\r)(?:\\2[\\t ].+|\\s*?(?=\\r?\\n|\\r)))+';
 
 	// Non exhaustive list of available filters and associated languages
 	var filters = [
 		'css',
-		{filter:'coffee',language:'coffeescript'},
+		{ filter: 'coffee', language: 'coffeescript' },
 		'erb',
 		'javascript',
 		'less',
@@ -121,19 +124,23 @@
 	var all_filters = {};
 	for (var i = 0, l = filters.length; i < l; i++) {
 		var filter = filters[i];
-		filter = typeof filter === 'string' ? {filter: filter, language: filter} : filter;
+		filter = typeof filter === 'string' ? { filter: filter, language: filter } : filter;
 		if (Prism.languages[filter.language]) {
 			all_filters['filter-' + filter.filter] = {
-				pattern: RegExp(filter_pattern.replace('{{filter_name}}', filter.filter)),
+				pattern: RegExp(filter_pattern.replace('{{filter_name}}', function () { return filter.filter; })),
 				lookbehind: true,
 				inside: {
 					'filter-name': {
 						pattern: /^:[\w-]+/,
-						alias: 'variable'
+						alias: 'symbol'
 					},
-					rest: Prism.languages[filter.language]
+					'text': {
+						pattern: /[\s\S]+/,
+						alias: [filter.language, 'language-' + filter.language],
+						inside: Prism.languages[filter.language]
+					}
 				}
-			}
+			};
 		}
 	}
 

data/vendor/assets/javascripts/languages/prism-handlebars.js

@@ -1,16 +1,16 @@
-(function(Prism) {
+(function (Prism) {
 
 	Prism.languages.handlebars = {
 		'comment': /\{\{![\s\S]*?\}\}/,
 		'delimiter': {
-			pattern: /^\{\{\{?|\}\}\}?$/i,
+			pattern: /^\{\{\{?|\}\}\}?$/,
 			alias: 'punctuation'
 		},
 		'string': /(["'])(?:\\.|(?!\1)[^\\\r\n])*\1/,
-		'number': /\b0x[\dA-Fa-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee][+-]?\d+)?/,
-		'boolean': /\b(?:true|false)\b/,
+		'number': /\b0x[\dA-Fa-f]+\b|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:[Ee][+-]?\d+)?/,
+		'boolean': /\b(?:false|true)\b/,
 		'block': {
-			pattern: /^(\s*~?\s*)[#\/]\S+?(?=\s*~?\s*$|\s)/i,
+			pattern: /^(\s*(?:~\s*)?)[#\/]\S+?(?=\s*(?:~\s*)?$|\s)/,
 			lookbehind: true,
 			alias: 'keyword'
 		},
@@ -25,13 +25,16 @@
 		'variable': /[^!"#%&'()*+,\/;<=>@\[\\\]^`{|}~\s]+/
 	};
 
-	Prism.hooks.add('before-tokenize', function(env) {
+	Prism.hooks.add('before-tokenize', function (env) {
 		var handlebarsPattern = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/g;
 		Prism.languages['markup-templating'].buildPlaceholders(env, 'handlebars', handlebarsPattern);
 	});
 
-	Prism.hooks.add('after-tokenize', function(env) {
+	Prism.hooks.add('after-tokenize', function (env) {
 		Prism.languages['markup-templating'].tokenizePlaceholders(env, 'handlebars');
 	});
 
+	Prism.languages.hbs = Prism.languages.handlebars;
+	Prism.languages.mustache = Prism.languages.handlebars;
+
 }(Prism));

data/vendor/assets/javascripts/languages/prism-haskell.js

@@ -1,37 +1,65 @@
 Prism.languages.haskell = {
 	'comment': {
-		pattern: /(^|[^-!#$%*+=?&@|~.:<>^\\\/])(?:--[^-!#$%*+=?&@|~.:<>^\\\/].*|{-[\s\S]*?-})/m,
+		pattern: /(^|[^-!#$%*+=?&@|~.:<>^\\\/])(?:--(?:(?=.)[^-!#$%*+=?&@|~.:<>^\\\/].*|$)|\{-[\s\S]*?-\})/m,
 		lookbehind: true
 	},
-	'char': /'(?:[^\\']|\\(?:[abfnrtv\\"'&]|\^[A-Z@[\]^_]|NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|\d+|o[0-7]+|x[0-9a-fA-F]+))'/,
+	'char': {
+		pattern: /'(?:[^\\']|\\(?:[abfnrtv\\"'&]|\^[A-Z@[\]^_]|ACK|BEL|BS|CAN|CR|DC1|DC2|DC3|DC4|DEL|DLE|EM|ENQ|EOT|ESC|ETB|ETX|FF|FS|GS|HT|LF|NAK|NUL|RS|SI|SO|SOH|SP|STX|SUB|SYN|US|VT|\d+|o[0-7]+|x[0-9a-fA-F]+))'/,
+		alias: 'string'
+	},
 	'string': {
-		pattern: /"(?:[^\\"]|\\(?:[abfnrtv\\"'&]|\^[A-Z@[\]^_]|NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|\d+|o[0-7]+|x[0-9a-fA-F]+)|\\\s+\\)*"/,
+		pattern: /"(?:[^\\"]|\\(?:\S|\s+\\))*"/,
 		greedy: true
 	},
 	'keyword': /\b(?:case|class|data|deriving|do|else|if|in|infixl|infixr|instance|let|module|newtype|of|primitive|then|type|where)\b/,
-	'import_statement': {
+	'import-statement': {
 		// The imported or hidden names are not included in this import
 		// statement. This is because we want to highlight those exactly like
 		// we do for the names in the program.
-		pattern: /((?:\r?\n|\r|^)\s*)import\s+(?:qualified\s+)?(?:[A-Z][\w']*)(?:\.[A-Z][\w']*)*(?:\s+as\s+(?:[A-Z][_a-zA-Z0-9']*)(?:\.[A-Z][\w']*)*)?(?:\s+hiding\b)?/m,
+		pattern: /(^[\t ]*)import\s+(?:qualified\s+)?(?:[A-Z][\w']*)(?:\.[A-Z][\w']*)*(?:\s+as\s+(?:[A-Z][\w']*)(?:\.[A-Z][\w']*)*)?(?:\s+hiding\b)?/m,
 		lookbehind: true,
 		inside: {
-			'keyword': /\b(?:import|qualified|as|hiding)\b/
+			'keyword': /\b(?:as|hiding|import|qualified)\b/,
+			'punctuation': /\./
 		}
 	},
 	// These are builtin variables only. Constructors are highlighted later as a constant.
 	'builtin': /\b(?:abs|acos|acosh|all|and|any|appendFile|approxRational|asTypeOf|asin|asinh|atan|atan2|atanh|basicIORun|break|catch|ceiling|chr|compare|concat|concatMap|const|cos|cosh|curry|cycle|decodeFloat|denominator|digitToInt|div|divMod|drop|dropWhile|either|elem|encodeFloat|enumFrom|enumFromThen|enumFromThenTo|enumFromTo|error|even|exp|exponent|fail|filter|flip|floatDigits|floatRadix|floatRange|floor|fmap|foldl|foldl1|foldr|foldr1|fromDouble|fromEnum|fromInt|fromInteger|fromIntegral|fromRational|fst|gcd|getChar|getContents|getLine|group|head|id|inRange|index|init|intToDigit|interact|ioError|isAlpha|isAlphaNum|isAscii|isControl|isDenormalized|isDigit|isHexDigit|isIEEE|isInfinite|isLower|isNaN|isNegativeZero|isOctDigit|isPrint|isSpace|isUpper|iterate|last|lcm|length|lex|lexDigits|lexLitChar|lines|log|logBase|lookup|map|mapM|mapM_|max|maxBound|maximum|maybe|min|minBound|minimum|mod|negate|not|notElem|null|numerator|odd|or|ord|otherwise|pack|pi|pred|primExitWith|print|product|properFraction|putChar|putStr|putStrLn|quot|quotRem|range|rangeSize|read|readDec|readFile|readFloat|readHex|readIO|readInt|readList|readLitChar|readLn|readOct|readParen|readSigned|reads|readsPrec|realToFrac|recip|rem|repeat|replicate|return|reverse|round|scaleFloat|scanl|scanl1|scanr|scanr1|seq|sequence|sequence_|show|showChar|showInt|showList|showLitChar|showParen|showSigned|showString|shows|showsPrec|significand|signum|sin|sinh|snd|sort|span|splitAt|sqrt|subtract|succ|sum|tail|take|takeWhile|tan|tanh|threadToIOResult|toEnum|toInt|toInteger|toLower|toRational|toUpper|truncate|uncurry|undefined|unlines|until|unwords|unzip|unzip3|userError|words|writeFile|zip|zip3|zipWith|zipWith3)\b/,
 	// decimal integers and floating point numbers | octal integers | hexadecimal integers
 	'number': /\b(?:\d+(?:\.\d+)?(?:e[+-]?\d+)?|0o[0-7]+|0x[0-9a-f]+)\b/i,
-	// Most of this is needed because of the meaning of a single '.'.
-	// If it stands alone freely, it is the function composition.
-	// It may also be a separator between a module name and an identifier => no
-	// operator. If it comes together with other special characters it is an
-	// operator too.
-	'operator': /\s\.\s|[-!#$%*+=?&@|~.:<>^\\\/]*\.[-!#$%*+=?&@|~.:<>^\\\/]+|[-!#$%*+=?&@|~.:<>^\\\/]+\.[-!#$%*+=?&@|~.:<>^\\\/]*|[-!#$%*+=?&@|~:<>^\\\/]+|`(?:[A-Z][\w']*\.)*[_a-z][\w']*`/,
+	'operator': [
+		{
+			// infix operator
+			pattern: /`(?:[A-Z][\w']*\.)*[_a-z][\w']*`/,
+			greedy: true
+		},
+		{
+			// function composition
+			pattern: /(\s)\.(?=\s)/,
+			lookbehind: true
+		},
+		// Most of this is needed because of the meaning of a single '.'.
+		// If it stands alone freely, it is the function composition.
+		// It may also be a separator between a module name and an identifier => no
+		// operator. If it comes together with other special characters it is an
+		// operator too.
+		//
+		// This regex means: /[-!#$%*+=?&@|~.:<>^\\\/]+/ without /\./.
+		/[-!#$%*+=?&@|~:<>^\\\/][-!#$%*+=?&@|~.:<>^\\\/]*|\.[-!#$%*+=?&@|~.:<>^\\\/]+/,
+	],
 	// In Haskell, nearly everything is a variable, do not highlight these.
-	'hvariable': /\b(?:[A-Z][\w']*\.)*[_a-z][\w']*\b/,
-	'constant': /\b(?:[A-Z][\w']*\.)*[A-Z][\w']*\b/,
+	'hvariable': {
+		pattern: /\b(?:[A-Z][\w']*\.)*[_a-z][\w']*/,
+		inside: {
+			'punctuation': /\./
+		}
+	},
+	'constant': {
+		pattern: /\b(?:[A-Z][\w']*\.)*[A-Z][\w']*/,
+		inside: {
+			'punctuation': /\./
+		}
+	},
 	'punctuation': /[{}[\];(),.:]/
 };