@codingame/monaco-editor-wrapper 1.14.5 → 1.14.6

package/dist/c.tmLanguage.js

@@ -3,7 +3,7 @@ var information_for_contributors = [
 	"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 	"Once accepted there, we are happy to receive an update request."
 ];
-var version = "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/0ef79f098ed80ce5a86be4ed40f99ebcdbac4895";
+var version = "https://github.com/jeff-hykin/better-c-syntax/commit/34712a6106a4ffb0a04d2fa836fd28ff6c5849a4";
 var name = "C";
 var scopeName = "source.c";
 var patterns = [
@@ -26,35 +26,28 @@ var patterns = [
 		include: "#switch_statement"
 	},
 	{
-		match: "\\b(break|continue|do|else|for|goto|if|_Pragma|return|while)\\b",
-		name: "keyword.control.c"
+		include: "#anon_pattern_1"
 	},
 	{
 		include: "#storage_types"
 	},
 	{
-		match: "typedef",
-		name: "keyword.other.typedef.c"
+		include: "#anon_pattern_2"
 	},
 	{
-		match: "\\b(const|extern|register|restrict|static|volatile|inline)\\b",
-		name: "storage.modifier.c"
+		include: "#anon_pattern_3"
 	},
 	{
-		match: "\\bk[A-Z]\\w*\\b",
-		name: "constant.other.variable.mac-classic.c"
+		include: "#anon_pattern_4"
 	},
 	{
-		match: "\\bg[A-Z]\\w*\\b",
-		name: "variable.other.readwrite.global.mac-classic.c"
+		include: "#anon_pattern_5"
 	},
 	{
-		match: "\\bs[A-Z]\\w*\\b",
-		name: "variable.other.readwrite.static.mac-classic.c"
+		include: "#anon_pattern_6"
 	},
 	{
-		match: "\\b(NULL|true|false|TRUE|FALSE)\\b",
-		name: "constant.language.c"
+		include: "#anon_pattern_7"
 	},
 	{
 		include: "#operators"
@@ -66,6 +59,183 @@ var patterns = [
 		include: "#strings"
 	},
 	{
+		include: "#anon_pattern_range_1"
+	},
+	{
+		include: "#anon_pattern_range_2"
+	},
+	{
+		include: "#anon_pattern_range_3"
+	},
+	{
+		include: "#pragma-mark"
+	},
+	{
+		include: "#anon_pattern_range_4"
+	},
+	{
+		include: "#anon_pattern_range_5"
+	},
+	{
+		include: "#anon_pattern_range_6"
+	},
+	{
+		include: "#anon_pattern_8"
+	},
+	{
+		include: "#anon_pattern_9"
+	},
+	{
+		include: "#anon_pattern_10"
+	},
+	{
+		include: "#anon_pattern_11"
+	},
+	{
+		include: "#anon_pattern_12"
+	},
+	{
+		include: "#anon_pattern_13"
+	},
+	{
+		include: "#block"
+	},
+	{
+		include: "#parens"
+	},
+	{
+		include: "#anon_pattern_range_7"
+	},
+	{
+		include: "#line_continuation_character"
+	},
+	{
+		include: "#anon_pattern_range_8"
+	},
+	{
+		include: "#anon_pattern_range_9"
+	},
+	{
+		include: "#anon_pattern_14"
+	},
+	{
+		include: "#anon_pattern_15"
+	}
+];
+var repository = {
+	"access-method": {
+		name: "meta.function-call.member.c",
+		begin: "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
+		beginCaptures: {
+			"1": {
+				name: "variable.object.c"
+			},
+			"2": {
+				name: "punctuation.separator.dot-access.c"
+			},
+			"3": {
+				name: "punctuation.separator.pointer-access.c"
+			},
+			"4": {
+				patterns: [
+					{
+						match: "\\.",
+						name: "punctuation.separator.dot-access.c"
+					},
+					{
+						match: "->",
+						name: "punctuation.separator.pointer-access.c"
+					},
+					{
+						match: "[a-zA-Z_][a-zA-Z_0-9]*",
+						name: "variable.object.c"
+					},
+					{
+						name: "everything.else.c",
+						match: ".+"
+					}
+				]
+			},
+			"5": {
+				name: "entity.name.function.member.c"
+			},
+			"6": {
+				name: "punctuation.section.arguments.begin.bracket.round.function.member.c"
+			}
+		},
+		end: "\\)",
+		endCaptures: {
+			"0": {
+				name: "punctuation.section.arguments.end.bracket.round.function.member.c"
+			}
+		},
+		patterns: [
+			{
+				include: "#function-call-innards"
+			}
+		]
+	},
+	anon_pattern_1: {
+		match: "\\b(break|continue|do|else|for|goto|if|_Pragma|return|while)\\b",
+		name: "keyword.control.c"
+	},
+	anon_pattern_10: {
+		match: "(?x) \\b\n(int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t\n|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t\n|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t\n|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t\n|uintmax_t|uintmax_t)\n\\b",
+		name: "support.type.stdint.c"
+	},
+	anon_pattern_11: {
+		match: "\\b(noErr|kNilOptions|kInvalidID|kVariableLengthArray)\\b",
+		name: "support.constant.mac-classic.c"
+	},
+	anon_pattern_12: {
+		match: "(?x) \\b\n(AbsoluteTime|Boolean|Byte|ByteCount|ByteOffset|BytePtr|CompTimeValue|ConstLogicalAddress|ConstStrFileNameParam\n|ConstStringPtr|Duration|Fixed|FixedPtr|Float32|Float32Point|Float64|Float80|Float96|FourCharCode|Fract|FractPtr\n|Handle|ItemCount|LogicalAddress|OptionBits|OSErr|OSStatus|OSType|OSTypePtr|PhysicalAddress|ProcessSerialNumber\n|ProcessSerialNumberPtr|ProcHandle|Ptr|ResType|ResTypePtr|ShortFixed|ShortFixedPtr|SignedByte|SInt16|SInt32|SInt64\n|SInt8|Size|StrFileName|StringHandle|StringPtr|TimeBase|TimeRecord|TimeScale|TimeValue|TimeValue64|UInt16|UInt32\n|UInt64|UInt8|UniChar|UniCharCount|UniCharCountPtr|UniCharPtr|UnicodeScalarValue|UniversalProcHandle|UniversalProcPtr\n|UnsignedFixed|UnsignedFixedPtr|UnsignedWide|UTF16Char|UTF32Char|UTF8Char)\n\\b",
+		name: "support.type.mac-classic.c"
+	},
+	anon_pattern_13: {
+		match: "\\b([A-Za-z0-9_]+_t)\\b",
+		name: "support.type.posix-reserved.c"
+	},
+	anon_pattern_14: {
+		match: ";",
+		name: "punctuation.terminator.statement.c"
+	},
+	anon_pattern_15: {
+		match: ",",
+		name: "punctuation.separator.delimiter.c"
+	},
+	anon_pattern_2: {
+		match: "typedef",
+		name: "keyword.other.typedef.c"
+	},
+	anon_pattern_3: {
+		match: "\\b(const|extern|register|restrict|static|volatile|inline)\\b",
+		name: "storage.modifier.c"
+	},
+	anon_pattern_4: {
+		match: "\\bk[A-Z]\\w*\\b",
+		name: "constant.other.variable.mac-classic.c"
+	},
+	anon_pattern_5: {
+		match: "\\bg[A-Z]\\w*\\b",
+		name: "variable.other.readwrite.global.mac-classic.c"
+	},
+	anon_pattern_6: {
+		match: "\\bs[A-Z]\\w*\\b",
+		name: "variable.other.readwrite.static.mac-classic.c"
+	},
+	anon_pattern_7: {
+		match: "\\b(NULL|true|false|TRUE|FALSE)\\b",
+		name: "constant.language.c"
+	},
+	anon_pattern_8: {
+		match: "\\b(u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t)\\b",
+		name: "support.type.sys-types.c"
+	},
+	anon_pattern_9: {
+		match: "\\b(pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t)\\b",
+		name: "support.type.pthread.c"
+	},
+	anon_pattern_range_1: {
 		name: "meta.preprocessor.macro.c",
 		begin: "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((#)\\s*define\\b)\\s+((?<!\\w)[a-zA-Z_]\\w*(?!\\w))(?:(\\()([^()\\\\]+)(\\)))?",
 		beginCaptures: {
@@ -137,7 +307,7 @@ var patterns = [
 			}
 		]
 	},
-	{
+	anon_pattern_range_2: {
 		begin: "^\\s*((#)\\s*(error|warning))\\b\\s*",
 		beginCaptures: {
 			"1": {
@@ -205,7 +375,7 @@ var patterns = [
 			}
 		]
 	},
-	{
+	anon_pattern_range_3: {
 		begin: "^\\s*((#)\\s*(include(?:_next)?|import))\\b\\s*",
 		beginCaptures: {
 			"1": {
@@ -253,10 +423,7 @@ var patterns = [
 			}
 		]
 	},
-	{
-		include: "#pragma-mark"
-	},
-	{
+	anon_pattern_range_4: {
 		begin: "^\\s*((#)\\s*line)\\b",
 		beginCaptures: {
 			"1": {
@@ -280,7 +447,7 @@ var patterns = [
 			}
 		]
 	},
-	{
+	anon_pattern_range_5: {
 		begin: "^\\s*(?:((#)\\s*undef))\\b",
 		beginCaptures: {
 			"1": {
@@ -302,7 +469,7 @@ var patterns = [
 			}
 		]
 	},
-	{
+	anon_pattern_range_6: {
 		begin: "^\\s*(?:((#)\\s*pragma))\\b",
 		beginCaptures: {
 			"1": {
@@ -330,37 +497,7 @@ var patterns = [
 			}
 		]
 	},
-	{
-		match: "\\b(u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t)\\b",
-		name: "support.type.sys-types.c"
-	},
-	{
-		match: "\\b(pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t)\\b",
-		name: "support.type.pthread.c"
-	},
-	{
-		match: "(?x) \\b\n(int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t\n|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t\n|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t\n|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t\n|uintmax_t|uintmax_t)\n\\b",
-		name: "support.type.stdint.c"
-	},
-	{
-		match: "\\b(noErr|kNilOptions|kInvalidID|kVariableLengthArray)\\b",
-		name: "support.constant.mac-classic.c"
-	},
-	{
-		match: "(?x) \\b\n(AbsoluteTime|Boolean|Byte|ByteCount|ByteOffset|BytePtr|CompTimeValue|ConstLogicalAddress|ConstStrFileNameParam\n|ConstStringPtr|Duration|Fixed|FixedPtr|Float32|Float32Point|Float64|Float80|Float96|FourCharCode|Fract|FractPtr\n|Handle|ItemCount|LogicalAddress|OptionBits|OSErr|OSStatus|OSType|OSTypePtr|PhysicalAddress|ProcessSerialNumber\n|ProcessSerialNumberPtr|ProcHandle|Ptr|ResType|ResTypePtr|ShortFixed|ShortFixedPtr|SignedByte|SInt16|SInt32|SInt64\n|SInt8|Size|StrFileName|StringHandle|StringPtr|TimeBase|TimeRecord|TimeScale|TimeValue|TimeValue64|UInt16|UInt32\n|UInt64|UInt8|UniChar|UniCharCount|UniCharCountPtr|UniCharPtr|UnicodeScalarValue|UniversalProcHandle|UniversalProcPtr\n|UnsignedFixed|UnsignedFixedPtr|UnsignedWide|UTF16Char|UTF32Char|UTF8Char)\n\\b",
-		name: "support.type.mac-classic.c"
-	},
-	{
-		match: "\\b([A-Za-z0-9_]+_t)\\b",
-		name: "support.type.posix-reserved.c"
-	},
-	{
-		include: "#block"
-	},
-	{
-		include: "#parens"
-	},
-	{
+	anon_pattern_range_7: {
 		name: "meta.function.c",
 		begin: "(?<!\\w)(?!\\s*(?:atomic_uint_least64_t|atomic_uint_least16_t|atomic_uint_least32_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_fast64_t|atomic_uint_fast32_t|atomic_int_least64_t|atomic_int_least32_t|pthread_rwlockattr_t|atomic_uint_fast16_t|pthread_mutexattr_t|atomic_int_fast16_t|atomic_uint_fast8_t|atomic_int_fast64_t|atomic_int_least8_t|atomic_int_fast32_t|atomic_int_fast8_t|pthread_condattr_t|pthread_rwlock_t|atomic_uintptr_t|atomic_ptrdiff_t|atomic_uintmax_t|atomic_intmax_t|atomic_char32_t|atomic_intptr_t|atomic_char16_t|pthread_mutex_t|pthread_cond_t|atomic_wchar_t|uint_least64_t|uint_least32_t|uint_least16_t|pthread_once_t|pthread_attr_t|uint_least8_t|int_least32_t|int_least16_t|pthread_key_t|uint_fast32_t|uint_fast64_t|uint_fast16_t|atomic_size_t|atomic_ushort|atomic_ullong|int_least64_t|atomic_ulong|int_least8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|memory_order|atomic_schar|atomic_uchar|atomic_short|atomic_llong|thread_local|atomic_bool|atomic_uint|atomic_long|int_fast8_t|suseconds_t|atomic_char|atomic_int|useconds_t|_Imaginary|uintmax_t|uintmax_t|in_addr_t|in_port_t|_Noreturn|blksize_t|pthread_t|uintptr_t|volatile|u_quad_t|blkcnt_t|intmax_t|intptr_t|_Complex|uint16_t|uint32_t|uint64_t|_Alignof|_Alignas|continue|unsigned|restrict|intmax_t|register|int64_t|qaddr_t|segsz_t|_Atomic|alignas|default|caddr_t|nlink_t|typedef|u_short|fixpt_t|clock_t|swblk_t|ssize_t|alignof|daddr_t|int16_t|int32_t|uint8_t|struct|mode_t|size_t|time_t|ushort|u_long|u_char|int8_t|double|signed|static|extern|inline|return|switch|xor_eq|and_eq|bitand|not_eq|sizeof|quad_t|uid_t|bitor|union|off_t|key_t|ino_t|compl|u_int|short|const|false|while|float|pid_t|break|_Bool|or_eq|div_t|dev_t|gid_t|id_t|long|case|goto|else|bool|auto|id_t|enum|uint|true|NULL|void|char|for|not|int|and|xor|do|or|if)\\s*\\()(?=[a-zA-Z_]\\w*\\s*\\()",
 		end: "(?!\\G)(?<=\\))",
@@ -370,10 +507,7 @@ var patterns = [
 			}
 		]
 	},
-	{
-		include: "#line_continuation_character"
-	},
-	{
+	anon_pattern_range_8: {
 		name: "meta.bracket.square.access.c",
 		begin: "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
 		beginCaptures: {
@@ -396,72 +530,10 @@ var patterns = [
 			}
 		]
 	},
-	{
+	anon_pattern_range_9: {
 		name: "storage.modifier.array.bracket.square.c",
 		match: "\\[\\s*\\]"
 	},
-	{
-		match: ";",
-		name: "punctuation.terminator.statement.c"
-	},
-	{
-		match: ",",
-		name: "punctuation.separator.delimiter.c"
-	}
-];
-var repository = {
-	"access-method": {
-		name: "meta.function-call.member.c",
-		begin: "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
-		beginCaptures: {
-			"1": {
-				name: "variable.object.c"
-			},
-			"2": {
-				name: "punctuation.separator.dot-access.c"
-			},
-			"3": {
-				name: "punctuation.separator.pointer-access.c"
-			},
-			"4": {
-				patterns: [
-					{
-						match: "\\.",
-						name: "punctuation.separator.dot-access.c"
-					},
-					{
-						match: "->",
-						name: "punctuation.separator.pointer-access.c"
-					},
-					{
-						match: "[a-zA-Z_][a-zA-Z_0-9]*",
-						name: "variable.object.c"
-					},
-					{
-						name: "everything.else.c",
-						match: ".+"
-					}
-				]
-			},
-			"5": {
-				name: "entity.name.function.member.c"
-			},
-			"6": {
-				name: "punctuation.section.arguments.begin.bracket.round.function.member.c"
-			}
-		},
-		end: "\\)",
-		endCaptures: {
-			"0": {
-				name: "punctuation.section.arguments.end.bracket.round.function.member.c"
-			}
-		},
-		patterns: [
-			{
-				include: "#function-call-innards"
-			}
-		]
-	},
 	backslash_escapes: {
 		match: "(?x)\\\\ (\n\\\\\t\t\t |\n[abefnprtv'\"?]   |\n[0-3][0-7]{,2}\t |\n[4-7]\\d?\t\t|\nx[a-fA-F0-9]{,2} |\nu[a-fA-F0-9]{,4} |\nU[a-fA-F0-9]{,8} )",
 		name: "constant.character.escape.c"
@@ -490,6 +562,40 @@ var repository = {
 			}
 		]
 	},
+	block_comment: {
+		patterns: [
+			{
+				begin: "\\s*+(\\/\\*)",
+				end: "\\*\\/",
+				beginCaptures: {
+					"1": {
+						name: "punctuation.definition.comment.begin.c"
+					}
+				},
+				endCaptures: {
+					"0": {
+						name: "punctuation.definition.comment.end.c"
+					}
+				},
+				name: "comment.block.c"
+			},
+			{
+				begin: "\\s*+(\\/\\*)",
+				end: "\\*\\/",
+				beginCaptures: {
+					"1": {
+						name: "punctuation.definition.comment.begin.c"
+					}
+				},
+				endCaptures: {
+					"0": {
+						name: "punctuation.definition.comment.end.c"
+					}
+				},
+				name: "comment.block.c"
+			}
+		]
+	},
 	block_innards: {
 		patterns: [
 			{
@@ -556,7 +662,7 @@ var repository = {
 				include: "#parens-block"
 			},
 			{
-				include: "$base"
+				include: "$self"
 			}
 		]
 	},
@@ -631,339 +737,359 @@ var repository = {
 	comments: {
 		patterns: [
 			{
-				name: "comment.line.double-slash.documentation.c",
-				begin: "(?:^)(?>\\s*)(\\/\\/[!\\/]+)",
-				beginCaptures: {
-					"1": {
-						name: "punctuation.definition.comment.documentation.c"
-					}
-				},
-				end: "(?<=\\n)(?<!\\\\\\n)",
 				patterns: [
 					{
-						include: "#line_continuation_character"
-					},
-					{
-						match: "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
-						name: "storage.type.class.doxygen.c"
-					},
-					{
-						match: "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)",
-						captures: {
-							"1": {
-								name: "storage.type.class.doxygen.c"
-							},
-							"2": {
-								name: "markup.italic.doxygen.c"
-							}
-						}
-					},
-					{
-						match: "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)",
-						captures: {
-							"1": {
-								name: "storage.type.class.doxygen.c"
-							},
-							"2": {
-								name: "markup.bold.doxygen.c"
-							}
-						}
-					},
-					{
-						match: "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)",
-						captures: {
-							"1": {
-								name: "storage.type.class.doxygen.c"
-							},
-							"2": {
-								name: "markup.inline.raw.string.c"
-							}
-						}
-					},
-					{
-						match: "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
-						name: "storage.type.class.doxygen.c"
-					},
-					{
-						match: "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
-						name: "storage.type.class.doxygen.c"
-					},
-					{
-						match: "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)",
-						captures: {
-							"1": {
-								name: "storage.type.class.doxygen.c"
-							},
-							"2": {
+						patterns: [
+							{
+								name: "comment.line.double-slash.documentation.c",
+								begin: "(?:^)(?>\\s*)(\\/\\/[!\\/]+)",
+								beginCaptures: {
+									"1": {
+										name: "punctuation.definition.comment.documentation.c"
+									}
+								},
+								end: "(?<=\\n)(?<!\\\\\\n)",
 								patterns: [
 									{
-										match: "in|out",
-										name: "keyword.other.parameter.direction.$0.c"
+										include: "#line_continuation_character"
+									},
+									{
+										match: "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+										name: "storage.type.class.doxygen.c"
+									},
+									{
+										match: "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)",
+										captures: {
+											"1": {
+												name: "storage.type.class.doxygen.c"
+											},
+											"2": {
+												name: "markup.italic.doxygen.c"
+											}
+										}
+									},
+									{
+										match: "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)",
+										captures: {
+											"1": {
+												name: "storage.type.class.doxygen.c"
+											},
+											"2": {
+												name: "markup.bold.doxygen.c"
+											}
+										}
+									},
+									{
+										match: "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)",
+										captures: {
+											"1": {
+												name: "storage.type.class.doxygen.c"
+											},
+											"2": {
+												name: "markup.inline.raw.string.c"
+											}
+										}
+									},
+									{
+										match: "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+										name: "storage.type.class.doxygen.c"
+									},
+									{
+										match: "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+										name: "storage.type.class.doxygen.c"
+									},
+									{
+										match: "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)",
+										captures: {
+											"1": {
+												name: "storage.type.class.doxygen.c"
+											},
+											"2": {
+												patterns: [
+													{
+														match: "in|out",
+														name: "keyword.other.parameter.direction.$0.c"
+													}
+												]
+											},
+											"3": {
+												name: "variable.parameter.c"
+											}
+										}
+									},
+									{
+										match: "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+										name: "storage.type.class.doxygen.c"
+									},
+									{
+										match: "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+										name: "storage.type.class.doxygen.c"
+									},
+									{
+										match: "(?:\\b[A-Z]+:|@[a-z_]+:)",
+										name: "storage.type.class.gtkdoc"
 									}
 								]
 							},
-							"3": {
-								name: "variable.parameter.c"
-							}
-						}
-					},
-					{
-						match: "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
-						name: "storage.type.class.doxygen.c"
-					},
-					{
-						match: "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
-						name: "storage.type.class.doxygen.c"
-					},
-					{
-						match: "(?:\\b[A-Z]+:|@[a-z_]+:)",
-						name: "storage.type.class.gtkdoc"
-					}
-				]
-			},
-			{
-				match: "(\\/\\*[!*]+(?=\\s))(.+)([!*]*\\*\\/)",
-				captures: {
-					"1": {
-						name: "punctuation.definition.comment.begin.documentation.c"
-					},
-					"2": {
-						patterns: [
 							{
-								match: "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
-								name: "storage.type.class.doxygen.c"
+								match: "(\\/\\*[!*]+(?=\\s))(.+)([!*]*\\*\\/)",
+								captures: {
+									"1": {
+										name: "punctuation.definition.comment.begin.documentation.c"
+									},
+									"2": {
+										patterns: [
+											{
+												match: "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+												name: "storage.type.class.doxygen.c"
+											},
+											{
+												match: "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)",
+												captures: {
+													"1": {
+														name: "storage.type.class.doxygen.c"
+													},
+													"2": {
+														name: "markup.italic.doxygen.c"
+													}
+												}
+											},
+											{
+												match: "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)",
+												captures: {
+													"1": {
+														name: "storage.type.class.doxygen.c"
+													},
+													"2": {
+														name: "markup.bold.doxygen.c"
+													}
+												}
+											},
+											{
+												match: "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)",
+												captures: {
+													"1": {
+														name: "storage.type.class.doxygen.c"
+													},
+													"2": {
+														name: "markup.inline.raw.string.c"
+													}
+												}
+											},
+											{
+												match: "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+												name: "storage.type.class.doxygen.c"
+											},
+											{
+												match: "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+												name: "storage.type.class.doxygen.c"
+											},
+											{
+												match: "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)",
+												captures: {
+													"1": {
+														name: "storage.type.class.doxygen.c"
+													},
+													"2": {
+														patterns: [
+															{
+																match: "in|out",
+																name: "keyword.other.parameter.direction.$0.c"
+															}
+														]
+													},
+													"3": {
+														name: "variable.parameter.c"
+													}
+												}
+											},
+											{
+												match: "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+												name: "storage.type.class.doxygen.c"
+											},
+											{
+												match: "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+												name: "storage.type.class.doxygen.c"
+											},
+											{
+												match: "(?:\\b[A-Z]+:|@[a-z_]+:)",
+												name: "storage.type.class.gtkdoc"
+											}
+										]
+									},
+									"3": {
+										name: "punctuation.definition.comment.end.documentation.c"
+									}
+								},
+								name: "comment.block.documentation.c"
 							},
 							{
-								match: "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)",
-								captures: {
+								name: "comment.block.documentation.c",
+								begin: "((?>\\s*)\\/\\*[!*]+(?:(?:\\n|$)|(?=\\s)))",
+								beginCaptures: {
 									"1": {
+										name: "punctuation.definition.comment.begin.documentation.c"
+									}
+								},
+								end: "([!*]*\\*\\/)",
+								endCaptures: {
+									"1": {
+										name: "punctuation.definition.comment.end.documentation.c"
+									}
+								},
+								patterns: [
+									{
+										match: "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+										name: "storage.type.class.doxygen.c"
+									},
+									{
+										match: "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)",
+										captures: {
+											"1": {
+												name: "storage.type.class.doxygen.c"
+											},
+											"2": {
+												name: "markup.italic.doxygen.c"
+											}
+										}
+									},
+									{
+										match: "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)",
+										captures: {
+											"1": {
+												name: "storage.type.class.doxygen.c"
+											},
+											"2": {
+												name: "markup.bold.doxygen.c"
+											}
+										}
+									},
+									{
+										match: "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)",
+										captures: {
+											"1": {
+												name: "storage.type.class.doxygen.c"
+											},
+											"2": {
+												name: "markup.inline.raw.string.c"
+											}
+										}
+									},
+									{
+										match: "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+										name: "storage.type.class.doxygen.c"
+									},
+									{
+										match: "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+										name: "storage.type.class.doxygen.c"
+									},
+									{
+										match: "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)",
+										captures: {
+											"1": {
+												name: "storage.type.class.doxygen.c"
+											},
+											"2": {
+												patterns: [
+													{
+														match: "in|out",
+														name: "keyword.other.parameter.direction.$0.c"
+													}
+												]
+											},
+											"3": {
+												name: "variable.parameter.c"
+											}
+										}
+									},
+									{
+										match: "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+										name: "storage.type.class.doxygen.c"
+									},
+									{
+										match: "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
 										name: "storage.type.class.doxygen.c"
 									},
-									"2": {
-										name: "markup.italic.doxygen.c"
+									{
+										match: "(?:\\b[A-Z]+:|@[a-z_]+:)",
+										name: "storage.type.class.gtkdoc"
 									}
-								}
+								]
 							},
 							{
-								match: "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)",
+								match: "^\\/\\* =(\\s*.*?)\\s*= \\*\\/$\\n?",
 								captures: {
 									"1": {
-										name: "storage.type.class.doxygen.c"
-									},
-									"2": {
-										name: "markup.bold.doxygen.c"
+										name: "meta.toc-list.banner.block.c"
 									}
-								}
+								},
+								name: "comment.block.banner.c"
 							},
 							{
-								match: "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)",
-								captures: {
+								name: "comment.block.c",
+								begin: "(\\/\\*)",
+								beginCaptures: {
 									"1": {
-										name: "storage.type.class.doxygen.c"
-									},
-									"2": {
-										name: "markup.inline.raw.string.c"
+										name: "punctuation.definition.comment.begin.c"
+									}
+								},
+								end: "(\\*\\/)",
+								endCaptures: {
+									"1": {
+										name: "punctuation.definition.comment.end.c"
 									}
 								}
 							},
 							{
-								match: "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
-								name: "storage.type.class.doxygen.c"
-							},
-							{
-								match: "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
-								name: "storage.type.class.doxygen.c"
-							},
-							{
-								match: "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)",
+								match: "^\\/\\/ =(\\s*.*?)\\s*=$\\n?",
 								captures: {
 									"1": {
-										name: "storage.type.class.doxygen.c"
-									},
-									"2": {
-										patterns: [
-											{
-												match: "in|out",
-												name: "keyword.other.parameter.direction.$0.c"
-											}
-										]
-									},
-									"3": {
-										name: "variable.parameter.c"
+										name: "meta.toc-list.banner.line.c"
 									}
-								}
-							},
-							{
-								match: "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
-								name: "storage.type.class.doxygen.c"
-							},
-							{
-								match: "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
-								name: "storage.type.class.doxygen.c"
+								},
+								name: "comment.line.banner.c"
 							},
 							{
-								match: "(?:\\b[A-Z]+:|@[a-z_]+:)",
-								name: "storage.type.class.gtkdoc"
-							}
-						]
-					},
-					"3": {
-						name: "punctuation.definition.comment.end.documentation.c"
-					}
-				},
-				name: "comment.block.documentation.c"
-			},
-			{
-				name: "comment.block.documentation.c",
-				begin: "((?>\\s*)\\/\\*[!*]+(?:(?:\\n|$)|(?=\\s)))",
-				beginCaptures: {
-					"1": {
-						name: "punctuation.definition.comment.begin.documentation.c"
-					}
-				},
-				end: "([!*]*\\*\\/)",
-				endCaptures: {
-					"1": {
-						name: "punctuation.definition.comment.end.documentation.c"
-					}
-				},
-				patterns: [
-					{
-						match: "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
-						name: "storage.type.class.doxygen.c"
-					},
-					{
-						match: "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)",
-						captures: {
-							"1": {
-								name: "storage.type.class.doxygen.c"
-							},
-							"2": {
-								name: "markup.italic.doxygen.c"
-							}
-						}
-					},
-					{
-						match: "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)",
-						captures: {
-							"1": {
-								name: "storage.type.class.doxygen.c"
-							},
-							"2": {
-								name: "markup.bold.doxygen.c"
-							}
-						}
-					},
-					{
-						match: "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)",
-						captures: {
-							"1": {
-								name: "storage.type.class.doxygen.c"
-							},
-							"2": {
-								name: "markup.inline.raw.string.c"
-							}
-						}
-					},
-					{
-						match: "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
-						name: "storage.type.class.doxygen.c"
-					},
-					{
-						match: "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
-						name: "storage.type.class.doxygen.c"
-					},
-					{
-						match: "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)",
-						captures: {
-							"1": {
-								name: "storage.type.class.doxygen.c"
-							},
-							"2": {
+								begin: "((?:^[ \\t]+)?)(?=\\/\\/)",
+								beginCaptures: {
+									"1": {
+										name: "punctuation.whitespace.comment.leading.c"
+									}
+								},
+								end: "(?!\\G)",
 								patterns: [
 									{
-										match: "in|out",
-										name: "keyword.other.parameter.direction.$0.c"
+										name: "comment.line.double-slash.c",
+										begin: "(\\/\\/)",
+										beginCaptures: {
+											"1": {
+												name: "punctuation.definition.comment.c"
+											}
+										},
+										end: "(?=\\n)",
+										patterns: [
+											{
+												include: "#line_continuation_character"
+											}
+										]
 									}
 								]
-							},
-							"3": {
-								name: "variable.parameter.c"
 							}
-						}
-					},
-					{
-						match: "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
-						name: "storage.type.class.doxygen.c"
+						]
 					},
 					{
-						match: "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
-						name: "storage.type.class.doxygen.c"
+						include: "#block_comment"
 					},
 					{
-						match: "(?:\\b[A-Z]+:|@[a-z_]+:)",
-						name: "storage.type.class.gtkdoc"
+						include: "#line_comment"
 					}
 				]
 			},
 			{
-				match: "^\\/\\* =(\\s*.*?)\\s*= \\*\\/$\\n?",
-				captures: {
-					"1": {
-						name: "meta.toc-list.banner.block.c"
-					}
-				},
-				name: "comment.block.banner.c"
-			},
-			{
-				name: "comment.block.c",
-				begin: "(\\/\\*)",
-				beginCaptures: {
-					"1": {
-						name: "punctuation.definition.comment.begin.c"
-					}
-				},
-				end: "(\\*\\/)",
-				endCaptures: {
-					"1": {
-						name: "punctuation.definition.comment.end.c"
-					}
-				}
-			},
-			{
-				match: "^\\/\\/ =(\\s*.*?)\\s*=$\\n?",
-				captures: {
-					"1": {
-						name: "meta.toc-list.banner.line.c"
-					}
-				},
-				name: "comment.line.banner.c"
+				include: "#block_comment"
 			},
 			{
-				begin: "((?:^[ \\t]+)?)(?=\\/\\/)",
-				beginCaptures: {
-					"1": {
-						name: "punctuation.whitespace.comment.leading.c"
-					}
-				},
-				end: "(?!\\G)",
-				patterns: [
-					{
-						name: "comment.line.double-slash.c",
-						begin: "(\\/\\/)",
-						beginCaptures: {
-							"1": {
-								name: "punctuation.definition.comment.c"
-							}
-						},
-						end: "(?=\\n)",
-						patterns: [
-							{
-								include: "#line_continuation_character"
-							}
-						]
-					}
-				]
+				include: "#line_comment"
 			}
 		]
 	},
@@ -1033,7 +1159,7 @@ var repository = {
 				include: "#function-call-innards"
 			},
 			{
-				include: "$base"
+				include: "$self"
 			}
 		]
 	},
@@ -1160,32 +1286,124 @@ var repository = {
 				]
 			},
 			{
-				include: "$base"
+				include: "$self"
 			}
 		]
 	},
 	inline_comment: {
-		match: "(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/))",
-		captures: {
-			"1": {
-				name: "comment.block.c punctuation.definition.comment.begin.c"
-			},
-			"2": {
-				name: "comment.block.c"
-			},
-			"3": {
+		patterns: [
+			{
 				patterns: [
 					{
-						match: "\\*\\/",
-						name: "comment.block.c punctuation.definition.comment.end.c"
+						match: "(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/))",
+						captures: {
+							"1": {
+								name: "comment.block.c punctuation.definition.comment.begin.c"
+							},
+							"2": {
+								name: "comment.block.c"
+							},
+							"3": {
+								patterns: [
+									{
+										match: "\\*\\/",
+										name: "comment.block.c punctuation.definition.comment.end.c"
+									},
+									{
+										match: "\\*",
+										name: "comment.block.c"
+									}
+								]
+							}
+						}
 					},
 					{
-						match: "\\*",
+						match: "(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/))",
+						captures: {
+							"1": {
+								name: "comment.block.c punctuation.definition.comment.begin.c"
+							},
+							"2": {
+								name: "comment.block.c"
+							},
+							"3": {
+								patterns: [
+									{
+										match: "\\*\\/",
+										name: "comment.block.c punctuation.definition.comment.end.c"
+									},
+									{
+										match: "\\*",
+										name: "comment.block.c"
+									}
+								]
+							}
+						}
+					}
+				]
+			},
+			{
+				match: "(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/))",
+				captures: {
+					"1": {
+						name: "comment.block.c punctuation.definition.comment.begin.c"
+					},
+					"2": {
 						name: "comment.block.c"
+					},
+					"3": {
+						patterns: [
+							{
+								match: "\\*\\/",
+								name: "comment.block.c punctuation.definition.comment.end.c"
+							},
+							{
+								match: "\\*",
+								name: "comment.block.c"
+							}
+						]
+					}
+				}
+			}
+		]
+	},
+	line_comment: {
+		patterns: [
+			{
+				begin: "\\s*+(\\/\\/)",
+				end: "(?<=\\n)(?<!\\\\\\n)",
+				beginCaptures: {
+					"1": {
+						name: "punctuation.definition.comment.c"
+					}
+				},
+				endCaptures: {
+				},
+				name: "comment.line.double-slash.c",
+				patterns: [
+					{
+						include: "#line_continuation_character"
+					}
+				]
+			},
+			{
+				begin: "\\s*+(\\/\\/)",
+				end: "(?<=\\n)(?<!\\\\\\n)",
+				beginCaptures: {
+					"1": {
+						name: "punctuation.definition.comment.c"
+					}
+				},
+				endCaptures: {
+				},
+				name: "comment.line.double-slash.c",
+				patterns: [
+					{
+						include: "#line_continuation_character"
 					}
 				]
 			}
-		}
+		]
 	},
 	line_continuation_character: {
 		patterns: [
@@ -1613,7 +1831,7 @@ var repository = {
 						include: "#function-call-innards"
 					},
 					{
-						include: "$base"
+						include: "$self"
 					}
 				]
 			}
@@ -1635,7 +1853,7 @@ var repository = {
 		},
 		patterns: [
 			{
-				include: "$base"
+				include: "$self"
 			}
 		]
 	},
@@ -1763,7 +1981,7 @@ var repository = {
 						]
 					},
 					{
-						include: "$base"
+						include: "$self"
 					}
 				]
 			},
@@ -2058,7 +2276,7 @@ var repository = {
 				include: "#member_access"
 			},
 			{
-				include: "$base"
+				include: "$self"
 			}
 		]
 	},
@@ -2204,7 +2422,7 @@ var repository = {
 								]
 							},
 							{
-								include: "$base"
+								include: "$self"
 							}
 						]
 					},
@@ -2462,7 +2680,7 @@ var repository = {
 						end: "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
 						patterns: [
 							{
-								include: "$base"
+								include: "$self"
 							}
 						]
 					}
@@ -2653,7 +2871,7 @@ var repository = {
 						]
 					},
 					{
-						include: "$base"
+						include: "$self"
 					}
 				]
 			}
@@ -2762,7 +2980,7 @@ var repository = {
 		end: "(?=^\\s*((#)\\s*endif\\b))",
 		patterns: [
 			{
-				include: "$base"
+				include: "$self"
 			}
 		]
 	},