From c896340bf70d2ab66e76385a8254b702e35a95f9 Mon Sep 17 00:00:00 2001
From: MoritzKn <moritz.kneilmann@gmx.de>
Date: Tue, 27 Sep 2016 11:27:10 +0200
Subject: [PATCH 1/5] Add snippets for core JSP-tags

---
 snippets/language-java.cson | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/snippets/language-java.cson b/snippets/language-java.cson
index 1f3bbb4..37fa7ae 100644
--- a/snippets/language-java.cson
+++ b/snippets/language-java.cson
@@ -129,3 +129,37 @@
   'while':
     'prefix': 'wh'
     'body': 'while ($1) {\n\t$0\n}'
+'.text.html.jsp':
+  'c:out':
+    'prefix': 'out'
+    'body': '<c:out value="\\${$1}"/>'
+  'c:set':
+    'prefix': 'set'
+    'body': '<c:set var="${1:name}" value="\\${$2}"/>'
+  'c:remove':
+    'prefix': 'rm'
+    'body': '<c:remove var="${1:name}"/>'
+  'c:catch':
+    'prefix': 'catch'
+    'body': '<c:catch var="${1:ex}">\n\t$2\n</c:catch>'
+  'c:if':
+    'prefix': 'if'
+    'body': '<c:if test="\\${${1:true}}">\n\t$0\n</c:if>'
+  'c:choose':
+    'prefix': 'choose'
+    'body': '<c:choose>\n\t<c:when test="\\${${1:true}}">\n\t\t$2\n\t</c:when>$3\n\t<c:otherwise>\n\t\t$4\n\t</c:otherwise>\n<c:choose>'
+  'c:when':
+    'prefix': 'when'
+    'body': '<c:when test="\\${${1:true}}">\n\t$2\n</c:when>'
+  'c:otherwise':
+    'prefix': 'other'
+    'body': '<c:otherwise>\n\t$1\n</c:otherwise>'
+  'c:forEach':
+    'prefix': 'forEach'
+    'body': '<c:forEach var="${1:i}" begin="$2" end="$3">\n\t$4\n</c:forEach>'
+  'c:forEach':
+    'prefix': 'forEachIn'
+    'body': '<c:forEach var="${1:item}" items="$2">\n\t$3\n</c:forEach>'
+  'c:forTokens':
+    'prefix': 'forTokens'
+    'body': '<c:forTokens var="${1:item}" items="$2" delims="${3:,}">\n\t$4\n</c:forTokens>'

From 868d397ee1df01a7d0c9fb39cf22376a41f9980c Mon Sep 17 00:00:00 2001
From: MoritzKn <moritz.kneilmann@gmx.de>
Date: Tue, 27 Sep 2016 11:45:11 +0200
Subject: [PATCH 2/5] Add snippets for core JSP syntax

---
 snippets/language-java.cson | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/snippets/language-java.cson b/snippets/language-java.cson
index 37fa7ae..5b8cbcf 100644
--- a/snippets/language-java.cson
+++ b/snippets/language-java.cson
@@ -130,6 +130,30 @@
     'prefix': 'wh'
     'body': 'while ($1) {\n\t$0\n}'
 '.text.html.jsp':
+  'scriptlet':
+    'prefix': '%'
+    'body': '<%\n\t$1\n%>'
+  'scriptlet (xml)':
+    'prefix': 'scriptlet'
+    'body': '<jsp:scriptlet>\n\t$1\n</jsp:scriptlet>'
+  'declaration':
+    'prefix': '%!'
+    'body': '<%!\n\t$1\n%>'
+  'declaration (xml)':
+    'prefix': 'declaration'
+    'body': '<jsp:declaration>\n\t$1\n</jsp:declaration>'
+  'expression':
+    'prefix': '%='
+    'body': '<%=\n\t$1\n%>'
+  'expression (xml)':
+    'prefix': 'expression'
+    'body': '<jsp:expression>\n\t$1\n</jsp:expression>'
+  'comment':
+    'prefix': '%--'
+    'body': '<%--\n\t$1\n--%>'
+  'el':
+    'prefix': '$'
+    'body': '\\${$1}'
   'c:out':
     'prefix': 'out'
     'body': '<c:out value="\\${$1}"/>'

From b9caad2e69a5cbeab8e378a4dd4cfcc5b09419f6 Mon Sep 17 00:00:00 2001
From: MoritzKn <moritz.kneilmann@gmx.de>
Date: Thu, 13 Oct 2016 09:57:30 +0200
Subject: [PATCH 3/5] Fix c:choose snippet

The closing tag was not closing.
---
 snippets/language-java.cson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/language-java.cson b/snippets/language-java.cson
index 5b8cbcf..798e2ea 100644
--- a/snippets/language-java.cson
+++ b/snippets/language-java.cson
@@ -171,7 +171,7 @@
     'body': '<c:if test="\\${${1:true}}">\n\t$0\n</c:if>'
   'c:choose':
     'prefix': 'choose'
-    'body': '<c:choose>\n\t<c:when test="\\${${1:true}}">\n\t\t$2\n\t</c:when>$3\n\t<c:otherwise>\n\t\t$4\n\t</c:otherwise>\n<c:choose>'
+    'body': '<c:choose>\n\t<c:when test="\\${${1:true}}">\n\t\t$2\n\t</c:when>$3\n\t<c:otherwise>\n\t\t$4\n\t</c:otherwise>\n</c:choose>'
   'c:when':
     'prefix': 'when'
     'body': '<c:when test="\\${${1:true}}">\n\t$2\n</c:when>'

From 27d117e5c276509f51884272141270cc71ae2f14 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.kneilmann@gmx.de>
Date: Sun, 16 Oct 2016 02:32:55 +0200
Subject: [PATCH 4/5] Make multi line JSP snippet bodies multi line strings

---
 snippets/language-java.cson | 117 +++++++++++++++++++++++++++++-------
 1 file changed, 94 insertions(+), 23 deletions(-)

diff --git a/snippets/language-java.cson b/snippets/language-java.cson
index 798e2ea..9a5696f 100644
--- a/snippets/language-java.cson
+++ b/snippets/language-java.cson
@@ -130,60 +130,131 @@
     'prefix': 'wh'
     'body': 'while ($1) {\n\t$0\n}'
 '.text.html.jsp':
+  'el':
+    'prefix': '$'
+    'body': '\\${$1}'
   'scriptlet':
     'prefix': '%'
-    'body': '<%\n\t$1\n%>'
-  'scriptlet (xml)':
-    'prefix': 'scriptlet'
-    'body': '<jsp:scriptlet>\n\t$1\n</jsp:scriptlet>'
+    'body': """
+    <%
+    \t$1
+    %>
+    """
   'declaration':
     'prefix': '%!'
-    'body': '<%!\n\t$1\n%>'
+    'body': """
+    <%!
+    \t$1
+    %>
+    """
   'declaration (xml)':
     'prefix': 'declaration'
-    'body': '<jsp:declaration>\n\t$1\n</jsp:declaration>'
+    'body': """
+    <jsp:declaration>
+    \t$1
+    </jsp:declaration>
+    """
   'expression':
     'prefix': '%='
-    'body': '<%=\n\t$1\n%>'
+    'body': """
+    <%=
+    \t$1
+    %>
+    """
   'expression (xml)':
     'prefix': 'expression'
-    'body': '<jsp:expression>\n\t$1\n</jsp:expression>'
+    'body': """
+    <jsp:expression>
+    \t$1
+    </jsp:expression>
+    """
   'comment':
     'prefix': '%--'
-    'body': '<%--\n\t$1\n--%>'
-  'el':
-    'prefix': '$'
-    'body': '\\${$1}'
+    'body': """
+    <%--
+    \t$1
+    --%>
+    """
+  'scriptlet (xml)':
+    'prefix': 'scriptlet'
+    'body': """
+    <jsp:scriptlet>
+    \t$1
+    </jsp:scriptlet>
+    """
   'c:out':
     'prefix': 'out'
-    'body': '<c:out value="\\${$1}"/>'
+    'body': """
+    <c:out value="\\${$1}"/>
+    """
   'c:set':
     'prefix': 'set'
-    'body': '<c:set var="${1:name}" value="\\${$2}"/>'
+    'body': """
+    <c:set var="${1:name}" value="\\${$2}"/>
+    """
   'c:remove':
     'prefix': 'rm'
-    'body': '<c:remove var="${1:name}"/>'
+    'body': """
+    <c:remove var="${1:name}"/>
+    """
   'c:catch':
     'prefix': 'catch'
-    'body': '<c:catch var="${1:ex}">\n\t$2\n</c:catch>'
+    'body': """
+    <c:catch var="${1:ex}">
+    \t$2
+    </c:catch>
+    """
   'c:if':
     'prefix': 'if'
-    'body': '<c:if test="\\${${1:true}}">\n\t$0\n</c:if>'
+    'body': """
+    <c:if test="\\${${1:true}}">
+    \t$0
+    </c:if>
+    """
   'c:choose':
     'prefix': 'choose'
-    'body': '<c:choose>\n\t<c:when test="\\${${1:true}}">\n\t\t$2\n\t</c:when>$3\n\t<c:otherwise>\n\t\t$4\n\t</c:otherwise>\n</c:choose>'
+    'body': """
+    <c:choose>
+    \t<c:when test="\\${${1:true}}">
+    \t\t$2
+    \t</c:when>$3
+    \t<c:otherwise>
+    \t\t$4
+    \t</c:otherwise>
+    </c:choose>
+    """
   'c:when':
     'prefix': 'when'
-    'body': '<c:when test="\\${${1:true}}">\n\t$2\n</c:when>'
+    'body': """
+    <c:when test="\\${${1:true}}">
+    \t$2
+    </c:when>
+    """
   'c:otherwise':
     'prefix': 'other'
-    'body': '<c:otherwise>\n\t$1\n</c:otherwise>'
+    'body': """
+    <c:otherwise>
+    \t$1
+    </c:otherwise>
+    """
   'c:forEach':
     'prefix': 'forEach'
-    'body': '<c:forEach var="${1:i}" begin="$2" end="$3">\n\t$4\n</c:forEach>'
+    'body': """
+    <c:forEach var="${1:i}" begin="$2" end="$3">
+    \t$4
+    </c:forEach>
+    """
   'c:forEach':
     'prefix': 'forEachIn'
-    'body': '<c:forEach var="${1:item}" items="$2">\n\t$3\n</c:forEach>'
+    'body': """
+    <c:forEach var="${1:item}" items="$2">
+    \t$3
+    </c:forEach>
+    """
   'c:forTokens':
     'prefix': 'forTokens'
-    'body': '<c:forTokens var="${1:item}" items="$2" delims="${3:,}">\n\t$4\n</c:forTokens>'
+    'body': """
+    <c:forTokens var="${1:item}" items="$2" delims="${3:,}">
+    \t$4
+    </c:forTokens>
+    """

From 9afe6a94440d5d420a116f726979919cc466970a Mon Sep 17 00:00:00 2001
From: Moritz <moritz.kneilmann@gmx.de>
Date: Sun, 16 Oct 2016 03:08:46 +0200
Subject: [PATCH 5/5] Add JSP snippets for started tags

Pressing tab after `<c:if` previously produced `<c:<c:if...`.
---
 snippets/language-java.cson | 156 ++++++++++++++++++++++++++++++++----
 1 file changed, 142 insertions(+), 14 deletions(-)

diff --git a/snippets/language-java.cson b/snippets/language-java.cson
index 9a5696f..9001a0d 100644
--- a/snippets/language-java.cson
+++ b/snippets/language-java.cson
@@ -147,13 +147,6 @@
     \t$1
     %>
     """
-  'declaration (xml)':
-    'prefix': 'declaration'
-    'body': """
-    <jsp:declaration>
-    \t$1
-    </jsp:declaration>
-    """
   'expression':
     'prefix': '%='
     'body': """
@@ -161,13 +154,6 @@
     \t$1
     %>
     """
-  'expression (xml)':
-    'prefix': 'expression'
-    'body': """
-    <jsp:expression>
-    \t$1
-    </jsp:expression>
-    """
   'comment':
     'prefix': '%--'
     'body': """
@@ -175,6 +161,20 @@
     \t$1
     --%>
     """
+  'declaration (xml)':
+    'prefix': 'declaration'
+    'body': """
+    <jsp:declaration>
+    \t$1
+    </jsp:declaration>
+    """
+  'expression (xml)':
+    'prefix': 'expression'
+    'body': """
+    <jsp:expression>
+    \t$1
+    </jsp:expression>
+    """
   'scriptlet (xml)':
     'prefix': 'scriptlet'
     'body': """
@@ -258,3 +258,131 @@
     \t$4
     </c:forTokens>
     """
+'.text.html.jsp .entity.name.tag':
+  'declaration (xml)':
+    'prefix': '<jsp:declaration'
+    'body': """
+    <jsp:declaration>
+    \t$1
+    </jsp:declaration>
+    """
+  'expression (xml)':
+    'prefix': '<jsp:expression'
+    'body': """
+    <jsp:expression>
+    \t$1
+    </jsp:expression>
+    """
+  'scriptlet (xml)':
+    'prefix': '<jsp:scriptlet'
+    'body': """
+    <jsp:scriptlet>
+    \t$1
+    </jsp:scriptlet>
+    """
+  'c:out':
+    'prefix': '<c:out'
+    'body': """
+    <c:out value="\\${$1}"/>
+    """
+  'c:set':
+    'prefix': '<c:set'
+    'body': """
+    <c:set var="${1:name}" value="\\${$2}"/>
+    """
+  'c:remove':
+    'prefix': '<c:rm'
+    'body': """
+    <c:remove var="${1:name}"/>
+    """
+  'c:catch':
+    'prefix': '<c:catch'
+    'body': """
+    <c:catch var="${1:ex}">
+    \t$2
+    </c:catch>
+    """
+  'c:if':
+    'prefix': '<c:if'
+    'body': """
+    <c:if test="\\${${1:true}}">
+    \t$0
+    </c:if>
+    """
+  'c:choose':
+    'prefix': '<c:choose'
+    'body': """
+    <c:choose>
+    \t<c:when test="\\${${1:true}}">
+    \t\t$2
+    \t</c:when>$3
+    \t<c:otherwise>
+    \t\t$4
+    \t</c:otherwise>
+    </c:choose>
+    """
+  'c:when':
+    'prefix': '<c:when'
+    'body': """
+    <c:when test="\\${${1:true}}">
+    \t$2
+    </c:when>
+    """
+  'c:otherwise':
+    'prefix': '<c:other'
+    'body': """
+    <c:otherwise>
+    \t$1
+    </c:otherwise>
+    """
+  'c:forEach':
+    'prefix': '<c:forEach'
+    'body': """
+    <c:forEach var="${1:i}" begin="$2" end="$3">
+    \t$4
+    </c:forEach>
+    """
+  'c:forEach':
+    'prefix': '<c:forEachIn'
+    'body': """
+    <c:forEach var="${1:item}" items="$2">
+    \t$3
+    </c:forEach>
+    """
+  'c:forTokens':
+    'prefix': '<c:forTokens'
+    'body': """
+    <c:forTokens var="${1:item}" items="$2" delims="${3:,}">
+    \t$4
+    </c:forTokens>
+    """
+'.text.html.jsp .punctuation.begin':
+  'scriptlet':
+    'prefix': '<%'
+    'body': """
+    <%
+    \t$1
+    %>
+    """
+  'declaration':
+    'prefix': '<%!'
+    'body': """
+    <%!
+    \t$1
+    %>
+    """
+  'expression':
+    'prefix': '<%='
+    'body': """
+    <%=
+    \t$1
+    %>
+    """
+'.text.html.jsp .punctuation.comment':
+  'comment':
+    'prefix': '<%--'
+    'body': """
+    <%--
+    \t$1
+    --%>
+    """