[Java] Fix handling of JSP directives

sublimehq · Feb 12, 2018 · 1c1aa09 · 1c1aa09
1 parent f2d9706
commit 1c1aa09
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Java/Java Server Pages (JSP).sublime-syntax b/Java/Java Server Pages (JSP).sublime-syntax
@@ -46,6 +46,8 @@ contexts:
                   pop: true
                 - match: \\.
                   scope: constant.character.escape.jsp
+            - match: '(?=\S)'
+              pop: true
     - match: "(<%[!=]?)|(<jsp:scriptlet>|<jsp:expression>|<jsp:declaration>)"
       captures:
         1: punctuation.section.embedded.begin.jsp

diff --git a/Java/syntax_test_jsp.jsp b/Java/syntax_test_jsp.jsp
@@ -7,6 +7,14 @@
 //  ^^^^^^^^^^^^^^^ meta.tag
 </head>
 <body>
+    <%@ include file="foo.bar" %>
+//  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.directive
+//  ^^^ punctuation.section.directive
+//                             ^^ punctuation.section.directive
+
+    Plain text
+//  ^^^^^^^^^^ text.html.jsp - meta
+
     <%-- This is a comment --%>
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.block.jsp
     <%