From 17668c91082e8a65867523ce7a4d052c70ea1e14 Mon Sep 17 00:00:00 2001 From: Brian Dean Jennings Date: Thu, 1 Feb 2018 00:33:25 +1300 Subject: [PATCH 1/2] Fix for \#tag highlighting This adds a check for an escape tokens just before matching the `#tag` check. --- app/renderer/ace-ink-mode/ace-ink.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/renderer/ace-ink-mode/ace-ink.js b/app/renderer/ace-ink-mode/ace-ink.js index 9ac2dc1a..bda0309c 100644 --- a/app/renderer/ace-ink-mode/ace-ink.js +++ b/app/renderer/ace-ink-mode/ace-ink.js @@ -400,6 +400,15 @@ var inkHighlightRules = function() { regex: /\s*~\s*.*$/ }], "#tags": [{ + // e.g. \\#tag should be highlighted + token: "doubleescape", + regex: /\\\\/ + }, { + // e.g. \#tag should not be highlighted + token: "escape", + regex: /\\#/ + }, { + // e.g. #tag should be highlighted token: "tag", regex: /#.*/ }], From 4dfa2cfb87e996cd6cc17421934b45d89091aa03 Mon Sep 17 00:00:00 2001 From: Brian Dean Jennings Date: Thu, 1 Feb 2018 00:38:44 +1300 Subject: [PATCH 2/2] Revert previous \#tag fix attempt --- app/renderer/ace-ink-mode/ace-ink.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/renderer/ace-ink-mode/ace-ink.js b/app/renderer/ace-ink-mode/ace-ink.js index 6aa376a9..bda0309c 100644 --- a/app/renderer/ace-ink-mode/ace-ink.js +++ b/app/renderer/ace-ink-mode/ace-ink.js @@ -410,7 +410,7 @@ var inkHighlightRules = function() { }, { // e.g. #tag should be highlighted token: "tag", - regex: /(?:(?!\\).|^)#.*/ + regex: /#.*/ }], "#mixedContent": [{ include: "#inlineConditional"