github-linguist 5.3.3 → 6.0.0

data/grammars/source.applescript.json

@@ -1,11 +1,6 @@
 {
-  "fileTypes": [
-    "applescript",
-    "script editor"
-  ],
-  "firstLineMatch": "^#!.*(osascript)",
-  "keyEquivalent": "^~A",
   "name": "AppleScript",
+  "scopeName": "source.applescript",
   "patterns": [
     {
       "include": "#blocks"
@@ -18,27 +13,34 @@
     "attributes.considering-ignoring": {
       "patterns": [
         {
-          "match": ",",
-          "name": "punctuation.separator.array.attributes.applescript"
+          "name": "punctuation.separator.array.attributes.applescript",
+          "match": ","
         },
         {
-          "match": "\\b(and)\\b",
-          "name": "keyword.control.attributes.and.applescript"
+          "name": "keyword.control.attributes.and.applescript",
+          "match": "\\b(and)\\b"
         },
         {
-          "match": "\\b(?i:case|diacriticals|hyphens|numeric\\s+strings|punctuation|white\\s+space)\\b",
-          "name": "constant.other.attributes.text.applescript"
+          "name": "constant.other.attributes.text.applescript",
+          "match": "\\b(?i:case|diacriticals|hyphens|numeric\\s+strings|punctuation|white\\s+space)\\b"
         },
         {
-          "match": "\\b(?i:application\\s+responses)\\b",
-          "name": "constant.other.attributes.application.applescript"
+          "name": "constant.other.attributes.application.applescript",
+          "match": "\\b(?i:application\\s+responses)\\b"
         }
       ]
     },
     "blocks": {
       "patterns": [
         {
+          "name": "meta.block.script.applescript",
           "begin": "^\\s*(script)\\s+(\\w+)",
+          "end": "^\\s*(end(?:\\s+script)?)(?=\\s*(--.*?)?$)",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.script.applescript"
@@ -47,21 +49,21 @@
               "name": "entity.name.type.script-object.applescript"
             }
           },
-          "end": "^\\s*(end(?:\\s+script)?)(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.script.applescript"
             }
-          },
-          "name": "meta.block.script.applescript",
+          }
+        },
+        {
+          "name": "meta.function.positional.applescript",
+          "begin": "^(?x)\n\t\t\t\t\t\t\\s*(to|on)\\s+ \t\t\t\t\t# \"on\" or \"to\"\n\t\t\t\t\t\t(\\w+)\t\t\t\t\t\t\t# function name\n\t\t\t\t\t\t(\\()\t\t\t\t\t\t\t# opening paren\n\t\t\t\t\t\t\t((?:[\\s,:\\{\\}]*(?:\\w+)?)*)\t# parameters\n\t\t\t\t\t\t(\\))\t\t\t\t\t\t\t# closing paren\n\t\t\t\t\t",
+          "end": "^\\s*(end)(?:\\s+(\\2))?(?=\\s*(--.*?)?$)",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^(?x)\n\t\t\t\t\t\t\\s*(to|on)\\s+ \t\t\t\t\t# \"on\" or \"to\"\n\t\t\t\t\t\t(\\w+)\t\t\t\t\t\t\t# function name\n\t\t\t\t\t\t(\\()\t\t\t\t\t\t\t# opening paren\n\t\t\t\t\t\t\t((?:[\\s,:\\{\\}]*(?:\\w+)?)*)\t# parameters\n\t\t\t\t\t\t(\\))\t\t\t\t\t\t\t# closing paren\n\t\t\t\t\t",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.function.applescript"
@@ -79,22 +81,32 @@
               "name": "punctuation.definition.parameters.end.applescript"
             }
           },
-          "comment": "\n\t\t\t\t\t\tThis is not a very well-designed rule.  For now,\n\t\t\t\t\t\twe can leave it like this though, as it sorta works.\n\t\t\t\t\t",
-          "end": "^\\s*(end)(?:\\s+(\\2))?(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.function.applescript"
             }
-          },
-          "name": "meta.function.positional.applescript",
+          }
+        },
+        {
+          "name": "meta.function.prepositional.applescript",
+          "begin": "^(?x)\n\t\t\t\t\t\t\\s*(to|on)\\s+ \t\t\t\t\t# \"on\" or \"to\"\n\t\t\t\t\t\t(\\w+)\t\t\t\t\t\t\t# function name\n\t\t\t\t\t\t(?:\\s+\n\t\t\t\t\t\t\t(of|in)\\s+\t\t\t\t\t# \"of\" or \"in\"\n\t\t\t\t\t\t\t(\\w+)\t\t\t\t\t\t# direct parameter\n\t\t\t\t\t\t)?\n\t\t\t\t\t\t(?=\\s+(above|against|apart\\s+from|around|aside\\s+from|at|below|beneath|beside|between|by|for|from|instead\\s+of|into|on|onto|out\\s+of|over|thru|under)\\b)\n\t\t\t\t\t",
+          "end": "^\\s*(end)(?:\\s+(\\2))?(?=\\s*(--.*?)?$)",
           "patterns": [
+            {
+              "match": "\\b(?i:above|against|apart\\s+from|around|aside\\s+from|at|below|beneath|beside|between|by|for|from|instead\\s+of|into|on|onto|out\\s+of|over|thru|under)\\s+(\\w+)\\b",
+              "captures": {
+                "1": {
+                  "name": "keyword.control.preposition.applescript"
+                },
+                "2": {
+                  "name": "variable.parameter.handler.applescript"
+                }
+              }
+            },
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^(?x)\n\t\t\t\t\t\t\\s*(to|on)\\s+ \t\t\t\t\t# \"on\" or \"to\"\n\t\t\t\t\t\t(\\w+)\t\t\t\t\t\t\t# function name\n\t\t\t\t\t\t(?:\\s+\n\t\t\t\t\t\t\t(of|in)\\s+\t\t\t\t\t# \"of\" or \"in\"\n\t\t\t\t\t\t\t(\\w+)\t\t\t\t\t\t# direct parameter\n\t\t\t\t\t\t)?\n\t\t\t\t\t\t(?=\\s+(above|against|apart\\s+from|around|aside\\s+from|at|below|beneath|beside|between|by|for|from|instead\\s+of|into|on|onto|out\\s+of|over|thru|under)\\b)\n\t\t\t\t\t",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.function.applescript"
@@ -109,33 +121,21 @@
               "name": "variable.parameter.handler.direct.applescript"
             }
           },
-          "comment": "TODO: match `given` parameters",
-          "end": "^\\s*(end)(?:\\s+(\\2))?(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.function.applescript"
             }
-          },
-          "name": "meta.function.prepositional.applescript",
+          }
+        },
+        {
+          "name": "meta.function.parameterless.applescript",
+          "begin": "^(?x)\n\t\t\t\t\t\t\\s*(to|on)\\s+ \t\t\t\t\t# \"on\" or \"to\"\n\t\t\t\t\t\t(\\w+)\t\t\t\t\t\t\t# function name\n\t\t\t\t\t\t(?=\\s*(--.*?)?$)\t\t\t\t# nothing else\n\t\t\t\t\t",
+          "end": "^\\s*(end)(?:\\s+(\\2))?(?=\\s*(--.*?)?$)",
           "patterns": [
-            {
-              "captures": {
-                "1": {
-                  "name": "keyword.control.preposition.applescript"
-                },
-                "2": {
-                  "name": "variable.parameter.handler.applescript"
-                }
-              },
-              "match": "\\b(?i:above|against|apart\\s+from|around|aside\\s+from|at|below|beneath|beside|between|by|for|from|instead\\s+of|into|on|onto|out\\s+of|over|thru|under)\\s+(\\w+)\\b"
-            },
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^(?x)\n\t\t\t\t\t\t\\s*(to|on)\\s+ \t\t\t\t\t# \"on\" or \"to\"\n\t\t\t\t\t\t(\\w+)\t\t\t\t\t\t\t# function name\n\t\t\t\t\t\t(?=\\s*(--.*?)?$)\t\t\t\t# nothing else\n\t\t\t\t\t",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.function.applescript"
@@ -144,18 +144,11 @@
               "name": "entity.name.function.handler.applescript"
             }
           },
-          "end": "^\\s*(end)(?:\\s+(\\2))?(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.function.applescript"
             }
-          },
-          "name": "meta.function.parameterless.applescript",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         },
         {
           "include": "#blocks.tell"
@@ -174,14 +167,14 @@
     "blocks.other": {
       "patterns": [
         {
+          "name": "meta.block.considering.applescript",
           "begin": "^\\s*(considering)\\b",
           "end": "^\\s*(end(?:\\s+considering)?)(?=\\s*(--.*?)?$)",
-          "name": "meta.block.considering.applescript",
           "patterns": [
             {
-              "begin": "(?<=considering)",
-              "end": "(?<!¬)$",
               "name": "meta.array.attributes.considering.applescript",
+              "begin": "(?\u003c=considering)",
+              "end": "(?\u003c!¬)$",
               "patterns": [
                 {
                   "include": "#attributes.considering-ignoring"
@@ -189,9 +182,9 @@
               ]
             },
             {
-              "begin": "(?<=ignoring)",
-              "end": "(?<!¬)$",
               "name": "meta.array.attributes.ignoring.applescript",
+              "begin": "(?\u003c=ignoring)",
+              "end": "(?\u003c!¬)$",
               "patterns": [
                 {
                   "include": "#attributes.considering-ignoring"
@@ -199,8 +192,8 @@
               ]
             },
             {
-              "match": "\\b(but)\\b",
-              "name": "keyword.control.but.applescript"
+              "name": "keyword.control.but.applescript",
+              "match": "\\b(but)\\b"
             },
             {
               "include": "$self"
@@ -208,14 +201,14 @@
           ]
         },
         {
+          "name": "meta.block.ignoring.applescript",
           "begin": "^\\s*(ignoring)\\b",
           "end": "^\\s*(end(?:\\s+ignoring)?)(?=\\s*(--.*?)?$)",
-          "name": "meta.block.ignoring.applescript",
           "patterns": [
             {
-              "begin": "(?<=considering)",
-              "end": "(?<!¬)$",
               "name": "meta.array.attributes.considering.applescript",
+              "begin": "(?\u003c=considering)",
+              "end": "(?\u003c!¬)$",
               "patterns": [
                 {
                   "include": "#attributes.considering-ignoring"
@@ -223,9 +216,9 @@
               ]
             },
             {
-              "begin": "(?<=ignoring)",
-              "end": "(?<!¬)$",
               "name": "meta.array.attributes.ignoring.applescript",
+              "begin": "(?\u003c=ignoring)",
+              "end": "(?\u003c!¬)$",
               "patterns": [
                 {
                   "include": "#attributes.considering-ignoring"
@@ -233,8 +226,8 @@
               ]
             },
             {
-              "match": "\\b(but)\\b",
-              "name": "keyword.control.but.applescript"
+              "name": "keyword.control.but.applescript",
+              "match": "\\b(but)\\b"
             },
             {
               "include": "$self"
@@ -242,142 +235,149 @@
           ]
         },
         {
+          "name": "meta.block.if.applescript",
           "begin": "^\\s*(if)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.if.applescript"
-            }
-          },
           "end": "^\\s*(end(?:\\s+if)?)(?=\\s*(--.*?)?$)",
-          "endCaptures": {
-            "1": {
-              "name": "keyword.control.end.applescript"
-            }
-          },
-          "name": "meta.block.if.applescript",
           "patterns": [
             {
-              "match": "\\b(then)\\b",
-              "name": "keyword.control.then.applescript"
+              "name": "keyword.control.then.applescript",
+              "match": "\\b(then)\\b"
             },
             {
-              "match": "\\b(else\\s+if)\\b",
-              "name": "keyword.control.else-if.applescript"
+              "name": "keyword.control.else-if.applescript",
+              "match": "\\b(else\\s+if)\\b"
             },
             {
-              "match": "\\b(else)\\b",
-              "name": "keyword.control.else.applescript"
+              "name": "keyword.control.else.applescript",
+              "match": "\\b(else)\\b"
             },
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(try)\\b",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.control.try.applescript"
+              "name": "keyword.control.if.applescript"
             }
           },
-          "end": "^\\s*(end(?:\\s+(try|error))?)(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.applescript"
             }
-          },
+          }
+        },
+        {
           "name": "meta.block.try.applescript",
+          "begin": "^\\s*(try)\\b",
+          "end": "^\\s*(end(?:\\s+(try|error))?)(?=\\s*(--.*?)?$)",
           "patterns": [
             {
-              "begin": "^\\s*(on\\s+error)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "keyword.control.exception.on-error.applescript"
-                }
-              },
-              "end": "(?<!¬)$",
               "name": "meta.property.error.applescript",
+              "begin": "^\\s*(on\\s+error)\\b",
+              "end": "(?\u003c!¬)$",
               "patterns": [
                 {
-                  "match": "\\b(?i:number|partial|from|to)\\b",
-                  "name": "keyword.control.exception.modifier.applescript"
+                  "name": "keyword.control.exception.modifier.applescript",
+                  "match": "\\b(?i:number|partial|from|to)\\b"
                 },
                 {
                   "include": "#inline"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "keyword.control.exception.on-error.applescript"
+                }
+              }
             },
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(using\\s+terms\\s+from)\\b",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.control.terms.applescript"
+              "name": "keyword.control.try.applescript"
             }
           },
-          "end": "^\\s*(end(?:\\s+using\\s+terms\\s+from)?)(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.applescript"
             }
-          },
+          }
+        },
+        {
           "name": "meta.block.terms.applescript",
+          "begin": "^\\s*(using\\s+terms\\s+from)\\b",
+          "end": "^\\s*(end(?:\\s+using\\s+terms\\s+from)?)(?=\\s*(--.*?)?$)",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(with\\s+timeout(\\s+of)?)\\b",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.control.timeout.applescript"
+              "name": "keyword.control.terms.applescript"
             }
           },
-          "end": "^\\s*(end(?:\\s+timeout)?)(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.applescript"
             }
-          },
+          }
+        },
+        {
           "name": "meta.block.timeout.applescript",
+          "begin": "^\\s*(with\\s+timeout(\\s+of)?)\\b",
+          "end": "^\\s*(end(?:\\s+timeout)?)(?=\\s*(--.*?)?$)",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(with\\s+transaction(\\s+of)?)\\b",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.control.transaction.applescript"
+              "name": "keyword.control.timeout.applescript"
             }
           },
-          "end": "^\\s*(end(?:\\s+transaction)?)(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.applescript"
             }
-          },
+          }
+        },
+        {
           "name": "meta.block.transaction.applescript",
+          "begin": "^\\s*(with\\s+transaction(\\s+of)?)\\b",
+          "end": "^\\s*(end(?:\\s+transaction)?)(?=\\s*(--.*?)?$)",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.transaction.applescript"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "keyword.control.end.applescript"
+            }
+          }
         }
       ]
     },
     "blocks.repeat": {
       "patterns": [
         {
+          "name": "meta.block.repeat.until.applescript",
           "begin": "^\\s*(repeat)\\s+(until)\\b",
+          "end": "^\\s*(end(?:\\s+repeat)?)(?=\\s*(--.*?)?$)",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.repeat.applescript"
@@ -386,21 +386,21 @@
               "name": "keyword.control.until.applescript"
             }
           },
-          "end": "^\\s*(end(?:\\s+repeat)?)(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.applescript"
             }
-          },
-          "name": "meta.block.repeat.until.applescript",
+          }
+        },
+        {
+          "name": "meta.block.repeat.while.applescript",
+          "begin": "^\\s*(repeat)\\s+(while)\\b",
+          "end": "^\\s*(end(?:\\s+repeat)?)(?=\\s*(--.*?)?$)",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(repeat)\\s+(while)\\b",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.repeat.applescript"
@@ -409,21 +409,29 @@
               "name": "keyword.control.while.applescript"
             }
           },
-          "end": "^\\s*(end(?:\\s+repeat)?)(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.applescript"
             }
-          },
-          "name": "meta.block.repeat.while.applescript",
+          }
+        },
+        {
+          "name": "meta.block.repeat.with.applescript",
+          "begin": "^\\s*(repeat)\\s+(with)\\s+(\\w+)\\b",
+          "end": "^\\s*(end(?:\\s+repeat)?)(?=\\s*(--.*?)?$)",
           "patterns": [
+            {
+              "name": "keyword.control.modifier.range.applescript",
+              "match": "\\b(from|to|by)\\b"
+            },
+            {
+              "name": "keyword.control.modifier.list.applescript",
+              "match": "\\b(in)\\b"
+            },
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(repeat)\\s+(with)\\s+(\\w+)\\b",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.repeat.applescript"
@@ -435,77 +443,73 @@
               "name": "variable.parameter.loop.applescript"
             }
           },
-          "end": "^\\s*(end(?:\\s+repeat)?)(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.applescript"
             }
-          },
-          "name": "meta.block.repeat.with.applescript",
+          }
+        },
+        {
+          "name": "meta.block.repeat.forever.applescript",
+          "begin": "^\\s*(repeat)\\b(?=\\s*(--.*?)?$)",
+          "end": "^\\s*(end(?:\\s+repeat)?)(?=\\s*(--.*?)?$)",
           "patterns": [
-            {
-              "match": "\\b(from|to|by)\\b",
-              "name": "keyword.control.modifier.range.applescript"
-            },
-            {
-              "match": "\\b(in)\\b",
-              "name": "keyword.control.modifier.list.applescript"
-            },
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(repeat)\\b(?=\\s*(--.*?)?$)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.repeat.applescript"
             }
           },
-          "end": "^\\s*(end(?:\\s+repeat)?)(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.applescript"
             }
-          },
-          "name": "meta.block.repeat.forever.applescript",
+          }
+        },
+        {
+          "name": "meta.block.repeat.times.applescript",
+          "begin": "^\\s*(repeat)\\b",
+          "end": "^\\s*(end(?:\\s+repeat)?)(?=\\s*(--.*?)?$)",
           "patterns": [
+            {
+              "name": "keyword.control.times.applescript",
+              "match": "\\b(times)\\b"
+            },
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(repeat)\\b",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.repeat.applescript"
             }
           },
-          "end": "^\\s*(end(?:\\s+repeat)?)(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.applescript"
             }
-          },
-          "name": "meta.block.repeat.times.applescript",
-          "patterns": [
-            {
-              "match": "\\b(times)\\b",
-              "name": "keyword.control.times.applescript"
-            },
-            {
-              "include": "$self"
-            }
-          ]
+          }
         }
       ]
     },
     "blocks.statement": {
       "patterns": [
         {
+          "name": "meta.statement.property.applescript",
           "begin": "\\b(prop(?:erty)?)\\s+(\\w+)\\b",
+          "end": "(?\u003c!¬)$",
+          "patterns": [
+            {
+              "name": "punctuation.separator.key-value.property.applescript",
+              "match": ":"
+            },
+            {
+              "include": "#inline"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.def.property.applescript"
@@ -513,21 +517,17 @@
             "2": {
               "name": "variable.other.property.applescript"
             }
-          },
-          "end": "(?<!¬)$",
-          "name": "meta.statement.property.applescript",
+          }
+        },
+        {
+          "name": "meta.statement.set.applescript",
+          "begin": "\\b(set)\\s+(\\w+)\\s+(to)\\b",
+          "end": "(?\u003c!¬)$",
           "patterns": [
-            {
-              "match": ":",
-              "name": "punctuation.separator.key-value.property.applescript"
-            },
             {
               "include": "#inline"
             }
-          ]
-        },
-        {
-          "begin": "\\b(set)\\s+(\\w+)\\s+(to)\\b",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.def.set.applescript"
@@ -538,109 +538,96 @@
             "3": {
               "name": "keyword.control.def.set.applescript"
             }
-          },
-          "end": "(?<!¬)$",
-          "name": "meta.statement.set.applescript",
-          "patterns": [
-            {
-              "include": "#inline"
-            }
-          ]
+          }
         },
         {
-          "begin": "\\b(local)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.def.local.applescript"
-            }
-          },
-          "end": "(?<!¬)$",
           "name": "meta.statement.local.applescript",
+          "begin": "\\b(local)\\b",
+          "end": "(?\u003c!¬)$",
           "patterns": [
             {
-              "match": ",",
-              "name": "punctuation.separator.variables.local.applescript"
+              "name": "punctuation.separator.variables.local.applescript",
+              "match": ","
             },
             {
-              "match": "\\b\\w+",
-              "name": "variable.other.readwrite.local.applescript"
+              "name": "variable.other.readwrite.local.applescript",
+              "match": "\\b\\w+"
             },
             {
               "include": "#inline"
             }
-          ]
-        },
-        {
-          "begin": "\\b(global)\\b",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.control.def.global.applescript"
+              "name": "keyword.control.def.local.applescript"
             }
-          },
-          "end": "(?<!¬)$",
+          }
+        },
+        {
           "name": "meta.statement.global.applescript",
+          "begin": "\\b(global)\\b",
+          "end": "(?\u003c!¬)$",
           "patterns": [
             {
-              "match": ",",
-              "name": "punctuation.separator.variables.global.applescript"
+              "name": "punctuation.separator.variables.global.applescript",
+              "match": ","
             },
             {
-              "match": "\\b\\w+",
-              "name": "variable.other.readwrite.global.applescript"
+              "name": "variable.other.readwrite.global.applescript",
+              "match": "\\b\\w+"
             },
             {
               "include": "#inline"
             }
-          ]
-        },
-        {
-          "begin": "\\b(error)\\b",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.control.exception.error.applescript"
+              "name": "keyword.control.def.global.applescript"
             }
-          },
-          "end": "(?<!¬)$",
+          }
+        },
+        {
           "name": "meta.statement.error.applescript",
+          "begin": "\\b(error)\\b",
+          "end": "(?\u003c!¬)$",
           "patterns": [
             {
-              "match": "\\b(number|partial|from|to)\\b",
-              "name": "keyword.control.exception.modifier.applescript"
+              "name": "keyword.control.exception.modifier.applescript",
+              "match": "\\b(number|partial|from|to)\\b"
             },
             {
               "include": "#inline"
             }
-          ]
-        },
-        {
-          "begin": "\\b(if)\\b(?=.*\\bthen\\b(?!\\s*(--.*?)?$))",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.control.if.applescript"
+              "name": "keyword.control.exception.error.applescript"
             }
-          },
-          "end": "(?<!¬)$",
+          }
+        },
+        {
           "name": "meta.statement.if-then.applescript",
+          "begin": "\\b(if)\\b(?=.*\\bthen\\b(?!\\s*(--.*?)?$))",
+          "end": "(?\u003c!¬)$",
           "patterns": [
             {
               "include": "#inline"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.if.applescript"
+            }
+          }
         }
       ]
     },
     "blocks.tell": {
       "patterns": [
         {
+          "name": "meta.block.tell.application.textmate.applescript",
           "begin": "^\\s*(tell)\\s+(?=app(lication)?\\s+\"(?i:textmate)\")(?!.*\\bto(?!\\s+tell)\\b)",
-          "captures": {
-            "1": {
-              "name": "keyword.control.tell.applescript"
-            }
-          },
-          "comment": "tell Textmate",
           "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
-          "name": "meta.block.tell.application.textmate.applescript",
           "patterns": [
             {
               "include": "#textmate"
@@ -651,18 +638,17 @@
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(tell)\\s+(?=app(lication)?\\s+\"(?i:finder)\")(?!.*\\bto(?!\\s+tell)\\b)",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control.tell.applescript"
             }
-          },
-          "comment": "tell Finder",
-          "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
+          }
+        },
+        {
           "name": "meta.block.tell.application.finder.applescript",
+          "begin": "^\\s*(tell)\\s+(?=app(lication)?\\s+\"(?i:finder)\")(?!.*\\bto(?!\\s+tell)\\b)",
+          "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
           "patterns": [
             {
               "include": "#finder"
@@ -673,18 +659,17 @@
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(tell)\\s+(?=app(lication)?\\s+\"(?i:system events)\")(?!.*\\bto(?!\\s+tell)\\b)",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control.tell.applescript"
             }
-          },
-          "comment": "tell System Events",
-          "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
+          }
+        },
+        {
           "name": "meta.block.tell.application.system-events.applescript",
+          "begin": "^\\s*(tell)\\s+(?=app(lication)?\\s+\"(?i:system events)\")(?!.*\\bto(?!\\s+tell)\\b)",
+          "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
           "patterns": [
             {
               "include": "#system-events"
@@ -695,18 +680,17 @@
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(tell)\\s+(?=app(lication)?\\s+\"(?i:itunes)\")(?!.*\\bto(?!\\s+tell)\\b)",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control.tell.applescript"
             }
-          },
-          "comment": "tell iTunes",
-          "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
+          }
+        },
+        {
           "name": "meta.block.tell.application.itunes.applescript",
+          "begin": "^\\s*(tell)\\s+(?=app(lication)?\\s+\"(?i:itunes)\")(?!.*\\bto(?!\\s+tell)\\b)",
+          "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
           "patterns": [
             {
               "include": "#itunes"
@@ -717,18 +701,17 @@
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(tell)\\s+(?=app(lication)?\\s+process\\b)(?!.*\\bto(?!\\s+tell)\\b)",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control.tell.applescript"
             }
-          },
-          "comment": "tell generic application process",
-          "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
+          }
+        },
+        {
           "name": "meta.block.tell.application-process.generic.applescript",
+          "begin": "^\\s*(tell)\\s+(?=app(lication)?\\s+process\\b)(?!.*\\bto(?!\\s+tell)\\b)",
+          "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
           "patterns": [
             {
               "include": "#standard-suite"
@@ -736,18 +719,17 @@
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(tell)\\s+(?=app(lication)?\\b)(?!.*\\bto(?!\\s+tell)\\b)",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control.tell.applescript"
             }
-          },
-          "comment": "tell generic application",
-          "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
+          }
+        },
+        {
           "name": "meta.block.tell.application.generic.applescript",
+          "begin": "^\\s*(tell)\\s+(?=app(lication)?\\b)(?!.*\\bto(?!\\s+tell)\\b)",
+          "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
           "patterns": [
             {
               "include": "#standard-suite"
@@ -755,39 +737,42 @@
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(tell)\\s+(?!.*\\bto(?!\\s+tell)\\b)",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control.tell.applescript"
             }
-          },
-          "comment": "generic tell block",
-          "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
+          }
+        },
+        {
           "name": "meta.block.tell.generic.applescript",
+          "begin": "^\\s*(tell)\\s+(?!.*\\bto(?!\\s+tell)\\b)",
+          "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(tell)\\s+(?=.*\\bto\\b)",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control.tell.applescript"
             }
-          },
-          "comment": "tell … to statement",
-          "end": "(?<!¬)$",
+          }
+        },
+        {
           "name": "meta.block.tell.generic.applescript",
+          "begin": "^\\s*(tell)\\s+(?=.*\\bto\\b)",
+          "end": "(?\u003c!¬)$",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "keyword.control.tell.applescript"
+            }
+          }
         }
       ]
     },
@@ -810,245 +795,231 @@
     "built-in.constant": {
       "patterns": [
         {
-          "comment": "yes/no can’t always be used as booleans, e.g. in an if() expression. But they work e.g. for boolean arguments.",
-          "match": "\\b(?i:true|false|yes|no)\\b",
-          "name": "constant.language.boolean.applescript"
+          "name": "constant.language.boolean.applescript",
+          "match": "\\b(?i:true|false|yes|no)\\b"
         },
         {
-          "match": "\\b(?i:null|missing\\s+value)\\b",
-          "name": "constant.language.null.applescript"
+          "name": "constant.language.null.applescript",
+          "match": "\\b(?i:null|missing\\s+value)\\b"
         },
         {
-          "match": "-?\\b\\d+((\\.(\\d+\\b)?)?(?i:e\\+?\\d*\\b)?|\\b)",
-          "name": "constant.numeric.applescript"
+          "name": "constant.numeric.applescript",
+          "match": "-?\\b\\d+((\\.(\\d+\\b)?)?(?i:e\\+?\\d*\\b)?|\\b)"
         },
         {
-          "match": "\\b(?i:space|tab|return|linefeed|quote)\\b",
-          "name": "constant.other.text.applescript"
+          "name": "constant.other.text.applescript",
+          "match": "\\b(?i:space|tab|return|linefeed|quote)\\b"
         },
         {
-          "match": "\\b(?i:all\\s+(caps|lowercase)|bold|condensed|expanded|hidden|italic|outline|plain|shadow|small\\s+caps|strikethrough|(sub|super)script|underline)\\b",
-          "name": "constant.other.styles.applescript"
+          "name": "constant.other.styles.applescript",
+          "match": "\\b(?i:all\\s+(caps|lowercase)|bold|condensed|expanded|hidden|italic|outline|plain|shadow|small\\s+caps|strikethrough|(sub|super)script|underline)\\b"
         },
         {
-          "match": "\\b(?i:Jan(uary)?|Feb(ruary)?|Mar(ch)?|Apr(il)?|May|Jun(e)?|Jul(y)?|Aug(ust)?|Sep(tember)?|Oct(ober)?|Nov(ember)?|Dec(ember)?)\\b",
-          "name": "constant.other.time.month.applescript"
+          "name": "constant.other.time.month.applescript",
+          "match": "\\b(?i:Jan(uary)?|Feb(ruary)?|Mar(ch)?|Apr(il)?|May|Jun(e)?|Jul(y)?|Aug(ust)?|Sep(tember)?|Oct(ober)?|Nov(ember)?|Dec(ember)?)\\b"
         },
         {
-          "match": "\\b(?i:Mon(day)?|Tue(sday)?|Wed(nesday)?|Thu(rsday)?|Fri(day)?|Sat(urday)?|Sun(day)?)\\b",
-          "name": "constant.other.time.weekday.applescript"
+          "name": "constant.other.time.weekday.applescript",
+          "match": "\\b(?i:Mon(day)?|Tue(sday)?|Wed(nesday)?|Thu(rsday)?|Fri(day)?|Sat(urday)?|Sun(day)?)\\b"
         },
         {
-          "match": "\\b(?i:AppleScript|pi|result|version|current\\s+application|its?|m[ey])\\b",
-          "name": "constant.other.miscellaneous.applescript"
+          "name": "constant.other.miscellaneous.applescript",
+          "match": "\\b(?i:AppleScript|pi|result|version|current\\s+application|its?|m[ey])\\b"
         },
         {
-          "match": "\\b(?i:text\\s+item\\s+delimiters|print\\s+(length|depth))\\b",
-          "name": "variable.language.applescript"
+          "name": "variable.language.applescript",
+          "match": "\\b(?i:text\\s+item\\s+delimiters|print\\s+(length|depth))\\b"
         }
       ]
     },
     "built-in.keyword": {
       "patterns": [
         {
-          "match": "(&|\\*|\\+|-|/|÷|\\^)",
-          "name": "keyword.operator.arithmetic.applescript"
+          "name": "keyword.operator.arithmetic.applescript",
+          "match": "(\u0026|\\*|\\+|-|/|÷|\\^)"
         },
         {
-          "match": "(=|≠|>|<|≥|>=|≤|<=)",
-          "name": "keyword.operator.comparison.applescript"
+          "name": "keyword.operator.comparison.applescript",
+          "match": "(=|≠|\u003e|\u003c|≥|\u003e=|≤|\u003c=)"
         },
         {
-          "match": "(?ix)\\b\n\t\t\t\t\t\t(and|or|div|mod|as|not\n\t\t\t\t\t\t|(a\\s+)?(ref(\\s+to)?|reference\\s+to)\n\t\t\t\t\t\t|equal(s|\\s+to)|contains?|comes\\s+(after|before)|(start|begin|end)s?\\s+with\n\t\t\t\t\t\t)\n\t\t\t\t\t\\b",
-          "name": "keyword.operator.word.applescript"
+          "name": "keyword.operator.word.applescript",
+          "match": "(?ix)\\b\n\t\t\t\t\t\t(and|or|div|mod|as|not\n\t\t\t\t\t\t|(a\\s+)?(ref(\\s+to)?|reference\\s+to)\n\t\t\t\t\t\t|equal(s|\\s+to)|contains?|comes\\s+(after|before)|(start|begin|end)s?\\s+with\n\t\t\t\t\t\t)\n\t\t\t\t\t\\b"
         },
         {
-          "comment": "In double quotes so we can use a single quote in the keywords.",
-          "match": "(?ix)\\b\n\t\t\t\t\t\t(is(n't|\\s+not)?(\\s+(equal(\\s+to)?|(less|greater)\\s+than(\\s+or\\s+equal(\\s+to)?)?|in|contained\\s+by))?\n\t\t\t\t\t\t|does(n't|\\s+not)\\s+(equal|come\\s+(before|after)|contain)\n\t\t\t\t\t\t)\n\t\t\t\t\t\\b",
-          "name": "keyword.operator.word.applescript"
+          "name": "keyword.operator.word.applescript",
+          "match": "(?ix)\\b\n\t\t\t\t\t\t(is(n't|\\s+not)?(\\s+(equal(\\s+to)?|(less|greater)\\s+than(\\s+or\\s+equal(\\s+to)?)?|in|contained\\s+by))?\n\t\t\t\t\t\t|does(n't|\\s+not)\\s+(equal|come\\s+(before|after)|contain)\n\t\t\t\t\t\t)\n\t\t\t\t\t\\b"
         },
         {
-          "match": "\\b(?i:some|every|whose|where|that|id|index|\\d+(st|nd|rd|th)|first|second|third|fourth|fifth|sixth|seventh|eighth|ninth|tenth|last|front|back|middle|named|beginning|end|from|to|thr(u|ough)|before|(front|back|beginning|end)\\s+of|after|behind|in\\s+(front|back|beginning|end)\\s+of)\\b",
-          "name": "keyword.operator.reference.applescript"
+          "name": "keyword.operator.reference.applescript",
+          "match": "\\b(?i:some|every|whose|where|that|id|index|\\d+(st|nd|rd|th)|first|second|third|fourth|fifth|sixth|seventh|eighth|ninth|tenth|last|front|back|middle|named|beginning|end|from|to|thr(u|ough)|before|(front|back|beginning|end)\\s+of|after|behind|in\\s+(front|back|beginning|end)\\s+of)\\b"
         },
         {
-          "match": "\\b(?i:continue|return|exit(\\s+repeat)?)\\b",
-          "name": "keyword.control.loop.applescript"
+          "name": "keyword.control.loop.applescript",
+          "match": "\\b(?i:continue|return|exit(\\s+repeat)?)\\b"
         },
         {
-          "match": "\\b(?i:about|above|after|against|and|apart\\s+from|around|as|aside\\s+from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|contain|contains|contains|copy|div|does|eighth|else|end|equal|equals|error|every|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead\\s+of|into|is|it|its|last|local|me|middle|mod|my|ninth|not|of|on|onto|or|out\\s+of|over|prop|property|put|ref|reference|repeat|returning|script|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\\b",
-          "name": "keyword.other.applescript"
+          "name": "keyword.other.applescript",
+          "match": "\\b(?i:about|above|after|against|and|apart\\s+from|around|as|aside\\s+from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|contain|contains|contains|copy|div|does|eighth|else|end|equal|equals|error|every|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead\\s+of|into|is|it|its|last|local|me|middle|mod|my|ninth|not|of|on|onto|or|out\\s+of|over|prop|property|put|ref|reference|repeat|returning|script|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\\b"
         }
       ]
     },
     "built-in.punctuation": {
       "patterns": [
         {
-          "match": "¬",
-          "name": "punctuation.separator.continuation.line.applescript"
+          "name": "punctuation.separator.continuation.line.applescript",
+          "match": "¬"
         },
         {
-          "comment": "the : in property assignments",
-          "match": ":",
-          "name": "punctuation.separator.key-value.property.applescript"
+          "name": "punctuation.separator.key-value.property.applescript",
+          "match": ":"
         },
         {
-          "comment": "the parentheses in groups",
-          "match": "[()]",
-          "name": "punctuation.section.group.applescript"
+          "name": "punctuation.section.group.applescript",
+          "match": "[()]"
         }
       ]
     },
     "built-in.support": {
       "patterns": [
         {
-          "match": "\\b(?i:POSIX\\s+path|frontmost|id|name|running|version|days?|weekdays?|months?|years?|time|date\\s+string|time\\s+string|length|rest|reverse|items?|contents|quoted\\s+form|characters?|paragraphs?|words?)\\b",
-          "name": "support.function.built-in.property.applescript"
+          "name": "support.function.built-in.property.applescript",
+          "match": "\\b(?i:POSIX\\s+path|frontmost|id|name|running|version|days?|weekdays?|months?|years?|time|date\\s+string|time\\s+string|length|rest|reverse|items?|contents|quoted\\s+form|characters?|paragraphs?|words?)\\b"
         },
         {
-          "match": "\\b(?i:activate|log|clipboard\\s+info|set\\s+the\\s+clipboard\\s+to|the\\s+clipboard|info\\s+for|list\\s+(disks|folder)|mount\\s+volume|path\\s+to(\\s+resource)?|close\\s+access|get\\s+eof|open\\s+for\\s+access|read|set\\s+eof|write|open\\s+location|current\\s+date|do\\s+shell\\s+script|get\\s+volume\\s+settings|random\\s+number|round|set\\s+volume|system\\s+(attribute|info)|time\\s+to\\s+GMT|load\\s+script|run\\s+script|scripting\\s+components|store\\s+script|copy|count|get|launch|run|set|ASCII\\s+(character|number)|localized\\s+string|offset|summarize|beep|choose\\s+(application|color|file(\\s+name)?|folder|from\\s+list|remote\\s+application|URL)|delay|display\\s+(alert|dialog)|say)\\b",
-          "name": "support.function.built-in.command.applescript"
+          "name": "support.function.built-in.command.applescript",
+          "match": "\\b(?i:activate|log|clipboard\\s+info|set\\s+the\\s+clipboard\\s+to|the\\s+clipboard|info\\s+for|list\\s+(disks|folder)|mount\\s+volume|path\\s+to(\\s+resource)?|close\\s+access|get\\s+eof|open\\s+for\\s+access|read|set\\s+eof|write|open\\s+location|current\\s+date|do\\s+shell\\s+script|get\\s+volume\\s+settings|random\\s+number|round|set\\s+volume|system\\s+(attribute|info)|time\\s+to\\s+GMT|load\\s+script|run\\s+script|scripting\\s+components|store\\s+script|copy|count|get|launch|run|set|ASCII\\s+(character|number)|localized\\s+string|offset|summarize|beep|choose\\s+(application|color|file(\\s+name)?|folder|from\\s+list|remote\\s+application|URL)|delay|display\\s+(alert|dialog)|say)\\b"
         },
         {
-          "match": "\\b(?i:get|run)\\b",
-          "name": "support.function.built-in.applescript"
+          "name": "support.function.built-in.applescript",
+          "match": "\\b(?i:get|run)\\b"
         },
         {
-          "match": "\\b(?i:anything|data|text|upper\\s+case|propert(y|ies))\\b",
-          "name": "support.class.built-in.applescript"
+          "name": "support.class.built-in.applescript",
+          "match": "\\b(?i:anything|data|text|upper\\s+case|propert(y|ies))\\b"
         },
         {
-          "match": "\\b(?i:alias|class)(es)?\\b",
-          "name": "support.class.built-in.applescript"
+          "name": "support.class.built-in.applescript",
+          "match": "\\b(?i:alias|class)(es)?\\b"
         },
         {
-          "match": "\\b(?i:app(lication)?|boolean|character|constant|date|event|file(\\s+specification)?|handler|integer|item|keystroke|linked\\s+list|list|machine|number|picture|preposition|POSIX\\s+file|real|record|reference(\\s+form)?|RGB\\s+color|script|sound|text\\s+item|type\\s+class|vector|writing\\s+code(\\s+info)?|zone|((international|styled(\\s+(Clipboard|Unicode))?|Unicode)\\s+)?text|((C|encoded|Pascal)\\s+)?string)s?\\b",
-          "name": "support.class.built-in.applescript"
+          "name": "support.class.built-in.applescript",
+          "match": "\\b(?i:app(lication)?|boolean|character|constant|date|event|file(\\s+specification)?|handler|integer|item|keystroke|linked\\s+list|list|machine|number|picture|preposition|POSIX\\s+file|real|record|reference(\\s+form)?|RGB\\s+color|script|sound|text\\s+item|type\\s+class|vector|writing\\s+code(\\s+info)?|zone|((international|styled(\\s+(Clipboard|Unicode))?|Unicode)\\s+)?text|((C|encoded|Pascal)\\s+)?string)s?\\b"
         },
         {
-          "match": "(?ix)\\b\n\t\t\t\t\t\t(\t(cubic\\s+(centi)?|square\\s+(kilo)?|centi|kilo)met(er|re)s\n\t\t\t\t\t\t|\tsquare\\s+(yards|feet|miles)|cubic\\s+(yards|feet|inches)|miles|inches\n\t\t\t\t\t\t|\tlit(re|er)s|gallons|quarts\n\t\t\t\t\t\t|\t(kilo)?grams|ounces|pounds\n\t\t\t\t\t\t|\tdegrees\\s+(Celsius|Fahrenheit|Kelvin)\n\t\t\t\t\t\t)\n\t\t\t\t\t\\b",
-          "name": "support.class.built-in.unit.applescript"
+          "name": "support.class.built-in.unit.applescript",
+          "match": "(?ix)\\b\n\t\t\t\t\t\t(\t(cubic\\s+(centi)?|square\\s+(kilo)?|centi|kilo)met(er|re)s\n\t\t\t\t\t\t|\tsquare\\s+(yards|feet|miles)|cubic\\s+(yards|feet|inches)|miles|inches\n\t\t\t\t\t\t|\tlit(re|er)s|gallons|quarts\n\t\t\t\t\t\t|\t(kilo)?grams|ounces|pounds\n\t\t\t\t\t\t|\tdegrees\\s+(Celsius|Fahrenheit|Kelvin)\n\t\t\t\t\t\t)\n\t\t\t\t\t\\b"
         },
         {
-          "match": "\\b(?i:seconds|minutes|hours|days)\\b",
-          "name": "support.class.built-in.time.applescript"
+          "name": "support.class.built-in.time.applescript",
+          "match": "\\b(?i:seconds|minutes|hours|days)\\b"
         }
       ]
     },
     "comments": {
       "patterns": [
         {
+          "name": "comment.line.number-sign.applescript",
           "begin": "^\\s*(#!)",
+          "end": "\\n",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.applescript"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.number-sign.applescript"
+          }
         },
         {
           "begin": "(^[ \\t]+)?(?=#)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.applescript"
-            }
-          },
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.number-sign.applescript",
               "begin": "#",
+              "end": "\\n",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.applescript"
                 }
-              },
-              "end": "\\n",
-              "name": "comment.line.number-sign.applescript"
+              }
             }
-          ]
-        },
-        {
-          "begin": "(^[ \\t]+)?(?=--)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.whitespace.comment.leading.applescript"
             }
-          },
+          }
+        },
+        {
+          "begin": "(^[ \\t]+)?(?=--)",
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.double-dash.applescript",
               "begin": "--",
+              "end": "\\n",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.applescript"
                 }
-              },
-              "end": "\\n",
-              "name": "comment.line.double-dash.applescript"
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.applescript"
+            }
+          }
         },
         {
+          "name": "comment.block.applescript",
           "begin": "\\(\\*",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.applescript"
-            }
-          },
           "end": "\\*\\)",
-          "name": "comment.block.applescript",
           "patterns": [
             {
               "include": "#comments.nested"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.applescript"
+            }
+          }
         }
       ]
     },
     "comments.nested": {
       "patterns": [
         {
+          "name": "comment.block.applescript",
           "begin": "\\(\\*",
+          "end": "\\*\\)",
+          "patterns": [
+            {
+              "include": "#comments.nested"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.applescript"
             }
           },
-          "end": "\\*\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.applescript"
             }
-          },
-          "name": "comment.block.applescript",
-          "patterns": [
-            {
-              "include": "#comments.nested"
-            }
-          ]
+          }
         }
       ]
     },
     "data-structures": {
       "patterns": [
         {
+          "name": "meta.array.applescript",
           "begin": "\\{",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.array.begin.applescript"
-            }
-          },
-          "comment": "We cannot necessarily distinguish \"records\" from \"arrays\", and so this could be either.",
           "end": "\\}",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.array.end.applescript"
-            }
-          },
-          "name": "meta.array.applescript",
           "patterns": [
             {
+              "match": "(\\w+|((\\|)[^|\\n]*(\\|)))\\s*(:)",
               "captures": {
                 "1": {
                   "name": "constant.other.key.applescript"
@@ -1065,55 +1036,66 @@
                 "5": {
                   "name": "punctuation.separator.key-value.applescript"
                 }
-              },
-              "match": "(\\w+|((\\|)[^|\\n]*(\\|)))\\s*(:)"
+              }
             },
             {
-              "match": ":",
-              "name": "punctuation.separator.key-value.applescript"
+              "name": "punctuation.separator.key-value.applescript",
+              "match": ":"
             },
             {
-              "match": ",",
-              "name": "punctuation.separator.array.applescript"
+              "name": "punctuation.separator.array.applescript",
+              "match": ","
             },
             {
               "include": "#inline"
             }
-          ]
-        },
-        {
-          "begin": "(?:(?<=application )|(?<=app ))(\")",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.string.applescript"
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.array.begin.applescript"
             }
           },
-          "end": "(\")",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.array.end.applescript"
+            }
+          }
+        },
+        {
           "name": "string.quoted.double.application-name.applescript",
+          "begin": "(?:(?\u003c=application )|(?\u003c=app ))(\")",
+          "end": "(\")",
           "patterns": [
             {
-              "match": "\\\\.",
-              "name": "constant.character.escape.applescript"
+              "name": "constant.character.escape.applescript",
+              "match": "\\\\."
             }
-          ]
-        },
-        {
-          "begin": "(\")",
+          ],
           "captures": {
             "1": {
               "name": "punctuation.definition.string.applescript"
             }
-          },
-          "end": "(\")",
+          }
+        },
+        {
           "name": "string.quoted.double.applescript",
+          "begin": "(\")",
+          "end": "(\")",
           "patterns": [
             {
-              "match": "\\\\.",
-              "name": "constant.character.escape.applescript"
+              "name": "constant.character.escape.applescript",
+              "match": "\\\\."
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.string.applescript"
+            }
+          }
         },
         {
+          "name": "meta.identifier.applescript",
+          "match": "(\\|)[^|\\n]*(\\|)",
           "captures": {
             "1": {
               "name": "punctuation.definition.identifier.applescript"
@@ -1121,11 +1103,11 @@
             "2": {
               "name": "punctuation.definition.identifier.applescript"
             }
-          },
-          "match": "(\\|)[^|\\n]*(\\|)",
-          "name": "meta.identifier.applescript"
+          }
         },
         {
+          "name": "constant.other.data.utxt.applescript",
+          "match": "(«)(data) (utxt|utf8)([[:xdigit:]]*)(»)(?:\\s+(as)\\s+(?i:Unicode\\s+text))?",
           "captures": {
             "1": {
               "name": "punctuation.definition.data.applescript"
@@ -1148,12 +1130,12 @@
             "7": {
               "name": "support.class.built-in.applescript"
             }
-          },
-          "match": "(«)(data) (utxt|utf8)([[:xdigit:]]*)(»)(?:\\s+(as)\\s+(?i:Unicode\\s+text))?",
-          "name": "constant.other.data.utxt.applescript"
+          }
         },
         {
+          "name": "constant.other.data.raw.applescript",
           "begin": "(«)(\\w+)\\b(?=\\s)",
+          "end": "(»)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.data.applescript"
@@ -1162,15 +1144,15 @@
               "name": "support.class.built-in.applescript"
             }
           },
-          "end": "(»)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.data.applescript"
             }
-          },
-          "name": "constant.other.data.raw.applescript"
+          }
         },
         {
+          "name": "invalid.illegal.data.applescript",
+          "match": "(«)[^»]*(»)",
           "captures": {
             "1": {
               "name": "punctuation.definition.data.applescript"
@@ -1178,37 +1160,35 @@
             "2": {
               "name": "punctuation.definition.data.applescript"
             }
-          },
-          "match": "(«)[^»]*(»)",
-          "name": "invalid.illegal.data.applescript"
+          }
         }
       ]
     },
     "finder": {
       "patterns": [
         {
-          "match": "\\b(item|container|(computer|disk|trash)-object|disk|folder|((alias|application|document|internet location) )?file|clipping|package)s?\\b",
-          "name": "support.class.finder.items.applescript"
+          "name": "support.class.finder.items.applescript",
+          "match": "\\b(item|container|(computer|disk|trash)-object|disk|folder|((alias|application|document|internet location) )?file|clipping|package)s?\\b"
         },
         {
-          "match": "\\b((Finder|desktop|information|preferences|clipping) )windows?\\b",
-          "name": "support.class.finder.window-classes.applescript"
+          "name": "support.class.finder.window-classes.applescript",
+          "match": "\\b((Finder|desktop|information|preferences|clipping) )windows?\\b"
         },
         {
-          "match": "\\b(preferences|(icon|column|list) view options|(label|column|alias list)s?)\\b",
-          "name": "support.class.finder.type-definitions.applescript"
+          "name": "support.class.finder.type-definitions.applescript",
+          "match": "\\b(preferences|(icon|column|list) view options|(label|column|alias list)s?)\\b"
         },
         {
-          "match": "\\b(copy|find|sort|clean up|eject|empty( trash)|erase|reveal|update)\\b",
-          "name": "support.function.finder.items.applescript"
+          "name": "support.function.finder.items.applescript",
+          "match": "\\b(copy|find|sort|clean up|eject|empty( trash)|erase|reveal|update)\\b"
         },
         {
-          "match": "\\b(insertion location|product version|startup disk|desktop|trash|home|computer container|finder preferences)\\b",
-          "name": "support.constant.finder.applescript"
+          "name": "support.constant.finder.applescript",
+          "match": "\\b(insertion location|product version|startup disk|desktop|trash|home|computer container|finder preferences)\\b"
         },
         {
-          "match": "\\b(visible)\\b",
-          "name": "support.variable.finder.applescript"
+          "name": "support.variable.finder.applescript",
+          "match": "\\b(visible)\\b"
         }
       ]
     },
@@ -1231,176 +1211,174 @@
     "itunes": {
       "patterns": [
         {
-          "match": "\\b(artwork|application|encoder|EQ preset|item|source|visual|(EQ |browser )?window|((audio CD|device|shared|URL|file) )?track|playlist window|((audio CD|device|radio tuner|library|folder|user) )?playlist)s?\\b",
-          "name": "support.class.itunes.applescript"
+          "name": "support.class.itunes.applescript",
+          "match": "\\b(artwork|application|encoder|EQ preset|item|source|visual|(EQ |browser )?window|((audio CD|device|shared|URL|file) )?track|playlist window|((audio CD|device|radio tuner|library|folder|user) )?playlist)s?\\b"
         },
         {
-          "match": "\\b(add|back track|convert|fast forward|(next|previous) track|pause|play(pause)?|refresh|resume|rewind|search|stop|update|eject|subscribe|update(Podcast|AllPodcasts)|download)\\b",
-          "name": "support.function.itunes.applescript"
+          "name": "support.function.itunes.applescript",
+          "match": "\\b(add|back track|convert|fast forward|(next|previous) track|pause|play(pause)?|refresh|resume|rewind|search|stop|update|eject|subscribe|update(Podcast|AllPodcasts)|download)\\b"
         },
         {
-          "match": "\\b(current (playlist|stream (title|URL)|track)|player state)\\b",
-          "name": "support.constant.itunes.applescript"
+          "name": "support.constant.itunes.applescript",
+          "match": "\\b(current (playlist|stream (title|URL)|track)|player state)\\b"
         },
         {
-          "match": "\\b(current (encoder|EQ preset|visual)|EQ enabled|fixed indexing|full screen|mute|player position|sound volume|visuals enabled|visual size)\\b",
-          "name": "support.variable.itunes.applescript"
+          "name": "support.variable.itunes.applescript",
+          "match": "\\b(current (encoder|EQ preset|visual)|EQ enabled|fixed indexing|full screen|mute|player position|sound volume|visuals enabled|visual size)\\b"
         }
       ]
     },
     "standard-suite": {
       "patterns": [
         {
-          "match": "\\b(colors?|documents?|items?|windows?)\\b",
-          "name": "support.class.standard-suite.applescript"
+          "name": "support.class.standard-suite.applescript",
+          "match": "\\b(colors?|documents?|items?|windows?)\\b"
         },
         {
-          "match": "\\b(close|count|delete|duplicate|exists|make|move|open|print|quit|save|activate|select|data size)\\b",
-          "name": "support.function.standard-suite.applescript"
+          "name": "support.function.standard-suite.applescript",
+          "match": "\\b(close|count|delete|duplicate|exists|make|move|open|print|quit|save|activate|select|data size)\\b"
         },
         {
-          "match": "\\b(name|frontmost|version)\\b",
-          "name": "support.constant.standard-suite.applescript"
+          "name": "support.constant.standard-suite.applescript",
+          "match": "\\b(name|frontmost|version)\\b"
         },
         {
-          "match": "\\b(selection)\\b",
-          "name": "support.variable.standard-suite.applescript"
+          "name": "support.variable.standard-suite.applescript",
+          "match": "\\b(selection)\\b"
         },
         {
-          "match": "\\b(attachments?|attribute runs?|characters?|paragraphs?|texts?|words?)\\b",
-          "name": "support.class.text-suite.applescript"
+          "name": "support.class.text-suite.applescript",
+          "match": "\\b(attachments?|attribute runs?|characters?|paragraphs?|texts?|words?)\\b"
         }
       ]
     },
     "standardadditions": {
       "patterns": [
         {
-          "match": "\\b((alert|dialog) reply)\\b",
-          "name": "support.class.standardadditions.user-interaction.applescript"
+          "name": "support.class.standardadditions.user-interaction.applescript",
+          "match": "\\b((alert|dialog) reply)\\b"
         },
         {
-          "match": "\\b(file information)\\b",
-          "name": "support.class.standardadditions.file.applescript"
+          "name": "support.class.standardadditions.file.applescript",
+          "match": "\\b(file information)\\b"
         },
         {
-          "match": "\\b(POSIX files?|system information|volume settings)\\b",
-          "name": "support.class.standardadditions.miscellaneous.applescript"
+          "name": "support.class.standardadditions.miscellaneous.applescript",
+          "match": "\\b(POSIX files?|system information|volume settings)\\b"
         },
         {
-          "match": "\\b(URLs?|internet address(es)?|web pages?|FTP items?)\\b",
-          "name": "support.class.standardadditions.internet.applescript"
+          "name": "support.class.standardadditions.internet.applescript",
+          "match": "\\b(URLs?|internet address(es)?|web pages?|FTP items?)\\b"
         },
         {
-          "match": "\\b(info for|list (disks|folder)|mount volume|path to( resource)?)\\b",
-          "name": "support.function.standardadditions.file.applescript"
+          "name": "support.function.standardadditions.file.applescript",
+          "match": "\\b(info for|list (disks|folder)|mount volume|path to( resource)?)\\b"
         },
         {
-          "match": "\\b(beep|choose (application|color|file( name)?|folder|from list|remote application|URL)|delay|display (alert|dialog)|say)\\b",
-          "name": "support.function.standardadditions.user-interaction.applescript"
+          "name": "support.function.standardadditions.user-interaction.applescript",
+          "match": "\\b(beep|choose (application|color|file( name)?|folder|from list|remote application|URL)|delay|display (alert|dialog)|say)\\b"
         },
         {
-          "match": "\\b(ASCII (character|number)|localized string|offset|summarize)\\b",
-          "name": "support.function.standardadditions.string.applescript"
+          "name": "support.function.standardadditions.string.applescript",
+          "match": "\\b(ASCII (character|number)|localized string|offset|summarize)\\b"
         },
         {
-          "match": "\\b(set the clipboard to|the clipboard|clipboard info)\\b",
-          "name": "support.function.standardadditions.clipboard.applescript"
+          "name": "support.function.standardadditions.clipboard.applescript",
+          "match": "\\b(set the clipboard to|the clipboard|clipboard info)\\b"
         },
         {
-          "match": "\\b(open for access|close access|read|write|get eof|set eof)\\b",
-          "name": "support.function.standardadditions.file-i-o.applescript"
+          "name": "support.function.standardadditions.file-i-o.applescript",
+          "match": "\\b(open for access|close access|read|write|get eof|set eof)\\b"
         },
         {
-          "match": "\\b((load|store|run) script|scripting components)\\b",
-          "name": "support.function.standardadditions.scripting.applescript"
+          "name": "support.function.standardadditions.scripting.applescript",
+          "match": "\\b((load|store|run) script|scripting components)\\b"
         },
         {
-          "match": "\\b(current date|do shell script|get volume settings|random number|round|set volume|system attribute|system info|time to GMT)\\b",
-          "name": "support.function.standardadditions.miscellaneous.applescript"
+          "name": "support.function.standardadditions.miscellaneous.applescript",
+          "match": "\\b(current date|do shell script|get volume settings|random number|round|set volume|system attribute|system info|time to GMT)\\b"
         },
         {
-          "match": "\\b(opening folder|(closing|moving) folder window for|adding folder items to|removing folder items from)\\b",
-          "name": "support.function.standardadditions.folder-actions.applescript"
+          "name": "support.function.standardadditions.folder-actions.applescript",
+          "match": "\\b(opening folder|(closing|moving) folder window for|adding folder items to|removing folder items from)\\b"
         },
         {
-          "match": "\\b(open location|handle CGI request)\\b",
-          "name": "support.function.standardadditions.internet.applescript"
+          "name": "support.function.standardadditions.internet.applescript",
+          "match": "\\b(open location|handle CGI request)\\b"
         }
       ]
     },
     "system-events": {
       "patterns": [
         {
-          "match": "\\b(audio (data|file))\\b",
-          "name": "support.class.system-events.audio-file.applescript"
+          "name": "support.class.system-events.audio-file.applescript",
+          "match": "\\b(audio (data|file))\\b"
         },
         {
-          "match": "\\b(alias(es)?|(Classic|local|network|system|user) domain objects?|disk( item)?s?|domains?|file( package)?s?|folders?|items?)\\b",
-          "name": "support.class.system-events.disk-folder-file.applescript"
+          "name": "support.class.system-events.disk-folder-file.applescript",
+          "match": "\\b(alias(es)?|(Classic|local|network|system|user) domain objects?|disk( item)?s?|domains?|file( package)?s?|folders?|items?)\\b"
         },
         {
-          "match": "\\b(delete|open|move)\\b",
-          "name": "support.function.system-events.disk-folder-file.applescript"
+          "name": "support.function.system-events.disk-folder-file.applescript",
+          "match": "\\b(delete|open|move)\\b"
         },
         {
-          "match": "\\b(folder actions?|scripts?)\\b",
-          "name": "support.class.system-events.folder-actions.applescript"
+          "name": "support.class.system-events.folder-actions.applescript",
+          "match": "\\b(folder actions?|scripts?)\\b"
         },
         {
-          "match": "\\b(attach action to|attached scripts|edit action of|remove action from)\\b",
-          "name": "support.function.system-events.folder-actions.applescript"
+          "name": "support.function.system-events.folder-actions.applescript",
+          "match": "\\b(attach action to|attached scripts|edit action of|remove action from)\\b"
         },
         {
-          "match": "\\b(movie data|movie file)\\b",
-          "name": "support.class.system-events.movie-file.applescript"
+          "name": "support.class.system-events.movie-file.applescript",
+          "match": "\\b(movie data|movie file)\\b"
         },
         {
-          "match": "\\b(log out|restart|shut down|sleep)\\b",
-          "name": "support.function.system-events.power.applescript"
+          "name": "support.function.system-events.power.applescript",
+          "match": "\\b(log out|restart|shut down|sleep)\\b"
         },
         {
-          "match": "\\b(((application |desk accessory )?process|(check|combo )?box)(es)?|(action|attribute|browser|(busy|progress|relevance) indicator|color well|column|drawer|group|grow area|image|incrementor|list|menu( bar)?( item)?|(menu |pop up |radio )?button|outline|(radio|tab|splitter) group|row|scroll (area|bar)|sheet|slider|splitter|static text|table|text (area|field)|tool bar|UI element|window)s?)\\b",
-          "name": "support.class.system-events.processes.applescript"
+          "name": "support.class.system-events.processes.applescript",
+          "match": "\\b(((application |desk accessory )?process|(check|combo )?box)(es)?|(action|attribute|browser|(busy|progress|relevance) indicator|color well|column|drawer|group|grow area|image|incrementor|list|menu( bar)?( item)?|(menu |pop up |radio )?button|outline|(radio|tab|splitter) group|row|scroll (area|bar)|sheet|slider|splitter|static text|table|text (area|field)|tool bar|UI element|window)s?)\\b"
         },
         {
-          "match": "\\b(click|key code|keystroke|perform|select)\\b",
-          "name": "support.function.system-events.processes.applescript"
+          "name": "support.function.system-events.processes.applescript",
+          "match": "\\b(click|key code|keystroke|perform|select)\\b"
         },
         {
-          "match": "\\b(property list (file|item))\\b",
-          "name": "support.class.system-events.property-list.applescript"
+          "name": "support.class.system-events.property-list.applescript",
+          "match": "\\b(property list (file|item))\\b"
         },
         {
-          "match": "\\b(annotation|QuickTime (data|file)|track)s?\\b",
-          "name": "support.class.system-events.quicktime-file.applescript"
+          "name": "support.class.system-events.quicktime-file.applescript",
+          "match": "\\b(annotation|QuickTime (data|file)|track)s?\\b"
         },
         {
-          "match": "\\b((abort|begin|end) transaction)\\b",
-          "name": "support.function.system-events.system-events.applescript"
+          "name": "support.function.system-events.system-events.applescript",
+          "match": "\\b((abort|begin|end) transaction)\\b"
         },
         {
-          "match": "\\b(XML (attribute|data|element|file)s?)\\b",
-          "name": "support.class.system-events.xml.applescript"
+          "name": "support.class.system-events.xml.applescript",
+          "match": "\\b(XML (attribute|data|element|file)s?)\\b"
         },
         {
-          "match": "\\b(print settings|users?|login items?)\\b",
-          "name": "support.class.sytem-events.other.applescript"
+          "name": "support.class.sytem-events.other.applescript",
+          "match": "\\b(print settings|users?|login items?)\\b"
         }
       ]
     },
     "textmate": {
       "patterns": [
         {
-          "match": "\\b(print settings)\\b",
-          "name": "support.class.textmate.applescript"
+          "name": "support.class.textmate.applescript",
+          "match": "\\b(print settings)\\b"
         },
         {
-          "match": "\\b(get url|insert|reload bundles)\\b",
-          "name": "support.function.textmate.applescript"
+          "name": "support.function.textmate.applescript",
+          "match": "\\b(get url|insert|reload bundles)\\b"
         }
       ]
     }
-  },
-  "scopeName": "source.applescript",
-  "uuid": "777CF925-14B9-428E-B07B-17FAAB8FA27E"
-}
+  }
+}