mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-11-09 20:44:03 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

chore: fix function typo

Browse source
This commit is contained in:
Jan De Dobbeleer 2023-09-19 19:25:35 +02:00 committed by Jan De Dobbeleer
parent 83149b2298
commit 35c2588365
22 changed files with 118 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/engine/config.go
View file

@ -34,26 +34,26 @@ const (
// Config holds all the theme for rendering the prompt
type Config struct {
Version int `json:"version"`
FinalSpace bool `json:"final_space,omitempty"`
ConsoleTitleTemplate string `json:"console_title_template,omitempty"`
TerminalBackground string `json:"terminal_background,omitempty"`
AccentColor string `json:"accent_color,omitempty"`
Blocks []*Block `json:"blocks,omitempty"`
Tooltips []*Segment `json:"tooltips,omitempty"`
TransientPrompt *Segment `json:"transient_prompt,omitempty"`
ValidLine *Segment `json:"valid_line,omitempty"`
ErrorLine *Segment `json:"error_line,omitempty"`
SecondaryPrompt *Segment `json:"secondary_prompt,omitempty"`
DebugPrompt *Segment `json:"debug_prompt,omitempty"`
Palette ansi.Palette `json:"palette,omitempty"`
Palettes *ansi.Palettes `json:"palettes,omitempty"`
Cycle ansi.Cycle `json:"cycle,omitempty"`
ShellIntegration bool `json:"shell_integration,omitempty"`
PWD string `json:"pwd,omitempty"`
Var map[string]interface{} `json:"var,omitempty"`
DisableCursorPositioning bool `json:"disable_cursor_positioning,omitempty"`
PatchPwshBleed bool `json:"patch_pwsh_bleed,omitempty"`
Version int `json:"version"`
FinalSpace bool `json:"final_space,omitempty"`
ConsoleTitleTemplate string `json:"console_title_template,omitempty"`
TerminalBackground string `json:"terminal_background,omitempty"`
AccentColor string `json:"accent_color,omitempty"`
Blocks []*Block `json:"blocks,omitempty"`
Tooltips []*Segment `json:"tooltips,omitempty"`
TransientPrompt *Segment `json:"transient_prompt,omitempty"`
ValidLine *Segment `json:"valid_line,omitempty"`
ErrorLine *Segment `json:"error_line,omitempty"`
SecondaryPrompt *Segment `json:"secondary_prompt,omitempty"`
DebugPrompt *Segment `json:"debug_prompt,omitempty"`
Palette ansi.Palette `json:"palette,omitempty"`
Palettes *ansi.Palettes `json:"palettes,omitempty"`
Cycle ansi.Cycle `json:"cycle,omitempty"`
ShellIntegration bool `json:"shell_integration,omitempty"`
PWD string `json:"pwd,omitempty"`
Var map[string]any `json:"var,omitempty"`
DisableCursorPositioning bool `json:"disable_cursor_positioning,omitempty"`
PatchPwshBleed bool `json:"patch_pwsh_bleed,omitempty"`
// Deprecated
OSC99 bool `json:"osc99,omitempty"`
@ -174,7 +174,7 @@ func (cfg *Config) sync() {
if !cfg.updated {
return
}
var structMap map[string]interface{}
var structMap map[string]any
inrec, err := json2.Marshal(cfg)
if err != nil {
return
@ -185,7 +185,7 @@ func (cfg *Config) sync() {
}
// remove empty structs
for k, v := range structMap {
if smap, OK := v.(map[string]interface{}); OK && len(smap) == 0 {
if smap, OK := v.(map[string]any); OK && len(smap) == 0 {
delete(structMap, k)
}
}

2
src/engine/migrate.go
View file

@ -183,7 +183,7 @@ func (segment *Segment) hasProperty(property properties.Property) bool {
return false
}
func (segment *Segment) migratePropertyValue(property properties.Property, value interface{}) {
func (segment *Segment) migratePropertyValue(property properties.Property, value any) {
if !segment.hasProperty(property) {
return
}

4
src/engine/migrate_test.go
View file

@ -41,7 +41,7 @@ func TestHasProperty(t *testing.T) {
func TestMigratePropertyValue(t *testing.T) {
cases := []struct {
Case string
Expected interface{}
Expected any
Property properties.Property
Props properties.Map
}{
@ -60,7 +60,7 @@ func TestMigratePropertyValue(t *testing.T) {
func TestMigratePropertyKey(t *testing.T) {
cases := []struct {
Case string
Expected interface{}
Expected any
OldProperty properties.Property
NewProperty properties.Property
Props properties.Map

2
src/engine/segment.go
View file

@ -65,7 +65,7 @@ type SegmentWriter interface {
// SegmentStyle the style of segment, for more information, see the constants
type SegmentStyle string
func (s *SegmentStyle) Resolve(env platform.Environment, context interface{}) SegmentStyle {
func (s *SegmentStyle) Resolve(env platform.Environment, context any) SegmentStyle {
txtTemplate := &template.Text{
Context: context,
Env: env,

2
src/http/oauth_test.go
View file

@ -143,7 +143,7 @@ func TestOauthResult(t *testing.T) {
url := "https://www.strava.com/api/v3/athlete/activities?page=1&per_page=1"
tokenURL := fmt.Sprintf("https://ohmyposh.dev/api/refresh?segment=test&token=%s", tc.RefreshToken)
var props properties.Map = map[properties.Property]interface{}{
var props properties.Map = map[properties.Property]any{
properties.CacheTimeout: tc.CacheTimeout,
properties.AccessToken: tc.AccessToken,
properties.RefreshToken: tc.RefreshToken,

2
src/http/request_test.go
View file

@ -62,7 +62,7 @@ func TestRequestResult(t *testing.T) {
}
for _, tc := range cases {
var props properties.Map = map[properties.Property]interface{}{
var props properties.Map = map[properties.Property]any{
properties.CacheTimeout: tc.CacheTimeout,
}

4
src/platform/battery/battery_openbsd.go
View file

@ -50,8 +50,8 @@ func Get() (*Info, error) {
apm_status, err := cmd.Run("apm", "-b")
if err != nil {
return nil, err
}
}
return parseBatteryOutput(apm_percentage, apm_status)
return parseBatteryOutput(apm_percentage, apm_status)
}

20
src/platform/battery/battery_openbsd_test.go
View file

@ -8,45 +8,45 @@ import (
func TestParseBatteryOutput(t *testing.T) {
cases := []struct {
Case string
PercentOutput string
StatusOutput string
ExpectedState State
ExpectedPercentage int
Case string
PercentOutput string
StatusOutput string
ExpectedState State
ExpectedPercentage int
ExpectError bool
}{
{
Case: "charging",
PercentOutput: "99",
StatusOutput: "3",
StatusOutput: "3",
ExpectedState: Charging,
ExpectedPercentage: 99,
},
{
Case: "charging 1%",
PercentOutput: "1",
StatusOutput: "3",
StatusOutput: "3",
ExpectedState: Charging,
ExpectedPercentage: 1,
},
{
Case: "removed",
PercentOutput: "0",
StatusOutput: "4",
StatusOutput: "4",
ExpectedState: Unknown,
ExpectedPercentage: 0,
},
{
Case: "charged",
PercentOutput: "100",
StatusOutput: "0",
StatusOutput: "0",
ExpectedState: Full,
ExpectedPercentage: 100,
},
{
Case: "discharging",
PercentOutput: "25",
StatusOutput: "1",
StatusOutput: "1",
ExpectedState: Discharging,
ExpectedPercentage: 25,
},

4
src/platform/shell.go
View file

@ -190,7 +190,7 @@ type TemplateCache struct {
sync.RWMutex
}
func (t *TemplateCache) AddSegmentData(key string, value interface{}) {
func (t *TemplateCache) AddSegmentData(key string, value any) {
t.Segments.Set(key, value)
}
@ -802,7 +802,7 @@ func (env *Shell) TemplateCache() *TemplateCache {
tmplCache.Segments = NewConcurrentMap()
tmplCache.PromptCount = env.CmdFlags.PromptCount
tmplCache.Env = make(map[string]string)
tmplCache.Var = make(map[string]interface{})
tmplCache.Var = make(map[string]any)
if env.Var != nil {
tmplCache.Var = env.Var

14
src/properties/map.go
View file

@ -54,7 +54,7 @@ const (
CacheTimeout Property = "cache_timeout"
)
type Map map[Property]interface{}
type Map map[Property]any
func (m Map) GetString(property Property, defaultValue string) string {
val, found := m[property]
@ -158,11 +158,11 @@ func (m Map) GetStringArray(property Property, defaultValue []string) []string {
return keyValues
}
func ParseStringArray(param interface{}) []string {
func ParseStringArray(param any) []string {
switch v := param.(type) {
default:
return []string{}
case []interface{}:
case []any:
list := make([]string, len(v))
for i, v := range v {
list[i] = fmt.Sprint(v)
@ -173,11 +173,11 @@ func ParseStringArray(param interface{}) []string {
}
}
func parseKeyValueArray(param interface{}) map[string]string {
func parseKeyValueArray(param any) map[string]string {
switch v := param.(type) {
default:
return map[string]string{}
case map[interface{}]interface{}:
case map[any]any:
keyValueArray := make(map[string]string)
for key, value := range v {
val := value.(string)
@ -185,14 +185,14 @@ func parseKeyValueArray(param interface{}) map[string]string {
keyValueArray[keyString] = val
}
return keyValueArray
case map[string]interface{}:
case map[string]any:
keyValueArray := make(map[string]string)
for key, value := range v {
val := value.(string)
keyValueArray[key] = val
}
return keyValueArray
case []interface{}:
case []any:
keyValueArray := make(map[string]string)
for _, s := range v {
l := ParseStringArray(s)

2
src/properties/map_test.go
View file

@ -89,7 +89,7 @@ func TestGetFloat64(t *testing.T) {
cases := []struct {
Case string
Expected float64
Input interface{}
Input any
}{
{Case: "int", Expected: 1337, Input: 1337},
{Case: "float64", Expected: 1337, Input: float64(1337)},

18
src/segments/az.go
View file

@ -33,15 +33,15 @@ type AzureConfig struct {
}
type AzureSubscription struct {
ID string `json:"id"`
Name string `json:"name"`
State string `json:"state"`
User *AzureUser `json:"user"`
IsDefault bool `json:"isDefault"`
TenantID string `json:"tenantId"`
EnvironmentName string `json:"environmentName"`
HomeTenantID string `json:"homeTenantId"`
ManagedByTenants []interface{} `json:"managedByTenants"`
ID string `json:"id"`
Name string `json:"name"`
State string `json:"state"`
User *AzureUser `json:"user"`
IsDefault bool `json:"isDefault"`
TenantID string `json:"tenantId"`
EnvironmentName string `json:"environmentName"`
HomeTenantID string `json:"homeTenantId"`
ManagedByTenants []any `json:"managedByTenants"`
}
type AzureUser struct {

4
src/segments/path_test.go
View file

@ -14,7 +14,7 @@ import (
mock2 "github.com/stretchr/testify/mock"
)
func renderTemplateNoTrimSpace(env *mock.MockedEnvironment, segmentTemplate string, context interface{}) string {
func renderTemplateNoTrimSpace(env *mock.MockedEnvironment, segmentTemplate string, context any) string {
found := false
for _, call := range env.Mock.ExpectedCalls {
if call.Method == "TemplateCache" {
@ -42,7 +42,7 @@ func renderTemplateNoTrimSpace(env *mock.MockedEnvironment, segmentTemplate stri
return text
}
func renderTemplate(env *mock.MockedEnvironment, segmentTemplate string, context interface{}) string {
func renderTemplate(env *mock.MockedEnvironment, segmentTemplate string, context any) string {
return strings.TrimSpace(renderTemplateNoTrimSpace(env, segmentTemplate, context))
}

6
src/segments/scm_test.go
View file

@ -111,7 +111,7 @@ func TestTruncateBranch(t *testing.T) {
Expected string
Branch string
FullBranch bool
MaxLength interface{}
MaxLength any
}{
{Case: "No limit", Expected: "are-belong-to-us", Branch: "/all-your-base/are-belong-to-us", FullBranch: false},
{Case: "No limit - larger", Expected: "are-belong", Branch: "/all-your-base/are-belong-to-us", FullBranch: false, MaxLength: 10.0},
@ -146,8 +146,8 @@ func TestTruncateBranchWithSymbol(t *testing.T) {
Expected string
Branch string
FullBranch bool
MaxLength interface{}
TruncateSymbol interface{}
MaxLength any
TruncateSymbol any
}{
{Case: "No limit", Expected: "are-belong-to-us", Branch: "/all-your-base/are-belong-to-us", FullBranch: false, TruncateSymbol: "..."},
{Case: "No limit - larger", Expected: "are-belong...", Branch: "/all-your-base/are-belong-to-us", FullBranch: false, MaxLength: 10.0, TruncateSymbol: "..."},

4
src/segments/withings.go
View file

@ -29,8 +29,8 @@ type Body struct {
}
type MeasureGroup struct {
Measures []*Measure `json:"measures"`
Comment interface{} `json:"comment"`
Measures []*Measure `json:"measures"`
Comment any `json:"comment"`
}
type Measure struct {

47
src/template/compare.go
View file

@ -1,19 +1,36 @@
package template
func interFaceToInt(e interface{}) int {
if val, OK := e.(int); OK {
return val
}
if val, OK := e.(float64); OK {
return int(val)
}
if val, OK := e.(int64); OK {
return int(val)
import (
"errors"
"strconv"
)
func toIntOrZero(e any) int {
if value, err := toInt(e); err == nil {
return value
}
return 0
}
func interfaceToFloat64(e interface{}) float64 {
func toInt(integer any) (int, error) {
switch seconds := integer.(type) {
default:
return 0, errors.New("invalid integer type")
case string:
return strconv.Atoi(seconds)
case int:
return seconds, nil
case int64:
return int(seconds), nil
case uint64:
return int(seconds), nil
case float64:
return int(seconds), nil
}
}
func toFloat64(e any) float64 {
if val, OK := e.(float64); OK {
return val
}
@ -26,19 +43,19 @@ func interfaceToFloat64(e interface{}) float64 {
return 0
}
func gt(e1, e2 interface{}) bool {
func gt(e1, e2 any) bool {
if val, OK := e1.(int); OK {
return val > interFaceToInt(e2)
return val > toIntOrZero(e2)
}
if val, OK := e1.(int64); OK {
return val > int64(interFaceToInt(e2))
return val > int64(toIntOrZero(e2))
}
if val, OK := e1.(float64); OK {
return val > interfaceToFloat64(e2)
return val > toFloat64(e2)
}
return false
}
func lt(e1, e2 interface{}) bool {
func lt(e1, e2 any) bool {
return gt(e2, e1)
}

8
src/template/compare_test.go
View file

@ -10,8 +10,8 @@ func TestGt(t *testing.T) {
cases := []struct {
Case string
Expected bool
E1 interface{}
E2 interface{}
E1 any
E2 any
}{
{Case: "Float vs int", Expected: false, E1: float64(3), E2: 4},
{Case: "Int vs float", Expected: false, E1: 3, E2: float64(4)},
@ -33,8 +33,8 @@ func TestLt(t *testing.T) {
cases := []struct {
Case string
Expected bool
E1 interface{}
E2 interface{}
E1 any
E2 any
}{
{Case: "Float vs int", Expected: true, E1: float64(3), E2: 4},
{Case: "Int vs float", Expected: true, E1: 3, E2: float64(4)},

2
src/template/func_map.go
View file

@ -7,7 +7,7 @@ import (
)
func funcMap() template.FuncMap {
funcMap := map[string]interface{}{
funcMap := map[string]any{
"secondsRound": secondsRound,
"url": url,
"path": path,

6
src/template/list.go
View file

@ -19,7 +19,7 @@ func (l List) Empty() bool {
return len(l) == 0
}
func (l List) Resolve(context interface{}, env platform.Environment, defaultValue string, logic Logic) string {
func (l List) Resolve(context any, env platform.Environment, defaultValue string, logic Logic) string {
switch logic {
case FirstMatch:
return l.FirstMatch(context, env, defaultValue)
@ -30,7 +30,7 @@ func (l List) Resolve(context interface{}, env platform.Environment, defaultValu
}
}
func (l List) Join(context interface{}, env platform.Environment) string {
func (l List) Join(context any, env platform.Environment) string {
if len(l) == 0 {
return ""
}
@ -50,7 +50,7 @@ func (l List) Join(context interface{}, env platform.Environment) string {
return buffer.String()
}
func (l List) FirstMatch(context interface{}, env platform.Environment, defaultValue string) string {
func (l List) FirstMatch(context any, env platform.Environment, defaultValue string) string {
if len(l) == 0 {
return defaultValue
}

18
src/template/round.go
View file

@ -1,28 +1,10 @@
package template
import (
"errors"
"strconv"
"strings"
)
func toInt(integer any) (int, error) {
switch seconds := integer.(type) {
default:
return 0, errors.New("invalid integer type")
case string:
return strconv.Atoi(seconds)
case int:
return seconds, nil
case int64:
return int(seconds), nil
case uint64:
return int(seconds), nil
case float64:
return int(seconds), nil
}
}
func secondsRound(seconds any) string {
s, err := toInt(seconds)
if err != nil {

10
src/template/text.go
View file

@ -42,12 +42,12 @@ var (
type Text struct {
Template string
Context interface{}
Context any
Env platform.Environment
TemplatesResult string
}
type Data interface{}
type Data any
type Context struct {
*platform.TemplateCache
@ -91,7 +91,7 @@ func (t *Text) Render() (string, error) {
return "", errors.New(msg["MSG"])
}
text := buffer.String()
// issue with missingkey=zero ignored for map[string]interface{}
// issue with missingkey=zero ignored for map[string]any
// https://github.com/golang/go/issues/24963
text = strings.ReplaceAll(text, "<no value>", "")
return text, nil
@ -195,7 +195,7 @@ func (t *Text) cleanTemplate() {
type fields map[string]bool
func (f *fields) init(data interface{}) {
func (f *fields) init(data any) {
if data == nil {
return
}
@ -208,7 +208,7 @@ func (f *fields) init(data interface{}) {
(*f)[val.Field(i).Name] = true
}
case reflect.Map:
m, ok := data.(map[string]interface{})
m, ok := data.(map[string]any)
if !ok {
return
}

14
src/template/text_test.go
View file

@ -19,7 +19,7 @@ func TestRenderTemplate(t *testing.T) {
Expected string
Template string
ShouldError bool
Context interface{}
Context any
}{
{
Case: "dot literal",
@ -184,7 +184,7 @@ func TestRenderTemplateEnvVar(t *testing.T) {
Template string
ShouldError bool
Env map[string]string
Context interface{}
Context any
}{
{
Case: "nil struct with env var",
@ -197,7 +197,7 @@ func TestRenderTemplateEnvVar(t *testing.T) {
Case: "map with env var",
Expected: "hello world",
Template: "{{.Env.HELLO}} {{.World}}",
Context: map[string]interface{}{"World": "world"},
Context: map[string]any{"World": "world"},
Env: map[string]string{"HELLO": "hello"},
},
{
@ -208,7 +208,7 @@ func TestRenderTemplateEnvVar(t *testing.T) {
Env: map[string]string{"HELLO": "hello"},
},
{Case: "no env var", Expected: "hello world", Template: "{{.Text}} world", Context: struct{ Text string }{Text: "hello"}},
{Case: "map", Expected: "hello world", Template: "{{.Text}} world", Context: map[string]interface{}{"Text": "hello"}},
{Case: "map", Expected: "hello world", Template: "{{.Text}} world", Context: map[string]any{"Text": "hello"}},
{Case: "empty map", Expected: " world", Template: "{{.Text}} world", Context: map[string]string{}},
{
Case: "Struct with duplicate property",
@ -228,14 +228,14 @@ func TestRenderTemplateEnvVar(t *testing.T) {
Case: "Map with duplicate property",
Expected: "posh",
Template: "{{ .OS }}",
Context: map[string]interface{}{"OS": "posh"},
Context: map[string]any{"OS": "posh"},
Env: map[string]string{"HELLO": "hello"},
},
{
Case: "Non-supported map",
Expected: "darwin",
Template: "{{ .OS }}",
Context: map[int]interface{}{},
Context: map[int]any{},
Env: map[string]string{"HELLO": "hello"},
},
}
@ -336,7 +336,7 @@ func TestCleanTemplate(t *testing.T) {
for _, tc := range cases {
tmpl := &Text{
Template: tc.Template,
Context: map[string]interface{}{"OS": "posh"},
Context: map[string]any{"OS": "posh"},
}
tmpl.cleanTemplate()
assert.Equal(t, tc.Expected, tmpl.Template, tc.Case)