ver 2010.02 → 2010.08

data/config/syntax/Apache.rb

@@ -3,17 +3,17 @@
 {fileTypes: ["conf", "htaccess"],
  foldingStartMarker: 
   /^[ ]*(?x)
-	(<(?i:FilesMatch|Files|DirectoryMatch|Directory|LocationMatch|Location|VirtualHost|IfModule|IfDefine)\b.*?>
+	(?<_1><(?i:FilesMatch|Files|DirectoryMatch|Directory|LocationMatch|Location|VirtualHost|IfModule|IfDefine)\b.*?>
 	)/,
  foldingStopMarker: 
   /^[ ]*(?x)
-	(<\/(?i:FilesMatch|Files|DirectoryMatch|Directory|LocationMatch|Location|VirtualHost|IfModule|IfDefine)>
+	(?<_1><\/(?i:FilesMatch|Files|DirectoryMatch|Directory|LocationMatch|Location|VirtualHost|IfModule|IfDefine)>
 	)/,
- keyEquivalent: /^~A/,
+ keyEquivalent: "^~A",
  name: "Apache",
  patterns: 
   [{captures: {1 => {name: "punctuation.definition.comment.apache-config"}},
-    match: /(#).*$\n?/,
+    match: /(?<_1>#).*$\n?/,
     name: "comment.line.number-sign.apache-config"},
    {captures: 
      {1 => {name: "punctuation.definition.tag.apache-config"},
@@ -22,9 +22,11 @@
       4 => {name: "meta.scope.between-tag-pair.apache-config"},
       5 => {name: "entity.name.tag.apache-config"},
       6 => {name: "punctuation.definition.tag.apache-config"}},
-    match: /^[ ]*(<)([a-zA-Z0-9:]+)[^>]*(>(<)\/)(\2)(>)/,
+    match: 
+     /^[ ]*(?<_1><)(?<_2>[a-zA-Z0-9:]+)[^>]*(?<_3>>(?<_4><)\/)(?<_5>\k<_2>)(?<_6>>)/,
     name: "meta.tag.any.html"},
-   {begin: /^[ ]*((<)(VirtualHost)(?:[ ]+([^>]+))?(>))/,
+   {begin: 
+     /^[ ]*(?<_1>(?<_2><)(?<_3>VirtualHost)(?:[ ]+(?<_4>[^>]+))?(?<_5>>))/,
     beginCaptures: 
      {1 => {name: "meta.tag.apache-config"},
       2 => {name: "punctuation.definition.tag.apache-config"},
@@ -39,7 +41,8 @@
       4 => {name: "punctuation.definition.tag.apache-config"}},
     name: "meta.vhost.apache-config",
     patterns: [{include: "$base"}]},
-   {begin: /^[ ]*((<)(Directory(?:Match)?)(?:[ ]+([^>]+))?(>))/,
+   {begin: 
+     /^[ ]*(?<_1>(?<_2><)(?<_3>Directory(?:Match)?)(?:[ ]+(?<_4>[^>]+))?(?<_5>>))/,
     beginCaptures: 
      {1 => {name: "meta.tag.apache-config"},
       2 => {name: "punctuation.definition.tag.apache-config"},
@@ -54,7 +57,8 @@
       4 => {name: "punctuation.definition.tag.apache-config"}},
     name: "meta.directory.apache-config",
     patterns: [{include: "$base"}]},
-   {begin: /^[ ]*((<)(Location(?:Match)?)(?:[ ]+([^>]+))?(>))/,
+   {begin: 
+     /^[ ]*(?<_1>(?<_2><)(?<_3>Location(?:Match)?)(?:[ ]+(?<_4>[^>]+))?(?<_5>>))/,
     beginCaptures: 
      {1 => {name: "meta.tag.apache-config"},
       2 => {name: "punctuation.definition.tag.apache-config"},
@@ -69,14 +73,14 @@
       4 => {name: "punctuation.definition.tag.apache-config"}},
     name: "meta.location.apache-config",
     patterns: [{include: "$base"}]},
-   {begin: /(^Include)/,
+   {begin: /(?<_1>^Include)/,
     beginCaptures: 
      {1 => {name: "support.constant.include.start.apache-config"}},
     end: "(\\n)",
     endCaptures: {1 => {name: "support.constant.include.end.apache-config"}},
     name: "source.include.apache-config",
-    patterns: [{match: /(.*)/, name: "text.include.apache-config"}]},
-   {begin: /^[ ]*\b(RewriteCond)\b/,
+    patterns: [{match: /(?<_1>.*)/, name: "text.include.apache-config"}]},
+   {begin: /^[ ]*\b(?<_1>RewriteCond)\b/,
     captures: {1 => {name: "support.constant.rewritecond.apache-config"}},
     end: "$",
     patterns: 
@@ -92,8 +96,8 @@
              name: "string.other.rewrite-condition.apache-config"},
             {captures: 
               {1 => {name: "string.regexp.rewrite-operator.apache-config"}},
-             match: /[ ]+(\[[^\]]+\])/}]}]}]},
-   {begin: /^[ ]*\b(RewriteRule)\b/,
+             match: /[ ]+(?<_1>\[[^\]]+\])/}]}]}]},
+   {begin: /^[ ]*\b(?<_1>RewriteRule)\b/,
     captures: {1 => {name: "support.constant.rewriterule.apache-config"}},
     end: "$",
     patterns: 
@@ -111,12 +115,12 @@
              name: "string.other.rewrite-substitution.apache-config"},
             {captures: 
               {1 => {name: "string.regexp.rewrite-operator.apache-config"}},
-             match: /[ ]+(\[[^\]]+\])/}]}]}]},
+             match: /[ ]+(?<_1>\[[^\]]+\])/}]}]}]},
    {match: 
-     /\b(R(e(sourceConfig|direct(Match|Temp|Permanent)?|qu(ire|estHeader)|ferer(Ignore|Log)|write(Rule|Map|Base|Cond|Options|Engine|Lo(ck|g(Level)?))|admeName|move(Handler|Charset|Type|InputFilter|OutputFilter|Encoding|Language))|Limit(MEM|NPROC|CPU))|Group|XBitHack|M(MapFile|i(nSpare(Servers|Threads)|meMagicFile)|odMimeUsePathInfo|Cache(RemovalAlgorithm|M(inObjectSize|ax(StreamingBuffer|Object(Size|Count)))|Size)|ultiviewsMatch|eta(Suffix|Dir|Files)|ax(RequestsPer(Child|Thread)|MemFree|Spare(Servers|Threads)|Clients|Threads(PerChild)?|KeepAliveRequests))|B(indAddress|S2000Account|rowserMatch(NoCase)?)|S(hmemUIDisUser|c(oreBoardFile|ript(Sock|InterpreterSource|Log(Buffer|Length)?|Alias(Match)?)?)|tart(Servers|Threads)|S(I(StartTag|TimeFormat|UndefinedEcho|E(ndTag|rrorMsg))|L(R(equire(SSL)?|andomSeed)|Mutex|SessionCache(Timeout)?|C(ipherSuite|ertificate(ChainFile|KeyFile|File)|A(Revocation(Path|File)|Certificate(Path|File)))|Options|P(assPhraseDialog|ro(tocol|xy(MachineCertificate(Path|File)|C(ipherSuite|A(Revocation(Path|File)|Certificate(Path|File)))|Protocol|Engine|Verify(Depth)?)))|Engine|Verify(Client|Depth)))|uexecUserGroup|e(ndBufferSize|cureListen|t(Handler|InputFilter|OutputFilter|Env(If(NoCase)?)?)|rver(Root|Signature|Name|T(ype|okens)|Path|Limit|A(dmin|lias)))|atisfy)|H(ostnameLookups|eader(Name)?)|N(o(Cache|Proxy)|umServers|ameVirtualHost|WSSL(TrustedCerts|Upgradeable))|C(h(ildPerUserID|eckSpelling|arset(SourceEnc|Options|Default))|GI(MapExtension|CommandArgs)|o(ntentDigest|okie(Style|Name|Tracking|Domain|Prefix|Expires|Format|Log)|reDumpDirectory)|ustomLog|learModuleList|ache(Root|Gc(MemUsage|Clean|Interval|Daily|Unused)|M(inFileSize|ax(Expire|FileSize))|Size|NegotiatedDocs|TimeMargin|Ignore(NoLastMod|CacheControl)|D(i(sable|rLe(ngth|vels))|efaultExpire)|E(nable|xpiryCheck)|F(ile|orceCompletion)|LastModifiedFactor))|T(hread(sPerChild|StackSize|Limit)|ypesConfig|ime(out|Out)|ransferLog)|I(n(clude|dex(Ignore|O(ptions|rderDefault)))|SAPI(ReadAheadBuffer|CacheFile|FakeAsync|LogNotSupported|AppendLogTo(Errors|Query))|dentityCheck|f(Module|Define)|map(Menu|Base|Default))|O(ptions|rder)|D(irectory(Match|Slash|Index)?|ocumentRoot|e(ny|f(late(MemLevel|BufferSize|CompressionLevel|FilterNote|WindowSize)|ault(Type|Icon|Language)))|av(MinTimeout|DepthInfinity|LockDB)?)|U(se(CanonicalName|r(Dir)?)|nsetEnv)|P(idFile|ort|assEnv|ro(tocol(ReqCheck|Echo)|xy(Re(ceiveBufferSize|quests|mote(Match)?)|Ma(tch|xForwards)|B(lock|adHeader)|Timeout|IOBufferSize|Domain|P(ass(Reverse)?|reserveHost)|ErrorOverride|Via)?))|E(nable(MMAP|Sendfile|ExceptionHook)|BCDIC(Convert(ByType)?|Kludge)|rror(Header|Document|Log)|x(t(endedStatus|Filter(Options|Define))|pires(ByType|Default|Active)|ample))|Virtual(ScriptAlias(IP)?|Host|DocumentRoot(IP)?)|KeepAlive(Timeout)?|F(ile(s(Match)?|ETag)|or(ce(Type|LanguagePriority)|ensicLog)|ancyIndexing)|Win32DisableAcceptEx|L(i(sten(Back(log|Log))?|mit(Request(Body|Field(s(ize)?|Size)|Line)|XMLRequestBody|InternalRecursion|Except)?)|o(c(kFile|ation(Match)?)|ad(Module|File)|g(Format|Level))|DAP(SharedCache(Size|File)|Cache(TTL|Entries)|TrustedCA(Type)?|OpCache(TTL|Entries))|anguagePriority)|A(ssignUserID|nonymous(_(MustGiveEmail|NoUserID|VerifyEmail|LogEmail|Authoritative))?|c(ce(ss(Config|FileName)|pt(Mutex|PathInfo|Filter))|tion)|dd(Module(Info)?|Handler|Charset|Type|I(nputFilter|con(By(Type|Encoding))?)|OutputFilter(ByType)?|De(scription|faultCharset)|Encoding|Language|Alt(By(Type|Encoding))?)|uth(GroupFile|Name|Type|D(B(GroupFile|M(GroupFile|Type|UserFile|Authoritative)|UserFile|Authoritative)|igest(GroupFile|ShmemSize|N(cCheck|once(Format|Lifetime))|Domain|Qop|File|Algorithm))|UserFile|LDAP(RemoteUserIsDN|GroupAttribute(IsDN)?|Bind(DN|Password)|C(harsetConfig|ompareDNOnServer)|DereferenceAliases|Url|Enabled|FrontPageHack|Authoritative)|Authoritative)|l(ias(Match)?|low(CONNECT|Override|EncodedSlashes)?)|gentLog)|MIMEMagicFile)\b/,
+     /\b(?<_1>R(?<_2>e(?<_3>sourceConfig|direct(?<_4>Match|Temp|Permanent)?|qu(?<_5>ire|estHeader)|ferer(?<_6>Ignore|Log)|write(?<_7>Rule|Map|Base|Cond|Options|Engine|Lo(?<_8>ck|g(?<_9>Level)?))|admeName|move(?<_10>Handler|Charset|Type|InputFilter|OutputFilter|Encoding|Language))|Limit(?<_11>MEM|NPROC|CPU))|Group|XBitHack|M(?<_12>MapFile|i(?<_13>nSpare(?<_14>Servers|Threads)|meMagicFile)|odMimeUsePathInfo|Cache(?<_15>RemovalAlgorithm|M(?<_16>inObjectSize|ax(?<_17>StreamingBuffer|Object(?<_18>Size|Count)))|Size)|ultiviewsMatch|eta(?<_19>Suffix|Dir|Files)|ax(?<_20>RequestsPer(?<_21>Child|Thread)|MemFree|Spare(?<_22>Servers|Threads)|Clients|Threads(?<_23>PerChild)?|KeepAliveRequests))|B(?<_24>indAddress|S2000Account|rowserMatch(?<_25>NoCase)?)|S(?<_26>hmemUIDisUser|c(?<_27>oreBoardFile|ript(?<_28>Sock|InterpreterSource|Log(?<_29>Buffer|Length)?|Alias(?<_30>Match)?)?)|tart(?<_31>Servers|Threads)|S(?<_32>I(?<_33>StartTag|TimeFormat|UndefinedEcho|E(?<_34>ndTag|rrorMsg))|L(?<_35>R(?<_36>equire(?<_37>SSL)?|andomSeed)|Mutex|SessionCache(?<_38>Timeout)?|C(?<_39>ipherSuite|ertificate(?<_40>ChainFile|KeyFile|File)|A(?<_41>Revocation(?<_42>Path|File)|Certificate(?<_43>Path|File)))|Options|P(?<_44>assPhraseDialog|ro(?<_45>tocol|xy(?<_46>MachineCertificate(?<_47>Path|File)|C(?<_48>ipherSuite|A(?<_49>Revocation(?<_50>Path|File)|Certificate(?<_51>Path|File)))|Protocol|Engine|Verify(?<_52>Depth)?)))|Engine|Verify(?<_53>Client|Depth)))|uexecUserGroup|e(?<_54>ndBufferSize|cureListen|t(?<_55>Handler|InputFilter|OutputFilter|Env(?<_56>If(?<_57>NoCase)?)?)|rver(?<_58>Root|Signature|Name|T(?<_59>ype|okens)|Path|Limit|A(?<_60>dmin|lias)))|atisfy)|H(?<_61>ostnameLookups|eader(?<_62>Name)?)|N(?<_63>o(?<_64>Cache|Proxy)|umServers|ameVirtualHost|WSSL(?<_65>TrustedCerts|Upgradeable))|C(?<_66>h(?<_67>ildPerUserID|eckSpelling|arset(?<_68>SourceEnc|Options|Default))|GI(?<_69>MapExtension|CommandArgs)|o(?<_70>ntentDigest|okie(?<_71>Style|Name|Tracking|Domain|Prefix|Expires|Format|Log)|reDumpDirectory)|ustomLog|learModuleList|ache(?<_72>Root|Gc(?<_73>MemUsage|Clean|Interval|Daily|Unused)|M(?<_74>inFileSize|ax(?<_75>Expire|FileSize))|Size|NegotiatedDocs|TimeMargin|Ignore(?<_76>NoLastMod|CacheControl)|D(?<_77>i(?<_78>sable|rLe(?<_79>ngth|vels))|efaultExpire)|E(?<_80>nable|xpiryCheck)|F(?<_81>ile|orceCompletion)|LastModifiedFactor))|T(?<_82>hread(?<_83>sPerChild|StackSize|Limit)|ypesConfig|ime(?<_84>out|Out)|ransferLog)|I(?<_85>n(?<_86>clude|dex(?<_87>Ignore|O(?<_88>ptions|rderDefault)))|SAPI(?<_89>ReadAheadBuffer|CacheFile|FakeAsync|LogNotSupported|AppendLogTo(?<_90>Errors|Query))|dentityCheck|f(?<_91>Module|Define)|map(?<_92>Menu|Base|Default))|O(?<_93>ptions|rder)|D(?<_94>irectory(?<_95>Match|Slash|Index)?|ocumentRoot|e(?<_96>ny|f(?<_97>late(?<_98>MemLevel|BufferSize|CompressionLevel|FilterNote|WindowSize)|ault(?<_99>Type|Icon|Language)))|av(?<_100>MinTimeout|DepthInfinity|LockDB)?)|U(?<_101>se(?<_102>CanonicalName|r(?<_103>Dir)?)|nsetEnv)|P(?<_104>idFile|ort|assEnv|ro(?<_105>tocol(?<_106>ReqCheck|Echo)|xy(?<_107>Re(?<_108>ceiveBufferSize|quests|mote(?<_109>Match)?)|Ma(?<_110>tch|xForwards)|B(?<_111>lock|adHeader)|Timeout|IOBufferSize|Domain|P(?<_112>ass(?<_113>Reverse)?|reserveHost)|ErrorOverride|Via)?))|E(?<_114>nable(?<_115>MMAP|Sendfile|ExceptionHook)|BCDIC(?<_116>Convert(?<_117>ByType)?|Kludge)|rror(?<_118>Header|Document|Log)|x(?<_119>t(?<_120>endedStatus|Filter(?<_121>Options|Define))|pires(?<_122>ByType|Default|Active)|ample))|Virtual(?<_123>ScriptAlias(?<_124>IP)?|Host|DocumentRoot(?<_125>IP)?)|KeepAlive(?<_126>Timeout)?|F(?<_127>ile(?<_128>s(?<_129>Match)?|ETag)|or(?<_130>ce(?<_131>Type|LanguagePriority)|ensicLog)|ancyIndexing)|Win32DisableAcceptEx|L(?<_132>i(?<_133>sten(?<_134>Back(?<_135>log|Log))?|mit(?<_136>Request(?<_137>Body|Field(?<_138>s(?<_139>ize)?|Size)|Line)|XMLRequestBody|InternalRecursion|Except)?)|o(?<_140>c(?<_141>kFile|ation(?<_142>Match)?)|ad(?<_143>Module|File)|g(?<_144>Format|Level))|DAP(?<_145>SharedCache(?<_146>Size|File)|Cache(?<_147>TTL|Entries)|TrustedCA(?<_148>Type)?|OpCache(?<_149>TTL|Entries))|anguagePriority)|A(?<_150>ssignUserID|nonymous(?<_151>_(?<_152>MustGiveEmail|NoUserID|VerifyEmail|LogEmail|Authoritative))?|c(?<_153>ce(?<_154>ss(?<_155>Config|FileName)|pt(?<_156>Mutex|PathInfo|Filter))|tion)|dd(?<_157>Module(?<_158>Info)?|Handler|Charset|Type|I(?<_159>nputFilter|con(?<_160>By(?<_161>Type|Encoding))?)|OutputFilter(?<_162>ByType)?|De(?<_163>scription|faultCharset)|Encoding|Language|Alt(?<_164>By(?<_165>Type|Encoding))?)|uth(?<_166>GroupFile|Name|Type|D(?<_167>B(?<_168>GroupFile|M(?<_169>GroupFile|Type|UserFile|Authoritative)|UserFile|Authoritative)|igest(?<_170>GroupFile|ShmemSize|N(?<_171>cCheck|once(?<_172>Format|Lifetime))|Domain|Qop|File|Algorithm))|UserFile|LDAP(?<_173>RemoteUserIsDN|GroupAttribute(?<_174>IsDN)?|Bind(?<_175>DN|Password)|C(?<_176>harsetConfig|ompareDNOnServer)|DereferenceAliases|Url|Enabled|FrontPageHack|Authoritative)|Authoritative)|l(?<_177>ias(?<_178>Match)?|low(?<_179>CONNECT|Override|EncodedSlashes)?)|gentLog)|MIMEMagicFile)\b/,
     name: "support.constant.apache-config"},
    {match: 
-     /\b(access_module|actions_module|action_module|alias_module|anon_auth_module|asis_module|authn_anon_module|authn_dbd_module|authn_dbm_module|authn_default_module|authn_file_module|authz_dbm_module|authz_default_module|authz_groupfile_module|authz_host_module|authz_owner_module|authz_user_module|auth_basic_module|auth_digest_module|auth_module|autoindex_module|bonjour_module|cache_module|cern_meta_module|cgi_module|config_log_module|dav_fs_module|dav_module|dbd_module|dbm_auth_module|deflate_module|digest_module|dir_module|disk_cache_module|dumpio_module|env_module|expires_module|ext_filter_module|fastcgi_module|filter_module|foo_module|headers_module|hfs_apple_module|ident_module|imagemap_module|imap_module|includes_module|include_module|info_module|jk_module|logio_module|log_config_module|log_forensic_module|mem_cache_module|mime_magic_module|mime_module|negotiation_module|perl_module|php4_module|php5_module|proxy_ajp_module|proxy_balancer_module|proxy_connect_module|proxy_ftp_module|proxy_http_module|proxy_module|rendezvous_apple_module|rendezvous_module|rewrite_module|setenvif_module|speling_module|ssl_module|status_module|substitute_module|unique_id_module|userdir_module|usertrack_module|version_module|vhost_alias_module)\b/,
+     /\b(?<_1>access_module|actions_module|action_module|alias_module|anon_auth_module|asis_module|authn_anon_module|authn_dbd_module|authn_dbm_module|authn_default_module|authn_file_module|authz_dbm_module|authz_default_module|authz_groupfile_module|authz_host_module|authz_owner_module|authz_user_module|auth_basic_module|auth_digest_module|auth_module|autoindex_module|bonjour_module|cache_module|cern_meta_module|cgi_module|config_log_module|dav_fs_module|dav_module|dbd_module|dbm_auth_module|deflate_module|digest_module|dir_module|disk_cache_module|dumpio_module|env_module|expires_module|ext_filter_module|fastcgi_module|filter_module|foo_module|headers_module|hfs_apple_module|ident_module|imagemap_module|imap_module|includes_module|include_module|info_module|jk_module|logio_module|log_config_module|log_forensic_module|mem_cache_module|mime_magic_module|mime_module|negotiation_module|perl_module|php4_module|php5_module|proxy_ajp_module|proxy_balancer_module|proxy_connect_module|proxy_ftp_module|proxy_http_module|proxy_module|rendezvous_apple_module|rendezvous_module|rewrite_module|setenvif_module|speling_module|ssl_module|status_module|substitute_module|unique_id_module|userdir_module|usertrack_module|version_module|vhost_alias_module)\b/,
     name: "support.class.apache-config"},
    {begin: /"/,
     beginCaptures: 
@@ -127,7 +131,7 @@
     name: "string.quoted.double.apache-config",
     patterns: 
      [{match: /""/, name: "constant.character.escape.apostrophe.apache"}]},
-   {begin: /(<\/?)([a-zA-Z]+)/,
+   {begin: /(?<_1><\/?)(?<_2>[a-zA-Z]+)/,
     captures: 
      {1 => {name: "punctuation.definition.tag.apache-config"},
       2 => {name: "entity.name.tag.apache-config"}},
@@ -140,7 +144,7 @@
          {1 => {name: "punctuation.definition.variable.apache-config"},
           3 => {name: "punctuation.definition.variable.apache-config"}},
         match: 
-         /(%\{)(?:HTTP_(?:USER_AGENT|REFERER|COOKIE|FORWARDED|HOST|PROXY_CONNECTION|ACCEPT)|REMOTE_(?:ADDR|HOST|USER|IDENT)|REQUEST_(?:METHOD|URI|FILENAME)|SCRIPT_FILENAME|PATH_INFO|QUERY_STRING|AUTH_TYPE|DOCUMENT_ROOT|SERVER_(?:ADMIN|NAME|ADDR|PORT|PROTOCOL|SOFTWARE)|TIME_(?:YEAR|MON|DAY|HOUR|MIN|SEC|WDAY)|TIME|API_VERSION|THE_REQUEST|IS_SUBREQ|(?:ENV|LA-U|LA-F|HTTP|SSL):[^\}]+)(\})/,
+         /(?<_1>%\{)(?:HTTP_(?:USER_AGENT|REFERER|COOKIE|FORWARDED|HOST|PROXY_CONNECTION|ACCEPT)|REMOTE_(?:ADDR|HOST|USER|IDENT)|REQUEST_(?:METHOD|URI|FILENAME)|SCRIPT_FILENAME|PATH_INFO|QUERY_STRING|AUTH_TYPE|DOCUMENT_ROOT|SERVER_(?:ADMIN|NAME|ADDR|PORT|PROTOCOL|SOFTWARE)|TIME_(?:YEAR|MON|DAY|HOUR|MIN|SEC|WDAY)|TIME|API_VERSION|THE_REQUEST|IS_SUBREQ|(?:ENV|LA-U|LA-F|HTTP|SSL):[^\}]+)(?<_2>\})/,
         name: "support.variable.apache-config"},
        {match: /%\{[^\}]+\}/,
         name: "invalid.illegal.bad-var.apache-config"}]}},

data/config/syntax/AppleScript.rb

@@ -5,137 +5,482 @@
  foldingStartMarker: 
   /(?x)
 	^\s*
-	(
-	 tell \s+ (?! .* \b(to)\b) .*
-	|tell\b.*?\bto\ tell \s+ (?! .* \b(to)\b) .*
+	(?<_1>
+	 tell \s+ (?! .* \b(?<_2>to)\b) .*
+	|tell\b.*?\bto\ tell \s+ (?! .* \b(?<_3>to)\b) .*
 	|using \s+ terms \s+ from \s+ .*
 	|if\b .* \bthen\b
 	|repeat\b .*
-	|( on | to )\b (?!\s+ error) .*
-	|try
-	|with \s+ timeout .*
+	|(?<_4> on | to )\b (?!\s+ error) .*
+	|try\b
+	|with \s+ timeout\b .*
 	|script\b .*
-	|( considering | ignoring )\b .*
-	)\s*(--.*?)?$
+	|(?<_5> considering | ignoring )\b .*
+	)\s*(?<_6>--.*?)?$
 	/,
  foldingStopMarker: /^\s*end\b.*$/,
- keyEquivalent: /^~A/,
+ keyEquivalent: "^~A",
  name: "AppleScript",
  patterns: [{include: "#blocks"}, {include: "#inline"}],
  repository: 
-  {blocks: 
+  {:"attributes.considering-ignoring" => 
     {patterns: 
-      [{begin: /^\s*(script)\s+(\w+)/,
-        captures: 
+      [{match: /,/,
+        name: "punctuation.separator.array.attributes.applescript"},
+       {match: /\b(?<_1>and)\b/,
+        name: "keyword.control.attributes.and.applescript"},
+       {match: 
+         /\b(?i:case|diacriticals|hyphens|numeric\s+strings|punctuation|white\s+space)\b/,
+        name: "constant.other.attributes.text.applescript"},
+       {match: /\b(?i:application\s+responses)\b/,
+        name: "constant.other.attributes.application.applescript"}]},
+   blocks: 
+    {patterns: 
+      [{begin: /^\s*(?<_1>script)\s+(?<_2>\w+)/,
+        beginCaptures: 
          {1 => {name: "keyword.control.script.applescript"},
           2 => {name: "entity.name.type.script-object.applescript"}},
-        end: "^\\s*(end script)",
-        name: "meta.script.applescript",
+        end: "^\\s*(end(?:\\s+script)?)(?=\\s*(--.*?)?$)",
+        endCaptures: {1 => {name: "keyword.control.script.applescript"}},
+        name: "meta.block.script.applescript",
         patterns: [{include: "$self"}]},
        {begin: 
          /^(?x)
-	\s*(to|on)\s+ 					# "on" or "to"
-	([A-Za-z][A-Za-z0-9_]*)			# function name
-	(\()							# opening paren
-	(?:(\w+(?:\s*,\s*\w+)*))?	# parameters
-	(\))							# closing paren
+	\s*(?<_1>to|on)\s+ 					# "on" or "to"
+	(?<_2>\w+)							# function name
+	(?<_3>\()							# opening paren
+	(?<_4>(?:[\s,:\{\}]*(?:\w+)?)*)	# parameters
+	(?<_5>\))							# closing paren
 	/,
-        captures: 
-         {1 => {name: "keyword.control.on.applescript"},
+        beginCaptures: 
+         {1 => {name: "keyword.control.function.applescript"},
           2 => {name: "entity.name.function.handler.applescript"},
           3 => {name: "punctuation.definition.parameters.applescript"},
           4 => {name: "variable.parameter.handler.applescript"},
           5 => {name: "punctuation.definition.parameters.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)(?: (\\2))?\\s*$",
-        name: "meta.function.with-parentheses.applescript",
+        end: "^\\s*(end)(?:\\s+(\\2))?(?=\\s*(--.*?)?$)",
+        endCaptures: {1 => {name: "keyword.control.function.applescript"}},
+        name: "meta.function.positional.applescript",
         patterns: [{include: "$self"}]},
        {begin: 
-         /^\s*(on)\s+(\w+)(?=\s+(above|against|apart from|around|aside from|at|below|beneath|beside|between|by|for|from|instead of|into|on|onto|out of|over|thru|under)\s+)/,
-        captures: 
-         {1 => {name: "keyword.control.on.applescript"},
-          2 => {name: "entity.name.function.handler.applescript"}},
-        end: "^\\s*(end)(?: (\\2))?\\s*$",
+         /^(?x)
+	\s*(?<_1>to|on)\s+ 					# "on" or "to"
+	(?<_2>\w+)							# function name
+	(?:\s+
+	(?<_3>of|in)\s+					# "of" or "in"
+	(?<_4>\w+)						# direct parameter
+	)?
+	(?=\s+(?<_5>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)
+	/,
+        beginCaptures: 
+         {1 => {name: "keyword.control.function.applescript"},
+          2 => {name: "entity.name.function.handler.applescript"},
+          3 => {name: "keyword.control.function.applescript"},
+          4 => {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",
         patterns: 
          [{captures: 
             {1 => {name: "keyword.control.preposition.applescript"},
              2 => {name: "variable.parameter.handler.applescript"}},
            match: 
-            /\b(above|against|apart from|around|aside from|at|below|beneath|beside|between|by|for|from|instead of|into|on|onto|out of|over|thru|under)\s+(\w+)\b/},
+            /\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+(?<_1>\w+)\b/},
+          {include: "$self"}]},
+       {begin: 
+         /^(?x)
+	\s*(?<_1>to|on)\s+ 					# "on" or "to"
+	(?<_2>\w+)							# function name
+	(?=\s*(?<_3>--.*?)?$)				# nothing else
+	/,
+        beginCaptures: 
+         {1 => {name: "keyword.control.function.applescript"},
+          2 => {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"},
+       {include: "#blocks.repeat"},
+       {include: "#blocks.statement"},
+       {include: "#blocks.other"}]},
+   :"blocks.other" => 
+    {patterns: 
+      [{begin: /^\s*(?<_1>considering)\b/,
+        end: "^\\s*(end(?:\\s+considering)?)(?=\\s*(--.*?)?$)",
+        name: "meta.block.considering.applescript",
+        patterns: 
+         [{begin: /(?<=considering)/,
+           end: "(?<!¬)$",
+           name: "meta.array.attributes.considering.applescript",
+           patterns: [{include: "#attributes.considering-ignoring"}]},
+          {begin: /(?<=ignoring)/,
+           end: "(?<!¬)$",
+           name: "meta.array.attributes.ignoring.applescript",
+           patterns: [{include: "#attributes.considering-ignoring"}]},
+          {match: /\b(?<_1>but)\b/, name: "keyword.control.but.applescript"},
+          {include: "$self"}]},
+       {begin: /^\s*(?<_1>ignoring)\b/,
+        end: "^\\s*(end(?:\\s+ignoring)?)(?=\\s*(--.*?)?$)",
+        name: "meta.block.ignoring.applescript",
+        patterns: 
+         [{begin: /(?<=considering)/,
+           end: "(?<!¬)$",
+           name: "meta.array.attributes.considering.applescript",
+           patterns: [{include: "#attributes.considering-ignoring"}]},
+          {begin: /(?<=ignoring)/,
+           end: "(?<!¬)$",
+           name: "meta.array.attributes.ignoring.applescript",
+           patterns: [{include: "#attributes.considering-ignoring"}]},
+          {match: /\b(?<_1>but)\b/, name: "keyword.control.but.applescript"},
+          {include: "$self"}]},
+       {begin: /^\s*(?<_1>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(?<_1>then)\b/, name: "keyword.control.then.applescript"},
+          {match: /\b(?<_1>else\s+if)\b/,
+           name: "keyword.control.else-if.applescript"},
+          {match: /\b(?<_1>else)\b/, name: "keyword.control.else.applescript"},
           {include: "$self"}]},
-       {include: "#tell-blocks"}]},
+       {begin: /^\s*(?<_1>try)\b/,
+        beginCaptures: {1 => {name: "keyword.control.try.applescript"}},
+        end: "^\\s*(end(?:\\s+(try|error))?)(?=\\s*(--.*?)?$)",
+        endCaptures: {1 => {name: "keyword.control.end.applescript"}},
+        name: "meta.block.try.applescript",
+        patterns: 
+         [{begin: /^\s*(?<_1>on\s+error)\b/,
+           beginCaptures: 
+            {1 => {name: "keyword.control.exception.on-error.applescript"}},
+           end: "(?<!¬)$",
+           name: "meta.property.error.applescript",
+           patterns: 
+            [{match: /\b(?i:number|partial|from|to)\b/,
+              name: "keyword.control.exception.modifier.applescript"},
+             {include: "#inline"}]},
+          {include: "$self"}]},
+       {begin: /^\s*(?<_1>using\s+terms\s+from)\b/,
+        beginCaptures: {1 => {name: "keyword.control.terms.applescript"}},
+        end: "^\\s*(end(?:\\s+using\\s+terms\\s+from)?)(?=\\s*(--.*?)?$)",
+        endCaptures: {1 => {name: "keyword.control.end.applescript"}},
+        name: "meta.block.terms.applescript",
+        patterns: [{include: "$self"}]},
+       {begin: /^\s*(?<_1>with\s+timeout(?<_2>\s+of)?)\b/,
+        beginCaptures: {1 => {name: "keyword.control.timeout.applescript"}},
+        end: "^\\s*(end(?:\\s+timeout)?)(?=\\s*(--.*?)?$)",
+        endCaptures: {1 => {name: "keyword.control.end.applescript"}},
+        name: "meta.block.timeout.applescript",
+        patterns: [{include: "$self"}]},
+       {begin: /^\s*(?<_1>with\s+transaction(?<_2>\s+of)?)\b/,
+        beginCaptures: 
+         {1 => {name: "keyword.control.transaction.applescript"}},
+        end: "^\\s*(end(?:\\s+transaction)?)(?=\\s*(--.*?)?$)",
+        endCaptures: {1 => {name: "keyword.control.end.applescript"}},
+        name: "meta.block.transaction.applescript",
+        patterns: [{include: "$self"}]}]},
+   :"blocks.repeat" => 
+    {patterns: 
+      [{begin: /^\s*(?<_1>repeat)\s+(?<_2>until)\b/,
+        beginCaptures: 
+         {1 => {name: "keyword.control.repeat.applescript"},
+          2 => {name: "keyword.control.until.applescript"}},
+        end: "^\\s*(end(?:\\s+repeat)?)(?=\\s*(--.*?)?$)",
+        endCaptures: {1 => {name: "keyword.control.end.applescript"}},
+        name: "meta.block.repeat.until.applescript",
+        patterns: [{include: "$self"}]},
+       {begin: /^\s*(?<_1>repeat)\s+(?<_2>while)\b/,
+        beginCaptures: 
+         {1 => {name: "keyword.control.repeat.applescript"},
+          2 => {name: "keyword.control.while.applescript"}},
+        end: "^\\s*(end(?:\\s+repeat)?)(?=\\s*(--.*?)?$)",
+        endCaptures: {1 => {name: "keyword.control.end.applescript"}},
+        name: "meta.block.repeat.while.applescript",
+        patterns: [{include: "$self"}]},
+       {begin: /^\s*(?<_1>repeat)\s+(?<_2>with)\s+(?<_3>\w+)\b/,
+        beginCaptures: 
+         {1 => {name: "keyword.control.repeat.applescript"},
+          2 => {name: "keyword.control.until.applescript"},
+          3 => {name: "variable.parameter.loop.applescript"}},
+        end: "^\\s*(end(?:\\s+repeat)?)(?=\\s*(--.*?)?$)",
+        endCaptures: {1 => {name: "keyword.control.end.applescript"}},
+        name: "meta.block.repeat.with.applescript",
+        patterns: 
+         [{match: /\b(?<_1>from|to|by)\b/,
+           name: "keyword.control.modifier.range.applescript"},
+          {match: /\b(?<_1>in)\b/,
+           name: "keyword.control.modifier.list.applescript"},
+          {include: "$self"}]},
+       {begin: /^\s*(?<_1>repeat)\b(?=\s*(?<_2>--.*?)?$)/,
+        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",
+        patterns: [{include: "$self"}]},
+       {begin: /^\s*(?<_1>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(?<_1>times)\b/,
+           name: "keyword.control.times.applescript"},
+          {include: "$self"}]}]},
+   :"blocks.statement" => 
+    {patterns: 
+      [{begin: /\b(?<_1>prop(?:erty)?)\s+(?<_2>\w+)\b/,
+        beginCaptures: 
+         {1 => {name: "keyword.control.def.property.applescript"},
+          2 => {name: "variable.other.property.applescript"}},
+        end: "(?<!¬)$",
+        name: "meta.statement.property.applescript",
+        patterns: 
+         [{match: /:/,
+           name: "punctuation.separator.key-value.property.applescript"},
+          {include: "#inline"}]},
+       {begin: /\b(?<_1>set)\s+(?<_2>\w+)\s+(?<_3>to)\b/,
+        beginCaptures: 
+         {1 => {name: "keyword.control.def.set.applescript"},
+          2 => {name: "variable.other.readwrite.set.applescript"},
+          3 => {name: "keyword.control.def.set.applescript"}},
+        end: "(?<!¬)$",
+        name: "meta.statement.set.applescript",
+        patterns: [{include: "#inline"}]},
+       {begin: /\b(?<_1>local)\b/,
+        beginCaptures: {1 => {name: "keyword.control.def.local.applescript"}},
+        end: "(?<!¬)$",
+        name: "meta.statement.local.applescript",
+        patterns: 
+         [{match: /,/,
+           name: "punctuation.separator.variables.local.applescript"},
+          {match: /\b\w+/, name: "variable.other.readwrite.local.applescript"},
+          {include: "#inline"}]},
+       {begin: /\b(?<_1>global)\b/,
+        beginCaptures: {1 => {name: "keyword.control.def.global.applescript"}},
+        end: "(?<!¬)$",
+        name: "meta.statement.global.applescript",
+        patterns: 
+         [{match: /,/,
+           name: "punctuation.separator.variables.global.applescript"},
+          {match: /\b\w+/,
+           name: "variable.other.readwrite.global.applescript"},
+          {include: "#inline"}]},
+       {begin: /\b(?<_1>error)\b/,
+        beginCaptures: 
+         {1 => {name: "keyword.control.exception.error.applescript"}},
+        end: "(?<!¬)$",
+        name: "meta.statement.error.applescript",
+        patterns: 
+         [{match: /\b(?<_1>number|partial|from|to)\b/,
+           name: "keyword.control.exception.modifier.applescript"},
+          {include: "#inline"}]},
+       {begin: /\b(?<_1>if)\b(?=.*\bthen\b(?!\s*(?<_2>--.*?)?$))/,
+        beginCaptures: {1 => {name: "keyword.control.if.applescript"}},
+        end: "(?<!¬)$",
+        name: "meta.statement.if-then.applescript",
+        patterns: [{include: "#inline"}]}]},
+   :"blocks.tell" => 
+    {patterns: 
+      [{begin: 
+         /^\s*(?<_1>tell)\s+(?=app(?<_2>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"},
+          {include: "#standard-suite"},
+          {include: "$self"}]},
+       {begin: 
+         /^\s*(?<_1>tell)\s+(?=app(?<_2>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",
+        patterns: 
+         [{include: "#finder"},
+          {include: "#standard-suite"},
+          {include: "$self"}]},
+       {begin: 
+         /^\s*(?<_1>tell)\s+(?=app(?<_2>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",
+        patterns: 
+         [{include: "#system-events"},
+          {include: "#standard-suite"},
+          {include: "$self"}]},
+       {begin: 
+         /^\s*(?<_1>tell)\s+(?=app(?<_2>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",
+        patterns: 
+         [{include: "#itunes"},
+          {include: "#standard-suite"},
+          {include: "$self"}]},
+       {begin: 
+         /^\s*(?<_1>tell)\s+(?=app(?<_2>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",
+        patterns: [{include: "#standard-suite"}, {include: "$self"}]},
+       {begin: 
+         /^\s*(?<_1>tell)\s+(?=app(?<_2>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",
+        patterns: [{include: "#standard-suite"}, {include: "$self"}]},
+       {begin: /^\s*(?<_1>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",
+        patterns: [{include: "$self"}]},
+       {begin: /^\s*(?<_1>tell)\s+(?=.*\bto\b)/,
+        captures: {1 => {name: "keyword.control.tell.applescript"}},
+        comment: "tell … to statement",
+        end: "(?<!¬)$",
+        name: "meta.block.tell.generic.applescript",
+        patterns: [{include: "$self"}]}]},
    :"built-in" => 
+    {patterns: 
+      [{include: "#built-in.constant"},
+       {include: "#built-in.keyword"},
+       {include: "#built-in.support"},
+       {include: "#built-in.punctuation"}]},
+   :"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"},
+       {match: /\b(?i:null|missing\s+value)\b/,
+        name: "constant.language.null.applescript"},
+       {match: /-?\b\d+(?<_1>(?<_2>\.(?<_3>\d+\b)?)?(?i:e\+?\d*\b)?|\b)/,
+        name: "constant.numeric.applescript"},
+       {match: /\b(?i:space|tab|return|linefeed|quote)\b/,
+        name: "constant.other.text.applescript"},
+       {match: 
+         /\b(?i:all\s+(?<_1>caps|lowercase)|bold|condensed|expanded|hidden|italic|outline|plain|shadow|small\s+caps|strikethrough|(?<_2>sub|super)script|underline)\b/,
+        name: "constant.other.styles.applescript"},
+       {match: 
+         /\b(?i:Jan(?<_1>uary)?|Feb(?<_2>ruary)?|Mar(?<_3>ch)?|Apr(?<_4>il)?|May|Jun(?<_5>e)?|Jul(?<_6>y)?|Aug(?<_7>ust)?|Sep(?<_8>tember)?|Oct(?<_9>ober)?|Nov(?<_10>ember)?|Dec(?<_11>ember)?)\b/,
+        name: "constant.other.time.month.applescript"},
+       {match: 
+         /\b(?i:Mon(?<_1>day)?|Tue(?<_2>sday)?|Wed(?<_3>nesday)?|Thu(?<_4>rsday)?|Fri(?<_5>day)?|Sat(?<_6>urday)?|Sun(?<_7>day)?)\b/,
+        name: "constant.other.time.weekday.applescript"},
+       {match: 
+         /\b(?i:AppleScript|pi|result|version|current\s+application|its?|m[ey])\b/,
+        name: "constant.other.miscellaneous.applescript"},
+       {match: /\b(?i:text\s+item\s+delimiters|print\s+(?<_1>length|depth))\b/,
+        name: "variable.language.applescript"}]},
+   :"built-in.keyword" => 
+    {patterns: 
+      [{match: /(?<_1>&|\*|\+|-|\/|÷|\^)/,
+        name: "keyword.operator.arithmetic.applescript"},
+       {match: /(?<_1>=|≠|>|<|≥|>=|≤|<=)/,
+        name: "keyword.operator.comparison.applescript"},
+       {match: 
+         /(?ix)\b
+	(?<_1>and|or|div|mod|as|not
+	|(?<_2>a\s+)?(?<_3>ref(?<_4>\s+to)?|reference\s+to)
+	|equal(?<_5>s|\s+to)|contains?|comes\s+(?<_6>after|before)|(?<_7>start|begin|end)s?\s+with
+	)
+	\b/,
+        name: "keyword.operator.word.applescript"},
+       {comment: 
+         "In double quotes so we can use a single quote in the keywords.",
+        match: 
+         /(?ix)\b
+	(?<_1>is(?<_2>n't|\s+not)?(?<_3>\s+(?<_4>equal(?<_5>\s+to)?|(?<_6>less|greater)\s+than(?<_7>\s+or\s+equal(?<_8>\s+to)?)?|in|contained\s+by))?
+	|does(?<_9>n't|\s+not)\s+(?<_10>equal|come\s+(?<_11>before|after)|contain)
+	)
+	\b/,
+        name: "keyword.operator.word.applescript"},
+       {match: 
+         /\b(?i:some|every|whose|where|that|id|index|\d+(?<_1>st|nd|rd|th)|first|second|third|fourth|fifth|sixth|seventh|eighth|ninth|tenth|last|front|back|middle|named|beginning|end|from|to|thr(?<_2>u|ough)|before|(?<_3>front|back|beginning|end)\s+of|after|behind|in\s+(?<_4>front|back|beginning|end)\s+of)\b/,
+        name: "keyword.operator.reference.applescript"},
+       {match: /\b(?i:continue|return|exit(?<_1>\s+repeat)?)\b/,
+        name: "keyword.control.loop.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/,
+        name: "keyword.other.applescript"}]},
+   :"built-in.punctuation" => 
     {patterns: 
       [{match: /¬/,
         name: "punctuation.separator.continuation.line.applescript"},
-       {match: 
-         /\b((a )?(ref( to)|reference to)|(does not|doesn't) (come (before|after)|contain|equal)|(start|begin)s? with|comes (before|after)|is(n't| not)?( (in|contained by|(less than|greater than)( or equal( to)?)?|equal( to)?))?|ends? with|contains?|equals?|than|and|div|mod|not|or|as)\b|(≠|≥|≤|>=|<=|÷|&|=|>|<|\*|\+|-|\/|\^)/,
-        name: "keyword.operator.applescript"},
-       {captures: {1 => {name: "keyword.control.applescript"}},
-        comment: 
-         "make sure that \"return\", \"property\", and other keywords are not preceded by something else, to disambiguate",
-        match: /(?<=^|then|to)\s*\b(return|prop(erty)?)\b/},
        {comment: "the : in property assignments",
         match: /:/,
         name: "punctuation.separator.key-value.property.applescript"},
        {comment: "the parentheses in groups",
-        match: /[()]/,
-        name: "punctuation.section.group.applescript"},
-       {match: 
-         /\b(on error|try|to|on|tell|if|then|else if|else|repeat( (while|until|with))?|using terms from|from|through|thru|with timeout|times|end (tell|repeat|if|timeout|using terms from|error|try)|end|my|where|whose|considering|ignoring|global|local|exit|continue|returning|set|copy|put)\b/,
-        name: "keyword.control.applescript"},
-       {match: 
-         /\b(every|some|index|named|from|to|through|thru|before|(in )?front of|after receiving|after|(in )?back of|beginning of|end of|in|of|first|second|third|fourth|fifth|sixth|seventh|eighth|ninth|tenth|\d+(st|nd|rd|th)|last|front|back|middle)\b/,
-        name: "keyword.control.reference.applescript"},
-       {match: 
-         /\b(all (caps|lowercase)|bold|condensed|expanded|hidden|italic|outline|plain|shadow|small caps|strikethrough|(sub|super)script|underline)\b/,
-        name: "constant.other.text-styles.applescript"},
-       {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"},
-       {match: /\b(null)\b/, name: "constant.language.null.applescript"},
+        match: /[(?<_1>)]/,
+        name: "punctuation.section.group.applescript"}]},
+   :"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"},
        {match: 
-         /\b(Jan(uary)?|Feb(ruary)?|Mar(ch)?|Apr(il)?|May|Jun(e)?|Jul(y)?|Aug(ust)?|Sep(tember)?|Oct(ober)?|Nov(ember)?|Dec(ember)?|weekdays?|Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday)\b/,
-        name: "constant.other.date-time.applescript"},
-       {comment: "these are used in considering/ignoring statements",
-        match: 
-         /\b(?<=considering|ignoring) (application responses|current application|case|diacriticals|expansion|hyphens|punctuation|white space)\b/,
-        name: "constant.other.considering-ignoring-attributes.applescript"},
-       {match: /\b(space|return|tab)\b/,
-        name: "constant.other.characters.applescript"},
-       {match: /\b(current application|it|me|version|result|pi|AppleScript)\b/,
-        name: "constant.other.miscellaneous.applescript"},
-       {match: /\b(text item delimiters|print length|print depth)\b/,
-        name: "variable.language.applescript"},
-       {match: /\b(count (each|every)|number of|error|get|run)\b/,
+         /\b(?i:activate|log|clipboard\s+info|set\s+the\s+clipboard\s+to|the\s+clipboard|info\s+for|list\s+(?<_1>disks|folder)|mount\s+volume|path\s+to(?<_2>\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+(?<_3>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+(?<_4>character|number)|localized\s+string|offset|summarize|beep|choose\s+(?<_5>application|color|file(?<_6>\s+name)?|folder|from\s+list|remote\s+application|URL)|delay|display\s+(?<_7>alert|dialog)|say)\b/,
+        name: "support.function.built-in.command.applescript"},
+       {match: /\b(?i:get|run)\b/,
         name: "support.function.built-in.applescript"},
+       {match: /\b(?i:anything|data|text|upper\s+case|propert(?<_1>y|ies))\b/,
+        name: "support.class.built-in.applescript"},
+       {match: /\b(?i:alias|class)(?<_1>es)?\b/,
+        name: "support.class.built-in.applescript"},
        {match: 
-         /\b(booleans?|integers?|reals?|numbers?|(linked )?lists?|vectors?|records?|items?|scripts?|events?|propert(y|ies)|constants?|prepositions?|reference forms?|handlers?|data|characters?|writing code( infos?)?|missing values?|references?|anything|missing value|upper case|app(lications?)?|text items?|((international|styled( Clipboard|Unicode)?|Unicode) )?text|(C | encoded| Pascal )?strings?|(type )?class(es)?|RGB colors?|pictures?|sounds?|versions?|file specifications?|alias(es)?|machines?|zones?|keystrokes?|seconds|dates?|months?|(cubic |square |cubic centi|square kilo|centi|kilo)met(er|re)s|(square |cubic )?(yards|feet)|(square )?miles|(cubic )?inches|lit(re|er)s|gallons|quarts|(kilo)?grams|ounces|pounds|degrees (Celsius|Fahrenheit|Kelvin))\b/,
+         /\b(?i:app(?<_1>lication)?|boolean|character|constant|date|event|file(?<_2>\s+specification)?|handler|integer|item|keystroke|linked\s+list|list|machine|number|picture|preposition|POSIX\s+file|real|record|reference(?<_3>\s+form)?|RGB\s+color|script|sound|text\s+item|type\s+class|vector|writing\s+code(?<_4>\s+info)?|zone|(?<_5>(?<_6>international|styled(?<_7>\s+(?<_8>Clipboard|Unicode))?|Unicode)\s+)?text|(?<_9>(?<_10>C|encoded|Pascal)\s+)?string)s?\b/,
         name: "support.class.built-in.applescript"},
-       {match: /\b\d+((\.(\d+\b)?)?(?i:e\+?\d*\b)?|\b)/,
-        name: "constant.numeric.applescript"},
-       {captures: {1 => {name: "variable.other.applescript"}},
-        match: /(?<=set[ \t])\s*([_a-zA-Z][_a-zA-Z0-9]*)\s*(?=[ \t]+to)/}]},
+       {match: 
+         /(?ix)\b
+	(?<_1>	(?<_2>cubic\s+(?<_3>centi)?|square\s+(?<_4>kilo)?|centi|kilo)met(?<_5>er|re)s
+	|	square\s+(?<_6>yards|feet|miles)|cubic\s+(?<_7>yards|feet|inches)|miles|inches
+	|	lit(?<_8>re|er)s|gallons|quarts
+	|	(?<_9>kilo)?grams|ounces|pounds
+	|	degrees\s+(?<_10>Celsius|Fahrenheit|Kelvin)
+	)
+	\b/,
+        name: "support.class.built-in.unit.applescript"},
+       {match: /\b(?i:seconds|minutes|hours|days)\b/,
+        name: "support.class.built-in.time.applescript"}]},
    comments: 
     {patterns: 
       [{captures: {1 => {name: "punctuation.definition.comment.applescript"}},
-        match: /(--).*$\n?/,
+        match: /^\s*(?<_1>#!).*$\n?/,
+        name: "comment.line.number-sign.applescript"},
+       {captures: {1 => {name: "punctuation.definition.comment.applescript"}},
+        match: /(?<_1>--).*$\n?/,
         name: "comment.line.double-dash.applescript"},
        {begin: /\(\*/,
         captures: {0 => {name: "punctuation.definition.comment.applescript"}},
         end: "\\*\\)",
-        name: "comment.block.applescript"}]},
+        name: "comment.block.applescript",
+        patterns: [{include: "#comments.nested"}]}]},
+   :"comments.nested" => 
+    {patterns: 
+      [{begin: /\(\*/,
+        captures: {0 => {name: "punctuation.definition.comment.applescript"}},
+        end: "\\*\\)",
+        name: "comment.block.applescript",
+        patterns: [{include: "#comments.nested"}]}]},
    :"data-structures" => 
     {patterns: 
-      [{begin: /(\{)/,
+      [{begin: /(?<_1>\{)/,
         captures: {1 => {name: "punctuation.section.array.applescript"}},
         comment: 
-         "\n\t\t\t\t\t\twe cannot necessarily distinguish \"records\" from\n\t\t\t\t\t\t\"arrays\", and so this could be either\n\t\t\t\t\t",
+         "We cannot necessarily distinguish \"records\" from \"arrays\", and so this could be either.",
         end: "(\\})",
-        name: "meta.data.array.applescript",
+        name: "meta.array.applescript",
         patterns: 
          [{captures: 
             {1 => {name: "constant.other.key.applescript"},
@@ -143,17 +488,17 @@
              3 => {name: "punctuation.definition.identifier.applescript"},
              4 => {name: "punctuation.definition.identifier.applescript"},
              5 => {name: "punctuation.separator.key-value.applescript"}},
-           match: /([A-Za-z]+|((\|)[^|\n]*(\|)))\s*(:)/},
+           match: /(?<_1>\w+|(?<_2>(?<_3>\|)[^|\n]*(?<_4>\|)))\s*(?<_5>:)/},
           {match: /:/, name: "punctuation.separator.key-value.applescript"},
           {match: /,/, name: "punctuation.separator.array.applescript"},
           {include: "#inline"}]},
-       {begin: /((?<=application )"|(?<=app )")/,
+       {begin: /(?:(?<=application )|(?<=app ))(?<_1>")/,
         captures: {1 => {name: "punctuation.definition.string.applescript"}},
         end: "(\")",
         name: "string.quoted.double.application-name.applescript",
         patterns: 
          [{match: /\\./, name: "constant.character.escape.applescript"}]},
-       {begin: /(")/,
+       {begin: /(?<_1>")/,
         captures: {1 => {name: "punctuation.definition.string.applescript"}},
         end: "(\")",
         name: "string.quoted.double.applescript",
@@ -162,7 +507,7 @@
        {captures: 
          {1 => {name: "punctuation.definition.identifier.applescript"},
           2 => {name: "punctuation.definition.identifier.applescript"}},
-        match: /(\|)[^|\n]*(\|)/,
+        match: /(?<_1>\|)[^|\n]*(?<_2>\|)/,
         name: "meta.identifier.applescript"},
        {captures: 
          {1 => {name: "punctuation.definition.data.applescript"},
@@ -173,26 +518,39 @@
           6 => {name: "keyword.operator.applescript"},
           7 => {name: "support.class.built-in.applescript"}},
         match: 
-         /(«)(data) (utxt|utf8)([0-9A-Fa-f]*)(»)(?: (as) (Unicode text))?/,
-        name: "meta.data.applescript"}]},
+         /(?<_1>«)(?<_2>data) (?<_3>utxt|utf8)(?<_4>[[:xdigit:]]*)(?<_5>»)(?:\s+(?<_6>as)\s+(?i:Unicode\s+text))?/,
+        name: "constant.other.data.utxt.applescript"},
+       {begin: /(?<_1>«)(?<_2>\w+)\b(?=\s)/,
+        beginCaptures: 
+         {1 => {name: "punctuation.definition.data.applescript"},
+          2 => {name: "support.class.built-in.applescript"}},
+        end: "(»)",
+        endCaptures: {1 => {name: "punctuation.definition.data.applescript"}},
+        name: "constant.other.data.raw.applescript"},
+       {captures: 
+         {1 => {name: "punctuation.definition.data.applescript"},
+          2 => {name: "punctuation.definition.data.applescript"}},
+        match: /(?<_1>«)[^»]*(?<_2>»)/,
+        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/,
+         /\b(?<_1>item|container|(?<_2>computer|disk|trash)-object|disk|folder|(?<_3>(?<_4>alias|application|document|internet location) )?file|clipping|package)s?\b/,
         name: "support.class.finder.items.applescript"},
        {match: 
-         /\b((Finder|desktop|information|preferences|clipping) )windows?\b/,
+         /\b(?<_1>(?<_2>Finder|desktop|information|preferences|clipping) )windows?\b/,
         name: "support.class.finder.window-classes.applescript"},
        {match: 
-         /\b(preferences|(icon|column|list) view options|(label|column|alias list)s?)\b/,
+         /\b(?<_1>preferences|(?<_2>icon|column|list) view options|(?<_3>label|column|alias list)s?)\b/,
         name: "support.class.finder.type-definitions.applescript"},
        {match: 
-         /\b(copy|find|sort|clean up|eject|empty( trash)|erase|reveal|update)\b/,
+         /\b(?<_1>copy|find|sort|clean up|eject|empty(?<_2> trash)|erase|reveal|update)\b/,
         name: "support.function.finder.items.applescript"},
        {match: 
-         /\b(insertion location|product version|startup disk|desktop|trash|home|computer container|finder preferences)\b/,
+         /\b(?<_1>insertion location|product version|startup disk|desktop|trash|home|computer container|finder preferences)\b/,
         name: "support.constant.finder.applescript"},
-       {match: /\b(visible)\b/, name: "support.variable.finder.applescript"}]},
+       {match: /\b(?<_1>visible)\b/,
+        name: "support.variable.finder.applescript"}]},
    inline: 
     {patterns: 
       [{include: "#comments"},
@@ -202,169 +560,105 @@
    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/,
+         /\b(?<_1>artwork|application|encoder|EQ preset|item|source|visual|(?<_2>EQ |browser )?window|(?<_3>(?<_4>audio CD|device|shared|URL|file) )?track|playlist window|(?<_5>(?<_6>audio CD|device|radio tuner|library|folder|user) )?playlist)s?\b/,
         name: "support.class.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/,
+         /\b(?<_1>add|back track|convert|fast forward|(?<_2>next|previous) track|pause|play(?<_3>pause)?|refresh|resume|rewind|search|stop|update|eject|subscribe|update(?<_4>Podcast|AllPodcasts)|download)\b/,
         name: "support.function.itunes.applescript"},
        {match: 
-         /\b(current (playlist|stream (title|URL)|track)|player state)\b/,
+         /\b(?<_1>current (?<_2>playlist|stream (?<_3>title|URL)|track)|player state)\b/,
         name: "support.constant.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/,
+         /\b(?<_1>current (?<_2>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"}]},
    :"standard-suite" => 
     {patterns: 
-      [{match: /\b(colors?|documents?|items?|windows?)\b/,
+      [{match: /\b(?<_1>colors?|documents?|items?|windows?)\b/,
         name: "support.class.standard-suite.applescript"},
        {match: 
-         /\b(close|count|delete|duplicate|exists|make|move|open|print|quit|save|activate|select|data size)\b/,
+         /\b(?<_1>close|count|delete|duplicate|exists|make|move|open|print|quit|save|activate|select|data size)\b/,
         name: "support.function.standard-suite.applescript"},
-       {match: /\b(name|frontmost|version)\b/,
+       {match: /\b(?<_1>name|frontmost|version)\b/,
         name: "support.constant.standard-suite.applescript"},
-       {match: /\b(selection)\b/,
+       {match: /\b(?<_1>selection)\b/,
         name: "support.variable.standard-suite.applescript"},
        {match: 
-         /\b(attachments?|attribute runs?|characters?|paragraphs?|texts?|words?)\b/,
+         /\b(?<_1>attachments?|attribute runs?|characters?|paragraphs?|texts?|words?)\b/,
         name: "support.class.text-suite.applescript"}]},
    standardadditions: 
     {patterns: 
-      [{match: /\b((alert|dialog) reply)\b/,
+      [{match: /\b(?<_1>(?<_2>alert|dialog) reply)\b/,
         name: "support.class.standardadditions.user-interaction.applescript"},
-       {match: /\b(file information)\b/,
+       {match: /\b(?<_1>file information)\b/,
         name: "support.class.standardadditions.file.applescript"},
-       {match: /\b(POSIX files?|system information|volume settings)\b/,
+       {match: /\b(?<_1>POSIX files?|system information|volume settings)\b/,
         name: "support.class.standardadditions.miscellaneous.applescript"},
-       {match: /\b(URLs?|internet address(es)?|web pages?|FTP items?)\b/,
+       {match: 
+         /\b(?<_1>URLs?|internet address(?<_2>es)?|web pages?|FTP items?)\b/,
         name: "support.class.standardadditions.internet.applescript"},
        {match: 
-         /\b(info for|list (disks|folder)|mount volume|path to( resource)?)\b/,
+         /\b(?<_1>info for|list (?<_2>disks|folder)|mount volume|path to(?<_3> resource)?)\b/,
         name: "support.function.standardadditions.file.applescript"},
        {match: 
-         /\b(beep|choose (application|color|file( name)?|folder|from list|remote application|URL)|delay|display (alert|dialog)|say)\b/,
+         /\b(?<_1>beep|choose (?<_2>application|color|file(?<_3> name)?|folder|from list|remote application|URL)|delay|display (?<_4>alert|dialog)|say)\b/,
         name: 
          "support.function.standardadditions.user-interaction.applescript"},
        {match: 
-         /\b(ASCII (character|number)|localized string|offset|summarize)\b/,
+         /\b(?<_1>ASCII (?<_2>character|number)|localized string|offset|summarize)\b/,
         name: "support.function.standardadditions.string.applescript"},
-       {match: /\b(set the clipboard to|the clipboard|clipboard info)\b/,
+       {match: /\b(?<_1>set the clipboard to|the clipboard|clipboard info)\b/,
         name: "support.function.standardadditions.clipboard.applescript"},
-       {match: /\b(open for access|close access|read|write|get eof|set eof)\b/,
+       {match: 
+         /\b(?<_1>open for access|close access|read|write|get eof|set eof)\b/,
         name: "support.function.standardadditions.file-i-o.applescript"},
-       {match: /\b((load|store|run) script|scripting components)\b/,
+       {match: /\b(?<_1>(?<_2>load|store|run) script|scripting components)\b/,
         name: "support.function.standardadditions.scripting.applescript"},
        {match: 
-         /\b(current date|do shell script|get volume settings|random number|round|set volume|system attribute|system info|time to GMT)\b/,
+         /\b(?<_1>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"},
        {match: 
-         /\b(opening folder|(closing|moving) folder window for|adding folder items to|removing folder items from)\b/,
+         /\b(?<_1>opening folder|(?<_2>closing|moving) folder window for|adding folder items to|removing folder items from)\b/,
         name: "support.function.standardadditions.folder-actions.applescript"},
-       {match: /\b(open location|handle CGI request)\b/,
+       {match: /\b(?<_1>open location|handle CGI request)\b/,
         name: "support.function.standardadditions.internet.applescript"}]},
    :"system-events" => 
     {patterns: 
-      [{match: /\b(audio (data|file))\b/,
+      [{match: /\b(?<_1>audio (?<_2>data|file))\b/,
         name: "support.class.system-events.audio-file.applescript"},
        {match: 
-         /\b(alias(es)?|(Classic|local|network|system|user) domain objects?|disk( item)?s?|domains?|file( package)?s?|folders?|items?)\b/,
+         /\b(?<_1>alias(?<_2>es)?|(?<_3>Classic|local|network|system|user) domain objects?|disk(?<_4> item)?s?|domains?|file(?<_5> package)?s?|folders?|items?)\b/,
         name: "support.class.system-events.disk-folder-file.applescript"},
-       {match: /\b(delete|open|move)\b/,
+       {match: /\b(?<_1>delete|open|move)\b/,
         name: "support.function.system-events.disk-folder-file.applescript"},
-       {match: /\b(folder actions?|scripts?)\b/,
+       {match: /\b(?<_1>folder actions?|scripts?)\b/,
         name: "support.class.system-events.folder-actions.applescript"},
        {match: 
-         /\b(attach action to|attached scripts|edit action of|remove action from)\b/,
+         /\b(?<_1>attach action to|attached scripts|edit action of|remove action from)\b/,
         name: "support.function.system-events.folder-actions.applescript"},
-       {match: /\b(movie data|movie file)\b/,
+       {match: /\b(?<_1>movie data|movie file)\b/,
         name: "support.class.system-events.movie-file.applescript"},
-       {match: /\b(log out|restart|shut down|sleep)\b/,
+       {match: /\b(?<_1>log out|restart|shut down|sleep)\b/,
         name: "support.function.system-events.power.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/,
+         /\b(?<_1>(?<_2>(?<_3>application |desk accessory )?process|(?<_4>check|combo )?box)(?<_5>es)?|(?<_6>action|attribute|browser|(?<_7>busy|progress|relevance) indicator|color well|column|drawer|group|grow area|image|incrementor|list|menu(?<_8> bar)?(?<_9> item)?|(?<_10>menu |pop up |radio )?button|outline|(?<_11>radio|tab|splitter) group|row|scroll (?<_12>area|bar)|sheet|slider|splitter|static text|table|text (?<_13>area|field)|tool bar|UI element|window)s?)\b/,
         name: "support.class.system-events.processes.applescript"},
-       {match: /\b(click|key code|keystroke|perform|select)\b/,
+       {match: /\b(?<_1>click|key code|keystroke|perform|select)\b/,
         name: "support.function.system-events.processes.applescript"},
-       {match: /\b(property list (file|item))\b/,
+       {match: /\b(?<_1>property list (?<_2>file|item))\b/,
         name: "support.class.system-events.property-list.applescript"},
-       {match: /\b(annotation|QuickTime (data|file)|track)s?\b/,
+       {match: /\b(?<_1>annotation|QuickTime (?<_2>data|file)|track)s?\b/,
         name: "support.class.system-events.quicktime-file.applescript"},
-       {match: /\b((abort|begin|end) transaction)\b/,
+       {match: /\b(?<_1>(?<_2>abort|begin|end) transaction)\b/,
         name: "support.function.system-events.system-events.applescript"},
-       {match: /\b(XML (attribute|data|element|file)s?)\b/,
+       {match: /\b(?<_1>XML (?<_2>attribute|data|element|file)s?)\b/,
         name: "support.class.system-events.xml.applescript"},
-       {match: /\b(print settings|users?|login items?)\b/,
+       {match: /\b(?<_1>print settings|users?|login items?)\b/,
         name: "support.class.sytem-events.other.applescript"}]},
-   :"tell-blocks" => 
-    {patterns: 
-      [{begin: /^\s*(tell)\s+(?=app(lication)?\s+"(?i:textmate)")(?!.*\bto\b)/,
-        captures: {1 => {name: "keyword.control.applescript"}},
-        comment: "tell Textmate",
-        end: "^\\s*(end tell)",
-        name: "meta.tell-block.application.textmate.applescript",
-        patterns: 
-         [{include: "#textmate"},
-          {include: "#standard-suite"},
-          {include: "$self"}]},
-       {begin: /^\s*(tell)\s+(?=app(lication)?\s+"(?i:finder)")(?!.*\bto\b)/,
-        captures: {1 => {name: "keyword.control.applescript"}},
-        comment: "tell Finder",
-        end: "^\\s*(end tell)",
-        name: "meta.tell-block.application.finder.applescript",
-        patterns: 
-         [{include: "#finder"},
-          {include: "#standard-suite"},
-          {include: "$self"}]},
-       {begin: 
-         /^\s*(tell)\s+(?=app(lication)?\s+"(?i:system events)")(?!.*\bto\b)/,
-        captures: {1 => {name: "keyword.control.applescript"}},
-        comment: "tell System Events",
-        end: "^\\s*(end tell)",
-        name: "meta.tell-block.application.system-events.applescript",
-        patterns: 
-         [{include: "#system-events"},
-          {include: "#standard-suite"},
-          {include: "$self"}]},
-       {begin: /^\s*(tell)\s+(?=app(lication)?\s+"(?i:itunes)")(?!.*\bto\b)/,
-        captures: {1 => {name: "keyword.control.applescript"}},
-        comment: "tell iTunes",
-        end: "^\\s*(end tell)",
-        name: "meta.tell-block.application.itunes.applescript",
-        patterns: 
-         [{include: "#itunes"},
-          {include: "#standard-suite"},
-          {include: "$self"}]},
-       {begin: /^\s*(tell)\s+(?=app(lication)?\b)(?!.*\bto\b)/,
-        captures: {1 => {name: "keyword.control.applescript"}},
-        comment: "tell generic application",
-        end: "^\\s*(end tell)",
-        name: "meta.tell-block.application.generic.applescript",
-        patterns: [{include: "#standard-suite"}, {include: "$self"}]},
-       {begin: 
-         /^\s*(tell)\s+(?=app(lication)?\b)(?=.*?to tell\s*(?!.*\bto\b))/,
-        captures: {1 => {name: "keyword.control.applescript"}},
-        comment: "tell ... to tell generic application",
-        end: "^\\s*(end tell)",
-        name: "meta.tell-block.application.generic.applescript",
-        patterns: [{include: "#standard-suite"}, {include: "$self"}]},
-       {begin: /^\s*(tell)\s+.*?(to tell)\s*(?!.*\bto\b)/,
-        captures: 
-         {1 => {name: "keyword.control.applescript"},
-          2 => {name: "keyword.control.applescript"}},
-        comment: "generic tell ... to tell block",
-        end: "^\\s*(end tell)",
-        name: "meta.tell-block.generic.applescript",
-        patterns: [{include: "$self"}]},
-       {begin: /^\s*(tell)\s+(?!.*\bto\b)/,
-        captures: {1 => {name: "keyword.control.applescript"}},
-        comment: "generic tell block",
-        end: "^\\s*(end tell)",
-        name: "meta.tell-block.generic.applescript",
-        patterns: [{include: "$self"}]}]},
    textmate: 
     {patterns: 
-      [{match: /\b(print settings)\b/,
+      [{match: /\b(?<_1>print settings)\b/,
         name: "support.class.textmate.applescript"},
-       {match: /\b(get url|insert|reload bundles)\b/,
+       {match: /\b(?<_1>get url|insert|reload bundles)\b/,
         name: "support.function.textmate.applescript"}]}},
  scopeName: "source.applescript",
  uuid: "777CF925-14B9-428E-B07B-17FAAB8FA27E"}