3diy
/
OctoprintKlipperPlugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update highlighter

This commit is contained in:
thelastWallE 2021-05-05 08:32:39 +02:00
parent 4ec03dd79e
commit 1fbe46282b
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
octoprint_klipper/static/js/lib/ace/mode-klipper_config.js
View File

@ -11,6 +11,8 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
include: "#single_line_comment" include: "#single_line_comment"
}, { }, {
include: "#config_block" include: "#config_block"
}, {
include: "#config_line_sensor"
}, { }, {
include: "#config_line" include: "#config_line"
}, { }, {
@ -162,9 +164,9 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
include: "#single_line_comment" include: "#single_line_comment"
}] }]
}], }],
"#config_line": [{ "#config_line_sensor": [{
token: ["variable.name", "variable.name", "variable.name", "variable.name"], token: ["variable.name", "variable.name"],
regex: /(?!(gcode))(?!(sensor_type))(\w+)(\s*[:]\s*)/, regex: /(sensor_type)(\s*[:]\s*)/,
push: [{ push: [{
token: "text", token: "text",
regex: /$/, regex: /$/,
@ -173,6 +175,17 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
include: "#known_thermistor_type" include: "#known_thermistor_type"
}, { }, {
include: "#known_extruder_sensor_type" include: "#known_extruder_sensor_type"
}, {
include: "#single_line_comment"
}]
}],
"#config_line": [{
token: ["variable.name"],
regex: /((?!gcode|sensor_type)\w+\s*[:]\s*)/,
push: [{
token: "text",
regex: /$/,
next: "pop"
}, { }, {
include: "#known_control_type" include: "#known_control_type"
}, { }, {
@ -197,21 +210,6 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
include: "#single_line_comment" include: "#single_line_comment"
}] }]
}], }],
"#config_line_sensor": [{
token: ["variable.name", "variable.name", "variable.name", "variable.name"],
regex: /(?!(gcode))(?=(sensor_type))(\w+)(\s*[:]\s*)/,
push: [{
token: "text",
regex: /$/,
next: "pop"
}, {
include: "#known_thermistor_type"
}, {
include: "#known_extruder_sensor_type"
}, {
include: "#single_line_comment"
}]
}],
// For multiple keys on one line eg.: ^EXP1_5, ^EXP1_3 // For multiple keys on one line eg.: ^EXP1_5, ^EXP1_3
"#config_line_display": [{ "#config_line_display": [{
token: ["variable.name", "variable.name", "variable.name"], token: ["variable.name", "variable.name", "variable.name"],
@ -257,7 +255,7 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
}], }],
"#gcode_command": [{ "#gcode_command": [{
token: ["text", "keyword.operator"], token: ["text", "keyword.operator"],
regex: /^(\s*)([A-z]+)(?![A-z])/, regex: /(\s*)([A-z]+)(?![A-z])/,
caseInsensitive: true, caseInsensitive: true,
push: [{ push: [{
token: "text", token: "text",