From b535f8ebddb6ffd49ed97a942de4cd4e5d3b81b1 Mon Sep 17 00:00:00 2001 From: "Ryan P.C. McQuen" Date: Mon, 8 Jan 2018 20:16:59 -0800 Subject: [PATCH 1/2] Fix code regex. This same principle could probably apply to the other regex. --- client/pages/viewerpage/editor/orgmode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/pages/viewerpage/editor/orgmode.js b/client/pages/viewerpage/editor/orgmode.js index 34834198..2b1c2c6d 100644 --- a/client/pages/viewerpage/editor/orgmode.js +++ b/client/pages/viewerpage/editor/orgmode.js @@ -9,7 +9,7 @@ CodeMirror.defineSimpleMode("orgmode", { {regex: /(^\*[^\/]*\*)/, token: ["strong"]}, {regex: /(^\/[^\/]*\/)/, token: ["em"]}, {regex: /(^\_[^\/]*\_)/, token: ["link"]}, - {regex: /(^\~[^\/]*\~)/, token: ["comment"]}, + {regex: /(~[^~]+~)/, token: ["comment"]}, {regex: /(^\=[^\/]*\=)/, token: ["comment"]}, {regex: /\[\[[^\[\]]*\]\[[^\[\]]*\]\]/, token: "url"}, // links {regex: /\[[xX\s]?\]/, token: 'qualifier'}, // checkbox From 287bee38133431269b3b2da74bf525c5274bdc9a Mon Sep 17 00:00:00 2001 From: "Ryan P.C. McQuen" Date: Mon, 22 Jan 2018 21:39:35 -0800 Subject: [PATCH 2/2] Fix some red herring regex. --- client/pages/viewerpage/editor/orgmode.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/pages/viewerpage/editor/orgmode.js b/client/pages/viewerpage/editor/orgmode.js index 2b1c2c6d..be470e26 100644 --- a/client/pages/viewerpage/editor/orgmode.js +++ b/client/pages/viewerpage/editor/orgmode.js @@ -5,12 +5,12 @@ CodeMirror.__mode = 'orgmode'; CodeMirror.defineSimpleMode("orgmode", { start: [ {regex: /^(^\*{1,6}\s)(TODO|DOING|WAITING|NEXT){0,1}(CANCELLED|CANCEL|DEFERRED|DONE|REJECTED|STOP|STOPPED){0,1}(.*)$/, token: ["header org-level-star", "header org-todo", "header org-done", "header"]}, - {regex: /(^\+[^\/]*\+)/, token: ["strikethrough"]}, - {regex: /(^\*[^\/]*\*)/, token: ["strong"]}, - {regex: /(^\/[^\/]*\/)/, token: ["em"]}, - {regex: /(^\_[^\/]*\_)/, token: ["link"]}, - {regex: /(~[^~]+~)/, token: ["comment"]}, - {regex: /(^\=[^\/]*\=)/, token: ["comment"]}, + {regex: /(\+[^\+]+\+)/, token: ["strikethrough"]}, + {regex: /(\*[^\*]+\*)/, token: ["strong"]}, + {regex: /(\/[^\/]+\/)/, token: ["em"]}, + {regex: /(\_[^\_]+\_)/, token: ["link"]}, + {regex: /(\~[^\~]+\~)/, token: ["comment"]}, + {regex: /(\=[^\=]+\=)/, token: ["comment"]}, {regex: /\[\[[^\[\]]*\]\[[^\[\]]*\]\]/, token: "url"}, // links {regex: /\[[xX\s]?\]/, token: 'qualifier'}, // checkbox {regex: /\#\+BEGIN_[A-Z]*/, token: "comment", next: "env"}, // comments