Refactor WebHandler syntax

Author: michaelblyons

README.md

@@ -48,7 +48,6 @@ only supports Visual Basic.
 
 - Identify more attributes of directives
 - Snippets and/or completions for ASP.Net builtins
-- Refactor C# Handler syntax (*.ashx*)
 
 ### Known issues
 

WebForms/ashx.sublime-syntax

@@ -3,19 +3,17 @@
 # http://www.sublimetext.com/docs/syntax.html
 name: .Net Web Handler (ASHX)
 scope: source.cs.webforms.ashx
-version: 2
 
-first_line_match: <%@\s*WebHandler
+extends: Packages/C#/C#.sublime-syntax
 
 file_extensions:
   - ashx
 
+first_line_match: <%@\s*WebHandler
+
 contexts:
-  main:
-    - match: ''
-      set: scope:source.cs
-      with_prototype:
-        - include: directive
+  shebang:
+    - include: directives
 
   directive-generic-attribute:
     - match: '\b(\w+)\s*(=)\s*((")[^"]*("))\s*'
@@ -31,7 +29,7 @@ contexts:
       scope: punctuation.section.embedded.end.cshtml
       pop: true
 
-  directive:
+  directives:
     # https://msdn.microsoft.com/en-us/library/xz702w3e(v=vs.100).aspx
     - match: '<%@'
       scope: punctuation.section.embedded.begin.cshtml

WebForms/tests/syntax_test_ashx.ashx

@@ -1,16 +1,64 @@
 // SYNTAX TEST "Packages/HTML (C#)/WebForms/ashx.sublime-syntax"
 
 <%@ WebHandler Language="C#" Class="Handler" %>
+//^^^^^^^^^^^^ meta.block.processing-directive.cshtml
+//^ punctuation.section.embedded.begin.cshtml
+//  ^^^^^^^^^^ meta.block.processing-directive.contents.type.cshtml constant.language.processing-directive.type.cshtml entity.name.class.cs
+//            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.block.processing-directive.contents.type.cshtml
+//             ^^^^^^^^ entity.other.attribute-name.cshtml
+//                     ^ punctuation.separator.key-value.cshtml
+//                      ^^^^ string.quoted.double.cshtml
+//                      ^ punctuation.definition.string.begin.cshtml
+//                         ^ punctuation.definition.string.end.cshtml
+//                           ^^^^^ entity.other.attribute-name.cshtml
+//                                ^ punctuation.separator.key-value.cshtml
+//                                 ^^^^^^^^^ string.quoted.double.cshtml
+//                                 ^ punctuation.definition.string.begin.cshtml
+//                                         ^ punctuation.definition.string.end.cshtml
+//                                           ^^ punctuation.section.embedded.end.cshtml
 
 using System;
 using System.Web;
+//^^^ keyword.control.import.cs
+//    ^^^^^^^^^^ meta.path.cs
+//          ^ punctuation.separator.namespace.cs
+//              ^ punctuation.terminator.statement.cs
 
 public class Handler : IHttpHandler
+//^^^^ storage.modifier.access.cs
+//     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.class.cs
+//     ^^^^^ keyword.declaration.class.cs
+//           ^^^^^^^ entity.name.class.cs
+//                   ^ punctuation.separator.type.cs
+//                     ^^^^^^^^^^^^ entity.other.inherited-class.cs
 {
     public void ProcessRequest(HttpContext context)
+//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.class.body.cs meta.block.cs
+//  ^^^^^^ storage.modifier.access.cs
+//         ^^^^ storage.type.cs
+//              ^^^^^^^^^^^^^^ meta.method.cs entity.name.function.cs
+//                            ^^^^^^^^^^^^^^^^^^^^^ meta.method.parameters.cs
+//                            ^ punctuation.section.parameters.begin.cs
+//                             ^^^^^^^^^^^ support.type.cs
+//                                         ^^^^^^^ variable.parameter.cs
+//                                                ^ punctuation.section.parameters.end.cs
     {
         context.Response.ContentType = "text/plain";
         context.Response.Write("Hello World");
+//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.class.body.cs meta.block.cs meta.method.body.cs meta.block.cs
+//      ^^^^^^^ variable.other.cs
+//             ^ punctuation.accessor.dot.cs
+//              ^^^^^^^^ variable.other.cs
+//                      ^ punctuation.accessor.dot.cs
+//                       ^^^^^^^^^^^^^^^^^^^^ meta.function-call.cs
+//                       ^^^^^ variable.function.cs
+//                            ^^^^^^^^^^^^^^^ meta.group.cs
+//                            ^ punctuation.section.group.begin.cs
+//                             ^^^^^^^^^^^^^ meta.string.cs string.quoted.double.cs
+//                             ^ punctuation.definition.string.begin.cs
+//                                         ^ punctuation.definition.string.end.cs
+//                                          ^ punctuation.section.group.end.cs
+//                                           ^ punctuation.terminator.statement.cs
     }
 
     public bool IsReusable