Merge branch 'master' into 2640-lisp

components/prism-birb.js

@@ -7,7 +7,7 @@ Prism.languages.birb = Prism.languages.extend('clike', {
 		/\b[A-Z](?:[\d_]*[a-zA-Z]\w*)?\b/,
 
 		// matches variable and function return types (parameters as well).
-		/\b[A-Z]\w*(?=\s+\w+\s*[;,=()])/
+		/\b(?:[A-Z]\w*|(?!(?:var|void)\b)[a-z]\w*)(?=\s+\w+\s*[;,=()])/
 	],
 	'keyword': /\b(?:assert|break|case|class|const|default|else|enum|final|follows|for|grab|if|nest|new|next|noSeeb|return|static|switch|throw|var|void|while)\b/,
 	'operator': /\+\+|--|&&|\|\||<<=?|>>=?|~(?:\/=?)?|[+\-*\/%&^|=!<>]=?|\?|:/,

components/prism-bsl.js

@@ -44,15 +44,15 @@ Prism.languages.bsl = {
 		{
 			pattern: /\b(?:and|not|or)\b/i
 		}
-
 	],
 	'punctuation': /\(\.|\.\)|[()\[\]:;,.]/,
 	'directive': [
 		// Теги препроцессора вида &Клиент, &Сервер, ...
 		// Preprocessor tags of the type &Client, &Server, ...
 		{
-			pattern: /^(\s*)&.*/m,
+			pattern: /^([ \t]*)&.*/m,
 			lookbehind: true,
+			greedy: true,
 			alias: 'important'
 		},
 		// Инструкции препроцессора вида:
@@ -64,7 +64,9 @@ Prism.languages.bsl = {
 		// ...
 		// #EndIf
 		{
-			pattern: /^\s*#.*/gm,
+			pattern: /^([ \t]*)#.*/gm,
+			lookbehind: true,
+			greedy: true,
 			alias: 'important'
 		}
 	]

components/prism-dataweave.js

@@ -30,12 +30,12 @@
 			pattern: /\/(?:[^\\\/\r\n]|\\[^\r\n])+\//,
 			greedy: true
 		},
+		'keyword': /\b(?:and|as|at|case|do|else|fun|if|input|is|match|not|ns|null|or|output|type|unless|update|using|var)\b/,
 		'function': /\b[A-Z_]\w*(?=\s*\()/i,
 		'number': /-?\b\d+(?:\.\d+)?(?:e[+-]?\d+)?\b/i,
 		'punctuation': /[{}[\];(),.:@]/,
 		'operator': /<<|>>|->|[<>~=]=?|!=|--?-?|\+\+?|!|\?/,
 		'boolean': /\b(?:false|true)\b/,
-		'keyword': /\b(?:and|as|at|case|do|else|fun|if|input|is|match|not|ns|null|or|output|type|unless|update|using|var)\b/
 	};
 
 }(Prism));