github-linguist 5.3.3 → 6.0.0

data/grammars/source.c++.qt.json

@@ -1,37 +1,29 @@
 {
-  "fileTypes": [
-
-  ],
-  "firstLineMatch": "-\\*- C\\+\\+ -\\*-",
-  "foldingStartMarker": "(?x)\n\t\t /\\*\\*(?!\\*)\n\t\t|^(?![^{]*?//|[^{]*?/\\*(?!.*?\\*/.*?\\{)).*?\\{\\s*($|//|/\\*(?!.*?\\*/.*\\S))\n\t",
-  "foldingStopMarker": "(?<!\\*)\\*\\*/|^\\s*\\}",
-  "keyEquivalent": "^~Q",
   "name": "C++ Qt",
+  "scopeName": "source.c++.qt",
   "patterns": [
     {
-      "match": "\\bQ_(CLASSINFO|ENUMS|FLAGS|INTERFACES|OBJECT|PROPERTY)\\b",
-      "name": "support.other.macro.qt"
+      "name": "support.other.macro.qt",
+      "match": "\\bQ_(CLASSINFO|ENUMS|FLAGS|INTERFACES|OBJECT|PROPERTY)\\b"
     },
     {
-      "match": "\\b((dis)?connect|emit|fore(ach|ver)|tr(Utf8)?|qobject_cast)\\b",
-      "name": "support.function.qt"
+      "name": "support.function.qt",
+      "match": "\\b((dis)?connect|emit|fore(ach|ver)|tr(Utf8)?|qobject_cast)\\b"
     },
     {
-      "match": "\\bQ(Abstract(Button|EventDispatcher|Extension(Factory|Manager)|FileEngine(Handler)?|FormBuilder|GraphicsShapeItem|Item(Delegate|Model|View)|ListModel|PrintDialog|ProxyModel|ScrollArea|Slider|Socket|SpinBox|TableModel|TextDocumentLayout)|Accessible(Bridge|BridgePlugin|Event|Interface|Object|Plugin|Widget)?|Action(Event|Group)?|(Core)?Application|AssistantClient|Ax(Aggregated|Base|Bindable|Factory|Object|Script|ScriptEngine|ScriptManager|Widget)|BasicTimer|Bit(Array|map)|BoxLayout|Brush|Buffer|ButtonBox|ButtonGroup|ByteArray(Matcher)?|(CDE|Windows(XP)?|Cleanlooks|Common|Mac|Plastique|Motif)Style|Cache|CalendarWidget|Char|CheckBox|ChildEvent|Clipboard|CloseEvent|Color(Dialog|map)?|ComboBox|Completer|ConicalGradient|ContextMenuEvent|CopChannel|Cursor|CustomRasterPaintDevice|DBus(AbstractAdaptor|AbstractInterface|Argument|Connection(Interface)?|Error|Interface|Message|ObjectPath|Reply|Server|Signature|Variant)|Data(Stream|WidgetMapper)|Date((Time)?(Edit)?)|Decoration(Factory|Plugin)?|Designer(ActionEditorInterface|ContainerExtension|CustomWidgetCollectionInterface|CustomWidgetInterface|FormEditorInterface|FormWindowCursorInterface|FormWindowInterface|FormWindowManagerInterface|MemberSheetExtension|ObjectInspectorInterface|PropertyEditorInterface|PropertySheetExtension|TaskMenuExtension|WidgetBoxInterface)|Desktop(Services|Widget)|Dial(og|ogButtonBox)?|Dir(Model|ectPainter)?|DockWidget|Dom(Attr|CDATASection|CharacterData|Comment|Document|DocumentFragment|DocumentType|Element|Entity|EntityReference|Implementation|NamedNodeMap|Node|NodeList|Notation|ProcessingInstruction|Text)|Double(SpinBox|Validator)|Drag((Enter|Leave|Move)Event)?|(Drop|DynamicPropertyChange)Event|ErrorMessage|Event(Loop)?|Extension(Factory|Manager)|FSFileEngine|File(Dialog|IconProvider|Info|OpenEvent|SystemWatcher)?|Flags?|Focus(Event|Frame)|Font(ComboBox|Database|Dialog|Info|MetricsF?)?|FormBuilder|Frame|Ftp|GL(Colormap|Context|Format|FramebufferObject|PixelBuffer|Widget)|Generic(Return)?Argument|Gradient|Graphics(EllipseItem|Item|ItemAnimation|ItemGroup|LineItem|PathItem|PixmapItem|PolygonItem|RectItem|Scene((ContextMenu|Hover|Mouse|Wheel)?Event)?|SimpleTextItem|SvgItem|TextItem|View)|GridLayout|GroupBox|HBoxLayout|Hash(Iterator)?|HeaderView|(Help|Hide|Hover)Event|Host(Address|Info)|Http((Response|Request)?Header)?|IODevice|Icon(DragEvent|Engine(Plugin)?)?|Image(IO(Handler|Plugin)|Reader|Writer)?|Input(Context(Factory|Plugin)?|Dialog|Event|MethodEvent)|IntValidator|Item(Delegate|Editor(CreatorBase|Factory)|Selection(Model|Range)?)|KbdDriver(Factory|Plugin)|Key(Event|Sequence)|LCDNumber|Label|Latin1(Char|String)|Layout(Item)?|Library(Info)?|Line(Edit|F)?|LinearGradient|LinkedList(Iterator)?|LinuxFbScreen|List(View|Iterator|Widget(Item)?)?|Locale|MacPasteboardMime|MainWindow|Map(Iterator)?|Matrix|Menu(Bar)?|MessageBox|Meta(ClassInfo|Enum|Method|Object|Property|Type)|Mime(Data|Source)|ModelIndex|MouseDriver(Factory|Plugin)|(Move|Mouse)Event|Movie|Multi(Hash|Map)|Mutable(Hash|(Linked)?List|Map|Set|Vector)Iterator|Mutex(Locker)?|Network(AddressEntry|Interface|Proxy)|Object(CleanupHandler)?|PageSetupDialog|Paint(Device|Engine(State)?|Event|er(Path(Stroker)?)?)|Pair|Palette|Pen|PersistentModelIndex|Picture(FormatPlugin|IO)?|Pixmap(Cache)?|PluginLoader|PointF?|Pointer|PolygonF?|Print(Dialog|Engine|er)|Process|Progress(Bar|Dialog)|ProxyModel|PushButton|Queue|RadialGradient|RadioButton|RasterPaintEngine|ReadLocker|ReadWriteLock|RectF?|RegExp(Validator)?|Region|ResizeEvent|Resource|RubberBand|Screen(Cursor|Driver(Factory|Plugin))?|Scroll(Area|Bar)|Semaphore|SessionManager|Set(Iterator)?|Settings|SharedData(Pointer)?|Shortcut(Event)?|ShowEvent|Signal(Mapper|Spy)|Size(Grip|Policy|F)?|Slider|SocketNotifier|SortFilterProxyModel|Sound|SpacerItem|SpinBox|SplashScreen|Splitter(Handle)?|Sql(Database|Driver(Creator(Base)?|Plugin)?|Error|Field|Index|Query(Model)?|Record|Relation|Relational(Delegate|TableModel)|Result|TableModel)|Stack(ed(Layout|Widget))?|StandardItem(EditorCreator|Model)?|Status(Bar|TipEvent)|String(List(Model)?|Matcher)?|Style(Factory|HintReturn(Mask)?|Option(Button|ComboBox|Complex|DockWidget|FocusRect|Frame(V2)?|GraphicsItem|GroupBox|Header|MenuItem|ProgressBar(V2)?|Q3(DockWindow|ListView|ListViewItem)|RubberBand|SizeGrip|Slider|SpinBox|Tab(BarBase|V2|WidgetFrame)?|TitleBar|Tool(Bar|Box|Button)|ViewItem(V2)?)?|Painter|Plugin)?|Svg(Renderer|Widget)|SyntaxHighlighter|SysInfo|System(Locale|TrayIcon)|Tab(Bar|Widget)|Table(Widget(Item|SelectionRange)?|View)|TabletEvent|Tcp(Server|Socket)|TemporaryFile|TestEventList|Text(Block(Format|Group|UserData)?|Browser|CharFormat|Codec(Plugin)?|Cursor|(De|En)coder|Document(Fragment)?|Edit|Fragment|Frame(Format)?|(Image)?Format|InlineObject|Layout|Length|Line|List(Format)?|Object|Option|Stream|Table(Cell|Format)?)|Thread(Storage)?|Time(Edit|Line)?|Timer(Event)?|Tool(Bar|Box|Button|Tip)|TransformedScreen|Translator|Tree(Widget(Item(Iterator)?)?|View)|UdpSocket|UiLoader|Undo(Command|Group|Stack|View)|Url(Info)?|Uuid|VBoxLayout|(VNC|VFb)Screen|Validator|VarLengthArray|Variant|Vector(Iterator)?|WS(Client|EmbedWidget|Event|InputMethod|(Keyboard|(Tslib|Calibrated)?Mouse)Handler|PointerCalibrationData|ScreenSaver|Server|Window(Surface)?)|WaitCondition|WhatsThis(ClickedEvent)?|WheelEvent|Widget(Action|Item)?|Window(StateChangeEvent|sMime)|Workspace|WriteLocker|X11Embed(Container|Widget)|X11Info|Xml(Attributes|(Content|DTD|Decl|Default|Error|Lexical)Handler|EntityResolver|InputSource|Locator|NamespaceSupport|ParseException|Reader|SimpleReader))\\b",
-      "name": "support.class.qt"
+      "name": "support.class.qt",
+      "match": "\\bQ(Abstract(Button|EventDispatcher|Extension(Factory|Manager)|FileEngine(Handler)?|FormBuilder|GraphicsShapeItem|Item(Delegate|Model|View)|ListModel|PrintDialog|ProxyModel|ScrollArea|Slider|Socket|SpinBox|TableModel|TextDocumentLayout)|Accessible(Bridge|BridgePlugin|Event|Interface|Object|Plugin|Widget)?|Action(Event|Group)?|(Core)?Application|AssistantClient|Ax(Aggregated|Base|Bindable|Factory|Object|Script|ScriptEngine|ScriptManager|Widget)|BasicTimer|Bit(Array|map)|BoxLayout|Brush|Buffer|ButtonBox|ButtonGroup|ByteArray(Matcher)?|(CDE|Windows(XP)?|Cleanlooks|Common|Mac|Plastique|Motif)Style|Cache|CalendarWidget|Char|CheckBox|ChildEvent|Clipboard|CloseEvent|Color(Dialog|map)?|ComboBox|Completer|ConicalGradient|ContextMenuEvent|CopChannel|Cursor|CustomRasterPaintDevice|DBus(AbstractAdaptor|AbstractInterface|Argument|Connection(Interface)?|Error|Interface|Message|ObjectPath|Reply|Server|Signature|Variant)|Data(Stream|WidgetMapper)|Date((Time)?(Edit)?)|Decoration(Factory|Plugin)?|Designer(ActionEditorInterface|ContainerExtension|CustomWidgetCollectionInterface|CustomWidgetInterface|FormEditorInterface|FormWindowCursorInterface|FormWindowInterface|FormWindowManagerInterface|MemberSheetExtension|ObjectInspectorInterface|PropertyEditorInterface|PropertySheetExtension|TaskMenuExtension|WidgetBoxInterface)|Desktop(Services|Widget)|Dial(og|ogButtonBox)?|Dir(Model|ectPainter)?|DockWidget|Dom(Attr|CDATASection|CharacterData|Comment|Document|DocumentFragment|DocumentType|Element|Entity|EntityReference|Implementation|NamedNodeMap|Node|NodeList|Notation|ProcessingInstruction|Text)|Double(SpinBox|Validator)|Drag((Enter|Leave|Move)Event)?|(Drop|DynamicPropertyChange)Event|ErrorMessage|Event(Loop)?|Extension(Factory|Manager)|FSFileEngine|File(Dialog|IconProvider|Info|OpenEvent|SystemWatcher)?|Flags?|Focus(Event|Frame)|Font(ComboBox|Database|Dialog|Info|MetricsF?)?|FormBuilder|Frame|Ftp|GL(Colormap|Context|Format|FramebufferObject|PixelBuffer|Widget)|Generic(Return)?Argument|Gradient|Graphics(EllipseItem|Item|ItemAnimation|ItemGroup|LineItem|PathItem|PixmapItem|PolygonItem|RectItem|Scene((ContextMenu|Hover|Mouse|Wheel)?Event)?|SimpleTextItem|SvgItem|TextItem|View)|GridLayout|GroupBox|HBoxLayout|Hash(Iterator)?|HeaderView|(Help|Hide|Hover)Event|Host(Address|Info)|Http((Response|Request)?Header)?|IODevice|Icon(DragEvent|Engine(Plugin)?)?|Image(IO(Handler|Plugin)|Reader|Writer)?|Input(Context(Factory|Plugin)?|Dialog|Event|MethodEvent)|IntValidator|Item(Delegate|Editor(CreatorBase|Factory)|Selection(Model|Range)?)|KbdDriver(Factory|Plugin)|Key(Event|Sequence)|LCDNumber|Label|Latin1(Char|String)|Layout(Item)?|Library(Info)?|Line(Edit|F)?|LinearGradient|LinkedList(Iterator)?|LinuxFbScreen|List(View|Iterator|Widget(Item)?)?|Locale|MacPasteboardMime|MainWindow|Map(Iterator)?|Matrix|Menu(Bar)?|MessageBox|Meta(ClassInfo|Enum|Method|Object|Property|Type)|Mime(Data|Source)|ModelIndex|MouseDriver(Factory|Plugin)|(Move|Mouse)Event|Movie|Multi(Hash|Map)|Mutable(Hash|(Linked)?List|Map|Set|Vector)Iterator|Mutex(Locker)?|Network(AddressEntry|Interface|Proxy)|Object(CleanupHandler)?|PageSetupDialog|Paint(Device|Engine(State)?|Event|er(Path(Stroker)?)?)|Pair|Palette|Pen|PersistentModelIndex|Picture(FormatPlugin|IO)?|Pixmap(Cache)?|PluginLoader|PointF?|Pointer|PolygonF?|Print(Dialog|Engine|er)|Process|Progress(Bar|Dialog)|ProxyModel|PushButton|Queue|RadialGradient|RadioButton|RasterPaintEngine|ReadLocker|ReadWriteLock|RectF?|RegExp(Validator)?|Region|ResizeEvent|Resource|RubberBand|Screen(Cursor|Driver(Factory|Plugin))?|Scroll(Area|Bar)|Semaphore|SessionManager|Set(Iterator)?|Settings|SharedData(Pointer)?|Shortcut(Event)?|ShowEvent|Signal(Mapper|Spy)|Size(Grip|Policy|F)?|Slider|SocketNotifier|SortFilterProxyModel|Sound|SpacerItem|SpinBox|SplashScreen|Splitter(Handle)?|Sql(Database|Driver(Creator(Base)?|Plugin)?|Error|Field|Index|Query(Model)?|Record|Relation|Relational(Delegate|TableModel)|Result|TableModel)|Stack(ed(Layout|Widget))?|StandardItem(EditorCreator|Model)?|Status(Bar|TipEvent)|String(List(Model)?|Matcher)?|Style(Factory|HintReturn(Mask)?|Option(Button|ComboBox|Complex|DockWidget|FocusRect|Frame(V2)?|GraphicsItem|GroupBox|Header|MenuItem|ProgressBar(V2)?|Q3(DockWindow|ListView|ListViewItem)|RubberBand|SizeGrip|Slider|SpinBox|Tab(BarBase|V2|WidgetFrame)?|TitleBar|Tool(Bar|Box|Button)|ViewItem(V2)?)?|Painter|Plugin)?|Svg(Renderer|Widget)|SyntaxHighlighter|SysInfo|System(Locale|TrayIcon)|Tab(Bar|Widget)|Table(Widget(Item|SelectionRange)?|View)|TabletEvent|Tcp(Server|Socket)|TemporaryFile|TestEventList|Text(Block(Format|Group|UserData)?|Browser|CharFormat|Codec(Plugin)?|Cursor|(De|En)coder|Document(Fragment)?|Edit|Fragment|Frame(Format)?|(Image)?Format|InlineObject|Layout|Length|Line|List(Format)?|Object|Option|Stream|Table(Cell|Format)?)|Thread(Storage)?|Time(Edit|Line)?|Timer(Event)?|Tool(Bar|Box|Button|Tip)|TransformedScreen|Translator|Tree(Widget(Item(Iterator)?)?|View)|UdpSocket|UiLoader|Undo(Command|Group|Stack|View)|Url(Info)?|Uuid|VBoxLayout|(VNC|VFb)Screen|Validator|VarLengthArray|Variant|Vector(Iterator)?|WS(Client|EmbedWidget|Event|InputMethod|(Keyboard|(Tslib|Calibrated)?Mouse)Handler|PointerCalibrationData|ScreenSaver|Server|Window(Surface)?)|WaitCondition|WhatsThis(ClickedEvent)?|WheelEvent|Widget(Action|Item)?|Window(StateChangeEvent|sMime)|Workspace|WriteLocker|X11Embed(Container|Widget)|X11Info|Xml(Attributes|(Content|DTD|Decl|Default|Error|Lexical)Handler|EntityResolver|InputSource|Locator|NamespaceSupport|ParseException|Reader|SimpleReader))\\b"
     },
     {
-      "match": "\\b(q(int8|int16|int32|int64|longlong|real|uint8|uint16|uint32|uint64|ulonglong)|u(char|int|long|short))\\b",
-      "name": "storage.type.qt"
+      "name": "storage.type.qt",
+      "match": "\\b(q(int8|int16|int32|int64|longlong|real|uint8|uint16|uint32|uint64|ulonglong)|u(char|int|long|short))\\b"
     },
     {
-      "match": "\\b((public|private|protected) slots|signals)\\b",
-      "name": "storage.modifier.qt"
+      "name": "storage.modifier.qt",
+      "match": "\\b((public|private|protected) slots|signals)\\b"
     },
     {
       "include": "source.c++"
     }
-  ],
-  "scopeName": "source.c++.qt",
-  "uuid": "C0D24A46-0534-11DB-8949-0011242E4184"
-}
+  ]
+}

data/grammars/source.c.ec.json

@@ -1,39 +1,33 @@
 {
-  "fileTypes": [
-    "ec",
-    "eh"
-  ],
-  "keyEquivalent": "^~E",
   "name": "eC",
+  "scopeName": "source.c.ec",
   "patterns": [
     {
       "include": "source.c"
     },
     {
-      "match": "\\b(property|import|delete|new|new0|renew|renew0|define|get|set|remote|dllexport|dllimport|stdcall|subclass|__on_register_module|namespace|using|typed_object|any_object|incref|register|watch|stopwatching|firewatchers|watchable|class_designer|class_fixed|class_no_expansion|isset|class_default_property|property_category|class_data|class_property|virtual|thisclass|dbtable|dbindex|database_open|dbfield|this|value)\\b",
-      "name": "keyword.other.ec"
+      "name": "keyword.other.ec",
+      "match": "\\b(property|import|delete|new|new0|renew|renew0|define|get|set|remote|dllexport|dllimport|stdcall|subclass|__on_register_module|namespace|using|typed_object|any_object|incref|register|watch|stopwatching|firewatchers|watchable|class_designer|class_fixed|class_no_expansion|isset|class_default_property|property_category|class_data|class_property|virtual|thisclass|dbtable|dbindex|database_open|dbfield|this|value)\\b"
     },
     {
-      "match": "\\b(true|false)\\b",
-      "name": "constant.language.boolean.ec"
+      "name": "constant.language.boolean.ec",
+      "match": "\\b(true|false)\\b"
     },
     {
-      "match": "\\bnull\\b",
-      "name": "constant.language.null.ec"
+      "name": "constant.language.null.ec",
+      "match": "\\bnull\\b"
     },
     {
-      "match": "\\bclass\\b",
-      "name": "storage.type.class.ec"
+      "name": "storage.type.class.ec",
+      "match": "\\bclass\\b"
     },
     {
-      "match": "\\b(private|public)\\b",
-      "name": "storage.modifier.ec"
+      "name": "storage.modifier.ec",
+      "match": "\\b(private|public)\\b"
     },
     {
-      "match": "\\b(unichar|uint|uint32|uint16|uint64|bool|byte|int64|uintptr|intptr|intsize|uintsize)\\b",
-      "name": "storage.type.ec"
+      "name": "storage.type.ec",
+      "match": "\\b(unichar|uint|uint32|uint16|uint64|bool|byte|int64|uintptr|intptr|intsize|uintsize)\\b"
     }
-  ],
-  "scopeName": "source.c.ec",
-  "uuid": "30A57404-CF1D-48D7-827B-864B0FFEB951"
-}
+  ]
+}

data/grammars/source.c.json

@@ -1,11 +1,6 @@
 {
-  "fileTypes": [
-    "c",
-    "h"
-  ],
-  "firstLineMatch": "-[*]-( Mode:)? C -[*]-",
-  "keyEquivalent": "^~C",
   "name": "C",
+  "scopeName": "source.c",
   "patterns": [
     {
       "include": "#preprocessor-rule-enabled"
@@ -23,91 +18,101 @@
       "include": "source.c.platform"
     },
     {
-      "match": "\\b(break|case|continue|default|do|else|for|goto|if|_Pragma|return|switch|while)\\b",
-      "name": "keyword.control.c"
+      "name": "keyword.control.c",
+      "match": "\\b(break|case|continue|default|do|else|for|goto|if|_Pragma|return|switch|while)\\b"
     },
     {
-      "match": "\\b(asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\b",
-      "name": "storage.type.c"
+      "name": "storage.type.c",
+      "match": "\\b(asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\b"
     },
     {
-      "match": "\\b(const|extern|register|restrict|static|volatile|inline)\\b",
-      "name": "storage.modifier.c"
+      "name": "storage.modifier.c",
+      "match": "\\b(const|extern|register|restrict|static|volatile|inline)\\b"
     },
     {
-      "comment": "common C constant naming idiom -- kConstantVariable",
-      "match": "\\bk[A-Z]\\w*\\b",
-      "name": "constant.other.variable.mac-classic.c"
+      "name": "constant.other.variable.mac-classic.c",
+      "match": "\\bk[A-Z]\\w*\\b"
     },
     {
-      "match": "\\bg[A-Z]\\w*\\b",
-      "name": "variable.other.readwrite.global.mac-classic.c"
+      "name": "variable.other.readwrite.global.mac-classic.c",
+      "match": "\\bg[A-Z]\\w*\\b"
     },
     {
-      "match": "\\bs[A-Z]\\w*\\b",
-      "name": "variable.other.readwrite.static.mac-classic.c"
+      "name": "variable.other.readwrite.static.mac-classic.c",
+      "match": "\\bs[A-Z]\\w*\\b"
     },
     {
-      "match": "\\b(NULL|true|false|TRUE|FALSE)\\b",
-      "name": "constant.language.c"
+      "name": "constant.language.c",
+      "match": "\\b(NULL|true|false|TRUE|FALSE)\\b"
     },
     {
       "include": "#sizeof"
     },
     {
+      "name": "constant.numeric.c",
+      "match": "(?x)\\b\n\t\t\t(  (?i:\n\t\t\t      0x ( [0-9A-Fa-f]+ ( ' [0-9A-Fa-f]+ )* )?  # Hexadecimal\n\t\t\t   |  0b ( [0-1]+       ( ' [0-1]+ )* )?        # Binary\n\t\t\t   |  0  ( [0-7]+       ( ' [0-7]+ )* )         # Octal\n\t\t\t   |     ( [0-9]+       ( ' [0-9]+ )* )         # Decimal\n\t\t\t   )\n\t\t\t   ( ([uUfF] | u?ll? | U?LL?)\\b | (?\u003cinc\u003e') | \\b )\n\t\t\t|  ( [0-9]+ ( ' [0-9]+ )* )?\n\t\t\t   (?i:\n\t\t\t      \\. ( [0-9]+ ( ' [0-9]+ )* ) E(\\+|-)? ( [0-9]+ ( ' [0-9]+ )* )\n\t\t\t   |  \\. ( [0-9]+ ( ' [0-9]+ )* )\n\t\t\t   |  E(\\+|-)? ( [0-9]+ ( ' [0-9]+ )* )\n\t\t\t   )\n\t\t\t   ( (?\u003cinc\u003e') | \\b )\n\t\t\t)",
       "captures": {
         "inc": {
           "name": "invalid.illegal.digit-separator-should-not-be-last.c++"
         }
-      },
-      "match": "(?x)\\b\n\t\t\t(  (?i:\n\t\t\t      0x ( [0-9A-Fa-f]+ ( ' [0-9A-Fa-f]+ )* )?  # Hexadecimal\n\t\t\t   |  0b ( [0-1]+       ( ' [0-1]+ )* )?        # Binary\n\t\t\t   |  0  ( [0-7]+       ( ' [0-7]+ )* )         # Octal\n\t\t\t   |     ( [0-9]+       ( ' [0-9]+ )* )         # Decimal\n\t\t\t   )\n\t\t\t   ( ([uUfF] | u?ll? | U?LL?)\\b | (?<inc>') | \\b )\n\t\t\t|  ( [0-9]+ ( ' [0-9]+ )* )?\n\t\t\t   (?i:\n\t\t\t      \\. ( [0-9]+ ( ' [0-9]+ )* ) E(\\+|-)? ( [0-9]+ ( ' [0-9]+ )* )\n\t\t\t   |  \\. ( [0-9]+ ( ' [0-9]+ )* )\n\t\t\t   |  E(\\+|-)? ( [0-9]+ ( ' [0-9]+ )* )\n\t\t\t   )\n\t\t\t   ( (?<inc>') | \\b )\n\t\t\t)",
-      "name": "constant.numeric.c"
+      }
     },
     {
+      "name": "string.quoted.double.c",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "include": "#string_escaped_char"
+        },
+        {
+          "include": "#string_placeholder"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.c"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.c"
         }
-      },
-      "name": "string.quoted.double.c",
+      }
+    },
+    {
+      "name": "string.quoted.single.c",
+      "begin": "'",
+      "end": "'",
       "patterns": [
         {
           "include": "#string_escaped_char"
-        },
-        {
-          "include": "#string_placeholder"
         }
-      ]
-    },
-    {
-      "begin": "'",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.c"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.c"
         }
-      },
-      "name": "string.quoted.single.c",
+      }
+    },
+    {
+      "name": "meta.preprocessor.macro.c",
+      "begin": "(?x)\n        \t\t^\\s*\\#\\s*(define)\\s+             # define\n        \t\t((?\u003cid\u003e[a-zA-Z_][a-zA-Z0-9_]*))  # macro name\n        \t\t(?:                              # and optionally:\n        \t\t    (\\()                         # an open parenthesis\n        \t\t        (\n        \t\t            \\s* \\g\u003cid\u003e \\s*       # first argument\n        \t\t            ((,) \\s* \\g\u003cid\u003e \\s*)*  # additional arguments\n        \t\t            (?:\\.\\.\\.)?          # varargs ellipsis?\n        \t\t        )\n        \t\t    (\\))                         # a close parenthesis\n        \t\t)?\n        \t",
+      "end": "(?=(?://|/\\*))|$",
       "patterns": [
         {
-          "include": "#string_escaped_char"
+          "name": "punctuation.separator.continuation.c",
+          "match": "(?\u003e\\\\\\s*\\n)"
+        },
+        {
+          "include": "$base"
         }
-      ]
-    },
-    {
-      "begin": "(?x)\n        \t\t^\\s*\\#\\s*(define)\\s+             # define\n        \t\t((?<id>[a-zA-Z_][a-zA-Z0-9_]*))  # macro name\n        \t\t(?:                              # and optionally:\n        \t\t    (\\()                         # an open parenthesis\n        \t\t        (\n        \t\t            \\s* \\g<id> \\s*       # first argument\n        \t\t            ((,) \\s* \\g<id> \\s*)*  # additional arguments\n        \t\t            (?:\\.\\.\\.)?          # varargs ellipsis?\n        \t\t        )\n        \t\t    (\\))                         # a close parenthesis\n        \t\t)?\n        \t",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.import.define.c"
@@ -127,123 +132,100 @@
         "8": {
           "name": "punctuation.definition.parameters.end.c"
         }
-      },
-      "end": "(?=(?://|/\\*))|$",
-      "name": "meta.preprocessor.macro.c",
-      "patterns": [
-        {
-          "match": "(?>\\\\\\s*\\n)",
-          "name": "punctuation.separator.continuation.c"
-        },
-        {
-          "include": "$base"
-        }
-      ]
+      }
     },
     {
+      "name": "meta.preprocessor.diagnostic.c",
       "begin": "^\\s*#\\s*(error|warning)\\b",
-      "captures": {
-        "1": {
-          "name": "keyword.control.import.error.c"
-        }
-      },
       "end": "$",
-      "name": "meta.preprocessor.diagnostic.c",
       "patterns": [
         {
-          "match": "(?>\\\\\\s*\\n)",
-          "name": "punctuation.separator.continuation.c"
+          "name": "punctuation.separator.continuation.c",
+          "match": "(?\u003e\\\\\\s*\\n)"
         }
-      ]
-    },
-    {
-      "begin": "^\\s*#\\s*(include|import)\\b",
+      ],
       "captures": {
         "1": {
-          "name": "keyword.control.import.include.c"
+          "name": "keyword.control.import.error.c"
         }
-      },
-      "end": "(?=(?://|/\\*))|$",
+      }
+    },
+    {
       "name": "meta.preprocessor.c.include",
+      "begin": "^\\s*#\\s*(include|import)\\b",
+      "end": "(?=(?://|/\\*))|$",
       "patterns": [
         {
-          "match": "(?>\\\\\\s*\\n)",
-          "name": "punctuation.separator.continuation.c"
+          "name": "punctuation.separator.continuation.c",
+          "match": "(?\u003e\\\\\\s*\\n)"
         },
         {
+          "name": "string.quoted.double.include.c",
           "begin": "\"",
+          "end": "\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.c"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.c"
             }
-          },
-          "name": "string.quoted.double.include.c"
+          }
         },
         {
-          "begin": "<",
+          "name": "string.quoted.other.lt-gt.include.c",
+          "begin": "\u003c",
+          "end": "\u003e",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.c"
             }
           },
-          "end": ">",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.c"
             }
-          },
-          "name": "string.quoted.other.lt-gt.include.c"
+          }
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "keyword.control.import.include.c"
+        }
+      }
     },
     {
       "include": "#pragma-mark"
     },
     {
+      "name": "meta.preprocessor.c",
       "begin": "^\\s*#\\s*(define|defined|elif|else|if|ifdef|ifndef|line|pragma|undef)\\b",
-      "captures": {
-        "1": {
-          "name": "keyword.control.import.c"
-        }
-      },
       "end": "(?=(?://|/\\*))|$",
-      "name": "meta.preprocessor.c",
       "patterns": [
         {
-          "match": "(?>\\\\\\s*\\n)",
-          "name": "punctuation.separator.continuation.c"
+          "name": "punctuation.separator.continuation.c",
+          "match": "(?\u003e\\\\\\s*\\n)"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "keyword.control.import.c"
+        }
+      }
     },
     {
-      "comment": "Reserved POSIX types",
-      "match": "\\b([a-z0-9_]+_t)\\b",
-      "name": "support.type.posix-reserved.c"
+      "name": "support.type.posix-reserved.c",
+      "match": "\\b([a-z0-9_]+_t)\\b"
     },
     {
       "include": "#block"
     },
     {
-      "begin": "(?x)\n    \t\t(?:  ^                                 # begin-of-line\n    \t\t  |  \n    \t\t     (?: (?= \\s )           (?<!else|new|return) (?<=\\w)      #  or word + space before name\n    \t\t       | (?= \\s*[A-Za-z_] ) (?<!&&)       (?<=[*&>])   #  or type modifier before name\n    \t\t     )\n    \t\t)\n    \t\t(\\s*) (?!(while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()\n    \t\t(\n    \t\t\t(?: [A-Za-z_][A-Za-z0-9_]*+ | :: )++ |                  # actual name\n    \t\t\t(?: (?<=operator) (?: [-*&<>=+!]+ | \\(\\) | \\[\\] ) )  # if it is a C++ operator\n    \t\t)\n    \t\t \\s*(?=\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.function.leading.c"
-        },
-        "3": {
-          "name": "entity.name.function.c"
-        },
-        "4": {
-          "name": "punctuation.definition.parameters.c"
-        }
-      },
-      "end": "(?<=\\})|(?=#)|(;)",
       "name": "meta.function.c",
+      "begin": "(?x)\n    \t\t(?:  ^                                 # begin-of-line\n    \t\t  |  \n    \t\t     (?: (?= \\s )           (?\u003c!else|new|return) (?\u003c=\\w)      #  or word + space before name\n    \t\t       | (?= \\s*[A-Za-z_] ) (?\u003c!\u0026\u0026)       (?\u003c=[*\u0026\u003e])   #  or type modifier before name\n    \t\t     )\n    \t\t)\n    \t\t(\\s*) (?!(while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()\n    \t\t(\n    \t\t\t(?: [A-Za-z_][A-Za-z0-9_]*+ | :: )++ |                  # actual name\n    \t\t\t(?: (?\u003c=operator) (?: [-*\u0026\u003c\u003e=+!]+ | \\(\\) | \\[\\] ) )  # if it is a C++ operator\n    \t\t)\n    \t\t \\s*(?=\\()",
+      "end": "(?\u003c=\\})|(?=#)|(;)",
       "patterns": [
         {
           "include": "#comments"
@@ -252,17 +234,29 @@
           "include": "#parens"
         },
         {
-          "match": "\\b(const|final|override|noexcept)\\b",
-          "name": "storage.modifier.$1.c++"
+          "name": "storage.modifier.$1.c++",
+          "match": "\\b(const|final|override|noexcept)\\b"
         },
         {
           "include": "#block"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.function.leading.c"
+        },
+        "3": {
+          "name": "entity.name.function.c"
+        },
+        "4": {
+          "name": "punctuation.definition.parameters.c"
+        }
+      }
     }
   ],
   "repository": {
     "access": {
+      "match": "(\\.)([a-zA-Z_][a-zA-Z_0-9]*)\\b(?!\\s*\\()",
       "captures": {
         "1": {
           "name": "punctuation.separator.variable-access.c"
@@ -270,30 +264,29 @@
         "2": {
           "name": "variable.other.dot-access.c"
         }
-      },
-      "match": "(\\.)([a-zA-Z_][a-zA-Z_0-9]*)\\b(?!\\s*\\()"
+      }
     },
     "block": {
       "patterns": [
         {
+          "name": "meta.block.c",
           "begin": "\\{",
+          "end": "\\}",
+          "patterns": [
+            {
+              "include": "#block_innards"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.c"
             }
           },
-          "end": "\\}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.c"
             }
-          },
-          "name": "meta.block.c",
-          "patterns": [
-            {
-              "include": "#block_innards"
-            }
-          ]
+          }
         }
       ]
     },
@@ -321,6 +314,8 @@
           "include": "#c_function_call"
         },
         {
+          "name": "meta.initialization.c",
+          "match": "(?x)\n\t\t\t        (?x)\n\t\t\t(?:  \n\t\t\t     (?: (?= \\s )           (?\u003c!else|new|return) (?\u003c=\\w)\\s+      #  or word + space before name\n\t\t\t     )\n\t\t\t)\n\t\t\t(\n\t\t\t\t(?: [A-Za-z_][A-Za-z0-9_]*+ | :: )++    |              # actual name\n\t\t\t\t(?: (?\u003c=operator) (?: [-*\u0026\u003c\u003e=+!]+ | \\(\\) | \\[\\] ) )?  # if it is a C++ operator\n\t\t\t)\n\t\t\t \\s*(\\()",
           "captures": {
             "1": {
               "name": "variable.other.c"
@@ -328,9 +323,7 @@
             "2": {
               "name": "punctuation.definition.parameters.c"
             }
-          },
-          "match": "(?x)\n\t\t\t        (?x)\n\t\t\t(?:  \n\t\t\t     (?: (?= \\s )           (?<!else|new|return) (?<=\\w)\\s+      #  or word + space before name\n\t\t\t     )\n\t\t\t)\n\t\t\t(\n\t\t\t\t(?: [A-Za-z_][A-Za-z0-9_]*+ | :: )++    |              # actual name\n\t\t\t\t(?: (?<=operator) (?: [-*&<>=+!]+ | \\(\\) | \\[\\] ) )?  # if it is a C++ operator\n\t\t\t)\n\t\t\t \\s*(\\()",
-          "name": "meta.initialization.c"
+          }
         },
         {
           "include": "#block"
@@ -341,6 +334,8 @@
       ]
     },
     "c_function_call": {
+      "name": "meta.function-call.c",
+      "match": "(?x) (?: (?= \\s )  (?:(?\u003c=else|new|return) | (?\u003c!\\w)) (\\s+))?\n\t\t\t(\\b \n\t\t\t\t(?!(while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()(?:(?!NS)[A-Za-z_][A-Za-z0-9_]*+\\b | :: )++                  # actual name\n\t\t\t)\n\t\t\t \\s*(\\()",
       "captures": {
         "1": {
           "name": "punctuation.whitespace.function-call.leading.c"
@@ -351,81 +346,78 @@
         "3": {
           "name": "punctuation.definition.parameters.c"
         }
-      },
-      "match": "(?x) (?: (?= \\s )  (?:(?<=else|new|return) | (?<!\\w)) (\\s+))?\n\t\t\t(\\b \n\t\t\t\t(?!(while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()(?:(?!NS)[A-Za-z_][A-Za-z0-9_]*+\\b | :: )++                  # actual name\n\t\t\t)\n\t\t\t \\s*(\\()",
-      "name": "meta.function-call.c"
+      }
     },
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.c",
+          "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
           "captures": {
             "1": {
               "name": "meta.toc-list.banner.block.c"
             }
-          },
-          "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
-          "name": "comment.block.c"
+          }
         },
         {
+          "name": "comment.block.c",
           "begin": "/\\*",
+          "end": "\\*/",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.c"
             }
           },
-          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.c"
             }
-          },
-          "name": "comment.block.c"
+          }
         },
         {
-          "match": "\\*/.*\\n",
-          "name": "invalid.illegal.stray-comment-end.c"
+          "name": "invalid.illegal.stray-comment-end.c",
+          "match": "\\*/.*\\n"
         },
         {
+          "name": "comment.line.banner.c++",
+          "match": "^// =(\\s*.*?)\\s*=\\s*$\\n?",
           "captures": {
             "1": {
               "name": "meta.toc-list.banner.line.c"
             }
-          },
-          "match": "^// =(\\s*.*?)\\s*=\\s*$\\n?",
-          "name": "comment.line.banner.c++"
+          }
         },
         {
           "begin": "(^[ \\t]+)?(?=//)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.c++"
-            }
-          },
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.double-slash.c++",
               "begin": "//",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.comment.c++"
-                }
-              },
               "end": "\\n",
-              "name": "comment.line.double-slash.c++",
               "patterns": [
                 {
-                  "match": "(?>\\\\\\s*\\n)",
-                  "name": "punctuation.separator.continuation.c++"
+                  "name": "punctuation.separator.continuation.c++",
+                  "match": "(?\u003e\\\\\\s*\\n)"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.comment.c++"
+                }
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.c++"
+            }
+          }
         }
       ]
     },
     "disabled": {
       "begin": "^\\s*#\\s*if(n?def)?\\b.*$",
-      "comment": "eat nested preprocessor if(def)s",
       "end": "^\\s*#\\s*endif\\b",
       "patterns": [
         {
@@ -437,26 +429,28 @@
       ]
     },
     "parens": {
+      "name": "meta.parens.c",
       "begin": "\\(",
+      "end": "\\)",
+      "patterns": [
+        {
+          "include": "$base"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.parens.begin.c"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.parens.end.c"
         }
-      },
-      "name": "meta.parens.c",
-      "patterns": [
-        {
-          "include": "$base"
-        }
-      ]
+      }
     },
     "pragma-mark": {
+      "name": "meta.section",
+      "match": "^\\s*(#\\s*(pragma\\s+mark)\\s+(.*))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.c"
@@ -467,27 +461,20 @@
         "3": {
           "name": "meta.toc-list.pragma-mark.c"
         }
-      },
-      "match": "^\\s*(#\\s*(pragma\\s+mark)\\s+(.*))",
-      "name": "meta.section"
+      }
     },
     "preprocessor-rule-disabled": {
       "begin": "^\\s*(#(if)\\s+(0)\\b).*",
-      "captures": {
-        "1": {
-          "name": "meta.preprocessor.c"
-        },
-        "2": {
-          "name": "keyword.control.import.if.c"
-        },
-        "3": {
-          "name": "constant.numeric.preprocessor.c"
-        }
-      },
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
+          "end": "(?=^\\s*#\\s*endif\\b)",
+          "patterns": [
+            {
+              "include": "$base"
+            }
+          ],
           "captures": {
             "1": {
               "name": "meta.preprocessor.c"
@@ -495,18 +482,11 @@
             "2": {
               "name": "keyword.control.import.else.c"
             }
-          },
-          "end": "(?=^\\s*#\\s*endif\\b)",
-          "patterns": [
-            {
-              "include": "$base"
-            }
-          ]
+          }
         },
         {
-          "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b)",
           "name": "comment.block.preprocessor.if-branch",
+          "end": "(?=^\\s*#\\s*(else|endif)\\b)",
           "patterns": [
             {
               "include": "#disabled"
@@ -516,10 +496,7 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-disabled-block": {
-      "begin": "^\\s*(#(if)\\s+(0)\\b).*",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.c"
@@ -530,11 +507,20 @@
         "3": {
           "name": "constant.numeric.preprocessor.c"
         }
-      },
+      }
+    },
+    "preprocessor-rule-disabled-block": {
+      "begin": "^\\s*(#(if)\\s+(0)\\b).*",
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
+          "end": "(?=^\\s*#\\s*endif\\b)",
+          "patterns": [
+            {
+              "include": "#block_innards"
+            }
+          ],
           "captures": {
             "1": {
               "name": "meta.preprocessor.c"
@@ -542,18 +528,11 @@
             "2": {
               "name": "keyword.control.import.else.c"
             }
-          },
-          "end": "(?=^\\s*#\\s*endif\\b)",
-          "patterns": [
-            {
-              "include": "#block_innards"
-            }
-          ]
+          }
         },
         {
-          "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b)",
           "name": "comment.block.preprocessor.if-branch.in-block",
+          "end": "(?=^\\s*#\\s*(else|endif)\\b)",
           "patterns": [
             {
               "include": "#disabled"
@@ -563,10 +542,7 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-enabled": {
-      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.c"
@@ -577,20 +553,15 @@
         "3": {
           "name": "constant.numeric.preprocessor.c"
         }
-      },
+      }
+    },
+    "preprocessor-rule-enabled": {
+      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
-          "begin": "^\\s*(#\\s*(else)\\b).*",
-          "captures": {
-            "1": {
-              "name": "meta.preprocessor.c"
-            },
-            "2": {
-              "name": "keyword.control.import.else.c"
-            }
-          },
           "contentName": "comment.block.preprocessor.else-branch",
+          "begin": "^\\s*(#\\s*(else)\\b).*",
           "end": "(?=^\\s*#\\s*endif\\b)",
           "patterns": [
             {
@@ -599,10 +570,17 @@
             {
               "include": "#pragma-mark"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "meta.preprocessor.c"
+            },
+            "2": {
+              "name": "keyword.control.import.else.c"
+            }
+          }
         },
         {
-          "begin": "",
           "end": "(?=^\\s*#\\s*(else|endif)\\b)",
           "patterns": [
             {
@@ -610,10 +588,7 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-enabled-block": {
-      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.c"
@@ -624,20 +599,15 @@
         "3": {
           "name": "constant.numeric.preprocessor.c"
         }
-      },
+      }
+    },
+    "preprocessor-rule-enabled-block": {
+      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
-          "begin": "^\\s*(#\\s*(else)\\b).*",
-          "captures": {
-            "1": {
-              "name": "meta.preprocessor.c"
-            },
-            "2": {
-              "name": "keyword.control.import.else.c"
-            }
-          },
           "contentName": "comment.block.preprocessor.else-branch.in-block",
+          "begin": "^\\s*(#\\s*(else)\\b).*",
           "end": "(?=^\\s*#\\s*endif\\b)",
           "patterns": [
             {
@@ -646,10 +616,17 @@
             {
               "include": "#pragma-mark"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "meta.preprocessor.c"
+            },
+            "2": {
+              "name": "keyword.control.import.else.c"
+            }
+          }
         },
         {
-          "begin": "",
           "end": "(?=^\\s*#\\s*(else|endif)\\b)",
           "patterns": [
             {
@@ -657,27 +634,27 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-other": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.c"
         },
         "2": {
-          "name": "keyword.control.import.c"
+          "name": "keyword.control.import.if.c"
+        },
+        "3": {
+          "name": "constant.numeric.preprocessor.c"
         }
-      },
+      }
+    },
+    "preprocessor-rule-other": {
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
           "include": "$base"
         }
-      ]
-    },
-    "preprocessor-rule-other-block": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.c"
@@ -685,39 +662,48 @@
         "2": {
           "name": "keyword.control.import.c"
         }
-      },
+      }
+    },
+    "preprocessor-rule-other-block": {
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
           "include": "#block_innards"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "meta.preprocessor.c"
+        },
+        "2": {
+          "name": "keyword.control.import.c"
+        }
+      }
     },
     "sizeof": {
-      "match": "\\b(sizeof)\\b",
-      "name": "keyword.operator.sizeof.c"
+      "name": "keyword.operator.sizeof.c",
+      "match": "\\b(sizeof)\\b"
     },
     "string_escaped_char": {
       "patterns": [
         {
-          "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x[a-fA-F0-9]{0,2}|u[a-fA-F0-9]{0,4}|U[a-fA-F0-9]{0,8})",
-          "name": "constant.character.escape.c"
+          "name": "constant.character.escape.c",
+          "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x[a-fA-F0-9]{0,2}|u[a-fA-F0-9]{0,4}|U[a-fA-F0-9]{0,8})"
         },
         {
-          "match": "\\\\.",
-          "name": "invalid.illegal.unknown-escape.c"
+          "name": "invalid.illegal.unknown-escape.c",
+          "match": "\\\\."
         }
       ]
     },
     "string_placeholder": {
       "patterns": [
         {
-          "match": "(?x)%\n    \t\t\t\t\t\t(\\d+\\$)?                             # field (argument #)\n    \t\t\t\t\t\t[#0\\- +']*                           # flags\n    \t\t\t\t\t\t[,;:_]?                              # separator character (AltiVec)\n    \t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)?              # minimum field width\n    \t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?         # precision\n    \t\t\t\t\t\t(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)? # length modifier\n    \t\t\t\t\t\t[diouxXDOUeEfFgGaACcSspn%]           # conversion type\n    \t\t\t\t\t",
-          "name": "constant.other.placeholder.c"
+          "name": "constant.other.placeholder.c",
+          "match": "(?x)%\n    \t\t\t\t\t\t(\\d+\\$)?                             # field (argument #)\n    \t\t\t\t\t\t[#0\\- +']*                           # flags\n    \t\t\t\t\t\t[,;:_]?                              # separator character (AltiVec)\n    \t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)?              # minimum field width\n    \t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?         # precision\n    \t\t\t\t\t\t(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)? # length modifier\n    \t\t\t\t\t\t[diouxXDOUeEfFgGaACcSspn%]           # conversion type\n    \t\t\t\t\t"
         }
       ]
     }
-  },
-  "scopeName": "source.c",
-  "uuid": "25066DC2-6B1D-11D9-9D5B-000D93589AF6"
-}
+  }
+}