Fix order of decoding entities in groovy (#1049) (#1050)

PrismJS · Nov 9, 2016 · d75da8e · d75da8e
1 parent 8b0520a
commit d75da8e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/components/prism-groovy.js b/components/prism-groovy.js
@@ -49,7 +49,7 @@ Prism.hooks.add('wrap', function(env) {
 			}
 
 			// To prevent double HTML-encoding we have to decode env.content first
-			env.content = env.content.replace(/&amp;/g, '&').replace(/&lt;/g, '<');
+			env.content = env.content.replace(/&lt;/g, '<').replace(/&amp;/g, '&');
 
 			env.content = Prism.highlight(env.content, {
 				'expression': {

diff --git a/components/prism-groovy.min.js b/components/prism-groovy.min.js
diff --git a/tests/languages/groovy/issue1049.js b/tests/languages/groovy/issue1049.js
@@ -0,0 +1,8 @@
+module.exports = {
+	'"&amp;"': '<span class="token string gstring">"&amp;amp;"</span>',
+	'"&amp;&amp;"': '<span class="token string gstring">"&amp;amp;&amp;amp;"</span>',
+	'"&lt;"': '<span class="token string gstring">"&amp;lt;"</span>',
+	'"&lt;&lt;"': '<span class="token string gstring">"&amp;lt;&amp;lt;"</span>',
+	'"&amp;lt;"': '<span class="token string gstring">"&amp;amp;lt;"</span>',
+	'"&gt;"': '<span class="token string gstring">"&amp;gt;"</span>',
+};