mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-28 20:39:40 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: allow custom folder separator for all styles

Browse source
This commit is contained in:
TravisTX 2020-12-25 20:33:51 -07:00 committed by Jan De Dobbeleer
parent c4cb6772e9
commit 1cfed78576
2 changed files with 56 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/segment_path.go
View file

@ -85,12 +85,10 @@ func (pt *path) getAgnosterPath() string {
func (pt *path) getAgnosterFullPath() string {
pwd := pt.getPwd()
pathSeparator := pt.env.getPathSeperator()
folderSeparator := pt.props.getString(FolderSeparatorIcon, pathSeparator)
if string(pwd[0]) == pathSeparator {
if string(pwd[0]) == pt.env.getPathSeperator() {
pwd = pwd[1:]
}
return strings.ReplaceAll(pwd, pathSeparator, folderSeparator)
return pt.replaceFolderSeparators(pwd)
}
func (pt *path) getAgnosterShortPath() string {
@ -111,7 +109,8 @@ func (pt *path) getAgnosterShortPath() string {
}
func (pt *path) getFullPath() string {
return pt.getPwd()
pwd := pt.getPwd()
return pt.replaceFolderSeparators(pwd)
}
func (pt *path) getFolderPath() string {
@ -166,6 +165,17 @@ func (pt *path) replaceMappedLocations(pwd string) string {
return pwd
}
func (pt *path) replaceFolderSeparators(pwd string) string {
defaultSeparator := pt.env.getPathSeperator()
folderSeparator := pt.props.getString(FolderSeparatorIcon, defaultSeparator)
if folderSeparator == defaultSeparator {
return pwd
}
pwd = strings.ReplaceAll(pwd, defaultSeparator, folderSeparator)
return pwd
}
func (pt *path) inHomeDir(pwd string) bool {
return strings.HasPrefix(pwd, pt.env.homeDir())
}
@ -180,13 +190,12 @@ func (pt *path) rootLocation() string {
func (pt *path) pathDepth(pwd string) int {
splitted := strings.Split(pwd, pt.env.getPathSeperator())
var validParts []string
depth := 0
for _, part := range splitted {
if part != "" {
validParts = append(validParts, part)
depth++
}
}
depth := len(validParts)
return depth - 1
}

39
src/segment_path_test.go
View file

@ -449,6 +449,45 @@ func TestGetAgnosterShortPathOneLevel(t *testing.T) {
assert.Equal(t, "foo", got)
}
func TestGetFullPath(t *testing.T) {
cases := []struct {
UseFolderSeparatorIcon bool
Pwd string
Expected string
}{
{UseFolderSeparatorIcon: false, Pwd: "", Expected: ""},
{UseFolderSeparatorIcon: false, Pwd: "/", Expected: "/"},
{UseFolderSeparatorIcon: false, Pwd: "/usr/home", Expected: "~"},
{UseFolderSeparatorIcon: false, Pwd: "/usr/home/abc", Expected: "~/abc"},
{UseFolderSeparatorIcon: false, Pwd: "/a/b/c/d", Expected: "/a/b/c/d"},
{UseFolderSeparatorIcon: true, Pwd: "", Expected: ""},
{UseFolderSeparatorIcon: true, Pwd: "/", Expected: "|"},
{UseFolderSeparatorIcon: true, Pwd: "/usr/home", Expected: "~"},
{UseFolderSeparatorIcon: true, Pwd: "/usr/home/abc", Expected: "~|abc"},
{UseFolderSeparatorIcon: true, Pwd: "/a/b/c/d", Expected: "|a|b|c|d"},
}
for _, tc := range cases {
env := new(MockedEnvironment)
env.On("getPathSeperator", nil).Return("/")
env.On("homeDir", nil).Return("/usr/home")
env.On("getcwd", nil).Return(tc.Pwd)
props := map[Property]interface{}{}
if tc.UseFolderSeparatorIcon {
props[FolderSeparatorIcon] = "|"
}
path := &path{
env: env,
props: &properties{
values: props,
},
}
got := path.getFullPath()
assert.Equal(t, tc.Expected, got)
}
}
func TestGetFolderPath(t *testing.T) {
pwd := "/usr/home/projects"
env := new(MockedEnvironment)