feat(parser): improve quote parsing and design

xNaCly · Apr 25, 2023 · ad42943 · ad42943
1 parent bd037f1
commit ad42943
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 34 deletions.
diff --git a/cli/cli.go b/cli/cli.go
@@ -1,9 +1,5 @@
 package cli
 
-// INFO: flags pkg is weird, the file always has to be at the end of the arguments list,
-// due to the fact that the flag pkg won't recognize options after encountering an option it does not recognize
-// :(
-
 import (
 	"flag"
 	"fmt"

diff --git a/doc/assets/blockquote.png b/doc/assets/blockquote.png
diff --git a/generator/generator.go b/generator/generator.go
@@ -23,9 +23,14 @@ const DEFAULT_TEMPLATE = `<!DOCTYPE html><html lang="en"><head><meta charset="UT
     --gray: #d0d7de;
     --light-gray: #f2f1f1;
     --lighter-gray: #f3f2f2; 
-    --info: #0969da;
-    --warning: #ccb700;
-    --danger: #ff0400;
+    --info: rgb(2, 122, 255);
+    --info-lighter: rgba(2, 122, 255, 0.1);
+    --warning: rgb(224, 220, 0);
+    --warning-lighter: rgba(224, 222, 113, 0.2);
+    --danger: rgb(251, 70, 76);
+    --danger-lighter: rgba(251, 70, 76, 0.1);
+    --note: rgb(83, 223, 221);
+    --note-lighter: rgb(83, 223, 221, 0.2); 
 }
 * {
     box-sizing: border-box;
@@ -101,28 +106,47 @@ blockquote {
     padding-right: 2rem;
     padding-left: 1.25rem;
     margin: 0;
-    margin-top: 0.5rem;
-    margin-bottom: 0.5rem;
+    margin-top: 1rem;
+    margin-bottom: 1rem;
     border-top-right-radius: 0.2rem;
     border-bottom-right-radius: 0.2rem;
 }
 blockquote .warning {
     color: var(--warning);
 }
-blockquote .warning:before {
-    margin-right: 0.25rem;
-}
 blockquote .info {
     color: var(--info);
 }
-blockquote .info:before {
-    margin-right: 0.25rem;
+blockquote .info {
+    color: var(--info);
 }
 blockquote .danger {
     color: var(--danger);
 }
-blockquote .danger:before {
-    margin-right: 0.25rem;
+blockquote .note {
+    color: var(--note);
+}
+.callout {
+    padding: 1rem;
+    border-radius: 0.25rem;
+    color: black;
+}
+.blockquote-info {
+    border: 0;
+    background-color: var(--info-lighter);
+}
+.blockquote-danger {
+    border: 0;
+    background-color: var(--danger-lighter);
+}
+.blockquote-warning {
+    border-radius: 0.5rem;
+    border: 0;
+    background-color: var(--warning-lighter);
+}
+.blockquote-note {
+    border: 0;
+    background-color: var(--note-lighter);
 }
 hr {
     height: 0.15rem;

diff --git a/parser/parser.go b/parser/parser.go
@@ -136,7 +136,9 @@ func (p *Parser) quote() Tag {
 		case scanner.BANG:
 			children = append(children, p.img())
 		case scanner.NEWLINE:
-			children = append(children, Br{})
+			if p.prev().Kind == scanner.GREATERTHAN {
+				children = append(children, Br{})
+			}
 			p.advance()
 		case scanner.HASH:
 			children = append(children, p.heading())

diff --git a/parser/tags.go b/parser/tags.go
@@ -58,29 +58,43 @@ type Quote struct {
 
 func (p Quote) String() string {
 	b := strings.Builder{}
-	b.WriteString("<blockquote>")
+	var callout bool
+	var cType string
 	for _, c := range p.children {
-		switch c.(type) {
-		case Bold:
-			t := c.(Bold)
-			switch strings.ToLower(t.text) {
-			case "warning":
-				t.className = "warning"
-			case "info":
-				t.className = "info"
-			case "danger":
-				t.className = "danger"
-			case "tip":
-				t.className = "tip"
+		if !callout {
+			switch c.(type) {
+			case Bold:
+				t := c.(Bold)
+				switch strings.ToLower(t.text) {
+				case "warning":
+					t.className = "warning"
+				case "info":
+					t.className = "info"
+				case "danger":
+					t.className = "danger"
+				case "note":
+					t.className = "note"
+				default:
+					b.WriteString(t.String())
+					continue
+				}
+				b.WriteString(t.String())
+				// used to stop checking for callouts
+				callout = true
+				cType = t.className
+				continue
 			}
-			b.WriteString(t.String())
-			continue
 		}
 
 		b.WriteString(c.String())
 	}
-	b.WriteString("</blockquote>")
-	return b.String()
+	prefix := "<blockquote>"
+
+	if callout {
+		prefix = "<blockquote class=\"callout blockquote-" + cType + "\">"
+	}
+
+	return prefix + b.String() + "</blockquote>"
 }
 
 // <ul></ul>, contains ListItem

diff --git a/test.md b/test.md
@@ -1,5 +1,9 @@
 # Heading 1
 
+> **Test**
+>
+> fleck does not support inline html.
+
 > **Info**
 >
 > fleck does not support inline html.
@@ -12,6 +16,10 @@
 >
 > fleck does not support inline html.
 
+> **Note**
+>
+> fleck does not support inline html.
+
 ```js
 // `npm run this-shit`
 console.log("🤬");