mirror of
https://github.com/JanDeDobbeleer/oh-my-posh.git
synced 2025-03-05 20:49:04 -08:00
parent
040a73e0f0
commit
9a98823166
|
@ -4,7 +4,6 @@ import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"errors"
|
"errors"
|
||||||
"oh-my-posh/environment"
|
"oh-my-posh/environment"
|
||||||
"oh-my-posh/regex"
|
|
||||||
"strings"
|
"strings"
|
||||||
"text/template"
|
"text/template"
|
||||||
)
|
)
|
||||||
|
@ -97,12 +96,10 @@ func (t *Text) cleanTemplate() {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
walkAndReplace := func(node string) string {
|
|
||||||
var result string
|
var result string
|
||||||
var property string
|
var property string
|
||||||
var inProperty bool
|
var inProperty bool
|
||||||
// var literal bool
|
for _, char := range t.Template {
|
||||||
for _, char := range node {
|
|
||||||
switch char {
|
switch char {
|
||||||
case '.':
|
case '.':
|
||||||
var lastChar rune
|
var lastChar rune
|
||||||
|
@ -140,13 +137,6 @@ func (t *Text) cleanTemplate() {
|
||||||
result += string(char)
|
result += string(char)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
// matches := regex.FindAllNamedRegexMatch(`(?: |{|\()(?P<VAR>(\.[a-zA-Z_][a-zA-Z0-9]*)+)`, t.Template)
|
t.Template = result
|
||||||
matches := regex.FindAllNamedRegexMatch(`(?P<NODE>{{[^{]+}})`, t.Template)
|
|
||||||
for _, match := range matches {
|
|
||||||
node := walkAndReplace(match["NODE"])
|
|
||||||
t.Template = strings.Replace(t.Template, match["NODE"], node, 1)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,18 @@ func TestRenderTemplate(t *testing.T) {
|
||||||
ShouldError bool
|
ShouldError bool
|
||||||
Context interface{}
|
Context interface{}
|
||||||
}{
|
}{
|
||||||
|
{
|
||||||
|
Case: "tillig's regex",
|
||||||
|
Expected: " ⎈ hello :: world ",
|
||||||
|
Template: " ⎈ {{ replaceP \"([a-f0-9]{2})[a-f0-9]{6}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{10}([a-f0-9]{2})\" .Context \"$1..$2\" }}{{ if .Namespace }} :: {{ .Namespace }}{{ end }} ", //nolint:lll
|
||||||
|
Context: struct {
|
||||||
|
Context string
|
||||||
|
Namespace string
|
||||||
|
}{
|
||||||
|
Context: "hello",
|
||||||
|
Namespace: "world",
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
Case: "Env like property name",
|
Case: "Env like property name",
|
||||||
Expected: "hello world",
|
Expected: "hello world",
|
||||||
|
|
Loading…
Reference in a new issue