mirror of
https://github.com/JanDeDobbeleer/oh-my-posh.git
synced 2025-03-05 20:49:04 -08:00
fix: ignore segments without writer
This commit is contained in:
parent
a639240f9c
commit
db212d513f
|
@ -90,8 +90,8 @@ func (e *engine) renderBlockSegments(block *Block) string {
|
||||||
defer e.reset()
|
defer e.reset()
|
||||||
e.activeBlock = block
|
e.activeBlock = block
|
||||||
for _, segment := range block.Segments {
|
for _, segment := range block.Segments {
|
||||||
props := segment.mapSegmentWithWriter(e.env)
|
props, err := segment.mapSegmentWithWriter(e.env)
|
||||||
if !segment.enabled() {
|
if err != nil || !segment.enabled() {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
e.activeSegment = segment
|
e.activeSegment = segment
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
|
import "errors"
|
||||||
|
|
||||||
//Segment represent a single segment and it's configuration
|
//Segment represent a single segment and it's configuration
|
||||||
type Segment struct {
|
type Segment struct {
|
||||||
Type SegmentType `json:"type"`
|
Type SegmentType `json:"type"`
|
||||||
|
@ -68,7 +70,7 @@ func (segment *Segment) enabled() bool {
|
||||||
return segment.writer.enabled()
|
return segment.writer.enabled()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (segment *Segment) mapSegmentWithWriter(env environmentInfo) *properties {
|
func (segment *Segment) mapSegmentWithWriter(env environmentInfo) (*properties, error) {
|
||||||
functions := map[SegmentType]SegmentWriter{
|
functions := map[SegmentType]SegmentWriter{
|
||||||
Session: &session{},
|
Session: &session{},
|
||||||
Path: &path{},
|
Path: &path{},
|
||||||
|
@ -92,7 +94,7 @@ func (segment *Segment) mapSegmentWithWriter(env environmentInfo) *properties {
|
||||||
}
|
}
|
||||||
writer.init(props, env)
|
writer.init(props, env)
|
||||||
segment.writer = writer
|
segment.writer = writer
|
||||||
return props
|
return props, nil
|
||||||
}
|
}
|
||||||
return nil
|
return nil, errors.New("Unable to map writer")
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,9 @@ func TestMapSegmentWriterCanMap(t *testing.T) {
|
||||||
Type: Session,
|
Type: Session,
|
||||||
}
|
}
|
||||||
env := new(MockedEnvironment)
|
env := new(MockedEnvironment)
|
||||||
sc.mapSegmentWithWriter(env)
|
props, err := sc.mapSegmentWithWriter(env)
|
||||||
|
assert.NotNil(t, props)
|
||||||
|
assert.NoError(t, err)
|
||||||
assert.NotNil(t, sc.writer)
|
assert.NotNil(t, sc.writer)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,6 +22,7 @@ func TestMapSegmentWriterCannotMap(t *testing.T) {
|
||||||
Type: "nilwriter",
|
Type: "nilwriter",
|
||||||
}
|
}
|
||||||
env := new(MockedEnvironment)
|
env := new(MockedEnvironment)
|
||||||
sc.mapSegmentWithWriter(env)
|
props, err := sc.mapSegmentWithWriter(env)
|
||||||
assert.Nil(t, sc.writer)
|
assert.Nil(t, props)
|
||||||
|
assert.Error(t, err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue