refactor: rename markdown.Base -> markdown.Node

main
hau 2020-11-28 00:39:05 +07:00
parent f31cc23ee2
commit 7d904261ee
7 changed files with 25 additions and 24 deletions

View File

@ -35,7 +35,7 @@ func (g *MarkdownGenerator) Generate(commits []convention.Commit) string {
return ""
}
bases := make([]markdown.Base, 0, defaultBasesLen)
bases := make([]markdown.Node, 0, defaultBasesLen)
// title
bases = append(bases, markdown.NewHeader(1, title))
@ -55,17 +55,17 @@ func (g *MarkdownGenerator) Generate(commits []convention.Commit) string {
return markdown.Generate(bases)
}
func (g *MarkdownGenerator) getNewMarkdownBases(commits []convention.Commit) []markdown.Base {
func (g *MarkdownGenerator) getNewMarkdownBases(commits []convention.Commit) []markdown.Node {
if len(commits) == 0 {
return nil
}
result := make([]markdown.Base, 0, defaultBasesLen)
result := make([]markdown.Node, 0, defaultBasesLen)
commitBases := make(map[string][]markdown.Base)
commitBases[addedType] = make([]markdown.Base, 0, defaultBasesLen)
commitBases[fixedType] = make([]markdown.Base, 0, defaultBasesLen)
commitBases[othersType] = make([]markdown.Base, 0, defaultBasesLen)
commitBases := make(map[string][]markdown.Node)
commitBases[addedType] = make([]markdown.Node, 0, defaultBasesLen)
commitBases[fixedType] = make([]markdown.Node, 0, defaultBasesLen)
commitBases[othersType] = make([]markdown.Node, 0, defaultBasesLen)
for _, commit := range commits {
t := getType(commit.Type)
@ -99,8 +99,8 @@ func (g *MarkdownGenerator) getNewMarkdownBases(commits []convention.Commit) []m
return result
}
func (g *MarkdownGenerator) getOldBases() []markdown.Base {
result := make([]markdown.Base, 0, defaultBasesLen)
func (g *MarkdownGenerator) getOldBases() []markdown.Node {
result := make([]markdown.Node, 0, defaultBasesLen)
lines := strings.Split(g.oldData, string(markdown.NewlineToken))

View File

@ -2,7 +2,7 @@ package markdown
import "strings"
func Generate(bases []Base) string {
func Generate(bases []Node) string {
lines := make([]string, len(bases))
for i, base := range bases {

View File

@ -9,12 +9,12 @@ import (
func TestGenerate(t *testing.T) {
tests := []struct {
name string
bases []Base
bases []Node
want string
}{
{
name: "normal",
bases: []Base{
bases: []Node{
header{
level: 1,
text: "header",

View File

@ -8,13 +8,14 @@ const (
headerToken = '#'
defaultListToken = '-'
alternativeListToken = '*'
spaceToken = ' '
NewlineToken = '\n'
spaceToken = ' '
NewlineToken = '\n'
)
// Base is single markdown syntax representation
// Node is single markdown syntax representation
// Example: header, list, ...
type Base interface {
type Node interface {
String() string
}
@ -23,7 +24,7 @@ type header struct {
text string
}
func NewHeader(level int, text string) Base {
func NewHeader(level int, text string) Node {
return header{
level: level,
text: text,
@ -49,7 +50,7 @@ type listItem struct {
text string
}
func NewListItem(text string) Base {
func NewListItem(text string) Node {
return listItem{
text: text,
}
@ -61,6 +62,6 @@ func (i listItem) String() string {
return string(defaultListToken) + string(spaceToken) + text
}
func Equal(base1, base2 Base) bool {
func Equal(base1, base2 Node) bool {
return base1.String() == base2.String()
}

View File

@ -6,8 +6,8 @@ const (
defaultBaseLen = 10
)
func Parse(lines []string) []Base {
bases := make([]Base, 0, defaultBaseLen)
func Parse(lines []string) []Node {
bases := make([]Node, 0, defaultBaseLen)
for _, line := range lines {
if line == "" {

View File

@ -10,7 +10,7 @@ func TestParse(t *testing.T) {
tests := []struct {
name string
lines []string
want []Base
want []Node
}{
{
name: "level 1",
@ -18,7 +18,7 @@ func TestParse(t *testing.T) {
"# abc",
"- xyz",
},
want: []Base{
want: []Node{
header{
level: 1,
text: "abc",
@ -34,7 +34,7 @@ func TestParse(t *testing.T) {
"### xyz",
"* abc",
},
want: []Base{
want: []Node{
header{
level: 3,
text: "xyz",