From e404f8994926a879d50f561d3330b559e7ee7683 Mon Sep 17 00:00:00 2001
From: thelastWallE <12502210+thelastWallE@users.noreply.github.com>
Date: Tue, 13 Apr 2021 22:31:40 +0200
Subject: [PATCH 1/3] more syntax highlighting

---
 .../static/js/lib/ace/mode-klipper_config.js  | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/octoprint_klipper/static/js/lib/ace/mode-klipper_config.js b/octoprint_klipper/static/js/lib/ace/mode-klipper_config.js
index de64fb4..a19b795 100644
--- a/octoprint_klipper/static/js/lib/ace/mode-klipper_config.js
+++ b/octoprint_klipper/static/js/lib/ace/mode-klipper_config.js
@@ -13,6 +13,8 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
                 include: "#config_block"
             }, {
                 include: "#config_line"
+            }, {
+                include: "#config_line_display"
             }, {
                 include: "#number"
             }, {
@@ -152,7 +154,7 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
             }],
             "#config_line": [{
                 token: ["variable.name", "text"],
-                regex: /(?!(gcode))(\w+)(\s*[:=]\s*)/,
+                regex: /(?!(gcode))(\w+)(\s*[:]\s*)/,
                 push: [{
                     token: "text",
                     regex: /$/,
@@ -181,7 +183,38 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
                     include: "#single_line_comment"
                 }]
             }],
-           "#gcode_line": [{
+            "#config_line_display": [{
+                token: ["variable.name", "text"],
+                regex: /(?!(gcode))(\w+)(\s*[=]\s*)/,
+                push: [{
+                    token: "text",
+                    regex: /,/,
+                    next: "pop"
+                }, {
+                    include: "#known_thermistor_type"
+                }, {
+                    include: "#known_extruder_sensor_type"
+                }, {
+                    include: "#known_control_type"
+                }, {
+                    include: "#known_display_type"
+                }, {
+                    include: "#known_kinematics_type"
+                }, {
+                    include: "#known_algo_type"
+                }, {
+                    include: "#pin"
+                }, {
+                    include: "#serial"
+                }, {
+                    include: "#number"
+                }, {
+                    include: "#boolean"
+                }, {
+                    include: "#single_line_comment"
+                }]
+            }],
+            "#gcode_line": [{
                 include: "#gcode_command"
             }, {
                 include: "#gcode_extended_command"

From 03b29f052aef2f9b5254eb93fad9e9522455482a Mon Sep 17 00:00:00 2001
From: thelastWallE <12502210+thelastWallE@users.noreply.github.com>
Date: Wed, 14 Apr 2021 23:02:26 +0200
Subject: [PATCH 2/3] fix for config lines with =

---
 octoprint_klipper/static/js/lib/ace/mode-klipper_config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/octoprint_klipper/static/js/lib/ace/mode-klipper_config.js b/octoprint_klipper/static/js/lib/ace/mode-klipper_config.js
index a19b795..0ea3b8a 100644
--- a/octoprint_klipper/static/js/lib/ace/mode-klipper_config.js
+++ b/octoprint_klipper/static/js/lib/ace/mode-klipper_config.js
@@ -188,7 +188,7 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
                 regex: /(?!(gcode))(\w+)(\s*[=]\s*)/,
                 push: [{
                     token: "text",
-                    regex: /,/,
+                    regex: /,|$/,
                     next: "pop"
                 }, {
                     include: "#known_thermistor_type"

From db8dc0b09ffd903453160fa8009fd83c1b528fef Mon Sep 17 00:00:00 2001
From: thelastWallE <12502210+thelastWallE@users.noreply.github.com>
Date: Thu, 15 Apr 2021 23:25:58 +0200
Subject: [PATCH 3/3] add probe for z-endstop

---
 octoprint_klipper/static/js/lib/ace/mode-klipper_config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/octoprint_klipper/static/js/lib/ace/mode-klipper_config.js b/octoprint_klipper/static/js/lib/ace/mode-klipper_config.js
index 0ea3b8a..2415c45 100644
--- a/octoprint_klipper/static/js/lib/ace/mode-klipper_config.js
+++ b/octoprint_klipper/static/js/lib/ace/mode-klipper_config.js
@@ -128,7 +128,7 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
             }],
             "#pin": [{
                 token: "support.type",
-                regex: /[\^~!]*(?:EXP|ar|analog)\d{1,2}/,
+                regex: /[\^~!]*(?:EXP|ar|analog)\d{1,2}|(?:probe:z_virtual_endstop)/,
                 caseInsensitive: true
             }, {
                 token: "support.type",