♻️ simplify comment parsing

ebullient · Aug 12, 2024 · 9c28d77 · 9c28d77
1 parent eb7c5be
commit 9c28d77
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/obsidian/comment.ts b/src/obsidian/comment.ts
@@ -94,6 +94,13 @@ export class CommentParser {
         return this.parseRegex.test(line);
     }
 
+    replace(line: string, comment: Comment): string {
+        return line.replace(
+            this.readCommentRegex,
+            this.commentToString(comment),
+        );
+    }
+
     private readCommentStringFromLine(line: string): string {
         return this.readCommentRegex.exec(line)?.[0] ?? '';
     }

diff --git a/src/obsidian/processors/commentProcessor.ts b/src/obsidian/processors/commentProcessor.ts
@@ -1,21 +1,15 @@
 import { CommentParser } from 'src/obsidian/comment';
 
 export class CommentProcessor {
-    private readCommentRegex = /<!--.*-->/;
-
     private parser: CommentParser = new CommentParser();
 
     process(markdown: string) {
         return markdown
             .split('\n')
             .map(line => {
-                if (this.parser.lineHasComment(line)) {
-                    return line.replace(
-                        this.readCommentRegex,
-                        this.parser.commentToString(
-                            this.parser.parseLine(line),
-                        ),
-                    );
+                const comment = this.parser.parseLine(line);
+                if (comment) {
+                    return this.parser.replace(line, comment);
                 } else {
                     return line;
                 }