github-linguist 5.3.3 → 6.0.0

data/grammars/source.nut.json

@@ -1,9 +1,6 @@
 {
-  "comment": "Squirrel Syntax: version 0.2.1",
-  "fileTypes": [
-    "nut"
-  ],
   "name": "Squirrel",
+  "scopeName": "source.nut",
   "patterns": [
     {
       "include": "#special-block"
@@ -12,44 +9,44 @@
       "include": "#comments"
     },
     {
-      "match": "\\b(break|case|catch|default|do|else|for|foreach|if|resume|return|switch|throw|try|while|yield)\\b",
-      "name": "keyword.control.squirrel"
+      "name": "keyword.control.squirrel",
+      "match": "\\b(break|case|catch|default|do|else|for|foreach|if|resume|return|switch|throw|try|while|yield)\\b"
     },
     {
-      "match": "\\b(clone|delete|in|instanceof|typeof)\\b",
-      "name": "keyword.control.squirrel"
+      "name": "keyword.control.squirrel",
+      "match": "\\b(clone|delete|in|instanceof|typeof)\\b"
     },
     {
-      "match": "\\b(base|this)\\b",
-      "name": "variable.language.squirrel"
+      "name": "variable.language.squirrel",
+      "match": "\\b(base|this)\\b"
     },
     {
-      "match": "\\b(class|constructor|function|local)\\b",
-      "name": "storage.type.squirrel"
+      "name": "storage.type.squirrel",
+      "match": "\\b(class|constructor|function|local)\\b"
     },
     {
-      "match": "\\b(const|extends|static)\\b",
-      "name": "storage.modifier.squirrel"
+      "name": "storage.modifier.squirrel",
+      "match": "\\b(const|extends|static)\\b"
     },
     {
-      "match": "\\b(null|true|false)\\b",
-      "name": "constant.squirrel.squirrel"
+      "name": "constant.squirrel.squirrel",
+      "match": "\\b(null|true|false)\\b"
     },
     {
-      "match": "!|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|==|=|!=|<=>|<=|>=|<-|>>>|<<|>>|<|>|!|&&|\\|\\||\\?\\:|\\*=|(?<!\\()/=|%=|\\+=|\\-=|&=|%=|\\.",
-      "name": "keyword.operator.squirrel"
+      "name": "keyword.operator.squirrel",
+      "match": "!|%|\u0026|\\*|\\-\\-|\\-|\\+\\+|\\+|==|=|!=|\u003c=\u003e|\u003c=|\u003e=|\u003c-|\u003e\u003e\u003e|\u003c\u003c|\u003e\u003e|\u003c|\u003e|!|\u0026\u0026|\\|\\||\\?\\:|\\*=|(?\u003c!\\()/=|%=|\\+=|\\-=|\u0026=|%=|\\."
     },
     {
-      "match": "\\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\\.[0-9]+)?))\\b",
-      "name": "constant.numeric.squirrel"
+      "name": "constant.numeric.squirrel",
+      "match": "\\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\\.[0-9]+)?))\\b"
     },
     {
-      "match": "\\b([_A-Za-z][_A-Za-z0-9]\\w*)\\b(?=\\s*(?:[({\"']|\\[\\[))",
-      "name": "support.function.any-method.squirrel"
+      "name": "support.function.any-method.squirrel",
+      "match": "\\b([_A-Za-z][_A-Za-z0-9]\\w*)\\b(?=\\s*(?:[({\"']|\\[\\[))"
     },
     {
-      "match": "(?<=[^.]\\.)\\b([_A-Za-z][_A-Za-z0-9]\\w*)",
-      "name": "variable.other.squirrel"
+      "name": "variable.other.squirrel",
+      "match": "(?\u003c=[^.]\\.)\\b([_A-Za-z][_A-Za-z0-9]\\w*)"
     },
     {
       "include": "#attributes"
@@ -63,9 +60,9 @@
   ],
   "repository": {
     "attributes": {
-      "begin": "</",
-      "end": "/>",
       "name": "meta.attributes.squirrel",
+      "begin": "\u003c/",
+      "end": "/\u003e",
       "patterns": [
         {
           "include": "$base"
@@ -75,31 +72,108 @@
     "block": {
       "patterns": [
         {
+          "name": "meta.block.squirrel",
           "begin": "\\{",
+          "end": "\\}",
+          "patterns": [
+            {
+              "include": "$base"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.squirrel"
             }
           },
-          "end": "\\}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.squirrel"
             }
+          }
+        }
+      ]
+    },
+    "comments": {
+      "patterns": [
+        {
+          "name": "comment.block.squirrel",
+          "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
+          "captures": {
+            "1": {
+              "name": "meta.toc-list.banner.block.squirrel"
+            }
+          }
+        },
+        {
+          "name": "comment.block.squirrel",
+          "begin": "/\\*",
+          "end": "\\*/",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.begin.squirrel"
+            }
           },
-          "name": "meta.block.squirrel",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.end.squirrel"
+            }
+          }
+        },
+        {
+          "begin": "(^[ \\t]+)?(?=//)",
+          "end": "(?!\\G)",
           "patterns": [
             {
-              "include": "$base"
+              "name": "comment.line.double-slash.squirrel",
+              "begin": "//",
+              "end": "(?=\\n)",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.comment.squirrel"
+                }
+              }
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.squirrel"
+            }
+          }
+        },
+        {
+          "begin": "(^[ \\t]+)?(?=#)",
+          "end": "(?!\\G)",
+          "patterns": [
+            {
+              "name": "comment.line.hash.squirrel",
+              "begin": "#",
+              "end": "(?=\\n)",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.comment.squirrel"
+                }
+              }
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.squirrel"
             }
-          ]
+          }
         }
       ]
     },
     "special-block": {
       "patterns": [
         {
+          "name": "meta.class-block.squirrel",
           "begin": "\\b(class)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*(extends)\\s*([_A-Za-z][_A-Za-z0-9]*\\b))?",
+          "end": "(?\u003c=\\})|(?=(=))",
+          "patterns": [
+            {
+              "include": "#block"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.squirrel"
@@ -113,17 +187,17 @@
             "5": {
               "name": "entity.name.type.inherited.squirrel"
             }
-          },
-          "end": "(?<=\\})|(?=(=))",
-          "name": "meta.class-block.squirrel",
+          }
+        },
+        {
+          "name": "meta.function-block.squirrel",
+          "begin": "\\b(function)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*(::)\\s*([_A-Za-z][_A-Za-z0-9]*\\b))?",
+          "end": "(?\u003c=\\})|(?=(=))",
           "patterns": [
             {
               "include": "#block"
             }
-          ]
-        },
-        {
-          "begin": "\\b(function)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*(::)\\s*([_A-Za-z][_A-Za-z0-9]*\\b))?",
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.squirrel"
@@ -137,17 +211,17 @@
             "5": {
               "name": "entity.name.function.squirrel"
             }
-          },
-          "end": "(?<=\\})|(?=(=))",
-          "name": "meta.function-block.squirrel",
+          }
+        },
+        {
+          "name": "meta.namespace-block.squirrel",
+          "begin": "\\b([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*(\u003c-))",
+          "end": "(?\u003c=\\})|(?=(;|,|\\(|\\)|\u003e|\\[|\\]|=))",
           "patterns": [
             {
               "include": "#block"
             }
-          ]
-        },
-        {
-          "begin": "\\b([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*(<-))",
+          ],
           "beginCaptures": {
             "1": {
               "name": "entity.name.type.squirrel"
@@ -155,112 +229,34 @@
             "3": {
               "name": "punctuation.separator.namespace.access.squirrel"
             }
-          },
-          "end": "(?<=\\})|(?=(;|,|\\(|\\)|>|\\[|\\]|=))",
-          "name": "meta.namespace-block.squirrel",
-          "patterns": [
-            {
-              "include": "#block"
-            }
-          ]
+          }
         }
       ]
     },
-    "comments": {
+    "strings": {
       "patterns": [
         {
-          "captures": {
-            "1": {
-              "name": "meta.toc-list.banner.block.squirrel"
-            }
-          },
-          "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
-          "name": "comment.block.squirrel"
-        },
-        {
-          "begin": "/\\*",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.begin.squirrel"
-            }
-          },
-          "end": "\\*/",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.end.squirrel"
-            }
-          },
-          "name": "comment.block.squirrel"
-        },
-        {
-          "begin": "(^[ \\t]+)?(?=//)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.squirrel"
-            }
-          },
-          "end": "(?!\\G)",
-          "patterns": [
-            {
-              "begin": "//",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.comment.squirrel"
-                }
-              },
-              "end": "(?=\\n)",
-              "name": "comment.line.double-slash.squirrel"
-            }
-          ]
-        },
-        {
-          "begin": "(^[ \\t]+)?(?=#)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.squirrel"
-            }
-          },
-          "end": "(?!\\G)",
+          "name": "string.quoted.double.squirrel",
+          "begin": "@?\"",
+          "end": "\"",
           "patterns": [
             {
-              "begin": "#",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.comment.squirrel"
-                }
-              },
-              "end": "(?=\\n)",
-              "name": "comment.line.hash.squirrel"
+              "name": "constant.character.escape.squirrel",
+              "match": "\\\\."
             }
-          ]
-        }
-      ]
-    },
-    "strings": {
-      "patterns": [
-        {
-          "begin": "@?\"",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.squirrel"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.squirrel"
             }
-          },
-          "name": "string.quoted.double.squirrel",
-          "patterns": [
-            {
-              "match": "\\\\.",
-              "name": "constant.character.escape.squirrel"
-            }
-          ]
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.nut"
-}
+  }
+}

data/grammars/source.objc++.json

@@ -1,11 +1,6 @@
 {
-  "fileTypes": [
-    "mm",
-    "M",
-    "h"
-  ],
-  "keyEquivalent": "^~O",
   "name": "Objective-C++",
+  "scopeName": "source.objc++",
   "patterns": [
     {
       "include": "source.c++"
@@ -13,7 +8,5 @@
     {
       "include": "source.objc"
     }
-  ],
-  "scopeName": "source.objc++",
-  "uuid": "FDAB1813-6B1C-11D9-BCAC-000D93589AF6"
-}
+  ]
+}

data/grammars/source.objc.json

@@ -1,13 +1,17 @@
 {
-  "fileTypes": [
-    "m",
-    "h"
-  ],
-  "keyEquivalent": "^~O",
   "name": "Objective-C",
+  "scopeName": "source.objc",
   "patterns": [
     {
+      "name": "meta.interface-or-protocol.objc",
+      "contentName": "meta.scope.interface.objc",
       "begin": "((@)(interface|protocol))(?!.+;)\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*((:)(?:\\s*)([A-Za-z][A-Za-z0-9]*))?(\\s|\\n)?",
+      "end": "((@)end)\\b",
+      "patterns": [
+        {
+          "include": "#interface_innards"
+        }
+      ],
       "captures": {
         "1": {
           "name": "storage.type.objc"
@@ -30,18 +34,18 @@
         "9": {
           "name": "meta.inherited-class.objc"
         }
-      },
-      "contentName": "meta.scope.interface.objc",
+      }
+    },
+    {
+      "name": "meta.implementation.objc",
+      "contentName": "meta.scope.implementation.objc",
+      "begin": "((@)(implementation))\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*(?::\\s*([A-Za-z][A-Za-z0-9]*))?",
       "end": "((@)end)\\b",
-      "name": "meta.interface-or-protocol.objc",
       "patterns": [
         {
-          "include": "#interface_innards"
+          "include": "#implementation_innards"
         }
-      ]
-    },
-    {
-      "begin": "((@)(implementation))\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*(?::\\s*([A-Za-z][A-Za-z0-9]*))?",
+      ],
       "captures": {
         "1": {
           "name": "storage.type.objc"
@@ -55,116 +59,122 @@
         "5": {
           "name": "entity.other.inherited-class.objc"
         }
-      },
-      "contentName": "meta.scope.implementation.objc",
-      "end": "((@)end)\\b",
-      "name": "meta.implementation.objc",
-      "patterns": [
-        {
-          "include": "#implementation_innards"
-        }
-      ]
+      }
     },
     {
-      "applyEndPatternLast": true,
       "begin": "(?=@\")",
       "end": "(?=\\S)",
       "patterns": [
         {
+          "name": "string.quoted.double.objc",
           "begin": "@?\"",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.objc"
-            }
-          },
           "end": "\"",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.objc"
-            }
-          },
-          "name": "string.quoted.double.objc",
           "patterns": [
             {
               "include": "source.c#string_escaped_char"
             },
             {
-              "match": "(?x)%\n    \t\t\t\t\t\t(\\d+\\$)?                             # field (argument #)\n    \t\t\t\t\t\t[#0\\- +']*                          # flags\n    \t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)?              # minimum field width\n    \t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?         # precision\n    \t\t\t\t\t\t[@]                                  # conversion type\n    \t\t\t\t\t",
-              "name": "constant.other.placeholder.objc"
+              "name": "constant.other.placeholder.objc",
+              "match": "(?x)%\n    \t\t\t\t\t\t(\\d+\\$)?                             # field (argument #)\n    \t\t\t\t\t\t[#0\\- +']*                          # flags\n    \t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)?              # minimum field width\n    \t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?         # precision\n    \t\t\t\t\t\t[@]                                  # conversion type\n    \t\t\t\t\t"
             },
             {
               "include": "source.c#string_placeholder"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.objc"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.objc"
+            }
+          }
         }
-      ]
+      ],
+      "applyEndPatternLast": true
     },
     {
-      "begin": "\\b(id)\\s*(?=<)",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.objc"
-        }
-      },
-      "end": "(?<=>)",
       "name": "meta.id-with-protocol.objc",
+      "begin": "\\b(id)\\s*(?=\u003c)",
+      "end": "(?\u003c=\u003e)",
       "patterns": [
         {
           "include": "#protocol_list"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.objc"
+        }
+      }
     },
     {
-      "match": "\\b(NS_DURING|NS_HANDLER|NS_ENDHANDLER)\\b",
-      "name": "keyword.control.macro.objc"
+      "name": "keyword.control.macro.objc",
+      "match": "\\b(NS_DURING|NS_HANDLER|NS_ENDHANDLER)\\b"
     },
     {
+      "name": "keyword.control.exception.objc",
+      "match": "(@)(try|catch|finally|throw)\\b",
       "captures": {
         "1": {
           "name": "punctuation.definition.keyword.objc"
         }
-      },
-      "match": "(@)(try|catch|finally|throw)\\b",
-      "name": "keyword.control.exception.objc"
+      }
     },
     {
+      "name": "keyword.control.synchronize.objc",
+      "match": "(@)(synchronized)\\b",
       "captures": {
         "1": {
           "name": "punctuation.definition.keyword.objc"
         }
-      },
-      "match": "(@)(synchronized)\\b",
-      "name": "keyword.control.synchronize.objc"
+      }
     },
     {
+      "name": "keyword.control.protocol-specification.objc",
+      "match": "(@)(required|optional)\\b",
       "captures": {
         "1": {
           "name": "punctuation.definition.keyword.objc"
         }
-      },
-      "match": "(@)(required|optional)\\b",
-      "name": "keyword.control.protocol-specification.objc"
+      }
     },
     {
+      "name": "keyword.other.objc",
+      "match": "(@)(defs|encode)\\b",
       "captures": {
         "1": {
           "name": "punctuation.definition.keyword.objc"
         }
-      },
-      "match": "(@)(defs|encode)\\b",
-      "name": "keyword.other.objc"
+      }
     },
     {
+      "name": "storage.type.objc",
+      "match": "(@)(class|protocol)\\b",
       "captures": {
         "1": {
           "name": "punctuation.definition.storage.type.objc"
         }
-      },
-      "match": "(@)(class|protocol)\\b",
-      "name": "storage.type.objc"
+      }
     },
     {
+      "name": "meta.selector.objc",
+      "contentName": "meta.selector.method-name.objc",
       "begin": "((@)selector)\\s*(\\()",
+      "end": "(\\))",
+      "patterns": [
+        {
+          "name": "support.function.any-method.name-of-parameter.objc",
+          "match": "\\b(?:[a-zA-Z_:][\\w]*)+",
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.arguments.objc"
+            }
+          }
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type.objc"
@@ -176,38 +186,24 @@
           "name": "punctuation.definition.storage.type.objc"
         }
       },
-      "contentName": "meta.selector.method-name.objc",
-      "end": "(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.storage.type.objc"
         }
-      },
-      "name": "meta.selector.objc",
-      "patterns": [
-        {
-          "captures": {
-            "1": {
-              "name": "punctuation.separator.arguments.objc"
-            }
-          },
-          "match": "\\b(?:[a-zA-Z_:][\\w]*)+",
-          "name": "support.function.any-method.name-of-parameter.objc"
-        }
-      ]
+      }
     },
     {
+      "name": "storage.modifier.objc",
+      "match": "(@)(synchronized|public|package|private|protected)\\b",
       "captures": {
         "1": {
           "name": "punctuation.definition.storage.modifier.objc"
         }
-      },
-      "match": "(@)(synchronized|public|package|private|protected)\\b",
-      "name": "storage.modifier.objc"
+      }
     },
     {
-      "match": "\\b(YES|NO|Nil|nil)\\b",
-      "name": "constant.language.objc"
+      "name": "constant.language.objc",
+      "match": "\\b(YES|NO|Nil|nil)\\b"
     },
     {
       "include": "source.objc.platform"
@@ -224,99 +220,81 @@
   ],
   "repository": {
     "bracketed_content": {
+      "name": "meta.bracketed.objc",
       "begin": "\\[",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.scope.begin.objc"
-        }
-      },
       "end": "\\]",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.scope.end.objc"
-        }
-      },
-      "name": "meta.bracketed.objc",
       "patterns": [
         {
-          "begin": "(?=predicateWithFormat:)(?<=NSPredicate )(predicateWithFormat:)",
-          "beginCaptures": {
-            "1": {
-              "name": "support.function.any-method.objc"
-            },
-            "2": {
-              "name": "punctuation.separator.arguments.objc"
-            }
-          },
-          "end": "(?=\\])",
           "name": "meta.function-call.predicate.objc",
+          "begin": "(?=predicateWithFormat:)(?\u003c=NSPredicate )(predicateWithFormat:)",
+          "end": "(?=\\])",
           "patterns": [
             {
+              "name": "support.function.any-method.name-of-parameter.objc",
+              "match": "\\bargument(Array|s)(:)",
               "captures": {
                 "1": {
                   "name": "punctuation.separator.arguments.objc"
                 }
-              },
-              "match": "\\bargument(Array|s)(:)",
-              "name": "support.function.any-method.name-of-parameter.objc"
+              }
             },
             {
+              "name": "invalid.illegal.unknown-method.objc",
+              "match": "\\b\\w+(:)",
               "captures": {
                 "1": {
                   "name": "punctuation.separator.arguments.objc"
                 }
-              },
-              "match": "\\b\\w+(:)",
-              "name": "invalid.illegal.unknown-method.objc"
+              }
             },
             {
+              "name": "string.quoted.double.objc",
               "begin": "@\"",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.string.begin.objc"
-                }
-              },
               "end": "\"",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.string.end.objc"
-                }
-              },
-              "name": "string.quoted.double.objc",
               "patterns": [
                 {
-                  "match": "\\b(AND|OR|NOT|IN)\\b",
-                  "name": "keyword.operator.logical.predicate.cocoa"
+                  "name": "keyword.operator.logical.predicate.cocoa",
+                  "match": "\\b(AND|OR|NOT|IN)\\b"
                 },
                 {
-                  "match": "\\b(ALL|ANY|SOME|NONE)\\b",
-                  "name": "constant.language.predicate.cocoa"
+                  "name": "constant.language.predicate.cocoa",
+                  "match": "\\b(ALL|ANY|SOME|NONE)\\b"
                 },
                 {
-                  "match": "\\b(NULL|NIL|SELF|TRUE|YES|FALSE|NO|FIRST|LAST|SIZE)\\b",
-                  "name": "constant.language.predicate.cocoa"
+                  "name": "constant.language.predicate.cocoa",
+                  "match": "\\b(NULL|NIL|SELF|TRUE|YES|FALSE|NO|FIRST|LAST|SIZE)\\b"
                 },
                 {
-                  "match": "\\b(MATCHES|CONTAINS|BEGINSWITH|ENDSWITH|BETWEEN)\\b",
-                  "name": "keyword.operator.comparison.predicate.cocoa"
+                  "name": "keyword.operator.comparison.predicate.cocoa",
+                  "match": "\\b(MATCHES|CONTAINS|BEGINSWITH|ENDSWITH|BETWEEN)\\b"
                 },
                 {
-                  "match": "\\bC(ASEINSENSITIVE|I)\\b",
-                  "name": "keyword.other.modifier.predicate.cocoa"
+                  "name": "keyword.other.modifier.predicate.cocoa",
+                  "match": "\\bC(ASEINSENSITIVE|I)\\b"
                 },
                 {
-                  "match": "\\b(ANYKEY|SUBQUERY|CAST|TRUEPREDICATE|FALSEPREDICATE)\\b",
-                  "name": "keyword.other.predicate.cocoa"
+                  "name": "keyword.other.predicate.cocoa",
+                  "match": "\\b(ANYKEY|SUBQUERY|CAST|TRUEPREDICATE|FALSEPREDICATE)\\b"
                 },
                 {
-                  "match": "\\\\(\\\\|[abefnrtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x[a-zA-Z0-9]+)",
-                  "name": "constant.character.escape.objc"
+                  "name": "constant.character.escape.objc",
+                  "match": "\\\\(\\\\|[abefnrtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x[a-zA-Z0-9]+)"
                 },
                 {
-                  "match": "\\\\.",
-                  "name": "invalid.illegal.unknown-escape.objc"
+                  "name": "invalid.illegal.unknown-escape.objc",
+                  "match": "\\\\."
+                }
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.begin.objc"
                 }
-              ]
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.end.objc"
+                }
+              }
             },
             {
               "include": "#special_variables"
@@ -327,10 +305,7 @@
             {
               "include": "$base"
             }
-          ]
-        },
-        {
-          "begin": "(?=\\w)(?<=[\\w\\]\\s)\"]\\s)(\\w+(?:(:)|(?=\\])))",
+          ],
           "beginCaptures": {
             "1": {
               "name": "support.function.any-method.objc"
@@ -338,18 +313,21 @@
             "2": {
               "name": "punctuation.separator.arguments.objc"
             }
-          },
-          "end": "(?=\\])",
+          }
+        },
+        {
           "name": "meta.function-call.objc",
+          "begin": "(?=\\w)(?\u003c=[\\w\\]\\s)\"]\\s)(\\w+(?:(:)|(?=\\])))",
+          "end": "(?=\\])",
           "patterns": [
             {
+              "name": "support.function.any-method.name-of-parameter.objc",
+              "match": "\\b\\w+(:)",
               "captures": {
                 "1": {
                   "name": "punctuation.separator.arguments.objc"
                 }
-              },
-              "match": "\\b\\w+(:)",
-              "name": "support.function.any-method.name-of-parameter.objc"
+              }
             },
             {
               "include": "#special_variables"
@@ -360,7 +338,15 @@
             {
               "include": "$base"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.any-method.objc"
+            },
+            "2": {
+              "name": "punctuation.separator.arguments.objc"
+            }
+          }
         },
         {
           "include": "#special_variables"
@@ -371,7 +357,17 @@
         {
           "include": "$self"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.scope.begin.objc"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.scope.end.objc"
+        }
+      }
     },
     "c_functions": {
       "patterns": [
@@ -379,6 +375,8 @@
           "include": "source.c.platform#functions"
         },
         {
+          "name": "meta.function-call.c",
+          "match": "(?x) (?: (?= \\s )  (?:(?\u003c=else|new|return) | (?\u003c!\\w)) (\\s+))?\n            \t\t\t(\\b \n            \t\t\t\t(?!(while|for|do|if|else|switch|catch|enumerate|return|r?iterate)\\s*\\()(?:(?!NS)[A-Za-z_][A-Za-z0-9_]*+\\b | :: )++                  # actual name\n            \t\t\t)\n            \t\t\t \\s*(\\()",
           "captures": {
             "1": {
               "name": "punctuation.whitespace.function-call.leading.c"
@@ -389,56 +387,53 @@
             "3": {
               "name": "punctuation.definition.parameters.c"
             }
-          },
-          "match": "(?x) (?: (?= \\s )  (?:(?<=else|new|return) | (?<!\\w)) (\\s+))?\n            \t\t\t(\\b \n            \t\t\t\t(?!(while|for|do|if|else|switch|catch|enumerate|return|r?iterate)\\s*\\()(?:(?!NS)[A-Za-z_][A-Za-z0-9_]*+\\b | :: )++                  # actual name\n            \t\t\t)\n            \t\t\t \\s*(\\()",
-          "name": "meta.function-call.c"
+          }
         }
       ]
     },
     "comment": {
       "patterns": [
         {
+          "name": "comment.block.objc",
           "begin": "/\\*",
+          "end": "\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.objc"
             }
-          },
-          "end": "\\*/",
-          "name": "comment.block.objc"
+          }
         },
         {
           "begin": "(^[ \\t]+)?(?=//)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.objc"
-            }
-          },
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.double-slash.objc",
               "begin": "//",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.comment.objc"
-                }
-              },
               "end": "\\n",
-              "name": "comment.line.double-slash.objc",
               "patterns": [
                 {
-                  "match": "(?>\\\\\\s*\\n)",
-                  "name": "punctuation.separator.continuation.objc"
+                  "name": "punctuation.separator.continuation.objc",
+                  "match": "(?\u003e\\\\\\s*\\n)"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.comment.objc"
+                }
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.objc"
+            }
+          }
         }
       ]
     },
     "disabled": {
       "begin": "^\\s*#\\s*if(n?def)?\\b.*$",
-      "comment": "eat nested preprocessor if(def)s",
       "end": "^\\s*#\\s*endif\\b.*$",
       "patterns": [
         {
@@ -500,18 +495,30 @@
       ]
     },
     "method": {
+      "name": "meta.function.objc",
       "begin": "^(-|\\+)\\s*",
       "end": "(?=\\{|#)|;",
-      "name": "meta.function.objc",
       "patterns": [
         {
+          "name": "meta.return-type.objc",
           "begin": "(\\()",
+          "end": "(\\))\\s*(\\w+\\b)",
+          "patterns": [
+            {
+              "include": "#protocol_list"
+            },
+            {
+              "include": "#protocol_type_qualifier"
+            },
+            {
+              "include": "$base"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.type.begin.objc"
             }
           },
-          "end": "(\\))\\s*(\\w+\\b)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.type.end.objc"
@@ -519,8 +526,16 @@
             "2": {
               "name": "entity.name.function.objc"
             }
-          },
-          "name": "meta.return-type.objc",
+          }
+        },
+        {
+          "name": "entity.name.function.name-of-parameter.objc",
+          "match": "\\b\\w+(?=:)"
+        },
+        {
+          "name": "meta.argument-type.objc",
+          "begin": "((:))\\s*(\\()",
+          "end": "(\\))\\s*(\\w+\\b)?",
           "patterns": [
             {
               "include": "#protocol_list"
@@ -531,14 +546,7 @@
             {
               "include": "$base"
             }
-          ]
-        },
-        {
-          "match": "\\b\\w+(?=:)",
-          "name": "entity.name.function.name-of-parameter.objc"
-        },
-        {
-          "begin": "((:))\\s*(\\()",
+          ],
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.name-of-parameter.objc"
@@ -550,7 +558,6 @@
               "name": "punctuation.definition.type.begin.objc"
             }
           },
-          "end": "(\\))\\s*(\\w+\\b)?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.type.end.objc"
@@ -558,19 +565,7 @@
             "2": {
               "name": "variable.parameter.function.objc"
             }
-          },
-          "name": "meta.argument-type.objc",
-          "patterns": [
-            {
-              "include": "#protocol_list"
-            },
-            {
-              "include": "#protocol_type_qualifier"
-            },
-            {
-              "include": "$base"
-            }
-          ]
+          }
         },
         {
           "include": "#comment"
@@ -578,9 +573,9 @@
       ]
     },
     "method_super": {
-      "begin": "^(?=-|\\+)",
-      "end": "(?<=\\})|(?=#)",
       "name": "meta.function-with-body.objc",
+      "begin": "^(?=-|\\+)",
+      "end": "(?\u003c=\\})|(?=#)",
       "patterns": [
         {
           "include": "#method"
@@ -591,6 +586,8 @@
       ]
     },
     "pragma-mark": {
+      "name": "meta.section",
+      "match": "^\\s*(#\\s*(pragma\\s+mark)\\s+(.*))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.c"
@@ -601,27 +598,20 @@
         "3": {
           "name": "meta.toc-list.pragma-mark.c"
         }
-      },
-      "match": "^\\s*(#\\s*(pragma\\s+mark)\\s+(.*))",
-      "name": "meta.section"
+      }
     },
     "preprocessor-rule-disabled-implementation": {
       "begin": "^\\s*(#(if)\\s+(0)\\b).*",
-      "captures": {
-        "1": {
-          "name": "meta.preprocessor.c"
-        },
-        "2": {
-          "name": "keyword.control.import.if.c"
-        },
-        "3": {
-          "name": "constant.numeric.preprocessor.c"
-        }
-      },
       "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "patterns": [
+            {
+              "include": "#interface_innards"
+            }
+          ],
           "captures": {
             "1": {
               "name": "meta.preprocessor.c"
@@ -629,18 +619,11 @@
             "2": {
               "name": "keyword.control.import.else.c"
             }
-          },
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
-          "patterns": [
-            {
-              "include": "#interface_innards"
-            }
-          ]
+          }
         },
         {
-          "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
           "name": "comment.block.preprocessor.if-branch.c",
+          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
           "patterns": [
             {
               "include": "#disabled"
@@ -650,10 +633,7 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-disabled-interface": {
-      "begin": "^\\s*(#(if)\\s+(0)\\b).*",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.c"
@@ -664,11 +644,20 @@
         "3": {
           "name": "constant.numeric.preprocessor.c"
         }
-      },
+      }
+    },
+    "preprocessor-rule-disabled-interface": {
+      "begin": "^\\s*(#(if)\\s+(0)\\b).*",
       "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "patterns": [
+            {
+              "include": "#interface_innards"
+            }
+          ],
           "captures": {
             "1": {
               "name": "meta.preprocessor.c"
@@ -676,18 +665,11 @@
             "2": {
               "name": "keyword.control.import.else.c"
             }
-          },
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
-          "patterns": [
-            {
-              "include": "#interface_innards"
-            }
-          ]
+          }
         },
         {
-          "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
           "name": "comment.block.preprocessor.if-branch.c",
+          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
           "patterns": [
             {
               "include": "#disabled"
@@ -697,10 +679,7 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-enabled-implementation": {
-      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.c"
@@ -711,20 +690,15 @@
         "3": {
           "name": "constant.numeric.preprocessor.c"
         }
-      },
+      }
+    },
+    "preprocessor-rule-enabled-implementation": {
+      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
       "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
       "patterns": [
         {
-          "begin": "^\\s*(#\\s*(else)\\b).*",
-          "captures": {
-            "1": {
-              "name": "meta.preprocessor.c"
-            },
-            "2": {
-              "name": "keyword.control.import.else.c"
-            }
-          },
           "contentName": "comment.block.preprocessor.else-branch.c",
+          "begin": "^\\s*(#\\s*(else)\\b).*",
           "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
           "patterns": [
             {
@@ -733,10 +707,17 @@
             {
               "include": "#pragma-mark"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "meta.preprocessor.c"
+            },
+            "2": {
+              "name": "keyword.control.import.else.c"
+            }
+          }
         },
         {
-          "begin": "",
           "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
           "patterns": [
             {
@@ -744,10 +725,7 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-enabled-interface": {
-      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.c"
@@ -758,20 +736,15 @@
         "3": {
           "name": "constant.numeric.preprocessor.c"
         }
-      },
+      }
+    },
+    "preprocessor-rule-enabled-interface": {
+      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
       "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
       "patterns": [
         {
-          "begin": "^\\s*(#\\s*(else)\\b).*",
-          "captures": {
-            "1": {
-              "name": "meta.preprocessor.c"
-            },
-            "2": {
-              "name": "keyword.control.import.else.c"
-            }
-          },
           "contentName": "comment.block.preprocessor.else-branch.c",
+          "begin": "^\\s*(#\\s*(else)\\b).*",
           "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
           "patterns": [
             {
@@ -780,10 +753,17 @@
             {
               "include": "#pragma-mark"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "meta.preprocessor.c"
+            },
+            "2": {
+              "name": "keyword.control.import.else.c"
+            }
+          }
         },
         {
-          "begin": "",
           "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
           "patterns": [
             {
@@ -791,27 +771,27 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-other-implementation": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.c"
         },
         "2": {
-          "name": "keyword.control.import.c"
+          "name": "keyword.control.import.if.c"
+        },
+        "3": {
+          "name": "constant.numeric.preprocessor.c"
         }
-      },
+      }
+    },
+    "preprocessor-rule-other-implementation": {
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
       "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=(?://|/\\*))|$)",
       "patterns": [
         {
           "include": "#implementation_innards"
         }
-      ]
-    },
-    "preprocessor-rule-other-interface": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.c"
@@ -819,18 +799,37 @@
         "2": {
           "name": "keyword.control.import.c"
         }
-      },
+      }
+    },
+    "preprocessor-rule-other-interface": {
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
       "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=(?://|/\\*))|$)",
       "patterns": [
         {
           "include": "#interface_innards"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "meta.preprocessor.c"
+        },
+        "2": {
+          "name": "keyword.control.import.c"
+        }
+      }
     },
     "properties": {
       "patterns": [
         {
+          "name": "meta.property-with-attributes.objc",
           "begin": "((@)property)\\s*(\\()",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "name": "keyword.other.property.attribute",
+              "match": "\\b(getter|setter|readonly|readwrite|assign|retain|copy|atomic|nonatomic|strong|weak|nullable|nonnull|class)\\b"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.other.property.objc"
@@ -842,21 +841,15 @@
               "name": "punctuation.section.scope.begin.objc"
             }
           },
-          "end": "(\\))",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.scope.end.objc"
             }
-          },
-          "name": "meta.property-with-attributes.objc",
-          "patterns": [
-            {
-              "match": "\\b(getter|setter|readonly|readwrite|assign|retain|copy|atomic|nonatomic|strong|weak|nullable|nonnull|class)\\b",
-              "name": "keyword.other.property.attribute"
-            }
-          ]
+          }
         },
         {
+          "name": "meta.property.objc",
+          "match": "((@)property)\\b",
           "captures": {
             "1": {
               "name": "keyword.other.property.objc"
@@ -864,58 +857,54 @@
             "2": {
               "name": "punctuation.definition.keyword.objc"
             }
-          },
-          "match": "((@)property)\\b",
-          "name": "meta.property.objc"
+          }
         }
       ]
     },
     "property_directive": {
+      "name": "keyword.other.property.directive.objc",
+      "match": "(@)(dynamic|synthesize)\\b",
       "captures": {
         "1": {
           "name": "punctuation.definition.keyword.objc"
         }
-      },
-      "match": "(@)(dynamic|synthesize)\\b",
-      "name": "keyword.other.property.directive.objc"
+      }
     },
     "protocol_list": {
-      "begin": "(<)",
+      "name": "meta.protocol-list.objc",
+      "begin": "(\u003c)",
+      "end": "(\u003e)",
+      "patterns": [
+        {
+          "include": "source.objc.platform#protocols"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.section.scope.begin.objc"
         }
       },
-      "end": "(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.scope.end.objc"
         }
-      },
-      "name": "meta.protocol-list.objc",
-      "patterns": [
-        {
-          "include": "source.objc.platform#protocols"
-        }
-      ]
+      }
     },
     "protocol_type_qualifier": {
-      "match": "\\b(in|out|inout|oneway|bycopy|byref)\\b",
-      "name": "storage.modifier.protocol.objc"
+      "name": "storage.modifier.protocol.objc",
+      "match": "\\b(in|out|inout|oneway|bycopy|byref)\\b"
     },
     "special_variables": {
       "patterns": [
         {
-          "match": "\\b_cmd\\b",
-          "name": "variable.other.selector.objc"
+          "name": "variable.other.selector.objc",
+          "match": "\\b_cmd\\b"
         },
         {
-          "match": "\\b(self|super)\\b",
-          "name": "variable.language.objc"
+          "name": "variable.language.objc",
+          "match": "\\b(self|super)\\b"
         }
       ]
     }
-  },
-  "scopeName": "source.objc",
-  "uuid": "F85CC716-6B1C-11D9-9A20-000D93589AF6"
-}
+  }
+}