Fix #183

c/tags.txt

@@ -1,6 +1,12 @@
 colon.c
 comma.c
 comment.block.c
+comment.block.preprocessor.elif-branch.c
+comment.block.preprocessor.elif-branch.in-block.c
+comment.block.preprocessor.else-branch.c
+comment.block.preprocessor.else-branch.in-block.c
+comment.block.preprocessor.if-branch.c
+comment.block.preprocessor.if-branch.in-block.c
 comment.line.banner.c
 comment.line.double-slash.c
 constant.character.escape.c

cpp/tags.txt

@@ -2,6 +2,12 @@ alias.cpp
 colon.cpp
 comma.cpp
 comment.block.cpp
+comment.block.preprocessor.elif-branch.cpp
+comment.block.preprocessor.elif-branch.in-block.cpp
+comment.block.preprocessor.else-branch.cpp
+comment.block.preprocessor.else-branch.in-block.cpp
+comment.block.preprocessor.if-branch.cpp
+comment.block.preprocessor.if-branch.in-block.cpp
 comment.line.banner.cpp
 comment.line.double-slash.cpp
 constant.character.escape.cpp
@@ -20,17 +26,27 @@ ellipses.cpp
 entity.name.function.call.cpp
 entity.name.function.constructor.cpp
 entity.name.function.cpp
+entity.name.function.definition.cpp
 entity.name.function.destructor.cpp
 entity.name.function.member.cpp
 entity.name.function.preprocessor.cpp
 entity.name.operator.overloadee.cpp
+entity.name.scope-resolution.cpp
+entity.name.scope-resolution.function.call.cpp
+entity.name.scope-resolution.function.definition.cpp
+entity.name.scope-resolution.function.definition.operator-overload.cpp
+entity.name.scope-resolution.namespace.alias.cpp
+entity.name.scope-resolution.namespace.block.cpp
+entity.name.scope-resolution.namespace.using.cpp
+entity.name.scope-resolution.template.call.cpp
+entity.name.scope-resolution.template.definition.cpp
 entity.name.tag.pragma-mark.cpp
 entity.name.type.$3.cpp
 entity.name.type.cpp
 entity.name.type.enum.cpp
 entity.name.type.inherited.cpp
+entity.name.type.namespace.alias.cpp
 entity.name.type.namespace.cpp
-entity.name.type.namespace.scope-resolution.cpp
 entity.name.type.struct.cpp
 entity.name.type.struct.parameter.cpp
 entity.name.type.template.cpp
@@ -82,6 +98,7 @@ keyword.operator.typeid.cpp
 keyword.operator.wordlike.cpp
 keyword.other.$0.cpp
 keyword.other.decltype.cpp
+keyword.other.namespace.alias.cpp
 keyword.other.namespace.definition.cpp
 keyword.other.namespace.directive.cpp
 keyword.other.operator.overload.cpp
@@ -97,6 +114,11 @@ keyword.other.unit.suffix.integer.cpp
 keyword.other.unit.user-defined.cpp
 keyword.other.using.directive.cpp
 memory.cpp
+meta.arguments.decltype.cpp
+meta.arguments.operator.alignas.cpp
+meta.arguments.operator.alignof.cpp
+meta.arguments.operator.sizeof.cpp
+meta.arguments.operator.typeid.cpp
 meta.block.class.cpp
 meta.block.cpp
 meta.block.enum.cpp
@@ -108,22 +130,26 @@ meta.block.union.cpp
 meta.body.class.cpp
 meta.body.enum.cpp
 meta.body.extern.cpp
+meta.body.function.definition.cpp
 meta.body.namespace.cpp
 meta.body.struct.cpp
 meta.body.switch.cpp
 meta.body.union.cpp
 meta.bracket.square.access.cpp
 meta.conditional.case.cpp
 meta.conditional.switch.cpp
+meta.declaration.namespace.alias.cpp
+meta.declaration.namespace.alias.value.cpp
 meta.declaration.type.alias.cpp
 meta.declaration.type.alias.value.unknown.cpp
 meta.encoding.cpp
 meta.enum.definition.cpp
-meta.function-call.cpp
+meta.function-call.member.cpp
 meta.function.constructor.cpp
 meta.function.constructor.initializer-list.cpp
 meta.function.cpp
 meta.function.definition.body.lambda.cpp
+meta.function.definition.cpp
 meta.function.definition.parameters.cpp
 meta.function.definition.parameters.lambda.cpp
 meta.function.definition.parameters.operator-overload.cpp
@@ -132,6 +158,7 @@ meta.function.destructor.prototype.cpp
 meta.head.class.cpp
 meta.head.enum.cpp
 meta.head.extern.cpp
+meta.head.function.definition.cpp
 meta.head.namespace.cpp
 meta.head.struct.cpp
 meta.head.switch.cpp
@@ -146,12 +173,12 @@ meta.preprocessor.include.cpp
 meta.preprocessor.macro.cpp
 meta.preprocessor.pragma.cpp
 meta.qualified_type.cpp
-meta.scope-resolution.cpp
 meta.section.cpp
 meta.static_assert.message.cpp
 meta.tail.class.cpp
 meta.tail.enum.cpp
 meta.tail.extern.cpp
+meta.tail.function.definition.cpp
 meta.tail.namespace.cpp
 meta.tail.struct.cpp
 meta.tail.switch.cpp
@@ -189,13 +216,15 @@ punctuation.section.angle-brackets.end.template.definition.cpp
 punctuation.section.angle-brackets.start.template.definition.cpp
 punctuation.section.arguments.begin.bracket.round.cpp
 punctuation.section.arguments.begin.bracket.round.decltype.cpp
+punctuation.section.arguments.begin.bracket.round.function.call.cpp
 punctuation.section.arguments.begin.bracket.round.function.member.cpp
 punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp
 punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp
 punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp
 punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp
 punctuation.section.arguments.end.bracket.round.cpp
 punctuation.section.arguments.end.bracket.round.decltype.cpp
+punctuation.section.arguments.end.bracket.round.function.call.cpp
 punctuation.section.arguments.end.bracket.round.function.member.cpp
 punctuation.section.arguments.end.bracket.round.operator.alignas.cpp
 punctuation.section.arguments.end.bracket.round.operator.alignof.cpp
@@ -207,6 +236,7 @@ punctuation.section.block.begin.bracket.curly.class.cpp
 punctuation.section.block.begin.bracket.curly.cpp
 punctuation.section.block.begin.bracket.curly.enum.cpp
 punctuation.section.block.begin.bracket.curly.extern.cpp
+punctuation.section.block.begin.bracket.curly.function.definition.cpp
 punctuation.section.block.begin.bracket.curly.lambda.cpp
 punctuation.section.block.begin.bracket.curly.namespace.cpp
 punctuation.section.block.begin.bracket.curly.struct.cpp
@@ -216,6 +246,7 @@ punctuation.section.block.end.bracket.curly.class.cpp
 punctuation.section.block.end.bracket.curly.cpp
 punctuation.section.block.end.bracket.curly.enum.cpp
 punctuation.section.block.end.bracket.curly.extern.cpp
+punctuation.section.block.end.bracket.curly.function.definition.cpp
 punctuation.section.block.end.bracket.curly.lambda.cpp
 punctuation.section.block.end.bracket.curly.namespace.cpp
 punctuation.section.block.end.bracket.curly.struct.cpp
@@ -243,10 +274,18 @@ punctuation.separator.delimiter.cpp
 punctuation.separator.delimiter.inhertance.cpp
 punctuation.separator.dot-access.cpp
 punctuation.separator.inhertance.cpp
-punctuation.separator.namespace.access.cpp
 punctuation.separator.parameters.cpp
 punctuation.separator.pointer-access.cpp
 punctuation.separator.range-based.cpp
+punctuation.separator.scope-resolution.cpp
+punctuation.separator.scope-resolution.function.call.cpp
+punctuation.separator.scope-resolution.function.definition.cpp
+punctuation.separator.scope-resolution.function.definition.operator-overload.cpp
+punctuation.separator.scope-resolution.namespace.alias.cpp
+punctuation.separator.scope-resolution.namespace.block.cpp
+punctuation.separator.scope-resolution.namespace.using.cpp
+punctuation.separator.scope-resolution.template.call.cpp
+punctuation.separator.scope-resolution.template.definition.cpp
 punctuation.separator.template.argument.cpp
 punctuation.separator.type-specifier.cpp
 punctuation.terminator.statement.cpp
@@ -255,6 +294,7 @@ punctuation.vararg-ellipses.template.definition.cpp
 punctuation.whitespace.comment.leading.cpp
 storage.modifier.array.bracket.square.cpp
 storage.modifier.cpp
+storage.modifier.inline.cpp
 storage.modifier.lambda.$0.cpp
 storage.modifier.pointer.cpp
 storage.modifier.reference.cpp
@@ -273,6 +313,7 @@ storage.type.modifier.access.$0.cpp
 storage.type.modifier.access.control.$1.cpp
 storage.type.modifier.final.cpp
 storage.type.modifier.virtual.cpp
+storage.type.namespace.alias.cpp
 storage.type.namespace.definition.cpp
 storage.type.namespace.directive.cpp
 storage.type.primitive.cpp

syntaxes/c.tmLanguage.json

@@ -2291,7 +2291,7 @@
       }
     },
     "method_access": {
-      "contentName": "meta.function-call.member",
+      "contentName": "meta.function-call.member.c",
       "begin": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
       "beginCaptures": {
         "1": {

syntaxes/c.tmLanguage.yaml

@@ -1268,7 +1268,7 @@
       '5':
         name: variable.other.member.c
   method_access:
-    contentName: meta.function-call.member
+    contentName: meta.function-call.member.c
     begin: "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()"
     beginCaptures:
       '1':