From b633744ec8a97b8144684d52845ba8dffe057e19 Mon Sep 17 00:00:00 2001
From: Rudolf-Walter Kiss-Szakacs <rudolf.wg@gmail.com>
Date: Thu, 30 May 2019 22:59:55 +0300
Subject: [PATCH] Enable syntax highlighting for groovy scripts.

---
 .../sandbox/groovy/SecureGroovyScript/JENKINS-15604.js       | 5 -----
 .../sandbox/groovy/SecureGroovyScript/config.jelly           | 5 ++---
 2 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SecureGroovyScript/JENKINS-15604.js

diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SecureGroovyScript/JENKINS-15604.js b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SecureGroovyScript/JENKINS-15604.js
deleted file mode 100644
index d3a0e6401..000000000
--- a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SecureGroovyScript/JENKINS-15604.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// https://issues.jenkins-ci.org/browse/JENKINS-15604 workaround:
-function cmChange(editor, change) {
-    editor.save();
-    $$('.validated').each(function (e) {e.onchange();});
-}
diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SecureGroovyScript/config.jelly b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SecureGroovyScript/config.jelly
index d60c7228c..26df976b7 100644
--- a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SecureGroovyScript/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SecureGroovyScript/config.jelly
@@ -26,9 +26,8 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
     <f:entry field="script" title="${%Groovy Script}">
-        <!-- TODO <st:adjunct includes="org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.JENKINS-15604"/> -->
-        <!-- TODO https://github.com/stapler/stapler-adjunct-codemirror/issues/1 means no true Groovy support -->
-        <f:textarea checkMethod="post"/> <!-- TODO codemirror-mode="clike" codemirror-config="'onBlur': cmChange" -->
+        <!-- The })// at the end of codemirror-config is a hack to work around Jenkins core replacing any onBlur we provide (see textarea.js) -->
+        <f:textarea checkMethod="post" codemirror-mode="clike" codemirror-config="mode: 'text/x-groovy', lineNumbers: true, matchBrackets: true, onBlur: function(editor){editor.save();editor.getTextArea().onchange();} })//" />
     </f:entry>
     <f:entry field="sandbox">
         <f:checkbox title="${%Use Groovy Sandbox}" default="${!h.hasPermission(app.RUN_SCRIPTS)}" />