tm-grammars 1.22.18 → 1.23.0

package/grammars/objective-cpp.json

@@ -104,7 +104,7 @@
   ],
   "repository": {
     "anonymous_pattern_1": {
-      "begin": "((@)(interface|protocol))(?!.+;)\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*((:)(?:\\s*)([A-Za-z][A-Za-z0-9]*))?(\\s|\\n)?",
+      "begin": "((@)(interface|protocol))(?!.+;)\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*((:)\\s*([A-Za-z][A-Za-z0-9]*))?([\\s\\n])?",
       "captures": {
         "1": {
           "name": "storage.type.objcpp"
@@ -191,7 +191,7 @@
               "name": "punctuation.separator.arguments.objcpp"
             }
           },
-          "match": "\\b(?:[a-zA-Z_:][\\w]*)+",
+          "match": "\\b(?:[a-zA-Z_:]\\w*)+",
           "name": "support.function.any-method.name-of-parameter.objcpp"
         }
       ]
@@ -233,7 +233,7 @@
           "name": "support.function.cocoa.objcpp"
         }
       },
-      "match": "(\\s*)\\b(NS(R(ound(DownToMultipleOfPageSize|UpToMultipleOfPageSize)|un(CriticalAlertPanel(RelativeToWindow)?|InformationalAlertPanel(RelativeToWindow)?|AlertPanel(RelativeToWindow)?)|e(set(MapTable|HashTable)|c(ycleZone|t(Clip(List)?|F(ill(UsingOperation|List(UsingOperation|With(Grays|Colors(UsingOperation)?))?)?|romString))|ordAllocationEvent)|turnAddress|leaseAlertPanel|a(dPixel|l(MemoryAvailable|locateCollectable))|gisterServicesProvider)|angeFromString)|Get(SizeAndAlignment|CriticalAlertPanel|InformationalAlertPanel|UncaughtExceptionHandler|FileType(s)?|WindowServerMemory|AlertPanel)|M(i(n(X|Y)|d(X|Y))|ouseInRect|a(p(Remove|Get|Member|Insert(IfAbsent|KnownAbsent)?)|ke(R(ect|ange)|Size|Point)|x(Range|X|Y)))|B(itsPer(SampleFromDepth|PixelFromDepth)|e(stDepth|ep|gin(CriticalAlertSheet|InformationalAlertSheet|AlertSheet)))|S(ho(uldRetainWithZone|w(sServicesMenuItem|AnimationEffect))|tringFrom(R(ect|ange)|MapTable|S(ize|elector)|HashTable|Class|Point)|izeFromString|e(t(ShowsServicesMenuItem|ZoneName|UncaughtExceptionHandler|FocusRingStyle)|lectorFromString|archPathForDirectoriesInDomains)|wap(Big(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|Short|Host(ShortTo(Big|Little)|IntTo(Big|Little)|DoubleTo(Big|Little)|FloatTo(Big|Little)|Long(To(Big|Little)|LongTo(Big|Little)))|Int|Double|Float|L(ittle(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|ong(Long)?)))|H(ighlightRect|o(stByteOrder|meDirectory(ForUser)?)|eight|ash(Remove|Get|Insert(IfAbsent|KnownAbsent)?)|FSType(CodeFromFileType|OfFile))|N(umberOfColorComponents|ext(MapEnumeratorPair|HashEnumeratorItem))|C(o(n(tainsRect|vert(GlyphsToPackedGlyphs|Swapped(DoubleToHost|FloatToHost)|Host(DoubleToSwapped|FloatToSwapped)))|unt(MapTable|HashTable|Frames|Windows(ForContext)?)|py(M(emoryPages|apTableWithZone)|Bits|HashTableWithZone|Object)|lorSpaceFromDepth|mpare(MapTables|HashTables))|lassFromString|reate(MapTable(WithZone)?|HashTable(WithZone)?|Zone|File(namePboardType|ContentsPboardType)))|TemporaryDirectory|I(s(ControllerMarker|EmptyRect|FreedObject)|n(setRect|crementExtraRefCount|te(r(sect(sRect|ionR(ect|ange))|faceStyleForKey)|gralRect)))|Zone(Realloc|Malloc|Name|Calloc|Fr(omPointer|ee))|O(penStepRootDirectory|ffsetRect)|D(i(sableScreenUpdates|videRect)|ottedFrameRect|e(c(imal(Round|Multiply|S(tring|ubtract)|Normalize|Co(py|mpa(ct|re))|IsNotANumber|Divide|Power|Add)|rementExtraRefCountWasZero)|faultMallocZone|allocate(MemoryPages|Object))|raw(Gr(oove|ayBezel)|B(itmap|utton)|ColorTiledRects|TiledRects|DarkBezel|W(hiteBezel|indowBackground)|LightBezel))|U(serName|n(ionR(ect|ange)|registerServicesProvider)|pdateDynamicServices)|Java(Bundle(Setup|Cleanup)|Setup(VirtualMachine)?|Needs(ToLoadClasses|VirtualMachine)|ClassesF(orBundle|romPath)|ObjectNamedInPath|ProvidesClasses)|P(oint(InRect|FromString)|erformService|lanarFromDepth|ageSize)|E(n(d(MapTableEnumeration|HashTableEnumeration)|umerate(MapTable|HashTable)|ableScreenUpdates)|qual(R(ects|anges)|Sizes|Points)|raseRect|xtraRefCount)|F(ileTypeForHFSTypeCode|ullUserName|r(ee(MapTable|HashTable)|ame(Rect(WithWidth(UsingOperation)?)?|Address)))|Wi(ndowList(ForContext)?|dth)|Lo(cationInRange|g(v|PageSize)?)|A(ccessibility(R(oleDescription(ForUIElement)?|aiseBadArgumentException)|Unignored(Children(ForOnlyChild)?|Descendant|Ancestor)|PostNotification|ActionDescription)|pplication(Main|Load)|vailableWindowDepths|ll(MapTable(Values|Keys)|HashTableObjects|ocate(MemoryPages|Collectable|Object)))))\\b"
+      "match": "(\\s*)\\b(NS(R(ound(DownToMultipleOfPageSize|UpToMultipleOfPageSize)|un(CriticalAlertPanel(RelativeToWindow)?|InformationalAlertPanel(RelativeToWindow)?|AlertPanel(RelativeToWindow)?)|e(set(MapTable|HashTable)|c(ycleZone|t(Clip(List)?|F(ill(UsingOperation|List(UsingOperation|With(Grays|Colors(UsingOperation)?))?)?|romString))|ordAllocationEvent)|turnAddress|leaseAlertPanel|a(dPixel|l(MemoryAvailable|locateCollectable))|gisterServicesProvider)|angeFromString)|Get(SizeAndAlignment|CriticalAlertPanel|InformationalAlertPanel|UncaughtExceptionHandler|FileType(s)?|WindowServerMemory|AlertPanel)|M(i(n([XY])|d([XY]))|ouseInRect|a(p(Remove|Get|Member|Insert(IfAbsent|KnownAbsent)?)|ke(R(ect|ange)|Size|Point)|x(Range|[XY])))|B(itsPer(SampleFromDepth|PixelFromDepth)|e(stDepth|ep|gin(CriticalAlertSheet|InformationalAlertSheet|AlertSheet)))|S(ho(uldRetainWithZone|w(sServicesMenuItem|AnimationEffect))|tringFrom(R(ect|ange)|MapTable|S(ize|elector)|HashTable|Class|Point)|izeFromString|e(t(ShowsServicesMenuItem|ZoneName|UncaughtExceptionHandler|FocusRingStyle)|lectorFromString|archPathForDirectoriesInDomains)|wap(Big(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|Short|Host(ShortTo(Big|Little)|IntTo(Big|Little)|DoubleTo(Big|Little)|FloatTo(Big|Little)|Long(To(Big|Little)|LongTo(Big|Little)))|Int|Double|Float|L(ittle(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|ong(Long)?)))|H(ighlightRect|o(stByteOrder|meDirectory(ForUser)?)|eight|ash(Remove|Get|Insert(IfAbsent|KnownAbsent)?)|FSType(CodeFromFileType|OfFile))|N(umberOfColorComponents|ext(MapEnumeratorPair|HashEnumeratorItem))|C(o(n(tainsRect|vert(GlyphsToPackedGlyphs|Swapped(DoubleToHost|FloatToHost)|Host(DoubleToSwapped|FloatToSwapped)))|unt(MapTable|HashTable|Frames|Windows(ForContext)?)|py(M(emoryPages|apTableWithZone)|Bits|HashTableWithZone|Object)|lorSpaceFromDepth|mpare(MapTables|HashTables))|lassFromString|reate(MapTable(WithZone)?|HashTable(WithZone)?|Zone|File(namePboardType|ContentsPboardType)))|TemporaryDirectory|I(s(ControllerMarker|EmptyRect|FreedObject)|n(setRect|crementExtraRefCount|te(r(sect(sRect|ionR(ect|ange))|faceStyleForKey)|gralRect)))|Zone(Realloc|Malloc|Name|Calloc|Fr(omPointer|ee))|O(penStepRootDirectory|ffsetRect)|D(i(sableScreenUpdates|videRect)|ottedFrameRect|e(c(imal(Round|Multiply|S(tring|ubtract)|Normalize|Co(py|mpa(ct|re))|IsNotANumber|Divide|Power|Add)|rementExtraRefCountWasZero)|faultMallocZone|allocate(MemoryPages|Object))|raw(Gr(oove|ayBezel)|B(itmap|utton)|ColorTiledRects|TiledRects|DarkBezel|W(hiteBezel|indowBackground)|LightBezel))|U(serName|n(ionR(ect|ange)|registerServicesProvider)|pdateDynamicServices)|Java(Bundle(Setup|Cleanup)|Setup(VirtualMachine)?|Needs(ToLoadClasses|VirtualMachine)|ClassesF(orBundle|romPath)|ObjectNamedInPath|ProvidesClasses)|P(oint(InRect|FromString)|erformService|lanarFromDepth|ageSize)|E(n(d(MapTableEnumeration|HashTableEnumeration)|umerate(MapTable|HashTable)|ableScreenUpdates)|qual(R(ects|anges)|Sizes|Points)|raseRect|xtraRefCount)|F(ileTypeForHFSTypeCode|ullUserName|r(ee(MapTable|HashTable)|ame(Rect(WithWidth(UsingOperation)?)?|Address)))|Wi(ndowList(ForContext)?|dth)|Lo(cationInRange|g(v|PageSize)?)|A(ccessibility(R(oleDescription(ForUIElement)?|aiseBadArgumentException)|Unignored(Children(ForOnlyChild)?|Descendant|Ancestor)|PostNotification|ActionDescription)|pplication(Main|Load)|vailableWindowDepths|ll(MapTable(Values|Keys)|HashTableObjects|ocate(MemoryPages|Collectable|Object)))))\\b"
     },
     "anonymous_pattern_2": {
       "begin": "((@)(implementation))\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*(?::\\s*([A-Za-z][A-Za-z0-9]*))?",
@@ -319,7 +319,7 @@
           "include": "#string_escaped_char"
         },
         {
-          "match": "%(\\d+\\$)?[#0\\- +']*((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?[@]",
+          "match": "%(\\d+\\$)?[#0\\- +']*((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?@",
           "name": "constant.other.placeholder.objcpp"
         },
         {
@@ -328,7 +328,7 @@
       ]
     },
     "anonymous_pattern_30": {
-      "match": "\\bNS(R(GB(ModeColorPanel|ColorSpaceModel)|ight(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey)|ound(RectBezelStyle|Bankers|ed(BezelStyle|TokenStyle|DisclosureBezelStyle)|Down|Up|Plain|Line(CapStyle|JoinStyle))|un(StoppedResponse|ContinuesResponse|AbortedResponse)|e(s(izableWindowMask|et(CursorRectsRunLoopOrdering|FunctionKey))|ce(ssedBezelStyle|iver(sCantHandleCommandScriptError|EvaluationScriptError))|turnTextMovement|doFunctionKey|quiredArgumentsMissingScriptError|l(evancyLevelIndicatorStyle|ative(Before|After))|gular(SquareBezelStyle|ControlSize)|moveTraitFontAction)|a(n(domSubelement|geDateMode)|tingLevelIndicatorStyle|dio(ModeMatrix|Button)))|G(IFFileType|lyph(Below|Inscribe(B(elow|ase)|Over(strike|Below)|Above)|Layout(WithPrevious|A(tAPoint|gainstAPoint))|A(ttribute(BidiLevel|Soft|Inscribe|Elastic)|bove))|r(ooveBorder|eaterThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|a(y(ModeColorPanel|ColorSpaceModel)|dient(None|Con(cave(Strong|Weak)|vex(Strong|Weak)))|phiteControlTint)))|XML(N(o(tationDeclarationKind|de(CompactEmptyElement|IsCDATA|OptionsNone|Use(SingleQuotes|DoubleQuotes)|Pre(serve(NamespaceOrder|C(haracterReferences|DATA)|DTD|Prefixes|E(ntities|mptyElements)|Quotes|Whitespace|A(ttributeOrder|ll))|ttyPrint)|ExpandEmptyElement))|amespaceKind)|CommentKind|TextKind|InvalidKind|D(ocument(X(MLKind|HTMLKind|Include)|HTMLKind|T(idy(XML|HTML)|extKind)|IncludeContentTypeDeclaration|Validate|Kind)|TDKind)|P(arser(GTRequiredError|XMLDeclNot(StartedError|FinishedError)|Mi(splaced(XMLDeclarationError|CDATAEndStringError)|xedContentDeclNot(StartedError|FinishedError))|S(t(andaloneValueError|ringNot(StartedError|ClosedError))|paceRequiredError|eparatorRequiredError)|N(MTOKENRequiredError|o(t(ationNot(StartedError|FinishedError)|WellBalancedError)|DTDError)|amespaceDeclarationError|AMERequiredError)|C(haracterRef(In(DTDError|PrologError|EpilogError)|AtEOFError)|o(nditionalSectionNot(StartedError|FinishedError)|mment(NotFinishedError|ContainsDoubleHyphenError))|DATANotFinishedError)|TagNameMismatchError|In(ternalError|valid(HexCharacterRefError|C(haracter(RefError|InEntityError|Error)|onditionalSectionError)|DecimalCharacterRefError|URIError|Encoding(NameError|Error)))|OutOfMemoryError|D(ocumentStartError|elegateAbortedParseError|OCTYPEDeclNotFinishedError)|U(RI(RequiredError|FragmentError)|n(declaredEntityError|parsedEntityError|knownEncodingError|finishedTagError))|P(CDATARequiredError|ublicIdentifierRequiredError|arsedEntityRef(MissingSemiError|NoNameError|In(Internal(SubsetError|Error)|PrologError|EpilogError)|AtEOFError)|r(ocessingInstructionNot(StartedError|FinishedError)|ematureDocumentEndError))|E(n(codingNotSupportedError|tity(Ref(In(DTDError|PrologError|EpilogError)|erence(MissingSemiError|WithoutNameError)|LoopError|AtEOFError)|BoundaryError|Not(StartedError|FinishedError)|Is(ParameterError|ExternalError)|ValueRequiredError))|qualExpectedError|lementContentDeclNot(StartedError|FinishedError)|xt(ernalS(tandaloneEntityError|ubsetNotFinishedError)|raContentError)|mptyDocumentError)|L(iteralNot(StartedError|FinishedError)|T(RequiredError|SlashRequiredError)|essThanSymbolInAttributeError)|Attribute(RedefinedError|HasNoValueError|Not(StartedError|FinishedError)|ListNot(StartedError|FinishedError)))|rocessingInstructionKind)|E(ntity(GeneralKind|DeclarationKind|UnparsedKind|P(ar(sedKind|ameterKind)|redefined))|lement(Declaration(MixedKind|UndefinedKind|E(lementKind|mptyKind)|Kind|AnyKind)|Kind))|Attribute(N(MToken(sKind|Kind)|otationKind)|CDATAKind|ID(Ref(sKind|Kind)|Kind)|DeclarationKind|En(tit(yKind|iesKind)|umerationKind)|Kind))|M(i(n(XEdge|iaturizableWindowMask|YEdge|uteCalendarUnit)|terLineJoinStyle|ddleSubelement|xedState)|o(nthCalendarUnit|deSwitchFunctionKey|use(Moved(Mask)?|E(ntered(Mask)?|ventSubtype|xited(Mask)?))|veToBezierPathElement|mentary(ChangeButton|Push(Button|InButton)|Light(Button)?))|enuFunctionKey|a(c(intoshInterfaceStyle|OSRomanStringEncoding)|tchesPredicateOperatorType|ppedRead|x(XEdge|YEdge))|ACHOperatingSystem)|B(MPFileType|o(ttomTabsBezelBorder|ldFontMask|rderlessWindowMask|x(Se(condary|parator)|OldStyle|Primary))|uttLineCapStyle|e(zelBorder|velLineJoinStyle|low(Bottom|Top)|gin(sWith(Comparison|PredicateOperatorType)|FunctionKey))|lueControlTint|ack(spaceCharacter|tabTextMovement|ingStore(Retained|Buffered|Nonretained)|TabCharacter|wardsSearch|groundTab)|r(owser(NoColumnResizing|UserColumnResizing|AutoColumnResizing)|eakFunctionKey))|S(h(ift(JISStringEncoding|KeyMask)|ow(ControlGlyphs|InvisibleGlyphs)|adowlessSquareBezelStyle)|y(s(ReqFunctionKey|tem(D(omainMask|efined(Mask)?)|FunctionKey))|mbolStringEncoding)|c(a(nnedOption|le(None|ToFit|Proportionally))|r(oll(er(NoPart|Increment(Page|Line|Arrow)|Decrement(Page|Line|Arrow)|Knob(Slot)?|Arrows(M(inEnd|axEnd)|None|DefaultSetting))|Wheel(Mask)?|LockFunctionKey)|eenChangedEventType))|t(opFunctionKey|r(ingDrawing(OneShot|DisableScreenFontSubstitution|Uses(DeviceMetrics|FontLeading|LineFragmentOrigin))|eam(Status(Reading|NotOpen|Closed|Open(ing)?|Error|Writing|AtEnd)|Event(Has(BytesAvailable|SpaceAvailable)|None|OpenCompleted|E(ndEncountered|rrorOccurred)))))|i(ngle(DateMode|UnderlineStyle)|ze(DownFontAction|UpFontAction))|olarisOperatingSystem|unOSOperatingSystem|pecialPageOrder|e(condCalendarUnit|lect(By(Character|Paragraph|Word)|i(ng(Next|Previous)|onAffinity(Downstream|Upstream))|edTab|FunctionKey)|gmentSwitchTracking(Momentary|Select(One|Any)))|quareLineCapStyle|witchButton|ave(ToOperation|Op(tions(Yes|No|Ask)|eration)|AsOperation)|mall(SquareBezelStyle|C(ontrolSize|apsFontMask)|IconButtonBezelStyle))|H(ighlightModeMatrix|SBModeColorPanel|o(ur(Minute(SecondDatePickerElementFlag|DatePickerElementFlag)|CalendarUnit)|rizontalRuler|meFunctionKey)|TTPCookieAcceptPolicy(Never|OnlyFromMainDocumentDomain|Always)|e(lp(ButtonBezelStyle|KeyMask|FunctionKey)|avierFontAction)|PUXOperatingSystem)|Year(MonthDa(yDatePickerElementFlag|tePickerElementFlag)|CalendarUnit)|N(o(n(StandardCharacterSetFontMask|ZeroWindingRule|activatingPanelMask|LossyASCIIStringEncoding)|Border|t(ification(SuspensionBehavior(Hold|Coalesce|D(eliverImmediately|rop))|NoCoalescing|CoalescingOn(Sender|Name)|DeliverImmediately|PostToAllSessions)|PredicateType|EqualToPredicateOperatorType)|S(cr(iptError|ollerParts)|ubelement|pecifierError)|CellMask|T(itle|opLevelContainersSpecifierError|abs(BezelBorder|NoBorder|LineBorder))|I(nterfaceStyle|mage)|UnderlineStyle|FontChangeAction)|u(ll(Glyph|CellType)|m(eric(Search|PadKeyMask)|berFormatter(Round(Half(Down|Up|Even)|Ceiling|Down|Up|Floor)|Behavior(10|Default)|S(cientificStyle|pellOutStyle)|NoStyle|CurrencyStyle|DecimalStyle|P(ercentStyle|ad(Before(Suffix|Prefix)|After(Suffix|Prefix))))))|e(t(Services(BadArgumentError|NotFoundError|C(ollisionError|ancelledError)|TimeoutError|InvalidError|UnknownError|ActivityInProgress)|workDomainMask)|wlineCharacter|xt(StepInterfaceStyle|FunctionKey))|EXTSTEPStringEncoding|a(t(iveShortGlyphPacking|uralTextAlignment)|rrowFontMask))|C(hange(ReadOtherContents|GrayCell(Mask)?|BackgroundCell(Mask)?|Cleared|Done|Undone|Autosaved)|MYK(ModeColorPanel|ColorSpaceModel)|ircular(BezelStyle|Slider)|o(n(stantValueExpressionType|t(inuousCapacityLevelIndicatorStyle|entsCellMask|ain(sComparison|erSpecifierError)|rol(Glyph|KeyMask))|densedFontMask)|lor(Panel(RGBModeMask|GrayModeMask|HSBModeMask|C(MYKModeMask|olorListModeMask|ustomPaletteModeMask|rayonModeMask)|WheelModeMask|AllModesMask)|ListModeColorPanel)|reServiceDirectory|m(p(osite(XOR|Source(In|O(ut|ver)|Atop)|Highlight|C(opy|lear)|Destination(In|O(ut|ver)|Atop)|Plus(Darker|Lighter))|ressedFontMask)|mandKeyMask))|u(stom(SelectorPredicateOperatorType|PaletteModeColorPanel)|r(sor(Update(Mask)?|PointingDevice)|veToBezierPathElement))|e(nterT(extAlignment|abStopType)|ll(State|H(ighlighted|as(Image(Horizontal|OnLeftOrBottom)|OverlappingImage))|ChangesContents|Is(Bordered|InsetButton)|Disabled|Editable|LightsBy(Gray|Background|Contents)|AllowsMixedState))|l(ipPagination|o(s(ePathBezierPathElement|ableWindowMask)|ckAndCalendarDatePickerStyle)|ear(ControlTint|DisplayFunctionKey|LineFunctionKey))|a(seInsensitive(Search|PredicateOption)|n(notCreateScriptCommandError|cel(Button|TextMovement))|chesDirectory|lculation(NoError|Overflow|DivideByZero|Underflow|LossOfPrecision)|rriageReturnCharacter)|r(itical(Request|AlertStyle)|ayonModeColorPanel))|T(hick(SquareBezelStyle|erSquareBezelStyle)|ypesetter(Behavior|HorizontalTabAction|ContainerBreakAction|ZeroAdvancementAction|OriginalBehavior|ParagraphBreakAction|WhitespaceAction|L(ineBreakAction|atestBehavior))|i(ckMark(Right|Below|Left|Above)|tledWindowMask|meZoneDatePickerElementFlag)|o(olbarItemVisibilityPriority(Standard|High|User|Low)|pTabsBezelBorder|ggleButton)|IFF(Compression(N(one|EXT)|CCITTFAX(3|4)|OldJPEG|JPEG|PackBits|LZW)|FileType)|e(rminate(Now|Cancel|Later)|xt(Read(InapplicableDocumentTypeError|WriteErrorM(inimum|aximum))|Block(M(i(nimum(Height|Width)|ddleAlignment)|a(rgin|ximum(Height|Width)))|B(o(ttomAlignment|rder)|aselineAlignment)|Height|TopAlignment|P(ercentageValueType|adding)|Width|AbsoluteValueType)|StorageEdited(Characters|Attributes)|CellType|ured(RoundedBezelStyle|BackgroundWindowMask|SquareBezelStyle)|Table(FixedLayoutAlgorithm|AutomaticLayoutAlgorithm)|Field(RoundedBezel|SquareBezel|AndStepperDatePickerStyle)|WriteInapplicableDocumentTypeError|ListPrependEnclosingMarker))|woByteGlyphPacking|ab(Character|TextMovement|le(tP(oint(Mask|EventSubtype)?|roximity(Mask|EventSubtype)?)|Column(NoResizing|UserResizingMask|AutoresizingMask)|View(ReverseSequentialColumnAutoresizingStyle|GridNone|S(olid(HorizontalGridLineMask|VerticalGridLineMask)|equentialColumnAutoresizingStyle)|NoColumnAutoresizing|UniformColumnAutoresizingStyle|FirstColumnOnlyAutoresizingStyle|LastColumnOnlyAutoresizingStyle)))|rackModeMatrix)|I(n(sert(CharFunctionKey|FunctionKey|LineFunctionKey)|t(Type|ernalS(criptError|pecifierError))|dexSubelement|validIndexSpecifierError|formational(Request|AlertStyle)|PredicateOperatorType)|talicFontMask|SO(2022JPStringEncoding|Latin(1StringEncoding|2StringEncoding))|dentityMappingCharacterCollection|llegalTextMovement|mage(R(ight|ep(MatchesDevice|LoadStatus(ReadingHeader|Completed|InvalidData|Un(expectedEOF|knownType)|WillNeedAllData)))|Below|C(ellType|ache(BySize|Never|Default|Always))|Interpolation(High|None|Default|Low)|O(nly|verlaps)|Frame(Gr(oove|ayBezel)|Button|None|Photo)|L(oadStatus(ReadError|C(ompleted|ancelled)|InvalidData|UnexpectedEOF)|eft)|A(lign(Right|Bottom(Right|Left)?|Center|Top(Right|Left)?|Left)|bove)))|O(n(State|eByteGlyphPacking|OffButton|lyScrollerArrows)|ther(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|TextMovement)|SF1OperatingSystem|pe(n(GL(GO(Re(setLibrary|tainRenderers)|ClearFormatCache|FormatCacheSize)|PFA(R(obust|endererID)|M(inimumPolicy|ulti(sample|Screen)|PSafe|aximumPolicy)|BackingStore|S(creenMask|te(ncilSize|reo)|ingleRenderer|upersample|ample(s|Buffers|Alpha))|NoRecovery|C(o(lor(Size|Float)|mpliant)|losestPolicy)|OffScreen|D(oubleBuffer|epthSize)|PixelBuffer|VirtualScreenCount|FullScreen|Window|A(cc(umSize|elerated)|ux(Buffers|DepthStencil)|l(phaSize|lRenderers))))|StepUnicodeReservedBase)|rationNotSupportedForKeyS(criptError|pecifierError))|ffState|KButton|rPredicateType|bjC(B(itfield|oolType)|S(hortType|tr(ingType|uctType)|electorType)|NoType|CharType|ObjectType|DoubleType|UnionType|PointerType|VoidType|FloatType|Long(Type|longType)|ArrayType))|D(i(s(c(losureBezelStyle|reteCapacityLevelIndicatorStyle)|playWindowRunLoopOrdering)|acriticInsensitivePredicateOption|rect(Selection|PredicateModifier))|o(c(ModalWindowMask|ument(Directory|ationDirectory))|ubleType|wn(TextMovement|ArrowFunctionKey))|e(s(cendingPageOrder|ktopDirectory)|cimalTabStopType|v(ice(NColorSpaceModel|IndependentModifierFlagsMask)|eloper(Directory|ApplicationDirectory))|fault(ControlTint|TokenStyle)|lete(Char(acter|FunctionKey)|FunctionKey|LineFunctionKey)|moApplicationDirectory)|a(yCalendarUnit|teFormatter(MediumStyle|Behavior(10|Default)|ShortStyle|NoStyle|FullStyle|LongStyle))|ra(wer(Clos(ingState|edState)|Open(ingState|State))|gOperation(Generic|Move|None|Copy|Delete|Private|Every|Link|All)))|U(ser(CancelledError|D(irectory|omainMask)|FunctionKey)|RL(Handle(NotLoaded|Load(Succeeded|InProgress|Failed))|CredentialPersistence(None|Permanent|ForSession))|n(scaledWindowMask|cachedRead|i(codeStringEncoding|talicFontMask|fiedTitleAndToolbarWindowMask)|d(o(CloseGroupingRunLoopOrdering|FunctionKey)|e(finedDateComponent|rline(Style(Single|None|Thick|Double)|Pattern(Solid|D(ot|ash(Dot(Dot)?)?)))))|known(ColorSpaceModel|P(ointingDevice|ageOrder)|KeyS(criptError|pecifierError))|boldFontMask)|tilityWindowMask|TF8StringEncoding|p(dateWindowsRunLoopOrdering|TextMovement|ArrowFunctionKey))|J(ustifiedTextAlignment|PEG(2000FileType|FileType)|apaneseEUC(GlyphPacking|StringEncoding))|P(o(s(t(Now|erFontMask|WhenIdle|ASAP)|iti(on(Replace|Be(fore|ginning)|End|After)|ve(IntType|DoubleType|FloatType)))|pUp(NoArrow|ArrowAt(Bottom|Center))|werOffEventType|rtraitOrientation)|NGFileType|ush(InCell(Mask)?|OnPushOffButton)|e(n(TipMask|UpperSideMask|PointingDevice|LowerSideMask)|riodic(Mask)?)|P(S(caleField|tatus(Title|Field)|aveButton)|N(ote(Title|Field)|ame(Title|Field))|CopiesField|TitleField|ImageButton|OptionsButton|P(a(perFeedButton|ge(Range(To|From)|ChoiceMatrix))|reviewButton)|LayoutButton)|lainTextTokenStyle|a(useFunctionKey|ragraphSeparatorCharacter|ge(DownFunctionKey|UpFunctionKey))|r(int(ing(ReplyLater|Success|Cancelled|Failure)|ScreenFunctionKey|erTable(NotFound|OK|Error)|FunctionKey)|o(p(ertyList(XMLFormat|MutableContainers(AndLeaves)?|BinaryFormat|Immutable|OpenStepFormat)|rietaryStringEncoding)|gressIndicator(BarStyle|SpinningStyle|Preferred(SmallThickness|Thickness|LargeThickness|AquaThickness)))|e(ssedTab|vFunctionKey))|L(HeightForm|CancelButton|TitleField|ImageButton|O(KButton|rientationMatrix)|UnitsButton|PaperNameButton|WidthForm))|E(n(terCharacter|d(sWith(Comparison|PredicateOperatorType)|FunctionKey))|v(e(nOddWindingRule|rySubelement)|aluatedObjectExpressionType)|qualTo(Comparison|PredicateOperatorType)|ra(serPointingDevice|CalendarUnit|DatePickerElementFlag)|x(clude(10|QuickDrawElementsIconCreationOption)|pandedFontMask|ecuteFunctionKey))|V(i(ew(M(in(XMargin|YMargin)|ax(XMargin|YMargin))|HeightSizable|NotSizable|WidthSizable)|aPanelFontAction)|erticalRuler|a(lidationErrorM(inimum|aximum)|riableExpressionType))|Key(SpecifierEvaluationScriptError|Down(Mask)?|Up(Mask)?|PathExpressionType|Value(MinusSetMutation|SetSetMutation|Change(Re(placement|moval)|Setting|Insertion)|IntersectSetMutation|ObservingOption(New|Old)|UnionSetMutation|ValidationError))|QTMovie(NormalPlayback|Looping(BackAndForthPlayback|Playback))|F(1(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|7FunctionKey|i(nd(PanelAction(Replace(A(ndFind|ll(InSelection)?))?|S(howFindPanel|e(tFindString|lectAll(InSelection)?))|Next|Previous)|FunctionKey)|tPagination|le(Read(No(SuchFileError|PermissionError)|CorruptFileError|In(validFileNameError|applicableStringEncodingError)|Un(supportedSchemeError|knownError))|HandlingPanel(CancelButton|OKButton)|NoSuchFileError|ErrorM(inimum|aximum)|Write(NoPermissionError|In(validFileNameError|applicableStringEncodingError)|OutOfSpaceError|Un(supportedSchemeError|knownError))|LockingError)|xedPitchFontMask)|2(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|o(nt(Mo(noSpaceTrait|dernSerifsClass)|BoldTrait|S(ymbolicClass|criptsClass|labSerifsClass|ansSerifClass)|C(o(ndensedTrait|llectionApplicationOnlyMask)|larendonSerifsClass)|TransitionalSerifsClass|I(ntegerAdvancementsRenderingMode|talicTrait)|O(ldStyleSerifsClass|rnamentalsClass)|DefaultRenderingMode|U(nknownClass|IOptimizedTrait)|Panel(S(hadowEffectModeMask|t(andardModesMask|rikethroughEffectModeMask)|izeModeMask)|CollectionModeMask|TextColorEffectModeMask|DocumentColorEffectModeMask|UnderlineEffectModeMask|FaceModeMask|All(ModesMask|EffectsModeMask))|ExpandedTrait|VerticalTrait|F(amilyClassMask|reeformSerifsClass)|Antialiased(RenderingMode|IntegerAdvancementsRenderingMode))|cusRing(Below|Type(None|Default|Exterior)|Only|Above)|urByteGlyphPacking|rm(attingError(M(inimum|aximum))?|FeedCharacter))|8FunctionKey|unction(ExpressionType|KeyMask)|3(1FunctionKey|2FunctionKey|3FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey)|9FunctionKey|4FunctionKey|P(RevertButton|S(ize(Title|Field)|etButton)|CurrentField|Preview(Button|Field))|l(oat(ingPointSamplesBitmapFormat|Type)|agsChanged(Mask)?)|axButton|5FunctionKey|6FunctionKey)|W(heelModeColorPanel|indow(s(NTOperatingSystem|CP125(1StringEncoding|2StringEncoding|3StringEncoding|4StringEncoding|0StringEncoding)|95(InterfaceStyle|OperatingSystem))|M(iniaturizeButton|ovedEventType)|Below|CloseButton|ToolbarButton|ZoomButton|Out|DocumentIconButton|ExposedEventType|Above)|orkspaceLaunch(NewInstance|InhibitingBackgroundOnly|Default|PreferringClassic|WithoutA(ctivation|ddingToRecents)|A(sync|nd(Hide(Others)?|Print)|llowingClassicStartup))|eek(day(CalendarUnit|OrdinalCalendarUnit)|CalendarUnit)|a(ntsBidiLevels|rningAlertStyle)|r(itingDirection(RightToLeft|Natural|LeftToRight)|apCalendarComponents))|L(i(stModeMatrix|ne(Moves(Right|Down|Up|Left)|B(order|reakBy(C(harWrapping|lipping)|Truncating(Middle|Head|Tail)|WordWrapping))|S(eparatorCharacter|weep(Right|Down|Up|Left))|ToBezierPathElement|DoesntMove|arSlider)|teralSearch|kePredicateOperatorType|ghterFontAction|braryDirectory)|ocalDomainMask|e(ssThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|ft(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey))|a(yout(RightToLeft|NotDone|CantFit|OutOfGlyphs|Done|LeftToRight)|ndscapeOrientation)|ABColorSpaceModel)|A(sc(iiWithDoubleByteEUCGlyphPacking|endingPageOrder)|n(y(Type|PredicateModifier|EventMask)|choredSearch|imation(Blocking|Nonblocking(Threaded)?|E(ffect(DisappearingItemDefault|Poof)|ase(In(Out)?|Out))|Linear)|dPredicateType)|t(Bottom|tachmentCharacter|omicWrite|Top)|SCIIStringEncoding|d(obe(GB1CharacterCollection|CNS1CharacterCollection|Japan(1CharacterCollection|2CharacterCollection)|Korea1CharacterCollection)|dTraitFontAction|minApplicationDirectory)|uto(saveOperation|Pagination)|pp(lication(SupportDirectory|D(irectory|e(fined(Mask)?|legateReply(Success|Cancel|Failure)|activatedEventType))|ActivatedEventType)|KitDefined(Mask)?)|l(ternateKeyMask|pha(ShiftKeyMask|NonpremultipliedBitmapFormat|FirstBitmapFormat)|ert(SecondButtonReturn|ThirdButtonReturn|OtherReturn|DefaultReturn|ErrorReturn|FirstButtonReturn|AlternateReturn)|l(ScrollerParts|DomainsMask|PredicateModifier|LibrariesDirectory|ApplicationsDirectory))|rgument(sWrongScriptError|EvaluationScriptError)|bove(Bottom|Top)|WTEventType))\\b",
+      "match": "\\bNS(R(GB(ModeColorPanel|ColorSpaceModel)|ight(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey)|ound(RectBezelStyle|Bankers|ed(BezelStyle|TokenStyle|DisclosureBezelStyle)|Down|Up|Plain|Line(CapStyle|JoinStyle))|un(StoppedResponse|ContinuesResponse|AbortedResponse)|e(s(izableWindowMask|et(CursorRectsRunLoopOrdering|FunctionKey))|ce(ssedBezelStyle|iver(sCantHandleCommandScriptError|EvaluationScriptError))|turnTextMovement|doFunctionKey|quiredArgumentsMissingScriptError|l(evancyLevelIndicatorStyle|ative(Before|After))|gular(SquareBezelStyle|ControlSize)|moveTraitFontAction)|a(n(domSubelement|geDateMode)|tingLevelIndicatorStyle|dio(ModeMatrix|Button)))|G(IFFileType|lyph(Below|Inscribe(B(elow|ase)|Over(strike|Below)|Above)|Layout(WithPrevious|A(tAPoint|gainstAPoint))|A(ttribute(BidiLevel|Soft|Inscribe|Elastic)|bove))|r(ooveBorder|eaterThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|a(y(ModeColorPanel|ColorSpaceModel)|dient(None|Con(cave(Strong|Weak)|vex(Strong|Weak)))|phiteControlTint)))|XML(N(o(tationDeclarationKind|de(CompactEmptyElement|IsCDATA|OptionsNone|Use(SingleQuotes|DoubleQuotes)|Pre(serve(NamespaceOrder|C(haracterReferences|DATA)|DTD|Prefixes|E(ntities|mptyElements)|Quotes|Whitespace|A(ttributeOrder|ll))|ttyPrint)|ExpandEmptyElement))|amespaceKind)|CommentKind|TextKind|InvalidKind|D(ocument(X(MLKind|HTMLKind|Include)|HTMLKind|T(idy(XML|HTML)|extKind)|IncludeContentTypeDeclaration|Validate|Kind)|TDKind)|P(arser(GTRequiredError|XMLDeclNot(StartedError|FinishedError)|Mi(splaced(XMLDeclarationError|CDATAEndStringError)|xedContentDeclNot(StartedError|FinishedError))|S(t(andaloneValueError|ringNot(StartedError|ClosedError))|paceRequiredError|eparatorRequiredError)|N(MTOKENRequiredError|o(t(ationNot(StartedError|FinishedError)|WellBalancedError)|DTDError)|amespaceDeclarationError|AMERequiredError)|C(haracterRef(In(DTDError|PrologError|EpilogError)|AtEOFError)|o(nditionalSectionNot(StartedError|FinishedError)|mment(NotFinishedError|ContainsDoubleHyphenError))|DATANotFinishedError)|TagNameMismatchError|In(ternalError|valid(HexCharacterRefError|C(haracter(RefError|InEntityError|Error)|onditionalSectionError)|DecimalCharacterRefError|URIError|Encoding(NameError|Error)))|OutOfMemoryError|D(ocumentStartError|elegateAbortedParseError|OCTYPEDeclNotFinishedError)|U(RI(RequiredError|FragmentError)|n(declaredEntityError|parsedEntityError|knownEncodingError|finishedTagError))|P(CDATARequiredError|ublicIdentifierRequiredError|arsedEntityRef(MissingSemiError|NoNameError|In(Internal(SubsetError|Error)|PrologError|EpilogError)|AtEOFError)|r(ocessingInstructionNot(StartedError|FinishedError)|ematureDocumentEndError))|E(n(codingNotSupportedError|tity(Ref(In(DTDError|PrologError|EpilogError)|erence(MissingSemiError|WithoutNameError)|LoopError|AtEOFError)|BoundaryError|Not(StartedError|FinishedError)|Is(ParameterError|ExternalError)|ValueRequiredError))|qualExpectedError|lementContentDeclNot(StartedError|FinishedError)|xt(ernalS(tandaloneEntityError|ubsetNotFinishedError)|raContentError)|mptyDocumentError)|L(iteralNot(StartedError|FinishedError)|T(RequiredError|SlashRequiredError)|essThanSymbolInAttributeError)|Attribute(RedefinedError|HasNoValueError|Not(StartedError|FinishedError)|ListNot(StartedError|FinishedError)))|rocessingInstructionKind)|E(ntity(GeneralKind|DeclarationKind|UnparsedKind|P(ar(sedKind|ameterKind)|redefined))|lement(Declaration(MixedKind|UndefinedKind|E(lementKind|mptyKind)|Kind|AnyKind)|Kind))|Attribute(N(MToken(sKind|Kind)|otationKind)|CDATAKind|ID(Ref(sKind|Kind)|Kind)|DeclarationKind|En(tit(yKind|iesKind)|umerationKind)|Kind))|M(i(n(XEdge|iaturizableWindowMask|YEdge|uteCalendarUnit)|terLineJoinStyle|ddleSubelement|xedState)|o(nthCalendarUnit|deSwitchFunctionKey|use(Moved(Mask)?|E(ntered(Mask)?|ventSubtype|xited(Mask)?))|veToBezierPathElement|mentary(ChangeButton|Push(Button|InButton)|Light(Button)?))|enuFunctionKey|a(c(intoshInterfaceStyle|OSRomanStringEncoding)|tchesPredicateOperatorType|ppedRead|x(XEdge|YEdge))|ACHOperatingSystem)|B(MPFileType|o(ttomTabsBezelBorder|ldFontMask|rderlessWindowMask|x(Se(condary|parator)|OldStyle|Primary))|uttLineCapStyle|e(zelBorder|velLineJoinStyle|low(Bottom|Top)|gin(sWith(Comparison|PredicateOperatorType)|FunctionKey))|lueControlTint|ack(spaceCharacter|tabTextMovement|ingStore(Retained|Buffered|Nonretained)|TabCharacter|wardsSearch|groundTab)|r(owser(NoColumnResizing|UserColumnResizing|AutoColumnResizing)|eakFunctionKey))|S(h(ift(JISStringEncoding|KeyMask)|ow(ControlGlyphs|InvisibleGlyphs)|adowlessSquareBezelStyle)|y(s(ReqFunctionKey|tem(D(omainMask|efined(Mask)?)|FunctionKey))|mbolStringEncoding)|c(a(nnedOption|le(None|ToFit|Proportionally))|r(oll(er(NoPart|Increment(Page|Line|Arrow)|Decrement(Page|Line|Arrow)|Knob(Slot)?|Arrows(M(inEnd|axEnd)|None|DefaultSetting))|Wheel(Mask)?|LockFunctionKey)|eenChangedEventType))|t(opFunctionKey|r(ingDrawing(OneShot|DisableScreenFontSubstitution|Uses(DeviceMetrics|FontLeading|LineFragmentOrigin))|eam(Status(Reading|NotOpen|Closed|Open(ing)?|Error|Writing|AtEnd)|Event(Has(BytesAvailable|SpaceAvailable)|None|OpenCompleted|E(ndEncountered|rrorOccurred)))))|i(ngle(DateMode|UnderlineStyle)|ze(DownFontAction|UpFontAction))|olarisOperatingSystem|unOSOperatingSystem|pecialPageOrder|e(condCalendarUnit|lect(By(Character|Paragraph|Word)|i(ng(Next|Previous)|onAffinity(Downstream|Upstream))|edTab|FunctionKey)|gmentSwitchTracking(Momentary|Select(One|Any)))|quareLineCapStyle|witchButton|ave(ToOperation|Op(tions(Yes|No|Ask)|eration)|AsOperation)|mall(SquareBezelStyle|C(ontrolSize|apsFontMask)|IconButtonBezelStyle))|H(ighlightModeMatrix|SBModeColorPanel|o(ur(Minute(SecondDatePickerElementFlag|DatePickerElementFlag)|CalendarUnit)|rizontalRuler|meFunctionKey)|TTPCookieAcceptPolicy(Never|OnlyFromMainDocumentDomain|Always)|e(lp(ButtonBezelStyle|KeyMask|FunctionKey)|avierFontAction)|PUXOperatingSystem)|Year(MonthDa(yDatePickerElementFlag|tePickerElementFlag)|CalendarUnit)|N(o(n(StandardCharacterSetFontMask|ZeroWindingRule|activatingPanelMask|LossyASCIIStringEncoding)|Border|t(ification(SuspensionBehavior(Hold|Coalesce|D(eliverImmediately|rop))|NoCoalescing|CoalescingOn(Sender|Name)|DeliverImmediately|PostToAllSessions)|PredicateType|EqualToPredicateOperatorType)|S(cr(iptError|ollerParts)|ubelement|pecifierError)|CellMask|T(itle|opLevelContainersSpecifierError|abs(BezelBorder|NoBorder|LineBorder))|I(nterfaceStyle|mage)|UnderlineStyle|FontChangeAction)|u(ll(Glyph|CellType)|m(eric(Search|PadKeyMask)|berFormatter(Round(Half(Down|Up|Even)|Ceiling|Down|Up|Floor)|Behavior(10|Default)|S(cientificStyle|pellOutStyle)|NoStyle|CurrencyStyle|DecimalStyle|P(ercentStyle|ad(Before(Suffix|Prefix)|After(Suffix|Prefix))))))|e(t(Services(BadArgumentError|NotFoundError|C(ollisionError|ancelledError)|TimeoutError|InvalidError|UnknownError|ActivityInProgress)|workDomainMask)|wlineCharacter|xt(StepInterfaceStyle|FunctionKey))|EXTSTEPStringEncoding|a(t(iveShortGlyphPacking|uralTextAlignment)|rrowFontMask))|C(hange(ReadOtherContents|GrayCell(Mask)?|BackgroundCell(Mask)?|Cleared|Done|Undone|Autosaved)|MYK(ModeColorPanel|ColorSpaceModel)|ircular(BezelStyle|Slider)|o(n(stantValueExpressionType|t(inuousCapacityLevelIndicatorStyle|entsCellMask|ain(sComparison|erSpecifierError)|rol(Glyph|KeyMask))|densedFontMask)|lor(Panel(RGBModeMask|GrayModeMask|HSBModeMask|C(MYKModeMask|olorListModeMask|ustomPaletteModeMask|rayonModeMask)|WheelModeMask|AllModesMask)|ListModeColorPanel)|reServiceDirectory|m(p(osite(XOR|Source(In|O(ut|ver)|Atop)|Highlight|C(opy|lear)|Destination(In|O(ut|ver)|Atop)|Plus(Darker|Lighter))|ressedFontMask)|mandKeyMask))|u(stom(SelectorPredicateOperatorType|PaletteModeColorPanel)|r(sor(Update(Mask)?|PointingDevice)|veToBezierPathElement))|e(nterT(extAlignment|abStopType)|ll(State|H(ighlighted|as(Image(Horizontal|OnLeftOrBottom)|OverlappingImage))|ChangesContents|Is(Bordered|InsetButton)|Disabled|Editable|LightsBy(Gray|Background|Contents)|AllowsMixedState))|l(ipPagination|o(s(ePathBezierPathElement|ableWindowMask)|ckAndCalendarDatePickerStyle)|ear(ControlTint|DisplayFunctionKey|LineFunctionKey))|a(seInsensitive(Search|PredicateOption)|n(notCreateScriptCommandError|cel(Button|TextMovement))|chesDirectory|lculation(NoError|Overflow|DivideByZero|Underflow|LossOfPrecision)|rriageReturnCharacter)|r(itical(Request|AlertStyle)|ayonModeColorPanel))|T(hick(SquareBezelStyle|erSquareBezelStyle)|ypesetter(Behavior|HorizontalTabAction|ContainerBreakAction|ZeroAdvancementAction|OriginalBehavior|ParagraphBreakAction|WhitespaceAction|L(ineBreakAction|atestBehavior))|i(ckMark(Right|Below|Left|Above)|tledWindowMask|meZoneDatePickerElementFlag)|o(olbarItemVisibilityPriority(Standard|High|User|Low)|pTabsBezelBorder|ggleButton)|IFF(Compression(N(one|EXT)|CCITTFAX([34])|OldJPEG|JPEG|PackBits|LZW)|FileType)|e(rminate(Now|Cancel|Later)|xt(Read(InapplicableDocumentTypeError|WriteErrorM(inimum|aximum))|Block(M(i(nimum(Height|Width)|ddleAlignment)|a(rgin|ximum(Height|Width)))|B(o(ttomAlignment|rder)|aselineAlignment)|Height|TopAlignment|P(ercentageValueType|adding)|Width|AbsoluteValueType)|StorageEdited(Characters|Attributes)|CellType|ured(RoundedBezelStyle|BackgroundWindowMask|SquareBezelStyle)|Table(FixedLayoutAlgorithm|AutomaticLayoutAlgorithm)|Field(RoundedBezel|SquareBezel|AndStepperDatePickerStyle)|WriteInapplicableDocumentTypeError|ListPrependEnclosingMarker))|woByteGlyphPacking|ab(Character|TextMovement|le(tP(oint(Mask|EventSubtype)?|roximity(Mask|EventSubtype)?)|Column(NoResizing|UserResizingMask|AutoresizingMask)|View(ReverseSequentialColumnAutoresizingStyle|GridNone|S(olid(HorizontalGridLineMask|VerticalGridLineMask)|equentialColumnAutoresizingStyle)|NoColumnAutoresizing|UniformColumnAutoresizingStyle|FirstColumnOnlyAutoresizingStyle|LastColumnOnlyAutoresizingStyle)))|rackModeMatrix)|I(n(sert(CharFunctionKey|FunctionKey|LineFunctionKey)|t(Type|ernalS(criptError|pecifierError))|dexSubelement|validIndexSpecifierError|formational(Request|AlertStyle)|PredicateOperatorType)|talicFontMask|SO(2022JPStringEncoding|Latin(1StringEncoding|2StringEncoding))|dentityMappingCharacterCollection|llegalTextMovement|mage(R(ight|ep(MatchesDevice|LoadStatus(ReadingHeader|Completed|InvalidData|Un(expectedEOF|knownType)|WillNeedAllData)))|Below|C(ellType|ache(BySize|Never|Default|Always))|Interpolation(High|None|Default|Low)|O(nly|verlaps)|Frame(Gr(oove|ayBezel)|Button|None|Photo)|L(oadStatus(ReadError|C(ompleted|ancelled)|InvalidData|UnexpectedEOF)|eft)|A(lign(Right|Bottom(Right|Left)?|Center|Top(Right|Left)?|Left)|bove)))|O(n(State|eByteGlyphPacking|OffButton|lyScrollerArrows)|ther(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|TextMovement)|SF1OperatingSystem|pe(n(GL(GO(Re(setLibrary|tainRenderers)|ClearFormatCache|FormatCacheSize)|PFA(R(obust|endererID)|M(inimumPolicy|ulti(sample|Screen)|PSafe|aximumPolicy)|BackingStore|S(creenMask|te(ncilSize|reo)|ingleRenderer|upersample|ample(s|Buffers|Alpha))|NoRecovery|C(o(lor(Size|Float)|mpliant)|losestPolicy)|OffScreen|D(oubleBuffer|epthSize)|PixelBuffer|VirtualScreenCount|FullScreen|Window|A(cc(umSize|elerated)|ux(Buffers|DepthStencil)|l(phaSize|lRenderers))))|StepUnicodeReservedBase)|rationNotSupportedForKeyS(criptError|pecifierError))|ffState|KButton|rPredicateType|bjC(B(itfield|oolType)|S(hortType|tr(ingType|uctType)|electorType)|NoType|CharType|ObjectType|DoubleType|UnionType|PointerType|VoidType|FloatType|Long(Type|longType)|ArrayType))|D(i(s(c(losureBezelStyle|reteCapacityLevelIndicatorStyle)|playWindowRunLoopOrdering)|acriticInsensitivePredicateOption|rect(Selection|PredicateModifier))|o(c(ModalWindowMask|ument(Directory|ationDirectory))|ubleType|wn(TextMovement|ArrowFunctionKey))|e(s(cendingPageOrder|ktopDirectory)|cimalTabStopType|v(ice(NColorSpaceModel|IndependentModifierFlagsMask)|eloper(Directory|ApplicationDirectory))|fault(ControlTint|TokenStyle)|lete(Char(acter|FunctionKey)|FunctionKey|LineFunctionKey)|moApplicationDirectory)|a(yCalendarUnit|teFormatter(MediumStyle|Behavior(10|Default)|ShortStyle|NoStyle|FullStyle|LongStyle))|ra(wer(Clos(ingState|edState)|Open(ingState|State))|gOperation(Generic|Move|None|Copy|Delete|Private|Every|Link|All)))|U(ser(CancelledError|D(irectory|omainMask)|FunctionKey)|RL(Handle(NotLoaded|Load(Succeeded|InProgress|Failed))|CredentialPersistence(None|Permanent|ForSession))|n(scaledWindowMask|cachedRead|i(codeStringEncoding|talicFontMask|fiedTitleAndToolbarWindowMask)|d(o(CloseGroupingRunLoopOrdering|FunctionKey)|e(finedDateComponent|rline(Style(Single|None|Thick|Double)|Pattern(Solid|D(ot|ash(Dot(Dot)?)?)))))|known(ColorSpaceModel|P(ointingDevice|ageOrder)|KeyS(criptError|pecifierError))|boldFontMask)|tilityWindowMask|TF8StringEncoding|p(dateWindowsRunLoopOrdering|TextMovement|ArrowFunctionKey))|J(ustifiedTextAlignment|PEG(2000FileType|FileType)|apaneseEUC(GlyphPacking|StringEncoding))|P(o(s(t(Now|erFontMask|WhenIdle|ASAP)|iti(on(Replace|Be(fore|ginning)|End|After)|ve(IntType|DoubleType|FloatType)))|pUp(NoArrow|ArrowAt(Bottom|Center))|werOffEventType|rtraitOrientation)|NGFileType|ush(InCell(Mask)?|OnPushOffButton)|e(n(TipMask|UpperSideMask|PointingDevice|LowerSideMask)|riodic(Mask)?)|P(S(caleField|tatus(Title|Field)|aveButton)|N(ote(Title|Field)|ame(Title|Field))|CopiesField|TitleField|ImageButton|OptionsButton|P(a(perFeedButton|ge(Range(To|From)|ChoiceMatrix))|reviewButton)|LayoutButton)|lainTextTokenStyle|a(useFunctionKey|ragraphSeparatorCharacter|ge(DownFunctionKey|UpFunctionKey))|r(int(ing(ReplyLater|Success|Cancelled|Failure)|ScreenFunctionKey|erTable(NotFound|OK|Error)|FunctionKey)|o(p(ertyList(XMLFormat|MutableContainers(AndLeaves)?|BinaryFormat|Immutable|OpenStepFormat)|rietaryStringEncoding)|gressIndicator(BarStyle|SpinningStyle|Preferred(SmallThickness|Thickness|LargeThickness|AquaThickness)))|e(ssedTab|vFunctionKey))|L(HeightForm|CancelButton|TitleField|ImageButton|O(KButton|rientationMatrix)|UnitsButton|PaperNameButton|WidthForm))|E(n(terCharacter|d(sWith(Comparison|PredicateOperatorType)|FunctionKey))|v(e(nOddWindingRule|rySubelement)|aluatedObjectExpressionType)|qualTo(Comparison|PredicateOperatorType)|ra(serPointingDevice|CalendarUnit|DatePickerElementFlag)|x(clude(10|QuickDrawElementsIconCreationOption)|pandedFontMask|ecuteFunctionKey))|V(i(ew(M(in(XMargin|YMargin)|ax(XMargin|YMargin))|HeightSizable|NotSizable|WidthSizable)|aPanelFontAction)|erticalRuler|a(lidationErrorM(inimum|aximum)|riableExpressionType))|Key(SpecifierEvaluationScriptError|Down(Mask)?|Up(Mask)?|PathExpressionType|Value(MinusSetMutation|SetSetMutation|Change(Re(placement|moval)|Setting|Insertion)|IntersectSetMutation|ObservingOption(New|Old)|UnionSetMutation|ValidationError))|QTMovie(NormalPlayback|Looping(BackAndForthPlayback|Playback))|F(1(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|7FunctionKey|i(nd(PanelAction(Replace(A(ndFind|ll(InSelection)?))?|S(howFindPanel|e(tFindString|lectAll(InSelection)?))|Next|Previous)|FunctionKey)|tPagination|le(Read(No(SuchFileError|PermissionError)|CorruptFileError|In(validFileNameError|applicableStringEncodingError)|Un(supportedSchemeError|knownError))|HandlingPanel(CancelButton|OKButton)|NoSuchFileError|ErrorM(inimum|aximum)|Write(NoPermissionError|In(validFileNameError|applicableStringEncodingError)|OutOfSpaceError|Un(supportedSchemeError|knownError))|LockingError)|xedPitchFontMask)|2(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|o(nt(Mo(noSpaceTrait|dernSerifsClass)|BoldTrait|S(ymbolicClass|criptsClass|labSerifsClass|ansSerifClass)|C(o(ndensedTrait|llectionApplicationOnlyMask)|larendonSerifsClass)|TransitionalSerifsClass|I(ntegerAdvancementsRenderingMode|talicTrait)|O(ldStyleSerifsClass|rnamentalsClass)|DefaultRenderingMode|U(nknownClass|IOptimizedTrait)|Panel(S(hadowEffectModeMask|t(andardModesMask|rikethroughEffectModeMask)|izeModeMask)|CollectionModeMask|TextColorEffectModeMask|DocumentColorEffectModeMask|UnderlineEffectModeMask|FaceModeMask|All(ModesMask|EffectsModeMask))|ExpandedTrait|VerticalTrait|F(amilyClassMask|reeformSerifsClass)|Antialiased(RenderingMode|IntegerAdvancementsRenderingMode))|cusRing(Below|Type(None|Default|Exterior)|Only|Above)|urByteGlyphPacking|rm(attingError(M(inimum|aximum))?|FeedCharacter))|8FunctionKey|unction(ExpressionType|KeyMask)|3(1FunctionKey|2FunctionKey|3FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey)|9FunctionKey|4FunctionKey|P(RevertButton|S(ize(Title|Field)|etButton)|CurrentField|Preview(Button|Field))|l(oat(ingPointSamplesBitmapFormat|Type)|agsChanged(Mask)?)|axButton|5FunctionKey|6FunctionKey)|W(heelModeColorPanel|indow(s(NTOperatingSystem|CP125(1StringEncoding|2StringEncoding|3StringEncoding|4StringEncoding|0StringEncoding)|95(InterfaceStyle|OperatingSystem))|M(iniaturizeButton|ovedEventType)|Below|CloseButton|ToolbarButton|ZoomButton|Out|DocumentIconButton|ExposedEventType|Above)|orkspaceLaunch(NewInstance|InhibitingBackgroundOnly|Default|PreferringClassic|WithoutA(ctivation|ddingToRecents)|A(sync|nd(Hide(Others)?|Print)|llowingClassicStartup))|eek(day(CalendarUnit|OrdinalCalendarUnit)|CalendarUnit)|a(ntsBidiLevels|rningAlertStyle)|r(itingDirection(RightToLeft|Natural|LeftToRight)|apCalendarComponents))|L(i(stModeMatrix|ne(Moves(Right|Down|Up|Left)|B(order|reakBy(C(harWrapping|lipping)|Truncating(Middle|Head|Tail)|WordWrapping))|S(eparatorCharacter|weep(Right|Down|Up|Left))|ToBezierPathElement|DoesntMove|arSlider)|teralSearch|kePredicateOperatorType|ghterFontAction|braryDirectory)|ocalDomainMask|e(ssThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|ft(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey))|a(yout(RightToLeft|NotDone|CantFit|OutOfGlyphs|Done|LeftToRight)|ndscapeOrientation)|ABColorSpaceModel)|A(sc(iiWithDoubleByteEUCGlyphPacking|endingPageOrder)|n(y(Type|PredicateModifier|EventMask)|choredSearch|imation(Blocking|Nonblocking(Threaded)?|E(ffect(DisappearingItemDefault|Poof)|ase(In(Out)?|Out))|Linear)|dPredicateType)|t(Bottom|tachmentCharacter|omicWrite|Top)|SCIIStringEncoding|d(obe(GB1CharacterCollection|CNS1CharacterCollection|Japan(1CharacterCollection|2CharacterCollection)|Korea1CharacterCollection)|dTraitFontAction|minApplicationDirectory)|uto(saveOperation|Pagination)|pp(lication(SupportDirectory|D(irectory|e(fined(Mask)?|legateReply(Success|Cancel|Failure)|activatedEventType))|ActivatedEventType)|KitDefined(Mask)?)|l(ternateKeyMask|pha(ShiftKeyMask|NonpremultipliedBitmapFormat|FirstBitmapFormat)|ert(SecondButtonReturn|ThirdButtonReturn|OtherReturn|DefaultReturn|ErrorReturn|FirstButtonReturn|AlternateReturn)|l(ScrollerParts|DomainsMask|PredicateModifier|LibrariesDirectory|ApplicationsDirectory))|rgument(sWrongScriptError|EvaluationScriptError)|bove(Bottom|Top)|WTEventType))\\b",
       "name": "support.constant.cocoa.objcpp"
     },
     "anonymous_pattern_4": {
@@ -347,7 +347,7 @@
       ]
     },
     "anonymous_pattern_5": {
-      "match": "\\b(NS_DURING|NS_HANDLER|NS_ENDHANDLER)\\b",
+      "match": "\\b(NS_(?:DURING|HANDLER|ENDHANDLER))\\b",
       "name": "keyword.control.macro.objcpp"
     },
     "anonymous_pattern_7": {
@@ -378,7 +378,7 @@
       "name": "keyword.control.protocol-specification.objcpp"
     },
     "apple_foundation_functional_macros": {
-      "begin": "(\\b(?:API_AVAILABLE|API_DEPRECATED|API_UNAVAILABLE|NS_AVAILABLE|NS_AVAILABLE_MAC|NS_AVAILABLE_IOS|NS_DEPRECATED|NS_DEPRECATED_MAC|NS_DEPRECATED_IOS|NS_SWIFT_NAME))(?:(?:\\s)+)?(\\()",
+      "begin": "(\\b(?:API_AVAILABLE|API_DEPRECATED|API_UNAVAILABLE|NS_AVAILABLE|NS_AVAILABLE_MAC|NS_AVAILABLE_IOS|NS_DEPRECATED|NS_DEPRECATED_MAC|NS_DEPRECATED_IOS|NS_SWIFT_NAME))\\s+{0,1}(\\()",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.preprocessor.apple-foundation.objcpp"
@@ -407,7 +407,7 @@
           "name": "punctuation.section.scope.begin.objcpp"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.objcpp"
@@ -425,7 +425,7 @@
               "name": "punctuation.separator.arguments.objcpp"
             }
           },
-          "end": "(?=\\])",
+          "end": "(?=])",
           "name": "meta.function-call.predicate.objcpp",
           "patterns": [
             {
@@ -486,7 +486,7 @@
                   "name": "keyword.other.predicate.cocoa.objcpp"
                 },
                 {
-                  "match": "\\\\(\\\\|[abefnrtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-zA-Z0-9]+)",
+                  "match": "\\\\([\\\\abefnrtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x[a-zA-Z0-9]+)",
                   "name": "constant.character.escape.objcpp"
                 },
                 {
@@ -507,7 +507,7 @@
           ]
         },
         {
-          "begin": "(?=\\w)(?<=[\\w\\])\"] )(\\w+(?:(:)|(?=\\])))",
+          "begin": "(?=\\w)(?<=[\\w\\])\"] )(\\w+(?:(:)|(?=])))",
           "beginCaptures": {
             "1": {
               "name": "support.function.any-method.objcpp"
@@ -516,7 +516,7 @@
               "name": "punctuation.separator.arguments.objcpp"
             }
           },
-          "end": "(?=\\])",
+          "end": "(?=])",
           "name": "meta.function-call.objcpp",
           "patterns": [
             {
@@ -561,7 +561,7 @@
               "name": "support.function.C99.objcpp"
             }
           },
-          "match": "(\\s*)\\b(hypot(f|l)?|s(scanf|ystem|nprintf|ca(nf|lb(n(f|l)?|ln(f|l)?))|i(n(h(f|l)?|f|l)?|gn(al|bit))|tr(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|k|f|l(d|l)?)|error|pbrk|ftime|len|rchr|xfrm)|printf|et(jmp|vbuf|locale|buf)|qrt(f|l)?|w(scanf|printf)|rand)|n(e(arbyint(f|l)?|xt(toward(f|l)?|after(f|l)?))|an(f|l)?)|c(s(in(h(f|l)?|f|l)?|qrt(f|l)?)|cos(h(f)?|f|l)?|imag(f|l)?|t(ime|an(h(f|l)?|f|l)?)|o(s(h(f|l)?|f|l)?|nj(f|l)?|pysign(f|l)?)|p(ow(f|l)?|roj(f|l)?)|e(il(f|l)?|xp(f|l)?)|l(o(ck|g(f|l)?)|earerr)|a(sin(h(f|l)?|f|l)?|cos(h(f|l)?|f|l)?|tan(h(f|l)?|f|l)?|lloc|rg(f|l)?|bs(f|l)?)|real(f|l)?|brt(f|l)?)|t(ime|o(upper|lower)|an(h(f|l)?|f|l)?|runc(f|l)?|gamma(f|l)?|mp(nam|file))|i(s(space|n(ormal|an)|cntrl|inf|digit|u(nordered|pper)|p(unct|rint)|finite|w(space|c(ntrl|type)|digit|upper|p(unct|rint)|lower|al(num|pha)|graph|xdigit|blank)|l(ower|ess(equal|greater)?)|al(num|pha)|gr(eater(equal)?|aph)|xdigit|blank)|logb(f|l)?|max(div|abs))|di(v|fftime)|_Exit|unget(c|wc)|p(ow(f|l)?|ut(s|c(har)?|wc(har)?)|error|rintf)|e(rf(c(f|l)?|f|l)?|x(it|p(2(f|l)?|f|l|m1(f|l)?)?))|v(s(scanf|nprintf|canf|printf|w(scanf|printf))|printf|f(scanf|printf|w(scanf|printf))|w(scanf|printf)|a_(start|copy|end|arg))|qsort|f(s(canf|e(tpos|ek))|close|tell|open|dim(f|l)?|p(classify|ut(s|c|w(s|c))|rintf)|e(holdexcept|set(e(nv|xceptflag)|round)|clearexcept|testexcept|of|updateenv|r(aiseexcept|ror)|get(e(nv|xceptflag)|round))|flush|w(scanf|ide|printf|rite)|loor(f|l)?|abs(f|l)?|get(s|c|pos|w(s|c))|re(open|e|ad|xp(f|l)?)|m(in(f|l)?|od(f|l)?|a(f|l|x(f|l)?)?))|l(d(iv|exp(f|l)?)|o(ngjmp|cal(time|econv)|g(1(p(f|l)?|0(f|l)?)|2(f|l)?|f|l|b(f|l)?)?)|abs|l(div|abs|r(int(f|l)?|ound(f|l)?))|r(int(f|l)?|ound(f|l)?)|gamma(f|l)?)|w(scanf|c(s(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|k|f|l(d|l)?|mbs)|pbrk|ftime|len|r(chr|tombs)|xfrm)|to(b|mb)|rtomb)|printf|mem(set|c(hr|py|mp)|move))|a(s(sert|ctime|in(h(f|l)?|f|l)?)|cos(h(f|l)?|f|l)?|t(o(i|f|l(l)?)|exit|an(h(f|l)?|2(f|l)?|f|l)?)|b(s|ort))|g(et(s|c(har)?|env|wc(har)?)|mtime)|r(int(f|l)?|ound(f|l)?|e(name|alloc|wind|m(ove|quo(f|l)?|ainder(f|l)?))|a(nd|ise))|b(search|towc)|m(odf(f|l)?|em(set|c(hr|py|mp)|move)|ktime|alloc|b(s(init|towcs|rtowcs)|towc|len|r(towc|len))))\\b"
+          "match": "(\\s*)\\b(hypot([fl])?|s(scanf|ystem|nprintf|ca(nf|lb(n([fl])?|ln([fl])?))|i(n(h([fl])?|[fl])?|gn(al|bit))|tr(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|[kf]|l([dl])?)|error|pbrk|ftime|len|rchr|xfrm)|printf|et(jmp|vbuf|locale|buf)|qrt([fl])?|w(scanf|printf)|rand)|n(e(arbyint([fl])?|xt(toward([fl])?|after([fl])?))|an([fl])?)|c(s(in(h([fl])?|[fl])?|qrt([fl])?)|cos(h(f)?|[fl])?|imag([fl])?|t(ime|an(h([fl])?|[fl])?)|o(s(h([fl])?|[fl])?|nj([fl])?|pysign([fl])?)|p(ow([fl])?|roj([fl])?)|e(il([fl])?|xp([fl])?)|l(o(ck|g([fl])?)|earerr)|a(sin(h([fl])?|[fl])?|cos(h([fl])?|[fl])?|tan(h([fl])?|[fl])?|lloc|rg([fl])?|bs([fl])?)|real([fl])?|brt([fl])?)|t(ime|o(upper|lower)|an(h([fl])?|[fl])?|runc([fl])?|gamma([fl])?|mp(nam|file))|i(s(space|n(ormal|an)|cntrl|inf|digit|u(nordered|pper)|p(unct|rint)|finite|w(space|c(ntrl|type)|digit|upper|p(unct|rint)|lower|al(num|pha)|graph|xdigit|blank)|l(ower|ess(equal|greater)?)|al(num|pha)|gr(eater(equal)?|aph)|xdigit|blank)|logb([fl])?|max(div|abs))|di(v|fftime)|_Exit|unget(c|wc)|p(ow([fl])?|ut(s|c(har)?|wc(har)?)|error|rintf)|e(rf(c([fl])?|[fl])?|x(it|p(2([fl])?|[fl]|m1([fl])?)?))|v(s(scanf|nprintf|canf|printf|w(scanf|printf))|printf|f(scanf|printf|w(scanf|printf))|w(scanf|printf)|a_(start|copy|end|arg))|qsort|f(s(canf|e(tpos|ek))|close|tell|open|dim([fl])?|p(classify|ut([sc]|w([sc]))|rintf)|e(holdexcept|set(e(nv|xceptflag)|round)|clearexcept|testexcept|of|updateenv|r(aiseexcept|ror)|get(e(nv|xceptflag)|round))|flush|w(scanf|ide|printf|rite)|loor([fl])?|abs([fl])?|get([sc]|pos|w([sc]))|re(open|e|ad|xp([fl])?)|m(in([fl])?|od([fl])?|a([fl]|x([fl])?)?))|l(d(iv|exp([fl])?)|o(ngjmp|cal(time|econv)|g(1(p([fl])?|0([fl])?)|2([fl])?|[fl]|b([fl])?)?)|abs|l(div|abs|r(int([fl])?|ound([fl])?))|r(int([fl])?|ound([fl])?)|gamma([fl])?)|w(scanf|c(s(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|[kf]|l([dl])?|mbs)|pbrk|ftime|len|r(chr|tombs)|xfrm)|to(b|mb)|rtomb)|printf|mem(set|c(hr|py|mp)|move))|a(s(sert|ctime|in(h([fl])?|[fl])?)|cos(h([fl])?|[fl])?|t(o([if]|l(l)?)|exit|an(h([fl])?|2([fl])?|[fl])?)|b(s|ort))|g(et(s|c(har)?|env|wc(har)?)|mtime)|r(int([fl])?|ound([fl])?|e(name|alloc|wind|m(ove|quo([fl])?|ainder([fl])?))|a(nd|ise))|b(search|towc)|m(odf([fl])?|em(set|c(hr|py|mp)|move)|ktime|alloc|b(s(init|towcs|rtowcs)|towc|len|r(towc|len))))\\b"
         },
         {
           "captures": {
@@ -645,7 +645,7 @@
           "include": "#special_variables"
         },
         {
-          "begin": "^\\s*((\\#)\\s*define)\\s+((?<id>[a-zA-Z_$][\\w$]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
+          "begin": "^\\s*((#)\\s*define)\\s+((?<id>[a-zA-Z_$][\\w$]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.define.objcpp"
@@ -669,7 +669,7 @@
               "name": "punctuation.definition.parameters.end.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.macro.objcpp",
           "patterns": [
             {
@@ -746,7 +746,7 @@
           ]
         },
         {
-          "begin": "^\\s*((#)\\s*(include(?:_next)?|import))\\b\\s*",
+          "begin": "^\\s*((#)\\s*(i(?:nclude(?:_next)?|mport)))\\b\\s*",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.$3.objcpp"
@@ -755,7 +755,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.include.objcpp",
           "patterns": [
             {
@@ -806,7 +806,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.objcpp",
           "patterns": [
             {
@@ -821,7 +821,7 @@
           ]
         },
         {
-          "begin": "^\\s*(?:((#)\\s*undef))\\b",
+          "begin": "^\\s*((#)\\s*undef)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.undef.objcpp"
@@ -830,7 +830,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.objcpp",
           "patterns": [
             {
@@ -843,7 +843,7 @@
           ]
         },
         {
-          "begin": "^\\s*(?:((#)\\s*pragma))\\b",
+          "begin": "^\\s*((#)\\s*pragma)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.pragma.objcpp"
@@ -852,7 +852,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.pragma.objcpp",
           "patterns": [
             {
@@ -875,7 +875,7 @@
           "name": "support.type.sys-types.objcpp"
         },
         {
-          "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",
+          "match": "\\b(pthread_(?:attr_t|cond_t|condattr_t|mutex_t|mutexattr_t|once_t|rwlock_t|rwlockattr_t|t|key_t))\\b",
           "name": "support.type.pthread.objcpp"
         },
         {
@@ -914,7 +914,7 @@
           "include": "#line_continuation_character"
         },
         {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))?(\\[)(?!])",
           "beginCaptures": {
             "1": {
               "name": "variable.object.objcpp"
@@ -923,7 +923,7 @@
               "name": "punctuation.definition.begin.bracket.square.objcpp"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.objcpp"
@@ -937,7 +937,7 @@
           ]
         },
         {
-          "match": "\\[\\s*\\]",
+          "match": "\\[\\s*]",
           "name": "storage.modifier.array.bracket.square.objcpp"
         },
         {
@@ -951,7 +951,7 @@
       ],
       "repository": {
         "access-method": {
-          "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]*)(\\()",
+          "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.objcpp"
@@ -1005,13 +1005,13 @@
         "block": {
           "patterns": [
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -1047,7 +1047,7 @@
               "include": "#c_function_call"
             },
             {
-              "begin": "(?:(?:(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)))((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "variable.other.objcpp"
@@ -1070,13 +1070,13 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -1097,7 +1097,7 @@
           ]
         },
         "c_function_call": {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
           "end": "(?<=\\))(?!\\w)",
           "name": "meta.function-call.objcpp",
           "patterns": [
@@ -1249,7 +1249,7 @@
               "include": "#operators"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objcpp"
@@ -1309,7 +1309,7 @@
               "include": "#vararg_ellipses"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objcpp"
@@ -1417,7 +1417,7 @@
                       "name": "punctuation.separator.pointer-access.objcpp"
                     }
                   },
-                  "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+                  "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))"
                 }
               ]
             },
@@ -1425,10 +1425,10 @@
               "name": "variable.other.member.objcpp"
             }
           },
-          "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(\\b(?!(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool|_Complex|_Imaginary|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|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|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t))[a-zA-Z_]\\w*\\b(?!\\())"
+          "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))((?:[a-zA-Z_]\\w*\\s*(?-im:\\.(?:\\*|)|->(?:\\*|))\\s*)*)\\s*(\\b(?!(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool|_Complex|_Imaginary|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|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|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t))[a-zA-Z_]\\w*\\b(?!\\())"
         },
         "method_access": {
-          "begin": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
+          "begin": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))((?:[a-zA-Z_]\\w*\\s*(?-im:\\.(?:\\*|)|->(?:\\*|))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -1475,7 +1475,7 @@
                       "name": "punctuation.separator.pointer-access.objcpp"
                     }
                   },
-                  "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+                  "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))"
                 }
               ]
             },
@@ -1501,7 +1501,7 @@
         },
         "numbers": {
           "begin": "(?<!\\w)(?=\\d|\\.\\d)",
-          "end": "(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))",
+          "end": "(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))",
           "patterns": [
             {
               "captures": {
@@ -1515,7 +1515,7 @@
                   "name": "constant.numeric.exponent.hexadecimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1527,7 +1527,7 @@
                   "name": "constant.numeric.hexadecimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1542,7 +1542,7 @@
                   "name": "constant.numeric.hexadecimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1557,7 +1557,7 @@
                   "name": "keyword.operator.plus.exponent.hexadecimal.objcpp"
                 }
               },
-              "match": "(\\G0[xX])(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([pP])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?<!')([pP])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?([lLfF](?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))"
             },
             {
               "captures": {
@@ -1568,7 +1568,7 @@
                   "name": "constant.numeric.exponent.decimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1580,7 +1580,7 @@
                   "name": "constant.numeric.decimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1595,7 +1595,7 @@
                   "name": "constant.numeric.decimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1610,7 +1610,7 @@
                   "name": "keyword.operator.plus.exponent.decimal.objcpp"
                 }
               },
-              "match": "(\\G(?=[0-9.])(?!0[xXbB]))(?:([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=[0-9])\\.|\\.(?=[0-9])))(?:([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([eE])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?<!')([eE])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?([lLfF](?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))"
             },
             {
               "captures": {
@@ -1621,7 +1621,7 @@
                   "name": "constant.numeric.binary.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1633,7 +1633,7 @@
                   "name": "keyword.other.unit.suffix.integer.objcpp"
                 }
               },
-              "match": "(\\G0[bB])([01](?:(?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0[bB])([01](?:[01]|((?<=\\h)'(?=\\h)))*)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))"
             },
             {
               "captures": {
@@ -1644,7 +1644,7 @@
                   "name": "constant.numeric.octal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1656,7 +1656,7 @@
                   "name": "keyword.other.unit.suffix.integer.objcpp"
                 }
               },
-              "match": "(\\G0)((?:(?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))+)(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0)((?:[0-7]|((?<=\\h)'(?=\\h)))+)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))"
             },
             {
               "captures": {
@@ -1667,7 +1667,7 @@
                   "name": "constant.numeric.hexadecimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1688,7 +1688,7 @@
                   "name": "constant.numeric.exponent.hexadecimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1697,7 +1697,7 @@
                   "name": "keyword.other.unit.suffix.integer.objcpp"
                 }
               },
-              "match": "(\\G0[xX])([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([pP])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)((?<!')([pP])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))"
             },
             {
               "captures": {
@@ -1705,7 +1705,7 @@
                   "name": "constant.numeric.decimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1726,7 +1726,7 @@
                   "name": "constant.numeric.exponent.decimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1735,10 +1735,10 @@
                   "name": "keyword.other.unit.suffix.integer.objcpp"
                 }
               },
-              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([eE])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)((?<!')([eE])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))"
             },
             {
-              "match": "(?:(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))+",
+              "match": "(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-])+",
               "name": "invalid.illegal.constant.numeric.objcpp"
             }
           ]
@@ -1770,7 +1770,7 @@
               "name": "keyword.operator.bitwise.shift.objcpp"
             },
             {
-              "match": "!=|<=|>=|==|<|>",
+              "match": "!=|<=|>=|==|[<>]",
               "name": "keyword.operator.comparison.objcpp"
             },
             {
@@ -1778,7 +1778,7 @@
               "name": "keyword.operator.logical.objcpp"
             },
             {
-              "match": "&|\\||\\^|~",
+              "match": "[\\&|\\^~]",
               "name": "keyword.operator.objcpp"
             },
             {
@@ -1786,7 +1786,7 @@
               "name": "keyword.operator.assignment.objcpp"
             },
             {
-              "match": "%|\\*|/|-|\\+",
+              "match": "[%*/\\-+]",
               "name": "keyword.operator.objcpp"
             },
             {
@@ -1852,7 +1852,7 @@
               "include": "#block_innards"
             },
             {
-              "match": "(?-mix:(?<!:):(?!:))",
+              "match": "(?-im:(?<!:):(?!:))",
               "name": "punctuation.range-based.objcpp"
             }
           ]
@@ -1904,7 +1904,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -1951,7 +1951,7 @@
                   "name": "invalid.illegal.stray-$1.objcpp"
                 }
               },
-              "match": "^\\s*#\\s*(else|elif|endif)\\b"
+              "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
             }
           ]
         },
@@ -1984,7 +1984,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -2031,14 +2031,14 @@
                   "name": "invalid.illegal.stray-$1.objcpp"
                 }
               },
-              "match": "^\\s*#\\s*(else|elif|endif)\\b"
+              "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
             }
           ]
         },
         "preprocessor-rule-conditional-line": {
           "patterns": [
             {
-              "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
+              "match": "\\bdefined\\b(?:\\s*$|(?=\\s*\\(*\\s*(?!defined\\b)[a-zA-Z_$][\\w$]*\\b\\s*\\)*\\s*(?:\\n|//|/\\*|[?:]|&&|\\|\\||\\\\\\s*\\n)))",
               "name": "keyword.control.directive.conditional.objcpp"
             },
             {
@@ -2111,13 +2111,13 @@
         "preprocessor-rule-define-line-blocks": {
           "patterns": [
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -2143,13 +2143,13 @@
               "include": "#vararg_ellipses"
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -2171,7 +2171,7 @@
               "name": "punctuation.section.parens.end.bracket.round.objcpp"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
               "end": "(?<=\\))(?!\\w)|(?<!\\\\)(?=\\s*\\n)",
               "name": "meta.function.objcpp",
               "patterns": [
@@ -2261,7 +2261,7 @@
               "include": "#operators"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objcpp"
@@ -2335,7 +2335,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -2369,10 +2369,10 @@
                       "name": "punctuation.definition.directive.objcpp"
                     }
                   },
-                  "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
                   "patterns": [
                     {
-                      "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                      "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                       "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                       "name": "meta.preprocessor.objcpp",
                       "patterns": [
@@ -2389,7 +2389,7 @@
                 {
                   "begin": "\\n",
                   "contentName": "comment.block.preprocessor.if-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2432,7 +2432,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -2466,10 +2466,10 @@
                       "name": "punctuation.definition.directive.objcpp"
                     }
                   },
-                  "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
                   "patterns": [
                     {
-                      "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                      "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                       "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                       "name": "meta.preprocessor.objcpp",
                       "patterns": [
@@ -2486,7 +2486,7 @@
                 {
                   "begin": "\\n",
                   "contentName": "comment.block.preprocessor.if-branch.in-block.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2513,10 +2513,10 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+          "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objcpp",
               "patterns": [
@@ -2531,7 +2531,7 @@
             {
               "begin": "\\n",
               "contentName": "comment.block.preprocessor.elif-branch.objcpp",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -2575,7 +2575,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -2625,7 +2625,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.if-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2637,7 +2637,7 @@
                 },
                 {
                   "begin": "\\n",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "$base"
@@ -2677,7 +2677,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -2727,7 +2727,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.if-branch.in-block.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2739,7 +2739,7 @@
                 },
                 {
                   "begin": "\\n",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#block_innards"
@@ -2766,7 +2766,7 @@
           "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objcpp",
               "patterns": [
@@ -2780,7 +2780,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*endif\\b))",
               "patterns": [
                 {
                   "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -2820,7 +2820,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.elif-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2853,7 +2853,7 @@
           "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objcpp",
               "patterns": [
@@ -2867,7 +2867,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*endif\\b))",
               "patterns": [
                 {
                   "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -2907,7 +2907,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.elif-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2970,7 +2970,7 @@
               "name": "variable.parameter.probably.objcpp"
             }
           },
-          "match": "(?<=(?:[a-zA-Z_0-9] |[&*>\\]\\)]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:,|\\)))"
+          "match": "(?<=(?:[a-zA-Z_0-9] |[\\&*>\\])]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[]\\s*)?[,)])"
         },
         "static_assert": {
           "begin": "(static_assert|_Static_assert)\\s*(\\()",
@@ -2990,7 +2990,7 @@
           },
           "patterns": [
             {
-              "begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\\\")?)",
+              "begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\")?)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.delimiter.objcpp"
@@ -3015,15 +3015,15 @@
         "storage_types": {
           "patterns": [
             {
-              "match": "(?-mix:(?<!\\w)(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool)(?!\\w))",
+              "match": "(?-im:(?<!\\w)(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool)(?!\\w))",
               "name": "storage.type.built-in.primitive.objcpp"
             },
             {
-              "match": "(?-mix:(?<!\\w)(?:_Complex|_Imaginary|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|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|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t)(?!\\w))",
+              "match": "(?-im:(?<!\\w)(?:_Complex|_Imaginary|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|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|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t)(?!\\w))",
               "name": "storage.type.built-in.objcpp"
             },
             {
-              "match": "(?-mix:\\b(asm|__asm__|enum|struct|union)\\b)",
+              "match": "(?-im:\\b(asm|__asm__|enum|struct|union)\\b)",
               "name": "storage.type.$1.objcpp"
             }
           ]
@@ -3031,7 +3031,7 @@
         "string_escaped_char": {
           "patterns": [
             {
-              "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+              "match": "\\\\([\\\\abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
               "name": "constant.character.escape.objcpp"
             },
             {
@@ -3043,7 +3043,7 @@
         "string_placeholder": {
           "patterns": [
             {
-              "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
+              "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|[ljtzqL]|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
               "name": "constant.other.placeholder.objcpp"
             },
             {
@@ -3139,7 +3139,7 @@
               "name": "keyword.control.switch.objcpp"
             }
           },
-          "end": "(?:(?<=\\})|(?=[;>\\[\\]=]))",
+          "end": "(?:(?<=})|(?=[;>\\[\\]=]))",
           "name": "meta.block.switch.objcpp",
           "patterns": [
             {
@@ -3162,7 +3162,7 @@
             },
             {
               "begin": "(?<=\\{)",
-              "end": "(\\})",
+              "end": "(})",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.section.block.end.bracket.curly.switch.objcpp"
@@ -3256,7 +3256,7 @@
           "name": "storage.modifier.objcpp"
         },
         {
-          "match": "\\b(private:|protected:|public:)",
+          "match": "\\b(p(?:rivate:|rotected:|ublic:))",
           "name": "storage.type.modifier.access.objcpp"
         },
         {
@@ -3264,11 +3264,11 @@
           "name": "keyword.control.objcpp"
         },
         {
-          "match": "\\bdelete\\b(\\s*\\[\\])?|\\bnew\\b(?!])",
+          "match": "\\b(?:delete\\b(\\s*\\[])?|new\\b(?!]))",
           "name": "keyword.control.objcpp"
         },
         {
-          "match": "\\b(f|m)[A-Z]\\w*\\b",
+          "match": "\\b([fm])[A-Z]\\w*\\b",
           "name": "variable.other.readwrite.member.objcpp"
         },
         {
@@ -3318,7 +3318,7 @@
           "name": "storage.modifier.objcpp"
         },
         {
-          "begin": "(?:^|(?:(?<!else|new|=)))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
+          "begin": "(?:^|(?<!else|new|=))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.objcpp"
@@ -3341,7 +3341,7 @@
           ]
         },
         {
-          "begin": "(?:^|(?:(?<!else|new|=)))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
+          "begin": "(?:^|(?<!else|new|=))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.objcpp"
@@ -3388,7 +3388,7 @@
               "name": "punctuation.section.block.begin.bracket.curly.objcpp"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -3416,7 +3416,7 @@
         "constructor": {
           "patterns": [
             {
-              "begin": "(?:^\\s*)((?!while|for|do|if|else|switch|catch|enumerate|r?iterate)[A-Za-z_][A-Za-z0-9_:]*)\\s*(\\()",
+              "begin": "^\\s*((?!while|for|do|if|else|switch|catch|enumerate|r?iterate)[A-Za-z_][A-Za-z0-9_:]*)\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.constructor.objcpp"
@@ -3496,7 +3496,7 @@
                   "name": "keyword.control.namespace.$2.objcpp"
                 }
               },
-              "end": "(?<=\\})|(?=(;|,|\\(|\\)|>|\\[|\\]|=))",
+              "end": "(?<=})|(?=([;,()>\\[\\]=]))",
               "name": "meta.namespace-block.objcpp",
               "patterns": [
                 {
@@ -3506,7 +3506,7 @@
                       "name": "punctuation.definition.scope.objcpp"
                     }
                   },
-                  "end": "\\}",
+                  "end": "}",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.definition.scope.objcpp"
@@ -3530,7 +3530,7 @@
               ]
             },
             {
-              "begin": "\\b(?:(class)|(struct))\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*:\\s*(public|protected|private)\\s*([_A-Za-z][_A-Za-z0-9]*\\b)((\\s*,\\s*(public|protected|private)\\s*[_A-Za-z][_A-Za-z0-9]*\\b)*))?",
+              "begin": "\\b(?:(class)|(struct))\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*:\\s*(p(?:ublic|rotected|rivate))\\s*([_A-Za-z][_A-Za-z0-9]*\\b)((\\s*,\\s*(p(?:ublic|rotected|rivate))\\s*[_A-Za-z][_A-Za-z0-9]*\\b)*))?",
               "beginCaptures": {
                 "1": {
                   "name": "storage.type.class.objcpp"
@@ -3550,7 +3550,7 @@
                 "7": {
                   "patterns": [
                     {
-                      "match": "(public|protected|private)",
+                      "match": "(p(?:ublic|rotected|rivate))",
                       "name": "storage.type.modifier.access.objcpp"
                     },
                     {
@@ -3560,7 +3560,7 @@
                   ]
                 }
               },
-              "end": "(?<=\\})|(?=(;|\\(|\\)|>|\\[|\\]|=))",
+              "end": "(?<=})|(?=([;()>\\[\\]=]))",
               "name": "meta.class-struct-block.objcpp",
               "patterns": [
                 {
@@ -3573,7 +3573,7 @@
                       "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                     }
                   },
-                  "end": "(\\})(\\s*\\n)?",
+                  "end": "(})(\\s*\\n)?",
                   "endCaptures": {
                     "1": {
                       "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -3606,7 +3606,7 @@
                   "name": "storage.modifier.objcpp"
                 }
               },
-              "end": "(?<=\\})|(?=\\w)|(?=\\s*#\\s*endif\\b)",
+              "end": "(?<=})|(?=\\w)|(?=\\s*#\\s*endif\\b)",
               "name": "meta.extern-block.objcpp",
               "patterns": [
                 {
@@ -3616,7 +3616,7 @@
                       "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                     }
                   },
-                  "end": "\\}|(?=\\s*#\\s*endif\\b)",
+                  "end": "}|(?=\\s*#\\s*endif\\b)",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -3641,7 +3641,7 @@
         "strings": {
           "patterns": [
             {
-              "begin": "(u|u8|U|L)?\"",
+              "begin": "(u|u8|[UL])?\"",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.objcpp"
@@ -3659,7 +3659,7 @@
               "name": "string.quoted.double.objcpp",
               "patterns": [
                 {
-                  "match": "\\\\u\\h{4}|\\\\U\\h{8}",
+                  "match": "\\\\(?:u\\h{4}|U\\h{8})",
                   "name": "constant.character.escape.objcpp"
                 },
                 {
@@ -3680,7 +3680,7 @@
               ]
             },
             {
-              "begin": "(u|u8|U|L)?R\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
+              "begin": "(u|u8|[UL])?R\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.objcpp"
@@ -3774,7 +3774,7 @@
           "include": "#special_block"
         },
         {
-          "match": "(?-mix:##[a-zA-Z_]\\w*(?!\\w))",
+          "match": "(?-im:##[a-zA-Z_]\\w*(?!\\w))",
           "name": "variable.other.macro.argument.objcpp"
         },
         {
@@ -3785,7 +3785,7 @@
           "name": "storage.modifier.specificer.functional.pre-parameters.$1.objcpp"
         },
         {
-          "match": "(?<!\\w)((?:final|override|volatile|const|noexcept))(?!\\w)(?=\\s*(?:(?:(?:(?:\\{|;))|[\\n\\r])))",
+          "match": "(?<!\\w)((?:final|override|volatile|const|noexcept))(?!\\w)(?=\\s*[{;\\n\\r])",
           "name": "storage.modifier.specifier.functional.post-parameters.$1.objcpp"
         },
         {
@@ -3793,7 +3793,7 @@
           "name": "storage.modifier.specifier.$1.objcpp"
         },
         {
-          "match": "(?<!\\w)((?:private|protected|public)) *:",
+          "match": "(?<!\\w)(p(?:rivate|rotected|ublic)) *:",
           "name": "storage.type.modifier.access.control.$1.objcpp"
         },
         {
@@ -3837,7 +3837,7 @@
           "name": "storage.modifier.objcpp"
         },
         {
-          "begin": "(?:^|(?:(?<!else|new|=)))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
+          "begin": "(?:^|(?<!else|new|=))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.destructor.objcpp"
@@ -3860,7 +3860,7 @@
           ]
         },
         {
-          "begin": "(?:^|(?:(?<!else|new|=)))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
+          "begin": "(?:^|(?<!else|new|=))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.objcpp"
@@ -3918,7 +3918,7 @@
           "include": "#strings-c"
         },
         {
-          "begin": "^\\s*((\\#)\\s*define)\\s+((?<id>[a-zA-Z_$][\\w$]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
+          "begin": "^\\s*((#)\\s*define)\\s+((?<id>[a-zA-Z_$][\\w$]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.define.objcpp"
@@ -3942,7 +3942,7 @@
               "name": "punctuation.definition.parameters.end.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.macro.objcpp",
           "patterns": [
             {
@@ -4019,7 +4019,7 @@
           ]
         },
         {
-          "begin": "^\\s*((#)\\s*(include(?:_next)?|import))\\b\\s*",
+          "begin": "^\\s*((#)\\s*(i(?:nclude(?:_next)?|mport)))\\b\\s*",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.$3.objcpp"
@@ -4028,7 +4028,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.include.objcpp",
           "patterns": [
             {
@@ -4079,7 +4079,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.objcpp",
           "patterns": [
             {
@@ -4094,7 +4094,7 @@
           ]
         },
         {
-          "begin": "^\\s*(?:((#)\\s*undef))\\b",
+          "begin": "^\\s*((#)\\s*undef)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.undef.objcpp"
@@ -4103,7 +4103,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.objcpp",
           "patterns": [
             {
@@ -4116,7 +4116,7 @@
           ]
         },
         {
-          "begin": "^\\s*(?:((#)\\s*pragma))\\b",
+          "begin": "^\\s*((#)\\s*pragma)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.pragma.objcpp"
@@ -4125,7 +4125,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.pragma.objcpp",
           "patterns": [
             {
@@ -4148,7 +4148,7 @@
           "name": "support.type.sys-types.objcpp"
         },
         {
-          "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",
+          "match": "\\b(pthread_(?:attr_t|cond_t|condattr_t|mutex_t|mutexattr_t|once_t|rwlock_t|rwlockattr_t|t|key_t))\\b",
           "name": "support.type.pthread.objcpp"
         },
         {
@@ -4156,7 +4156,7 @@
           "name": "support.type.stdint.objcpp"
         },
         {
-          "match": "(?<!\\w)[a-zA-Z_](?:\\w)*_t(?!\\w)",
+          "match": "(?<!\\w)[a-zA-Z_]\\w*_t(?!\\w)",
           "name": "support.type.posix-reserved.objcpp"
         },
         {
@@ -4179,7 +4179,7 @@
           "include": "#line_continuation_character"
         },
         {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))?(\\[)(?!])",
           "beginCaptures": {
             "1": {
               "name": "variable.other.object.objcpp"
@@ -4188,7 +4188,7 @@
               "name": "punctuation.definition.begin.bracket.square.objcpp"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.objcpp"
@@ -4202,7 +4202,7 @@
           ]
         },
         {
-          "match": "(?-mix:(?<!delete))\\\\[\\\\s*\\\\]",
+          "match": "(?-im:(?<!delete))\\\\[\\\\s*]",
           "name": "storage.modifier.array.bracket.square.objcpp"
         },
         {
@@ -4250,11 +4250,11 @@
               "name": "variable.other.member.objcpp"
             }
           },
-          "match": "(?:(?:([a-zA-Z_]\\w*)|(?<=\\]|\\))))\\s*(?:(?:((?:(?:\\.|\\.\\*)))|((?:(?:->|->\\*)))))\\s*((?:[a-zA-Z_]\\w*\\s*(?:(?:\\.|->))\\s*)*)\\b(?!(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|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|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|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t))([a-zA-Z_]\\w*)\\b(?!\\()",
+          "match": "(?:([a-zA-Z_]\\w*)|(?<=[\\])]))\\s*(?:(\\.(?:|\\*))|(->(?:|\\*)))\\s*((?:[a-zA-Z_]\\w*\\s*(?:\\.|->)\\s*)*)\\b(?!(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|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|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|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t))([a-zA-Z_]\\w*)\\b(?!\\()",
           "name": "variable.other.object.access.objcpp"
         },
         "access-method": {
-          "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]*)(\\()",
+          "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.other.object.objcpp"
@@ -4325,7 +4325,7 @@
               "name": "punctuation.section.block.begin.bracket.curly.objcpp"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -4353,13 +4353,13 @@
         "block-c": {
           "patterns": [
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -4395,7 +4395,7 @@
               "include": "#c_function_call"
             },
             {
-              "begin": "(?:(?:(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)))((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "variable.other.objcpp"
@@ -4418,13 +4418,13 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -4445,7 +4445,7 @@
           ]
         },
         "c_function_call": {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*(?:<[\\s<>,\\w]*>\\s*)?\\(|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
           "end": "(?<=\\))(?!\\w)",
           "name": "meta.function-call.objcpp",
           "patterns": [
@@ -4524,7 +4524,7 @@
         "constructor": {
           "patterns": [
             {
-              "begin": "(?:^\\s*)((?!while|for|do|if|else|switch|catch)[A-Za-z_][A-Za-z0-9_:]*)\\s*(\\()",
+              "begin": "^\\s*((?!while|for|do|if|else|switch|catch)[A-Za-z_][A-Za-z0-9_:]*)\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.constructor.objcpp"
@@ -4596,7 +4596,7 @@
               "include": "#operators"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:new)\\s*((?:(?:<(?:[\\s<>,\\w])*>\\s*))?)|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(new\\s*((?:<[\\s<>,\\w]*>\\s*)?)|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.operator.memory.new.objcpp"
@@ -4625,7 +4625,7 @@
               ]
             },
             {
-              "begin": "(?<!\\w)(?!\\s*(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|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|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|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|NULL|true|false|nullptr|class|struct|union|enum|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|this|template|namespace|using|operator|typedef|decltype|typename|asm|__asm__|concept|requires|export|thread_local|atomic_cancel|atomic_commit|atomic_noexcept|co_await|co_return|co_yield|import|module|reflexpr|synchronized)\\s*\\()((?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*)\\s*([a-zA-Z_]\\w*)\\s*(?:((?:<(?:[\\s<>,\\w])*>\\s*)))?(\\()",
+              "begin": "(?<!\\w)(?!\\s*(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|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|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|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|NULL|true|false|nullptr|class|struct|union|enum|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|this|template|namespace|using|operator|typedef|decltype|typename|asm|__asm__|concept|requires|export|thread_local|atomic_cancel|atomic_commit|atomic_noexcept|co_await|co_return|co_yield|import|module|reflexpr|synchronized)\\s*\\()((?:[a-zA-Z_]\\w*\\s*(?:<[\\s<>,\\w]*>\\s*)?::)*)\\s*([a-zA-Z_]\\w*)\\s*(<[\\s<>,\\w]*>\\s*)?(\\()",
               "beginCaptures": {
                 "1": {
                   "patterns": [
@@ -4699,7 +4699,7 @@
               "include": "#vararg_ellipses-c"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objcpp"
@@ -4708,7 +4708,7 @@
                   "name": "punctuation.section.parameters.begin.bracket.round.objcpp"
                 }
               },
-              "end": "\\)|:",
+              "end": "[):]",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.parameters.end.bracket.round.objcpp"
@@ -4779,7 +4779,7 @@
               "name": "keyword.operator.memory.new.objcpp"
             }
           },
-          "match": "(?<!\\w)(?:(?:(delete)\\s*(\\[\\])|(delete))|(new))(?!\\w)",
+          "match": "(?<!\\w)(?:(?:(delete)\\s*(\\[])|(delete))|(new))(?!\\w)",
           "name": "keyword.operator.memory.objcpp"
         },
         "number_literal": {
@@ -4968,10 +4968,10 @@
               "name": "keyword.operator.plus.exponent.hexadecimal.objcpp"
             }
           },
-          "match": "((?<!\\w)(?:(?:(?:(0[xX])(?:([0-9a-fA-F](?:(?:(?:[0-9a-fA-F]|((?<!')'(?!')))))*))?((?:(?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F]))))(?:([0-9a-fA-F](?:(?:(?:[0-9a-fA-F]|((?<!')'(?!')))))*))?(?:([pP])(\\+)?(\\-)?((?:[0-9](?:(?:(?:[0-9]|(?:(?<!')'(?!')))))*)))?|(?:([0-9](?:(?:(?:[0-9]|((?<!')'(?!')))))*))?((?:(?:(?<=[0-9])\\.|\\.(?=[0-9]))))(?:([0-9](?:(?:(?:[0-9]|((?<!')'(?!')))))*))?(?:([eE])(\\+)?(\\-)?((?:[0-9](?:(?:(?:[0-9]|(?:(?<!')'(?!')))))*)))?)(?:([lLfF](?!\\w)))?|(?:(?:(?:(?:(?:(0[bB])((?:(?:(?:[01]|((?<!')'(?!')))))+)|(0)((?:(?:(?:[0-7]|((?<!')'(?!')))))+)))|(0[xX])([0-9a-fA-F](?:(?:(?:[0-9a-fA-F]|((?<!')'(?!')))))*)(?:([pP])(\\+)?(\\-)?((?:[0-9](?:(?:(?:[0-9]|(?:(?<!')'(?!')))))*)))?))|([0-9](?:(?:(?:[0-9]|((?<!')'(?!')))))*)(?:([eE])(\\+)?(\\-)?((?:[0-9](?:(?:(?:[0-9]|(?:(?<!')'(?!')))))*)))?)(?:((?:(?:(?:(?:(?:(?:(?:(?:(?:(?:(?:(?:LL[uU]|ll[uU]))|[uU]LL))|[uU]ll))|ll))|LL))|[uUlL]))(?!\\w)))?))(\\w*))"
+          "match": "((?<!\\w)(?:(?:(0[xX])(\\h(?:\\h|((?<!')'(?!')))*)?((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<!')'(?!')))*)?(?:([pP])(\\+)?(-)?([0-9](?:[0-9]|(?<!')'(?!'))*))?|([0-9](?:[0-9]|((?<!')'(?!')))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<!')'(?!')))*)?(?:([eE])(\\+)?(-)?([0-9](?:[0-9]|(?<!')'(?!'))*))?)([lLfF](?!\\w))?|(?:(?:(?:(0[bB])((?:[01]|((?<!')'(?!')))+)|(0)((?:[0-7]|((?<!')'(?!')))+))|(0[xX])(\\h(?:\\h|((?<!')'(?!')))*)(?:([pP])(\\+)?(-)?([0-9](?:[0-9]|(?<!')'(?!'))*))?)|([0-9](?:[0-9]|((?<!')'(?!')))*)(?:([eE])(\\+)?(-)?([0-9](?:[0-9]|(?<!')'(?!'))*))?)((?:(?:(?:(?:(?:(?:LL[uU]|ll[uU])|[uU]LL)|[uU]ll)|ll)|LL)|[uUlL])(?!\\w))?)(\\w*))"
         },
         "operator_overload": {
-          "begin": "((?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*)\\s*(operator)((?:(?:\\s*(?:\\+\\+|\\-\\-|\\(\\)|\\[\\]|\\->|\\+\\+|\\-\\-|\\+|\\-|!|~|\\*|&|\\->\\*|\\*|\\/|%|\\+|\\-|<<|>>|<=>|<|<=|>|>=|==|!=|&|\\^|\\||&&|\\|\\||=|\\+=|\\-=|\\*=|\\/=|%=|<<=|>>=|&=|\\^=|\\|=|,)|\\s+(?:(?:(?:new|new\\[\\]|delete|delete\\[\\])|(?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*[a-zA-Z_]\\w*\\s*(?:&)?)))))\\s*(\\()",
+          "begin": "((?:[a-zA-Z_]\\w*\\s*(?:<[\\s<>,\\w]*>\\s*)?::)*)\\s*(operator)((?:\\s*(?:\\+\\+|--|\\(\\)|\\[]|->|\\+\\+|--|[+\\-!~*\\&]|->\\*|[*/%+\\-]|<<|>>|<=>|<|<=|>|>=|==|!=|[\\&\\^|]|&&|\\|\\||=|\\+=|-=|\\*=|/=|%=|<<=|>>=|&=|\\^=|\\|=|,)|\\s+(?:(?:new|new\\[]|delete|delete\\[])|(?:[a-zA-Z_]\\w*\\s*(?:<[\\s<>,\\w]*>\\s*)?::)*[a-zA-Z_]\\w*\\s*&?)))\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.scope.objcpp"
@@ -5005,7 +5005,7 @@
         "operators": {
           "patterns": [
             {
-              "match": "(?-mix:(?<!\\w)((?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept))(?!\\w))",
+              "match": "(?-im:(?<!\\w)((?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept))(?!\\w))",
               "name": "keyword.operator.$1.objcpp"
             },
             {
@@ -5029,7 +5029,7 @@
               "name": "keyword.operator.bitwise.shift.objcpp"
             },
             {
-              "match": "!=|<=|>=|==|<|>",
+              "match": "!=|<=|>=|==|[<>]",
               "name": "keyword.operator.comparison.objcpp"
             },
             {
@@ -5037,7 +5037,7 @@
               "name": "keyword.operator.logical.objcpp"
             },
             {
-              "match": "&|\\||\\^|~",
+              "match": "[\\&|\\^~]",
               "name": "keyword.operator.objcpp"
             },
             {
@@ -5045,7 +5045,7 @@
               "name": "keyword.operator.assignment.objcpp"
             },
             {
-              "match": "%|\\*|/|-|\\+",
+              "match": "[%*/\\-+]",
               "name": "keyword.operator.objcpp"
             },
             {
@@ -5170,7 +5170,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -5217,7 +5217,7 @@
                   "name": "invalid.illegal.stray-$1.objcpp"
                 }
               },
-              "match": "^\\s*#\\s*(else|elif|endif)\\b"
+              "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
             }
           ]
         },
@@ -5250,7 +5250,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -5297,14 +5297,14 @@
                   "name": "invalid.illegal.stray-$1.objcpp"
                 }
               },
-              "match": "^\\s*#\\s*(else|elif|endif)\\b"
+              "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
             }
           ]
         },
         "preprocessor-rule-conditional-line": {
           "patterns": [
             {
-              "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
+              "match": "\\bdefined\\b(?:\\s*$|(?=\\s*\\(*\\s*(?!defined\\b)[a-zA-Z_$][\\w$]*\\b\\s*\\)*\\s*(?:\\n|//|/\\*|[?:]|&&|\\|\\||\\\\\\s*\\n)))",
               "name": "keyword.control.directive.conditional.objcpp"
             },
             {
@@ -5376,13 +5376,13 @@
         "preprocessor-rule-define-line-blocks": {
           "patterns": [
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -5408,17 +5408,17 @@
               "include": "#vararg_ellipses-c"
             },
             {
-              "match": "(?-mix:##?[a-zA-Z_]\\w*(?!\\w))",
+              "match": "(?-im:##?[a-zA-Z_]\\w*(?!\\w))",
               "name": "variable.other.macro.argument.objcpp"
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -5440,7 +5440,7 @@
               "name": "punctuation.section.parens.end.bracket.round.objcpp"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
               "end": "(?<=\\))(?!\\w)|(?<!\\\\)(?=\\s*\\n)",
               "name": "meta.function.objcpp",
               "patterns": [
@@ -5530,7 +5530,7 @@
               "include": "#operators"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objcpp"
@@ -5604,7 +5604,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -5638,10 +5638,10 @@
                       "name": "punctuation.definition.directive.objcpp"
                     }
                   },
-                  "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
                   "patterns": [
                     {
-                      "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                      "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                       "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                       "name": "meta.preprocessor.objcpp",
                       "patterns": [
@@ -5658,7 +5658,7 @@
                 {
                   "begin": "\\n",
                   "contentName": "comment.block.preprocessor.if-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -5701,7 +5701,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -5735,10 +5735,10 @@
                       "name": "punctuation.definition.directive.objcpp"
                     }
                   },
-                  "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
                   "patterns": [
                     {
-                      "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                      "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                       "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                       "name": "meta.preprocessor.objcpp",
                       "patterns": [
@@ -5755,7 +5755,7 @@
                 {
                   "begin": "\\n",
                   "contentName": "comment.block.preprocessor.if-branch.in-block.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -5782,10 +5782,10 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+          "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objcpp",
               "patterns": [
@@ -5800,7 +5800,7 @@
             {
               "begin": "\\n",
               "contentName": "comment.block.preprocessor.elif-branch.objcpp",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -5844,7 +5844,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -5894,7 +5894,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.if-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -5906,7 +5906,7 @@
                 },
                 {
                   "begin": "\\n",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "$base"
@@ -5946,7 +5946,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -5996,7 +5996,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.if-branch.in-block.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -6008,7 +6008,7 @@
                 },
                 {
                   "begin": "\\n",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#block_innards-c"
@@ -6035,7 +6035,7 @@
           "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objcpp",
               "patterns": [
@@ -6049,7 +6049,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*endif\\b))",
               "patterns": [
                 {
                   "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -6089,7 +6089,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.elif-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -6122,7 +6122,7 @@
           "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objcpp",
               "patterns": [
@@ -6136,7 +6136,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*endif\\b))",
               "patterns": [
                 {
                   "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -6176,7 +6176,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.elif-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -6242,7 +6242,7 @@
               "name": "variable.parameter.probably.objcpp"
             }
           },
-          "match": "(?:(?:([a-zA-Z_]\\w*)\\s*(?==)|(?<=\\w\\s|\\*\\/|[&*>\\]\\)])\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:(?:,|\\))))))"
+          "match": "(?:([a-zA-Z_]\\w*)\\s*(?==)|(?<=\\w\\s|\\*/|[\\&*>\\])])\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[]\\s*)?[,)]))"
         },
         "scope_resolution": {
           "captures": {
@@ -6267,13 +6267,13 @@
               "name": "punctuation.separator.namespace.access.objcpp"
             }
           },
-          "match": "((?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*\\s*)([a-zA-Z_]\\w*)\\s*((?:<(?:[\\s<>,\\w])*>\\s*))?(::)",
+          "match": "((?:[a-zA-Z_]\\w*\\s*(?:<[\\s<>,\\w]*>\\s*)?::)*\\s*)([a-zA-Z_]\\w*)\\s*(<[\\s<>,\\w]*>\\s*)?(::)",
           "name": "meta.scope-resolution.objcpp"
         },
         "special_block": {
           "patterns": [
             {
-              "begin": "\\b(using)\\s+(namespace)\\s+(?:((?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*)\\s*)?((?<!\\w)[a-zA-Z_]\\w*(?!\\w))(?=;|\\n)",
+              "begin": "\\b(using)\\s+(namespace)\\s+(?:((?:[a-zA-Z_]\\w*\\s*(?:<[\\s<>,\\w]*>\\s*)?::)*)\\s*)?((?<!\\w)[a-zA-Z_]\\w*(?!\\w))(?=[;\\n])",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.other.using.directive.objcpp"
@@ -6301,7 +6301,7 @@
               "name": "meta.using-namespace-declaration.objcpp"
             },
             {
-              "begin": "(?<!\\w)(namespace)\\s+(?:(?:((?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*[a-zA-Z_]\\w*)|(?={)))",
+              "begin": "(?<!\\w)(namespace)\\s+(?:((?:[a-zA-Z_]\\w*\\s*(?:<[\\s<>,\\w]*>\\s*)?::)*[a-zA-Z_]\\w*)|(?=\\{))",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.other.namespace.definition.objcpp storage.type.namespace.definition.objcpp"
@@ -6309,7 +6309,7 @@
                 "2": {
                   "patterns": [
                     {
-                      "match": "(?-mix:(?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+                      "match": "(?-im:(?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
                       "name": "entity.name.type.objcpp"
                     },
                     {
@@ -6319,7 +6319,7 @@
                   ]
                 }
               },
-              "end": "(?<=\\})|(?=(;|,|\\(|\\)|>|\\[|\\]|=))",
+              "end": "(?<=})|(?=([;,()>\\[\\]=]))",
               "name": "meta.namespace-block.objcpp",
               "patterns": [
                 {
@@ -6329,7 +6329,7 @@
                       "name": "punctuation.definition.scope.objcpp"
                     }
                   },
-                  "end": "\\}",
+                  "end": "}",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.definition.scope.objcpp"
@@ -6353,7 +6353,7 @@
               ]
             },
             {
-              "begin": "\\b(?:(class)|(struct))\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*:\\s*(public|protected|private)\\s*([_A-Za-z][_A-Za-z0-9]*\\b)((\\s*,\\s*(public|protected|private)\\s*[_A-Za-z][_A-Za-z0-9]*\\b)*))?",
+              "begin": "\\b(?:(class)|(struct))\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*:\\s*(p(?:ublic|rotected|rivate))\\s*([_A-Za-z][_A-Za-z0-9]*\\b)((\\s*,\\s*(p(?:ublic|rotected|rivate))\\s*[_A-Za-z][_A-Za-z0-9]*\\b)*))?",
               "beginCaptures": {
                 "1": {
                   "name": "storage.type.class.objcpp"
@@ -6373,7 +6373,7 @@
                 "7": {
                   "patterns": [
                     {
-                      "match": "(public|protected|private)",
+                      "match": "(p(?:ublic|rotected|rivate))",
                       "name": "storage.type.modifier.access.objcpp"
                     },
                     {
@@ -6383,7 +6383,7 @@
                   ]
                 }
               },
-              "end": "(?<=\\})|(;)|(?=(\\(|\\)|>|\\[|\\]|=))",
+              "end": "(?<=})|(;)|(?=([()>\\[\\]=]))",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.terminator.statement.objcpp"
@@ -6401,7 +6401,7 @@
                       "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                     }
                   },
-                  "end": "(\\})(\\s*\\n)?",
+                  "end": "(})(\\s*\\n)?",
                   "endCaptures": {
                     "1": {
                       "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -6434,7 +6434,7 @@
                   "name": "storage.modifier.objcpp"
                 }
               },
-              "end": "(?<=\\})|(?=\\w)|(?=\\s*#\\s*endif\\b)",
+              "end": "(?<=})|(?=\\w)|(?=\\s*#\\s*endif\\b)",
               "name": "meta.extern-block.objcpp",
               "patterns": [
                 {
@@ -6444,7 +6444,7 @@
                       "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                     }
                   },
-                  "end": "\\}|(?=\\s*#\\s*endif\\b)",
+                  "end": "}|(?=\\s*#\\s*endif\\b)",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -6485,7 +6485,7 @@
         "string_escaped_char-c": {
           "patterns": [
             {
-              "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+              "match": "\\\\([\\\\abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
               "name": "constant.character.escape.objcpp"
             },
             {
@@ -6497,7 +6497,7 @@
         "string_placeholder-c": {
           "patterns": [
             {
-              "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
+              "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|[ljtzqL]|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
               "name": "constant.other.placeholder.objcpp"
             }
           ]
@@ -6505,7 +6505,7 @@
         "strings": {
           "patterns": [
             {
-              "begin": "(u|u8|U|L)?\"",
+              "begin": "(u|u8|[UL])?\"",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.objcpp"
@@ -6523,7 +6523,7 @@
               "name": "string.quoted.double.objcpp",
               "patterns": [
                 {
-                  "match": "\\\\u\\h{4}|\\\\U\\h{8}",
+                  "match": "\\\\(?:u\\h{4}|U\\h{8})",
                   "name": "constant.character.escape.objcpp"
                 },
                 {
@@ -6544,7 +6544,7 @@
               ]
             },
             {
-              "begin": "(u|u8|U|L)?R\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
+              "begin": "(u|u8|[UL])?R\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.objcpp"
@@ -6598,7 +6598,7 @@
               ]
             },
             {
-              "begin": "(?-mix:(?<![\\da-fA-F])')",
+              "begin": "(?-im:(?<![\\da-fA-F])')",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.objcpp"
@@ -6656,10 +6656,10 @@
               ]
             }
           },
-          "match": "<(?:[\\s<>,\\w])*>\\s*"
+          "match": "<[\\s<>,\\w]*>\\s*"
         },
         "template_definition": {
-          "begin": "(?-mix:(?<!\\w)(template)\\s*(<))",
+          "begin": "(?-im:(?<!\\w)(template)\\s*(<))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.template.objcpp"
@@ -6668,7 +6668,7 @@
               "name": "punctuation.section.angle-brackets.start.template.definition.objcpp"
             }
           },
-          "end": "(?-mix:(>))",
+          "end": "(?-im:(>))",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.angle-brackets.end.template.definition.objcpp"
@@ -6723,7 +6723,7 @@
               "name": "entity.name.type.template.objcpp"
             }
           },
-          "match": "((?:(?:(?:(?:(?:(?:\\s*([a-zA-Z_]\\w*)|((?:[a-zA-Z_]\\w*\\s+)+)([a-zA-Z_]\\w*)))|([a-zA-Z_]\\w*)\\s*(\\.\\.\\.)\\s*([a-zA-Z_]\\w*)))|((?:[a-zA-Z_]\\w*\\s+)*)([a-zA-Z_]\\w*)\\s*([=])\\s*(\\w+)))\\s*(?:(?:(,)|(?=>))))"
+          "match": "((?:(?:(?:\\s*([a-zA-Z_]\\w*)|((?:[a-zA-Z_]\\w*\\s+)+)([a-zA-Z_]\\w*))|([a-zA-Z_]\\w*)\\s*(\\.\\.\\.)\\s*([a-zA-Z_]\\w*))|((?:[a-zA-Z_]\\w*\\s+)*)([a-zA-Z_]\\w*)\\s*(=)\\s*(\\w+))\\s*(?:(,)|(?=>)))"
         },
         "vararg_ellipses-c": {
           "match": "(?<!\\.)\\.\\.\\.(?!\\.)",
@@ -6791,8 +6791,8 @@
       ]
     },
     "method": {
-      "begin": "^(-|\\+)\\s*",
-      "end": "(?=\\{|#)|;",
+      "begin": "^([\\-+])\\s*",
+      "end": "(?=[{#])|;",
       "name": "meta.function.objcpp",
       "patterns": [
         {
@@ -6869,8 +6869,8 @@
       ]
     },
     "method_super": {
-      "begin": "^(?=-|\\+)",
-      "end": "(?<=\\})|(?=#)",
+      "begin": "^(?=[\\-+])",
+      "end": "(?<=})|(?=#)",
       "name": "meta.function-with-body.objcpp",
       "patterns": [
         {
@@ -6909,7 +6909,7 @@
           "name": "constant.numeric.preprocessor.objcpp"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=/[/*])|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
@@ -6921,7 +6921,7 @@
               "name": "keyword.control.import.else.objcpp"
             }
           },
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#interface_innards"
@@ -6930,7 +6930,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*?(?:(?=/[/*])|$))",
           "name": "comment.block.preprocessor.if-branch.objcpp",
           "patterns": [
             {
@@ -6956,7 +6956,7 @@
           "name": "constant.numeric.preprocessor.objcpp"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=/[/*])|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
@@ -6968,7 +6968,7 @@
               "name": "keyword.control.import.else.objcpp"
             }
           },
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#interface_innards"
@@ -6977,7 +6977,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*?(?:(?=/[/*])|$))",
           "name": "comment.block.preprocessor.if-branch.objcpp",
           "patterns": [
             {
@@ -7003,7 +7003,7 @@
           "name": "constant.numeric.preprocessor.objcpp"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=/[/*])|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b).*",
@@ -7016,7 +7016,7 @@
             }
           },
           "contentName": "comment.block.preprocessor.else-branch.objcpp",
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#disabled"
@@ -7028,7 +7028,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#implementation_innards"
@@ -7050,7 +7050,7 @@
           "name": "constant.numeric.preprocessor.objcpp"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=/[/*])|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b).*",
@@ -7063,7 +7063,7 @@
             }
           },
           "contentName": "comment.block.preprocessor.else-branch.objcpp",
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#disabled"
@@ -7075,7 +7075,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#interface_innards"
@@ -7085,7 +7085,7 @@
       ]
     },
     "preprocessor-rule-other-implementation": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=/[/*])|$))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.objcpp"
@@ -7094,7 +7094,7 @@
           "name": "keyword.control.import.objcpp"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=(?://|/\\*))|$)",
+      "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=/[/*])|$)",
       "patterns": [
         {
           "include": "#implementation_innards"
@@ -7102,7 +7102,7 @@
       ]
     },
     "preprocessor-rule-other-interface": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=/[/*])|$))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.objcpp"
@@ -7111,7 +7111,7 @@
           "name": "keyword.control.import.objcpp"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=(?://|/\\*))|$)",
+      "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=/[/*])|$)",
       "patterns": [
         {
           "include": "#interface_innards"
@@ -7202,7 +7202,7 @@
           "name": "variable.other.selector.objcpp"
         },
         {
-          "match": "\\b(self|super)\\b",
+          "match": "\\b(s(?:elf|uper))\\b",
           "name": "variable.language.objcpp"
         }
       ]
@@ -7210,7 +7210,7 @@
     "string_escaped_char": {
       "patterns": [
         {
-          "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+          "match": "\\\\([\\\\abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
           "name": "constant.character.escape.objcpp"
         },
         {
@@ -7222,7 +7222,7 @@
     "string_placeholder": {
       "patterns": [
         {
-          "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
+          "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|[ljtzqL]|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
           "name": "constant.other.placeholder.objcpp"
         },
         {