优化注释TODO高亮

ssssssss-team · Aug 8, 2021 · 3155671 · 3155671
1 parent 41512af
commit 3155671
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/magic-editor/src/console/src/scripts/editor/high-light.js b/magic-editor/src/console/src/scripts/editor/high-light.js
@@ -43,17 +43,16 @@ export const HighLightOptions = {
             [/`/, 'string', '@string_backtick']
         ],
         comment: [
-            [/((TODO)|(todo)|(fixme)|(FIXME))[ \t]+[^\n(?!\*\/)]+/, 'comment.todo'],
-            [/[ \t]+/, 'comment'],
-            [/\*\//, 'comment', '@pop'],
-            [/[^ \t*\/]+(?!((TODO)|(todo)|(fixme)|(FIXME)))/, 'comment'],
-            [/./, 'comment'],
+            [/\*\//, 'comment', '@popall'],
+            [/\S((TODO)|(todo)|(fixme)|(FIXME))\s+/, 'comment'],
+            [/((TODO)|(todo)|(fixme)|(FIXME))\s+[^(*/)]+/, 'comment.todo'],
+            [/\S/, 'comment'],
         ],
         commentTodo: [
-            [/((TODO)|(todo)|(fixme)|(FIXME))[ \t]+[^\n]+/, 'comment.todo','@popall'],
             [/^/,'', '@popall'],
-            [/[^ \t]+(?!((TODO)|(todo)|(fixme)|(FIXME)))/, 'comment', '@commentTodo']
-
+            [/\S((TODO)|(todo)|(fixme)|(FIXME))\s+/, 'comment'],
+            [/((TODO)|(todo)|(fixme)|(FIXME))[ \t]+[^\n]+/, 'comment.todo','@popall'],
+            [/\S/, 'comment'],
         ],
         regexp: [
             [