1、GLUE版本逻辑调整;
This commit is contained in:
parent
548426e9a7
commit
7a781ad371
|
@ -5,6 +5,7 @@ import com.xxl.job.admin.core.model.XxlJobLogGlue;
|
||||||
import com.xxl.job.admin.dao.IXxlJobInfoDao;
|
import com.xxl.job.admin.dao.IXxlJobInfoDao;
|
||||||
import com.xxl.job.admin.dao.IXxlJobLogGlueDao;
|
import com.xxl.job.admin.dao.IXxlJobLogGlueDao;
|
||||||
import com.xxl.job.core.biz.model.ReturnT;
|
import com.xxl.job.core.biz.model.ReturnT;
|
||||||
|
import com.xxl.job.core.glue.GlueTypeEnum;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.ui.Model;
|
import org.springframework.ui.Model;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
@ -35,6 +36,12 @@ public class JobCodeController {
|
||||||
if (jobInfo == null) {
|
if (jobInfo == null) {
|
||||||
throw new RuntimeException("抱歉,任务不存在.");
|
throw new RuntimeException("抱歉,任务不存在.");
|
||||||
}
|
}
|
||||||
|
if (GlueTypeEnum.BEAN == GlueTypeEnum.match(jobInfo.getGlueType())) {
|
||||||
|
throw new RuntimeException("该任务非GLUE模式.");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Glue类型-字典
|
||||||
|
model.addAttribute("GlueTypeEnum", GlueTypeEnum.values());
|
||||||
|
|
||||||
model.addAttribute("jobInfo", jobInfo);
|
model.addAttribute("jobInfo", jobInfo);
|
||||||
model.addAttribute("jobLogGlues", jobLogGlues);
|
model.addAttribute("jobLogGlues", jobLogGlues);
|
||||||
|
@ -48,28 +55,28 @@ public class JobCodeController {
|
||||||
if (glueRemark==null) {
|
if (glueRemark==null) {
|
||||||
return new ReturnT<String>(500, "请输入备注");
|
return new ReturnT<String>(500, "请输入备注");
|
||||||
}
|
}
|
||||||
if (glueRemark.length()<6 || glueRemark.length()>100) {
|
if (glueRemark.length()<4 || glueRemark.length()>100) {
|
||||||
return new ReturnT<String>(500, "备注长度应该在6至100之间");
|
return new ReturnT<String>(500, "备注长度应该在4至100之间");
|
||||||
}
|
}
|
||||||
XxlJobInfo exists_jobInfo = xxlJobInfoDao.loadById(id);
|
XxlJobInfo exists_jobInfo = xxlJobInfoDao.loadById(id);
|
||||||
if (exists_jobInfo == null) {
|
if (exists_jobInfo == null) {
|
||||||
return new ReturnT<String>(500, "参数异常");
|
return new ReturnT<String>(500, "参数异常");
|
||||||
}
|
}
|
||||||
|
|
||||||
// log old code
|
|
||||||
XxlJobLogGlue xxlJobLogGlue = new XxlJobLogGlue();
|
|
||||||
xxlJobLogGlue.setJobId(exists_jobInfo.getId());
|
|
||||||
xxlJobLogGlue.setGlueType(exists_jobInfo.getGlueType());
|
|
||||||
xxlJobLogGlue.setGlueSource(exists_jobInfo.getGlueSource());
|
|
||||||
xxlJobLogGlue.setGlueRemark(exists_jobInfo.getGlueRemark());
|
|
||||||
xxlJobLogGlueDao.save(xxlJobLogGlue);
|
|
||||||
|
|
||||||
// update new code
|
// update new code
|
||||||
exists_jobInfo.setGlueSource(glueSource);
|
exists_jobInfo.setGlueSource(glueSource);
|
||||||
exists_jobInfo.setGlueRemark(glueRemark);
|
exists_jobInfo.setGlueRemark(glueRemark);
|
||||||
exists_jobInfo.setGlueUpdatetime(new Date());
|
exists_jobInfo.setGlueUpdatetime(new Date());
|
||||||
xxlJobInfoDao.update(exists_jobInfo);
|
xxlJobInfoDao.update(exists_jobInfo);
|
||||||
|
|
||||||
|
// log old code
|
||||||
|
XxlJobLogGlue xxlJobLogGlue = new XxlJobLogGlue();
|
||||||
|
xxlJobLogGlue.setJobId(exists_jobInfo.getId());
|
||||||
|
xxlJobLogGlue.setGlueType(exists_jobInfo.getGlueType());
|
||||||
|
xxlJobLogGlue.setGlueSource(glueSource);
|
||||||
|
xxlJobLogGlue.setGlueRemark(glueRemark);
|
||||||
|
xxlJobLogGlueDao.save(xxlJobLogGlue);
|
||||||
|
|
||||||
// remove code backup more than 30
|
// remove code backup more than 30
|
||||||
xxlJobLogGlueDao.removeOld(exists_jobInfo.getId(), 30);
|
xxlJobLogGlueDao.removeOld(exists_jobInfo.getId(), 30);
|
||||||
|
|
||||||
|
|
|
@ -79,9 +79,6 @@ public class XxlJobServiceImpl implements IXxlJobService {
|
||||||
if (StringUtils.isBlank(jobInfo.getAuthor())) {
|
if (StringUtils.isBlank(jobInfo.getAuthor())) {
|
||||||
return new ReturnT<String>(500, "请输入“负责人”");
|
return new ReturnT<String>(500, "请输入“负责人”");
|
||||||
}
|
}
|
||||||
if (StringUtils.isBlank(jobInfo.getAlarmEmail())) {
|
|
||||||
return new ReturnT<String>(500, "请输入“报警邮件”");
|
|
||||||
}
|
|
||||||
if (ExecutorRouteStrategyEnum.match(jobInfo.getExecutorRouteStrategy(), null) == null) {
|
if (ExecutorRouteStrategyEnum.match(jobInfo.getExecutorRouteStrategy(), null) == null) {
|
||||||
return new ReturnT<String>(500, "路由策略非法");
|
return new ReturnT<String>(500, "路由策略非法");
|
||||||
}
|
}
|
||||||
|
@ -145,9 +142,6 @@ public class XxlJobServiceImpl implements IXxlJobService {
|
||||||
if (StringUtils.isBlank(jobInfo.getAuthor())) {
|
if (StringUtils.isBlank(jobInfo.getAuthor())) {
|
||||||
return new ReturnT<String>(500, "请输入“负责人”");
|
return new ReturnT<String>(500, "请输入“负责人”");
|
||||||
}
|
}
|
||||||
if (StringUtils.isBlank(jobInfo.getAlarmEmail())) {
|
|
||||||
return new ReturnT<String>(500, "请输入“报警邮件”");
|
|
||||||
}
|
|
||||||
if (ExecutorRouteStrategyEnum.match(jobInfo.getExecutorRouteStrategy(), null) == null) {
|
if (ExecutorRouteStrategyEnum.match(jobInfo.getExecutorRouteStrategy(), null) == null) {
|
||||||
return new ReturnT<String>(500, "路由策略非法");
|
return new ReturnT<String>(500, "路由策略非法");
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<#-- icon -->
|
<#-- icon -->
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<a href="../../index2.html" class="navbar-brand"><b>Web</b>IDE</a>
|
<a class="navbar-brand"><b>Web</b>IDE</a>
|
||||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
|
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
|
||||||
<i class="fa fa-bars"></i>
|
<i class="fa fa-bars"></i>
|
||||||
</button>
|
</button>
|
||||||
|
@ -35,7 +35,7 @@
|
||||||
<#-- left nav -->
|
<#-- left nav -->
|
||||||
<div class="collapse navbar-collapse pull-left" id="navbar-collapse">
|
<div class="collapse navbar-collapse pull-left" id="navbar-collapse">
|
||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
<li class="active" ><a href="javascript:;">任务:${jobInfo.jobDesc}<span class="sr-only">(current)</span></a></li>
|
<li class="active" ><a href="javascript:;"><#list GlueTypeEnum as item><#if item == jobInfo.glueType>${item.desc}</#if></#list> 任务:${jobInfo.jobDesc}<span class="sr-only">(current)</span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -45,11 +45,19 @@
|
||||||
<li class="dropdown">
|
<li class="dropdown">
|
||||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">版本回溯 <span class="caret"></span></a>
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">版本回溯 <span class="caret"></span></a>
|
||||||
<ul class="dropdown-menu" role="menu">
|
<ul class="dropdown-menu" role="menu">
|
||||||
<li><a href="javascript:;" class="source_version" version="version_now" >${jobInfo.glueRemark}【OnLine】</a></li>
|
<li <#if jobLogGlues?exists && jobLogGlues?size gt 0 >style="display: none;"</#if> >
|
||||||
|
<a href="javascript:;" class="source_version" version="version_now" glueType="${jobInfo.glueType}" >
|
||||||
|
<#list GlueTypeEnum as item><#if item == jobInfo.glueType>${item.desc}</#if></#list>: ${jobInfo.glueRemark}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
<textarea id="version_now" style="display:none;" >${jobInfo.glueSource}</textarea>
|
<textarea id="version_now" style="display:none;" >${jobInfo.glueSource}</textarea>
|
||||||
<#if jobLogGlues?exists && jobLogGlues?size gt 0 >
|
<#if jobLogGlues?exists && jobLogGlues?size gt 0 >
|
||||||
<#list jobLogGlues as glue>
|
<#list jobLogGlues as glue>
|
||||||
<li><a href="javascript:;" class="source_version" version="version_${glue.id}" >${glue.glueRemark}</a></li>
|
<li>
|
||||||
|
<a href="javascript:;" class="source_version" version="version_${glue.id}" glueType="${glue.glueType}" >
|
||||||
|
<#list GlueTypeEnum as item><#if item == glue.glueType>${item.desc}</#if></#list>: ${glue.glueRemark}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
<textarea id="version_${glue.id}" style="display:none;" >${glue.glueSource}</textarea>
|
<textarea id="version_${glue.id}" style="display:none;" >${glue.glueSource}</textarea>
|
||||||
</#list>
|
</#list>
|
||||||
</#if>
|
</#if>
|
||||||
|
@ -103,10 +111,13 @@
|
||||||
<@netCommon.commonScript />
|
<@netCommon.commonScript />
|
||||||
<script src="${request.contextPath}/static/plugins/codemirror/lib/codemirror.js"></script>
|
<script src="${request.contextPath}/static/plugins/codemirror/lib/codemirror.js"></script>
|
||||||
<script src="${request.contextPath}/static/plugins/codemirror/mode/clike/clike.js"></script>
|
<script src="${request.contextPath}/static/plugins/codemirror/mode/clike/clike.js"></script>
|
||||||
|
<script src="${request.contextPath}/static/plugins/codemirror/mode/shell/shell.js"></script>
|
||||||
|
<script src="${request.contextPath}/static/plugins/codemirror/mode/python/python.js"></script>
|
||||||
<script src="${request.contextPath}/static/plugins/codemirror/addon/hint/show-hint.js"></script>
|
<script src="${request.contextPath}/static/plugins/codemirror/addon/hint/show-hint.js"></script>
|
||||||
<script src="${request.contextPath}/static/plugins/codemirror/addon/hint/anyword-hint.js"></script>
|
<script src="${request.contextPath}/static/plugins/codemirror/addon/hint/anyword-hint.js"></script>
|
||||||
<script>
|
<script>
|
||||||
var id = '${jobInfo.id}';
|
var id = '${jobInfo.id}';
|
||||||
|
var glueType = '${jobInfo.glueType}';
|
||||||
</script>
|
</script>
|
||||||
<script src="${request.contextPath}/static/js/jobcode.index.1.js"></script>
|
<script src="${request.contextPath}/static/js/jobcode.index.1.js"></script>
|
||||||
|
|
||||||
|
|
|
@ -154,10 +154,10 @@
|
||||||
<div class="col-sm-4"><input type="text" class="form-control" name="childJobKey" placeholder="请输入子任务的任务Key,如存在多个逗号分隔" maxlength="100" ></div>
|
<div class="col-sm-4"><input type="text" class="form-control" name="childJobKey" placeholder="请输入子任务的任务Key,如存在多个逗号分隔" maxlength="100" ></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="lastname" class="col-sm-2 control-label">报警邮件<font color="red">*</font></label>
|
|
||||||
<div class="col-sm-4"><input type="text" class="form-control" name="alarmEmail" placeholder="请输入“报警邮件”,多个邮件地址逗号分隔" maxlength="100" ></div>
|
|
||||||
<label for="lastname" class="col-sm-2 control-label">负责人<font color="red">*</font></label>
|
<label for="lastname" class="col-sm-2 control-label">负责人<font color="red">*</font></label>
|
||||||
<div class="col-sm-4"><input type="text" class="form-control" name="author" placeholder="请输入“负责人”" maxlength="50" ></div>
|
<div class="col-sm-4"><input type="text" class="form-control" name="author" placeholder="请输入“负责人”" maxlength="50" ></div>
|
||||||
|
<label for="lastname" class="col-sm-2 control-label">报警邮件<font color="black">*</font></label>
|
||||||
|
<div class="col-sm-4"><input type="text" class="form-control" name="alarmEmail" placeholder="请输入“报警邮件”,多个邮件地址逗号分隔" maxlength="100" ></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
|
@ -188,6 +188,38 @@ public class DemoGlueJobHandler extends IJobHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
</textarea>
|
||||||
|
<textarea name="glueSource_shell" style="display:none;" >
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
echo hello shell
|
||||||
|
|
||||||
|
for x in 1 2 3 4
|
||||||
|
do
|
||||||
|
echo number=$x
|
||||||
|
sleep 1s
|
||||||
|
done
|
||||||
|
|
||||||
|
echo1 111
|
||||||
|
printf 666
|
||||||
|
echo2 222
|
||||||
|
</textarea>
|
||||||
|
<textarea name="glueSource_python" style="display:none;" >
|
||||||
|
#!/usr/bin/python
|
||||||
|
# -*- coding: UTF-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import time
|
||||||
|
|
||||||
|
logging.basicConfig(level=logging.DEBUG)
|
||||||
|
|
||||||
|
logging.info('hello python')
|
||||||
|
|
||||||
|
for num in range(0, 3):
|
||||||
|
time.sleep(1)
|
||||||
|
logging.info('当前序号 :' + str(num) )
|
||||||
|
|
||||||
|
logging.info('Good bye!')
|
||||||
</textarea>
|
</textarea>
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
|
@ -248,10 +280,10 @@ public class DemoGlueJobHandler extends IJobHandler {
|
||||||
<div class="col-sm-4"><input type="text" class="form-control" name="childJobKey" placeholder="请输入子任务的任务Key,如存在多个逗号分隔" maxlength="100" ></div>
|
<div class="col-sm-4"><input type="text" class="form-control" name="childJobKey" placeholder="请输入子任务的任务Key,如存在多个逗号分隔" maxlength="100" ></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="lastname" class="col-sm-2 control-label">报警邮件<font color="red">*</font></label>
|
|
||||||
<div class="col-sm-4"><input type="text" class="form-control" name="alarmEmail" placeholder="请输入“报警邮件”,多个邮件地址逗号分隔" maxlength="100" ></div>
|
|
||||||
<label for="lastname" class="col-sm-2 control-label">负责人<font color="red">*</font></label>
|
<label for="lastname" class="col-sm-2 control-label">负责人<font color="red">*</font></label>
|
||||||
<div class="col-sm-4"><input type="text" class="form-control" name="author" placeholder="请输入“负责人”" maxlength="50" ></div>
|
<div class="col-sm-4"><input type="text" class="form-control" name="author" placeholder="请输入“负责人”" maxlength="50" ></div>
|
||||||
|
<label for="lastname" class="col-sm-2 control-label">报警邮件<font color="black">*</font></label>
|
||||||
|
<div class="col-sm-4"><input type="text" class="form-control" name="alarmEmail" placeholder="请输入“报警邮件”,多个邮件地址逗号分隔" maxlength="100" ></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<#-- icon -->
|
<#-- icon -->
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<a href="../../index2.html" class="navbar-brand"><b>执行日志</b>Console</a>
|
<a class="navbar-brand"><b>执行日志</b>Console</a>
|
||||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
|
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
|
||||||
<i class="fa fa-bars"></i>
|
<i class="fa fa-bars"></i>
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -6,18 +6,36 @@ $(function() {
|
||||||
lineNumbers : true,
|
lineNumbers : true,
|
||||||
matchBrackets : true
|
matchBrackets : true
|
||||||
});*/
|
});*/
|
||||||
var codeEditor = CodeMirror(document.getElementById("ideWindow"), {
|
|
||||||
mode : "text/x-java",
|
var codeEditor;
|
||||||
lineNumbers : true,
|
function initIde(glueType, glueSource) {
|
||||||
matchBrackets : true,
|
var ideMode = "text/x-java";
|
||||||
value: $("#version_now").val()
|
if ('GLUE_GROOVY'==glueType){
|
||||||
});
|
ideMode = "text/x-java";
|
||||||
|
} else if ('GLUE_SHELL'==glueType){
|
||||||
|
ideMode = "text/x-sh";
|
||||||
|
} else if ('GLUE_PYTHON'==glueType){
|
||||||
|
ideMode = "text/x-python";
|
||||||
|
}
|
||||||
|
|
||||||
|
codeEditor = CodeMirror(document.getElementById("ideWindow"), {
|
||||||
|
mode : ideMode,
|
||||||
|
lineNumbers : true,
|
||||||
|
matchBrackets : true,
|
||||||
|
value: glueSource
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
initIde(glueType, $("#version_now").val());
|
||||||
|
|
||||||
// code change
|
// code change
|
||||||
$(".source_version").click(function(){
|
$(".source_version").click(function(){
|
||||||
|
var glueType = $(this).attr('glueType');
|
||||||
var sourceId = $(this).attr('version');
|
var sourceId = $(this).attr('version');
|
||||||
var temp = $( "#" + sourceId ).val();
|
var temp = $( "#" + sourceId ).val();
|
||||||
codeEditor.setValue( temp );
|
|
||||||
|
codeEditor.setValue('');
|
||||||
|
initIde(glueType, temp);
|
||||||
});
|
});
|
||||||
|
|
||||||
// code source save
|
// code source save
|
||||||
|
@ -34,8 +52,8 @@ $(function() {
|
||||||
ComAlert.show(2, "请输入备注");
|
ComAlert.show(2, "请输入备注");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (glueRemark.length < 6|| glueRemark.length > 100) {
|
if (glueRemark.length <4 || glueRemark.length > 100) {
|
||||||
ComAlert.show(2, "备注长度应该在6至100之间");
|
ComAlert.show(2, "备注长度应该在4至100之间");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -239,9 +239,6 @@ $(function() {
|
||||||
},
|
},
|
||||||
jobCron : {
|
jobCron : {
|
||||||
required : true
|
required : true
|
||||||
},
|
|
||||||
alarmEmail : {
|
|
||||||
required : true
|
|
||||||
},
|
},
|
||||||
author : {
|
author : {
|
||||||
required : true
|
required : true
|
||||||
|
@ -254,9 +251,6 @@ $(function() {
|
||||||
jobCron : {
|
jobCron : {
|
||||||
required :"请输入“Cron”."
|
required :"请输入“Cron”."
|
||||||
},
|
},
|
||||||
alarmEmail : {
|
|
||||||
required : "请输入“报警邮件”."
|
|
||||||
},
|
|
||||||
author : {
|
author : {
|
||||||
required : "请输入“负责人”."
|
required : "请输入“负责人”."
|
||||||
}
|
}
|
||||||
|
@ -349,9 +343,6 @@ $(function() {
|
||||||
jobCron : {
|
jobCron : {
|
||||||
required : true
|
required : true
|
||||||
},
|
},
|
||||||
alarmEmail : {
|
|
||||||
required : true
|
|
||||||
},
|
|
||||||
author : {
|
author : {
|
||||||
required : true
|
required : true
|
||||||
}
|
}
|
||||||
|
@ -363,9 +354,6 @@ $(function() {
|
||||||
jobCron : {
|
jobCron : {
|
||||||
required :"请输入“Cron”."
|
required :"请输入“Cron”."
|
||||||
},
|
},
|
||||||
alarmEmail : {
|
|
||||||
required : "请输入“报警邮件”."
|
|
||||||
},
|
|
||||||
author : {
|
author : {
|
||||||
required : "请输入“负责人”."
|
required : "请输入“负责人”."
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,51 +0,0 @@
|
||||||
// CodeMirror, copyright (c) by Marijn Haverbeke and others
|
|
||||||
// Distributed under an MIT license: http://codemirror.net/LICENSE
|
|
||||||
|
|
||||||
(function() {
|
|
||||||
var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-c");
|
|
||||||
function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
|
|
||||||
|
|
||||||
MT("indent",
|
|
||||||
"[variable-3 void] [def foo]([variable-3 void*] [variable a], [variable-3 int] [variable b]) {",
|
|
||||||
" [variable-3 int] [variable c] [operator =] [variable b] [operator +]",
|
|
||||||
" [number 1];",
|
|
||||||
" [keyword return] [operator *][variable a];",
|
|
||||||
"}");
|
|
||||||
|
|
||||||
MT("indent_switch",
|
|
||||||
"[keyword switch] ([variable x]) {",
|
|
||||||
" [keyword case] [number 10]:",
|
|
||||||
" [keyword return] [number 20];",
|
|
||||||
" [keyword default]:",
|
|
||||||
" [variable printf]([string \"foo %c\"], [variable x]);",
|
|
||||||
"}");
|
|
||||||
|
|
||||||
MT("def",
|
|
||||||
"[variable-3 void] [def foo]() {}",
|
|
||||||
"[keyword struct] [def bar]{}",
|
|
||||||
"[variable-3 int] [variable-3 *][def baz]() {}");
|
|
||||||
|
|
||||||
MT("double_block",
|
|
||||||
"[keyword for] (;;)",
|
|
||||||
" [keyword for] (;;)",
|
|
||||||
" [variable x][operator ++];",
|
|
||||||
"[keyword return];");
|
|
||||||
|
|
||||||
MT("preprocessor",
|
|
||||||
"[meta #define FOO 3]",
|
|
||||||
"[variable-3 int] [variable foo];",
|
|
||||||
"[meta #define BAR\\]",
|
|
||||||
"[meta 4]",
|
|
||||||
"[variable-3 unsigned] [variable-3 int] [variable bar] [operator =] [number 8];",
|
|
||||||
"[meta #include <baz> ][comment // comment]")
|
|
||||||
|
|
||||||
|
|
||||||
var mode_cpp = CodeMirror.getMode({indentUnit: 2}, "text/x-c++src");
|
|
||||||
function MTCPP(name) { test.mode(name, mode_cpp, Array.prototype.slice.call(arguments, 1)); }
|
|
||||||
|
|
||||||
MTCPP("cpp14_literal",
|
|
||||||
"[number 10'000];",
|
|
||||||
"[number 0b10'000];",
|
|
||||||
"[number 0x10'000];",
|
|
||||||
"[string '100000'];");
|
|
||||||
})();
|
|
|
@ -1,230 +0,0 @@
|
||||||
// CodeMirror, copyright (c) by Marijn Haverbeke and others
|
|
||||||
// Distributed under an MIT license: http://codemirror.net/LICENSE
|
|
||||||
|
|
||||||
(function(mod) {
|
|
||||||
if (typeof exports == "object" && typeof module == "object") // CommonJS
|
|
||||||
mod(require("../../lib/codemirror"));
|
|
||||||
else if (typeof define == "function" && define.amd) // AMD
|
|
||||||
define(["../../lib/codemirror"], mod);
|
|
||||||
else // Plain browser env
|
|
||||||
mod(CodeMirror);
|
|
||||||
})(function(CodeMirror) {
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
CodeMirror.defineMode("groovy", function(config) {
|
|
||||||
function words(str) {
|
|
||||||
var obj = {}, words = str.split(" ");
|
|
||||||
for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
|
|
||||||
return obj;
|
|
||||||
}
|
|
||||||
var keywords = words(
|
|
||||||
"abstract as assert boolean break byte case catch char class const continue def default " +
|
|
||||||
"do double else enum extends final finally float for goto if implements import in " +
|
|
||||||
"instanceof int interface long native new package private protected public return " +
|
|
||||||
"short static strictfp super switch synchronized threadsafe throw throws transient " +
|
|
||||||
"try void volatile while");
|
|
||||||
var blockKeywords = words("catch class do else finally for if switch try while enum interface def");
|
|
||||||
var standaloneKeywords = words("return break continue");
|
|
||||||
var atoms = words("null true false this");
|
|
||||||
|
|
||||||
var curPunc;
|
|
||||||
function tokenBase(stream, state) {
|
|
||||||
var ch = stream.next();
|
|
||||||
if (ch == '"' || ch == "'") {
|
|
||||||
return startString(ch, stream, state);
|
|
||||||
}
|
|
||||||
if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
|
|
||||||
curPunc = ch;
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (/\d/.test(ch)) {
|
|
||||||
stream.eatWhile(/[\w\.]/);
|
|
||||||
if (stream.eat(/eE/)) { stream.eat(/\+\-/); stream.eatWhile(/\d/); }
|
|
||||||
return "number";
|
|
||||||
}
|
|
||||||
if (ch == "/") {
|
|
||||||
if (stream.eat("*")) {
|
|
||||||
state.tokenize.push(tokenComment);
|
|
||||||
return tokenComment(stream, state);
|
|
||||||
}
|
|
||||||
if (stream.eat("/")) {
|
|
||||||
stream.skipToEnd();
|
|
||||||
return "comment";
|
|
||||||
}
|
|
||||||
if (expectExpression(state.lastToken, false)) {
|
|
||||||
return startString(ch, stream, state);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (ch == "-" && stream.eat(">")) {
|
|
||||||
curPunc = "->";
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (/[+\-*&%=<>!?|\/~]/.test(ch)) {
|
|
||||||
stream.eatWhile(/[+\-*&%=<>|~]/);
|
|
||||||
return "operator";
|
|
||||||
}
|
|
||||||
stream.eatWhile(/[\w\$_]/);
|
|
||||||
if (ch == "@") { stream.eatWhile(/[\w\$_\.]/); return "meta"; }
|
|
||||||
if (state.lastToken == ".") return "property";
|
|
||||||
if (stream.eat(":")) { curPunc = "proplabel"; return "property"; }
|
|
||||||
var cur = stream.current();
|
|
||||||
if (atoms.propertyIsEnumerable(cur)) { return "atom"; }
|
|
||||||
if (keywords.propertyIsEnumerable(cur)) {
|
|
||||||
if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
|
|
||||||
else if (standaloneKeywords.propertyIsEnumerable(cur)) curPunc = "standalone";
|
|
||||||
return "keyword";
|
|
||||||
}
|
|
||||||
return "variable";
|
|
||||||
}
|
|
||||||
tokenBase.isBase = true;
|
|
||||||
|
|
||||||
function startString(quote, stream, state) {
|
|
||||||
var tripleQuoted = false;
|
|
||||||
if (quote != "/" && stream.eat(quote)) {
|
|
||||||
if (stream.eat(quote)) tripleQuoted = true;
|
|
||||||
else return "string";
|
|
||||||
}
|
|
||||||
function t(stream, state) {
|
|
||||||
var escaped = false, next, end = !tripleQuoted;
|
|
||||||
while ((next = stream.next()) != null) {
|
|
||||||
if (next == quote && !escaped) {
|
|
||||||
if (!tripleQuoted) { break; }
|
|
||||||
if (stream.match(quote + quote)) { end = true; break; }
|
|
||||||
}
|
|
||||||
if (quote == '"' && next == "$" && !escaped && stream.eat("{")) {
|
|
||||||
state.tokenize.push(tokenBaseUntilBrace());
|
|
||||||
return "string";
|
|
||||||
}
|
|
||||||
escaped = !escaped && next == "\\";
|
|
||||||
}
|
|
||||||
if (end) state.tokenize.pop();
|
|
||||||
return "string";
|
|
||||||
}
|
|
||||||
state.tokenize.push(t);
|
|
||||||
return t(stream, state);
|
|
||||||
}
|
|
||||||
|
|
||||||
function tokenBaseUntilBrace() {
|
|
||||||
var depth = 1;
|
|
||||||
function t(stream, state) {
|
|
||||||
if (stream.peek() == "}") {
|
|
||||||
depth--;
|
|
||||||
if (depth == 0) {
|
|
||||||
state.tokenize.pop();
|
|
||||||
return state.tokenize[state.tokenize.length-1](stream, state);
|
|
||||||
}
|
|
||||||
} else if (stream.peek() == "{") {
|
|
||||||
depth++;
|
|
||||||
}
|
|
||||||
return tokenBase(stream, state);
|
|
||||||
}
|
|
||||||
t.isBase = true;
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
function tokenComment(stream, state) {
|
|
||||||
var maybeEnd = false, ch;
|
|
||||||
while (ch = stream.next()) {
|
|
||||||
if (ch == "/" && maybeEnd) {
|
|
||||||
state.tokenize.pop();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
maybeEnd = (ch == "*");
|
|
||||||
}
|
|
||||||
return "comment";
|
|
||||||
}
|
|
||||||
|
|
||||||
function expectExpression(last, newline) {
|
|
||||||
return !last || last == "operator" || last == "->" || /[\.\[\{\(,;:]/.test(last) ||
|
|
||||||
last == "newstatement" || last == "keyword" || last == "proplabel" ||
|
|
||||||
(last == "standalone" && !newline);
|
|
||||||
}
|
|
||||||
|
|
||||||
function Context(indented, column, type, align, prev) {
|
|
||||||
this.indented = indented;
|
|
||||||
this.column = column;
|
|
||||||
this.type = type;
|
|
||||||
this.align = align;
|
|
||||||
this.prev = prev;
|
|
||||||
}
|
|
||||||
function pushContext(state, col, type) {
|
|
||||||
return state.context = new Context(state.indented, col, type, null, state.context);
|
|
||||||
}
|
|
||||||
function popContext(state) {
|
|
||||||
var t = state.context.type;
|
|
||||||
if (t == ")" || t == "]" || t == "}")
|
|
||||||
state.indented = state.context.indented;
|
|
||||||
return state.context = state.context.prev;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Interface
|
|
||||||
|
|
||||||
return {
|
|
||||||
startState: function(basecolumn) {
|
|
||||||
return {
|
|
||||||
tokenize: [tokenBase],
|
|
||||||
context: new Context((basecolumn || 0) - config.indentUnit, 0, "top", false),
|
|
||||||
indented: 0,
|
|
||||||
startOfLine: true,
|
|
||||||
lastToken: null
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
token: function(stream, state) {
|
|
||||||
var ctx = state.context;
|
|
||||||
if (stream.sol()) {
|
|
||||||
if (ctx.align == null) ctx.align = false;
|
|
||||||
state.indented = stream.indentation();
|
|
||||||
state.startOfLine = true;
|
|
||||||
// Automatic semicolon insertion
|
|
||||||
if (ctx.type == "statement" && !expectExpression(state.lastToken, true)) {
|
|
||||||
popContext(state); ctx = state.context;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (stream.eatSpace()) return null;
|
|
||||||
curPunc = null;
|
|
||||||
var style = state.tokenize[state.tokenize.length-1](stream, state);
|
|
||||||
if (style == "comment") return style;
|
|
||||||
if (ctx.align == null) ctx.align = true;
|
|
||||||
|
|
||||||
if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
|
|
||||||
// Handle indentation for {x -> \n ... }
|
|
||||||
else if (curPunc == "->" && ctx.type == "statement" && ctx.prev.type == "}") {
|
|
||||||
popContext(state);
|
|
||||||
state.context.align = false;
|
|
||||||
}
|
|
||||||
else if (curPunc == "{") pushContext(state, stream.column(), "}");
|
|
||||||
else if (curPunc == "[") pushContext(state, stream.column(), "]");
|
|
||||||
else if (curPunc == "(") pushContext(state, stream.column(), ")");
|
|
||||||
else if (curPunc == "}") {
|
|
||||||
while (ctx.type == "statement") ctx = popContext(state);
|
|
||||||
if (ctx.type == "}") ctx = popContext(state);
|
|
||||||
while (ctx.type == "statement") ctx = popContext(state);
|
|
||||||
}
|
|
||||||
else if (curPunc == ctx.type) popContext(state);
|
|
||||||
else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
|
|
||||||
pushContext(state, stream.column(), "statement");
|
|
||||||
state.startOfLine = false;
|
|
||||||
state.lastToken = curPunc || style;
|
|
||||||
return style;
|
|
||||||
},
|
|
||||||
|
|
||||||
indent: function(state, textAfter) {
|
|
||||||
if (!state.tokenize[state.tokenize.length-1].isBase) return 0;
|
|
||||||
var firstChar = textAfter && textAfter.charAt(0), ctx = state.context;
|
|
||||||
if (ctx.type == "statement" && !expectExpression(state.lastToken, true)) ctx = ctx.prev;
|
|
||||||
var closing = firstChar == ctx.type;
|
|
||||||
if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : config.indentUnit);
|
|
||||||
else if (ctx.align) return ctx.column + (closing ? 0 : 1);
|
|
||||||
else return ctx.indented + (closing ? 0 : config.indentUnit);
|
|
||||||
},
|
|
||||||
|
|
||||||
electricChars: "{}",
|
|
||||||
closeBrackets: {triples: "'\""},
|
|
||||||
fold: "brace"
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
CodeMirror.defineMIME("text/x-groovy", "groovy");
|
|
||||||
|
|
||||||
});
|
|
340
xxl-job-admin/src/main/webapp/static/plugins/codemirror/mode/python/python.js
vendored
Executable file
340
xxl-job-admin/src/main/webapp/static/plugins/codemirror/mode/python/python.js
vendored
Executable file
|
@ -0,0 +1,340 @@
|
||||||
|
// CodeMirror, copyright (c) by Marijn Haverbeke and others
|
||||||
|
// Distributed under an MIT license: http://codemirror.net/LICENSE
|
||||||
|
|
||||||
|
(function(mod) {
|
||||||
|
if (typeof exports == "object" && typeof module == "object") // CommonJS
|
||||||
|
mod(require("../../lib/codemirror"));
|
||||||
|
else if (typeof define == "function" && define.amd) // AMD
|
||||||
|
define(["../../lib/codemirror"], mod);
|
||||||
|
else // Plain browser env
|
||||||
|
mod(CodeMirror);
|
||||||
|
})(function(CodeMirror) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
function wordRegexp(words) {
|
||||||
|
return new RegExp("^((" + words.join(")|(") + "))\\b");
|
||||||
|
}
|
||||||
|
|
||||||
|
var wordOperators = wordRegexp(["and", "or", "not", "is"]);
|
||||||
|
var commonKeywords = ["as", "assert", "break", "class", "continue",
|
||||||
|
"def", "del", "elif", "else", "except", "finally",
|
||||||
|
"for", "from", "global", "if", "import",
|
||||||
|
"lambda", "pass", "raise", "return",
|
||||||
|
"try", "while", "with", "yield", "in"];
|
||||||
|
var commonBuiltins = ["abs", "all", "any", "bin", "bool", "bytearray", "callable", "chr",
|
||||||
|
"classmethod", "compile", "complex", "delattr", "dict", "dir", "divmod",
|
||||||
|
"enumerate", "eval", "filter", "float", "format", "frozenset",
|
||||||
|
"getattr", "globals", "hasattr", "hash", "help", "hex", "id",
|
||||||
|
"input", "int", "isinstance", "issubclass", "iter", "len",
|
||||||
|
"list", "locals", "map", "max", "memoryview", "min", "next",
|
||||||
|
"object", "oct", "open", "ord", "pow", "property", "range",
|
||||||
|
"repr", "reversed", "round", "set", "setattr", "slice",
|
||||||
|
"sorted", "staticmethod", "str", "sum", "super", "tuple",
|
||||||
|
"type", "vars", "zip", "__import__", "NotImplemented",
|
||||||
|
"Ellipsis", "__debug__"];
|
||||||
|
CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins));
|
||||||
|
|
||||||
|
function top(state) {
|
||||||
|
return state.scopes[state.scopes.length - 1];
|
||||||
|
}
|
||||||
|
|
||||||
|
CodeMirror.defineMode("python", function(conf, parserConf) {
|
||||||
|
var ERRORCLASS = "error";
|
||||||
|
|
||||||
|
var singleDelimiters = parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.]/;
|
||||||
|
var doubleOperators = parserConf.doubleOperators || /^([!<>]==|<>|<<|>>|\/\/|\*\*)/;
|
||||||
|
var doubleDelimiters = parserConf.doubleDelimiters || /^(\+=|\-=|\*=|%=|\/=|&=|\|=|\^=)/;
|
||||||
|
var tripleDelimiters = parserConf.tripleDelimiters || /^(\/\/=|>>=|<<=|\*\*=)/;
|
||||||
|
|
||||||
|
var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
|
||||||
|
|
||||||
|
var myKeywords = commonKeywords, myBuiltins = commonBuiltins;
|
||||||
|
if (parserConf.extra_keywords != undefined)
|
||||||
|
myKeywords = myKeywords.concat(parserConf.extra_keywords);
|
||||||
|
|
||||||
|
if (parserConf.extra_builtins != undefined)
|
||||||
|
myBuiltins = myBuiltins.concat(parserConf.extra_builtins);
|
||||||
|
|
||||||
|
var py3 = !(parserConf.version && Number(parserConf.version) < 3)
|
||||||
|
if (py3) {
|
||||||
|
// since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
|
||||||
|
var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!@]/;
|
||||||
|
var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
|
||||||
|
myKeywords = myKeywords.concat(["nonlocal", "False", "True", "None", "async", "await"]);
|
||||||
|
myBuiltins = myBuiltins.concat(["ascii", "bytes", "exec", "print"]);
|
||||||
|
var stringPrefixes = new RegExp("^(([rbuf]|(br))?('{3}|\"{3}|['\"]))", "i");
|
||||||
|
} else {
|
||||||
|
var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!]/;
|
||||||
|
var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*/;
|
||||||
|
myKeywords = myKeywords.concat(["exec", "print"]);
|
||||||
|
myBuiltins = myBuiltins.concat(["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
|
||||||
|
"file", "intern", "long", "raw_input", "reduce", "reload",
|
||||||
|
"unichr", "unicode", "xrange", "False", "True", "None"]);
|
||||||
|
var stringPrefixes = new RegExp("^(([rubf]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
|
||||||
|
}
|
||||||
|
var keywords = wordRegexp(myKeywords);
|
||||||
|
var builtins = wordRegexp(myBuiltins);
|
||||||
|
|
||||||
|
// tokenizers
|
||||||
|
function tokenBase(stream, state) {
|
||||||
|
if (stream.sol()) state.indent = stream.indentation()
|
||||||
|
// Handle scope changes
|
||||||
|
if (stream.sol() && top(state).type == "py") {
|
||||||
|
var scopeOffset = top(state).offset;
|
||||||
|
if (stream.eatSpace()) {
|
||||||
|
var lineOffset = stream.indentation();
|
||||||
|
if (lineOffset > scopeOffset)
|
||||||
|
pushPyScope(state);
|
||||||
|
else if (lineOffset < scopeOffset && dedent(stream, state) && stream.peek() != "#")
|
||||||
|
state.errorToken = true;
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
|
var style = tokenBaseInner(stream, state);
|
||||||
|
if (scopeOffset > 0 && dedent(stream, state))
|
||||||
|
style += " " + ERRORCLASS;
|
||||||
|
return style;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return tokenBaseInner(stream, state);
|
||||||
|
}
|
||||||
|
|
||||||
|
function tokenBaseInner(stream, state) {
|
||||||
|
if (stream.eatSpace()) return null;
|
||||||
|
|
||||||
|
var ch = stream.peek();
|
||||||
|
|
||||||
|
// Handle Comments
|
||||||
|
if (ch == "#") {
|
||||||
|
stream.skipToEnd();
|
||||||
|
return "comment";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle Number Literals
|
||||||
|
if (stream.match(/^[0-9\.]/, false)) {
|
||||||
|
var floatLiteral = false;
|
||||||
|
// Floats
|
||||||
|
if (stream.match(/^[\d_]*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
|
||||||
|
if (stream.match(/^[\d_]+\.\d*/)) { floatLiteral = true; }
|
||||||
|
if (stream.match(/^\.\d+/)) { floatLiteral = true; }
|
||||||
|
if (floatLiteral) {
|
||||||
|
// Float literals may be "imaginary"
|
||||||
|
stream.eat(/J/i);
|
||||||
|
return "number";
|
||||||
|
}
|
||||||
|
// Integers
|
||||||
|
var intLiteral = false;
|
||||||
|
// Hex
|
||||||
|
if (stream.match(/^0x[0-9a-f_]+/i)) intLiteral = true;
|
||||||
|
// Binary
|
||||||
|
if (stream.match(/^0b[01_]+/i)) intLiteral = true;
|
||||||
|
// Octal
|
||||||
|
if (stream.match(/^0o[0-7_]+/i)) intLiteral = true;
|
||||||
|
// Decimal
|
||||||
|
if (stream.match(/^[1-9][\d_]*(e[\+\-]?[\d_]+)?/)) {
|
||||||
|
// Decimal literals may be "imaginary"
|
||||||
|
stream.eat(/J/i);
|
||||||
|
// TODO - Can you have imaginary longs?
|
||||||
|
intLiteral = true;
|
||||||
|
}
|
||||||
|
// Zero by itself with no other piece of number.
|
||||||
|
if (stream.match(/^0(?![\dx])/i)) intLiteral = true;
|
||||||
|
if (intLiteral) {
|
||||||
|
// Integer literals may be "long"
|
||||||
|
stream.eat(/L/i);
|
||||||
|
return "number";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle Strings
|
||||||
|
if (stream.match(stringPrefixes)) {
|
||||||
|
state.tokenize = tokenStringFactory(stream.current());
|
||||||
|
return state.tokenize(stream, state);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle operators and Delimiters
|
||||||
|
if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters))
|
||||||
|
return "punctuation";
|
||||||
|
|
||||||
|
if (stream.match(doubleOperators) || stream.match(singleOperators))
|
||||||
|
return "operator";
|
||||||
|
|
||||||
|
if (stream.match(singleDelimiters))
|
||||||
|
return "punctuation";
|
||||||
|
|
||||||
|
if (state.lastToken == "." && stream.match(identifiers))
|
||||||
|
return "property";
|
||||||
|
|
||||||
|
if (stream.match(keywords) || stream.match(wordOperators))
|
||||||
|
return "keyword";
|
||||||
|
|
||||||
|
if (stream.match(builtins))
|
||||||
|
return "builtin";
|
||||||
|
|
||||||
|
if (stream.match(/^(self|cls)\b/))
|
||||||
|
return "variable-2";
|
||||||
|
|
||||||
|
if (stream.match(identifiers)) {
|
||||||
|
if (state.lastToken == "def" || state.lastToken == "class")
|
||||||
|
return "def";
|
||||||
|
return "variable";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle non-detected items
|
||||||
|
stream.next();
|
||||||
|
return ERRORCLASS;
|
||||||
|
}
|
||||||
|
|
||||||
|
function tokenStringFactory(delimiter) {
|
||||||
|
while ("rubf".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
|
||||||
|
delimiter = delimiter.substr(1);
|
||||||
|
|
||||||
|
var singleline = delimiter.length == 1;
|
||||||
|
var OUTCLASS = "string";
|
||||||
|
|
||||||
|
function tokenString(stream, state) {
|
||||||
|
while (!stream.eol()) {
|
||||||
|
stream.eatWhile(/[^'"\\]/);
|
||||||
|
if (stream.eat("\\")) {
|
||||||
|
stream.next();
|
||||||
|
if (singleline && stream.eol())
|
||||||
|
return OUTCLASS;
|
||||||
|
} else if (stream.match(delimiter)) {
|
||||||
|
state.tokenize = tokenBase;
|
||||||
|
return OUTCLASS;
|
||||||
|
} else {
|
||||||
|
stream.eat(/['"]/);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (singleline) {
|
||||||
|
if (parserConf.singleLineStringErrors)
|
||||||
|
return ERRORCLASS;
|
||||||
|
else
|
||||||
|
state.tokenize = tokenBase;
|
||||||
|
}
|
||||||
|
return OUTCLASS;
|
||||||
|
}
|
||||||
|
tokenString.isString = true;
|
||||||
|
return tokenString;
|
||||||
|
}
|
||||||
|
|
||||||
|
function pushPyScope(state) {
|
||||||
|
while (top(state).type != "py") state.scopes.pop()
|
||||||
|
state.scopes.push({offset: top(state).offset + conf.indentUnit,
|
||||||
|
type: "py",
|
||||||
|
align: null})
|
||||||
|
}
|
||||||
|
|
||||||
|
function pushBracketScope(stream, state, type) {
|
||||||
|
var align = stream.match(/^([\s\[\{\(]|#.*)*$/, false) ? null : stream.column() + 1
|
||||||
|
state.scopes.push({offset: state.indent + hangingIndent,
|
||||||
|
type: type,
|
||||||
|
align: align})
|
||||||
|
}
|
||||||
|
|
||||||
|
function dedent(stream, state) {
|
||||||
|
var indented = stream.indentation();
|
||||||
|
while (state.scopes.length > 1 && top(state).offset > indented) {
|
||||||
|
if (top(state).type != "py") return true;
|
||||||
|
state.scopes.pop();
|
||||||
|
}
|
||||||
|
return top(state).offset != indented;
|
||||||
|
}
|
||||||
|
|
||||||
|
function tokenLexer(stream, state) {
|
||||||
|
if (stream.sol()) state.beginningOfLine = true;
|
||||||
|
|
||||||
|
var style = state.tokenize(stream, state);
|
||||||
|
var current = stream.current();
|
||||||
|
|
||||||
|
// Handle decorators
|
||||||
|
if (state.beginningOfLine && current == "@")
|
||||||
|
return stream.match(identifiers, false) ? "meta" : py3 ? "operator" : ERRORCLASS;
|
||||||
|
|
||||||
|
if (/\S/.test(current)) state.beginningOfLine = false;
|
||||||
|
|
||||||
|
if ((style == "variable" || style == "builtin")
|
||||||
|
&& state.lastToken == "meta")
|
||||||
|
style = "meta";
|
||||||
|
|
||||||
|
// Handle scope changes.
|
||||||
|
if (current == "pass" || current == "return")
|
||||||
|
state.dedent += 1;
|
||||||
|
|
||||||
|
if (current == "lambda") state.lambda = true;
|
||||||
|
if (current == ":" && !state.lambda && top(state).type == "py")
|
||||||
|
pushPyScope(state);
|
||||||
|
|
||||||
|
var delimiter_index = current.length == 1 ? "[({".indexOf(current) : -1;
|
||||||
|
if (delimiter_index != -1)
|
||||||
|
pushBracketScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
|
||||||
|
|
||||||
|
delimiter_index = "])}".indexOf(current);
|
||||||
|
if (delimiter_index != -1) {
|
||||||
|
if (top(state).type == current) state.indent = state.scopes.pop().offset - hangingIndent
|
||||||
|
else return ERRORCLASS;
|
||||||
|
}
|
||||||
|
if (state.dedent > 0 && stream.eol() && top(state).type == "py") {
|
||||||
|
if (state.scopes.length > 1) state.scopes.pop();
|
||||||
|
state.dedent -= 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return style;
|
||||||
|
}
|
||||||
|
|
||||||
|
var external = {
|
||||||
|
startState: function(basecolumn) {
|
||||||
|
return {
|
||||||
|
tokenize: tokenBase,
|
||||||
|
scopes: [{offset: basecolumn || 0, type: "py", align: null}],
|
||||||
|
indent: basecolumn || 0,
|
||||||
|
lastToken: null,
|
||||||
|
lambda: false,
|
||||||
|
dedent: 0
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
token: function(stream, state) {
|
||||||
|
var addErr = state.errorToken;
|
||||||
|
if (addErr) state.errorToken = false;
|
||||||
|
var style = tokenLexer(stream, state);
|
||||||
|
|
||||||
|
if (style && style != "comment")
|
||||||
|
state.lastToken = (style == "keyword" || style == "punctuation") ? stream.current() : style;
|
||||||
|
if (style == "punctuation") style = null;
|
||||||
|
|
||||||
|
if (stream.eol() && state.lambda)
|
||||||
|
state.lambda = false;
|
||||||
|
return addErr ? style + " " + ERRORCLASS : style;
|
||||||
|
},
|
||||||
|
|
||||||
|
indent: function(state, textAfter) {
|
||||||
|
if (state.tokenize != tokenBase)
|
||||||
|
return state.tokenize.isString ? CodeMirror.Pass : 0;
|
||||||
|
|
||||||
|
var scope = top(state), closing = scope.type == textAfter.charAt(0)
|
||||||
|
if (scope.align != null)
|
||||||
|
return scope.align - (closing ? 1 : 0)
|
||||||
|
else
|
||||||
|
return scope.offset - (closing ? hangingIndent : 0)
|
||||||
|
},
|
||||||
|
|
||||||
|
electricInput: /^\s*[\}\]\)]$/,
|
||||||
|
closeBrackets: {triples: "'\""},
|
||||||
|
lineComment: "#",
|
||||||
|
fold: "indent"
|
||||||
|
};
|
||||||
|
return external;
|
||||||
|
});
|
||||||
|
|
||||||
|
CodeMirror.defineMIME("text/x-python", "python");
|
||||||
|
|
||||||
|
var words = function(str) { return str.split(" "); };
|
||||||
|
|
||||||
|
CodeMirror.defineMIME("text/x-cython", {
|
||||||
|
name: "python",
|
||||||
|
extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
|
||||||
|
"extern gil include nogil property public"+
|
||||||
|
"readonly struct union DEF IF ELIF ELSE")
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
139
xxl-job-admin/src/main/webapp/static/plugins/codemirror/mode/shell/shell.js
vendored
Executable file
139
xxl-job-admin/src/main/webapp/static/plugins/codemirror/mode/shell/shell.js
vendored
Executable file
|
@ -0,0 +1,139 @@
|
||||||
|
// CodeMirror, copyright (c) by Marijn Haverbeke and others
|
||||||
|
// Distributed under an MIT license: http://codemirror.net/LICENSE
|
||||||
|
|
||||||
|
(function(mod) {
|
||||||
|
if (typeof exports == "object" && typeof module == "object") // CommonJS
|
||||||
|
mod(require("../../lib/codemirror"));
|
||||||
|
else if (typeof define == "function" && define.amd) // AMD
|
||||||
|
define(["../../lib/codemirror"], mod);
|
||||||
|
else // Plain browser env
|
||||||
|
mod(CodeMirror);
|
||||||
|
})(function(CodeMirror) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
CodeMirror.defineMode('shell', function() {
|
||||||
|
|
||||||
|
var words = {};
|
||||||
|
function define(style, string) {
|
||||||
|
var split = string.split(' ');
|
||||||
|
for(var i = 0; i < split.length; i++) {
|
||||||
|
words[split[i]] = style;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Atoms
|
||||||
|
define('atom', 'true false');
|
||||||
|
|
||||||
|
// Keywords
|
||||||
|
define('keyword', 'if then do else elif while until for in esac fi fin ' +
|
||||||
|
'fil done exit set unset export function');
|
||||||
|
|
||||||
|
// Commands
|
||||||
|
define('builtin', 'ab awk bash beep cat cc cd chown chmod chroot clear cp ' +
|
||||||
|
'curl cut diff echo find gawk gcc get git grep kill killall ln ls make ' +
|
||||||
|
'mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh ' +
|
||||||
|
'shopt shred source sort sleep ssh start stop su sudo tee telnet top ' +
|
||||||
|
'touch vi vim wall wc wget who write yes zsh');
|
||||||
|
|
||||||
|
function tokenBase(stream, state) {
|
||||||
|
if (stream.eatSpace()) return null;
|
||||||
|
|
||||||
|
var sol = stream.sol();
|
||||||
|
var ch = stream.next();
|
||||||
|
|
||||||
|
if (ch === '\\') {
|
||||||
|
stream.next();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (ch === '\'' || ch === '"' || ch === '`') {
|
||||||
|
state.tokens.unshift(tokenString(ch, ch === "`" ? "quote" : "string"));
|
||||||
|
return tokenize(stream, state);
|
||||||
|
}
|
||||||
|
if (ch === '#') {
|
||||||
|
if (sol && stream.eat('!')) {
|
||||||
|
stream.skipToEnd();
|
||||||
|
return 'meta'; // 'comment'?
|
||||||
|
}
|
||||||
|
stream.skipToEnd();
|
||||||
|
return 'comment';
|
||||||
|
}
|
||||||
|
if (ch === '$') {
|
||||||
|
state.tokens.unshift(tokenDollar);
|
||||||
|
return tokenize(stream, state);
|
||||||
|
}
|
||||||
|
if (ch === '+' || ch === '=') {
|
||||||
|
return 'operator';
|
||||||
|
}
|
||||||
|
if (ch === '-') {
|
||||||
|
stream.eat('-');
|
||||||
|
stream.eatWhile(/\w/);
|
||||||
|
return 'attribute';
|
||||||
|
}
|
||||||
|
if (/\d/.test(ch)) {
|
||||||
|
stream.eatWhile(/\d/);
|
||||||
|
if(stream.eol() || !/\w/.test(stream.peek())) {
|
||||||
|
return 'number';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stream.eatWhile(/[\w-]/);
|
||||||
|
var cur = stream.current();
|
||||||
|
if (stream.peek() === '=' && /\w+/.test(cur)) return 'def';
|
||||||
|
return words.hasOwnProperty(cur) ? words[cur] : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function tokenString(quote, style) {
|
||||||
|
var close = quote == "(" ? ")" : quote == "{" ? "}" : quote
|
||||||
|
return function(stream, state) {
|
||||||
|
var next, end = false, escaped = false;
|
||||||
|
while ((next = stream.next()) != null) {
|
||||||
|
if (next === close && !escaped) {
|
||||||
|
end = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (next === '$' && !escaped && quote !== "'") {
|
||||||
|
escaped = true;
|
||||||
|
stream.backUp(1);
|
||||||
|
state.tokens.unshift(tokenDollar);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (!escaped && next === quote && quote !== close) {
|
||||||
|
state.tokens.unshift(tokenString(quote, style))
|
||||||
|
return tokenize(stream, state)
|
||||||
|
}
|
||||||
|
escaped = !escaped && next === '\\';
|
||||||
|
}
|
||||||
|
if (end || !escaped) state.tokens.shift();
|
||||||
|
return style;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
var tokenDollar = function(stream, state) {
|
||||||
|
if (state.tokens.length > 1) stream.eat('$');
|
||||||
|
var ch = stream.next()
|
||||||
|
if (/['"({]/.test(ch)) {
|
||||||
|
state.tokens[0] = tokenString(ch, ch == "(" ? "quote" : ch == "{" ? "def" : "string");
|
||||||
|
return tokenize(stream, state);
|
||||||
|
}
|
||||||
|
if (!/\d/.test(ch)) stream.eatWhile(/\w/);
|
||||||
|
state.tokens.shift();
|
||||||
|
return 'def';
|
||||||
|
};
|
||||||
|
|
||||||
|
function tokenize(stream, state) {
|
||||||
|
return (state.tokens[0] || tokenBase) (stream, state);
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
startState: function() {return {tokens:[]};},
|
||||||
|
token: function(stream, state) {
|
||||||
|
return tokenize(stream, state);
|
||||||
|
},
|
||||||
|
closeBrackets: "()[]{}''\"\"``",
|
||||||
|
lineComment: '#',
|
||||||
|
fold: "brace"
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
CodeMirror.defineMIME('text/x-sh', 'shell');
|
||||||
|
|
||||||
|
});
|
|
@ -87,6 +87,9 @@ public class JobThread extends Thread{
|
||||||
executeResult = ReturnT.FAIL;
|
executeResult = ReturnT.FAIL;
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
if (toStop) {
|
||||||
|
logger.error("----------- xxl-job toStop, stopReason:{}", stopReason);
|
||||||
|
}
|
||||||
logger.error("JobThread Exception:", e);
|
logger.error("JobThread Exception:", e);
|
||||||
StringWriter out = new StringWriter();
|
StringWriter out = new StringWriter();
|
||||||
e.printStackTrace(new PrintWriter(out));
|
e.printStackTrace(new PrintWriter(out));
|
||||||
|
|
Loading…
Reference in New Issue