OrgGo/termui
1
0
Fork 0
mirror of https://github.com/gizak/termui.git synced 2025-04-26 13:48:54 +08:00
Code Issues Projects Releases Wiki Activity

clean up and better order

Browse Source
This commit is contained in:
Andrew Arrow 2022-11-07 11:30:57 -08:00
parent c77684f434
commit eaf7f8d6e6
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
style_parser.go
View File

@ -5,7 +5,6 @@
package termui
import (
"fmt"
"strings"
)
@ -71,17 +70,6 @@ func readStyle(runes []rune, defaultStyle Style) Style {
return style
}
func processToken(token, previous string) (string, string) {
fmt.Println("1", token)
index := strings.Index(token, ")")
if index == -1 {
return "", ""
}
styleString := token[0:index]
restOfString := token[index:]
return styleString, restOfString
}
func lookLeftForBracket(s string) (string, string) {
index := strings.LastIndex(s, "[")
return s[0:index], s[index+1:]
@ -113,6 +101,9 @@ func BreakByStyles(s string) []string {
buff = append(buff, remainder)
break
}
if i > len(tokens)-1 {
break
}
}
return buff
@ -139,9 +130,7 @@ func containsColorOrMod(s string) bool {
func ParseStyles(s string, defaultStyle Style) []Cell {
cells := []Cell{}
fmt.Println("11")
items := BreakByStyles(s)
fmt.Println("11", len(items))
if len(items) == 1 {
runes := []rune(s)
for _, _rune := range runes {
@ -150,13 +139,12 @@ func ParseStyles(s string, defaultStyle Style) []Cell {
return cells
}
//test blue fg:blue,bg:white,mod:bold and red fg:red and maybe even foo bg:red !
style := defaultStyle
for i := len(items) - 1; i > -1; i-- {
if containsColorOrMod(items[i]) {
style = readStyle([]rune(items[i]), defaultStyle)
} else {
cells = append(cells, RunesToStyledCells([]rune(items[i]), style)...)
cells = append(RunesToStyledCells([]rune(items[i]), style), cells...)
style = defaultStyle
}
}

4
style_parser_test.go
View File

@ -1,6 +1,7 @@
package termui
import (
"fmt"
"strings"
"testing"
)
@ -19,6 +20,9 @@ func TestBreakByStyles(t *testing.T) {
func TestParseStyles(t *testing.T) {
cells := ParseStyles("test nothing", NewStyle(ColorWhite))
cells = ParseStyles("test [blue](fg:blue,bg:white,mod:bold) and [red](fg:red)", NewStyle(ColorWhite))
fmt.Println(cells)
text2 := textFromCells(cells)
fmt.Println(text2)
if len(cells) != 17 {
t.Fatal("wrong length", len(cells))
}