nihilazo
/
go-gemtext
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix bullets, add alt text to preformatted toggles

This commit is contained in:
Nico 2020-11-12 11:08:41 +00:00
parent 561165ad84
commit 4f40ff17b6
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
parser.go
View File

@ -81,13 +81,13 @@ func ParseLine(line string, isPreformatted bool) (GemtextObject, error) {
case strings.HasPrefix(line, "=>"):
return ParseLink(line)
case strings.HasPrefix(line, "```"):
return GemtextObject{Type: PREFORMATTED_TOGGLE, Literal: line}, nil
return GemtextObject{Type: PREFORMATTED_TOGGLE, Literal: line, Text: line[3:]}, nil
case strings.HasPrefix(line, "#"):
return ParseHeading(line)
case strings.HasPrefix(line, ">"):
return GemtextObject{Type: QUOTE, Text: strings.TrimSpace(line[1:]), Literal: line}, nil
case strings.HasPrefix(line, "*"):
return GemtextObject{Type: LIST, Text: strings.TrimSpace(line[1:]), Literal: line}, nil
case strings.HasPrefix(line, "* "): // Bullets require a space, per the spec
return GemtextObject{Type: LIST, Text: line[2:], Literal: line}, nil
}
return GemtextObject{Type: TEXT, Text: line, Literal: line}, nil
} else {
@ -97,4 +97,4 @@ func ParseLine(line string, isPreformatted bool) (GemtextObject, error) {
}
// ParsePage takes a string containing the contents of a gemtext page and returns a GemtextPage.
func ParseFile() {}
func ParsePage(p string) {}

13
parser_test.go
View File

@ -11,6 +11,7 @@ type LineCase struct {
func TestParseLine(t *testing.T) {
cases := []LineCase{
LineCase{Str: "```", Preformatted: false, Want: GemtextObject{Type: PREFORMATTED_TOGGLE, Literal: "```"}},
LineCase{Str: "```alt", Preformatted: false, Want: GemtextObject{Type: PREFORMATTED_TOGGLE, Literal: "```alt", Text:"alt"}},
LineCase{
Str: "This is a test of a normal text line.",
Preformatted: false,
@ -84,9 +85,9 @@ func TestParseLine(t *testing.T) {
Str: "*list item",
Preformatted: false,
Want: GemtextObject{
Type: LIST,
Type: TEXT,
Literal: "*list item",
Text: "list item"},
Text: "*list item"},
},
LineCase{
Str: "* list item",
@ -96,14 +97,6 @@ func TestParseLine(t *testing.T) {
Literal: "* list item",
Text: "list item"},
},
LineCase{
Str: "* list item",
Preformatted: false,
Want: GemtextObject{
Type: LIST,
Literal: "* list item",
Text: "list item"},
},
LineCase{
Str: ">quote",
Preformatted: false,