michael/lf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added new Promptfmt Option to remove trailing separator (#545)

Browse Source 
* Added new Promptfmt Option to remove trailing seperator

* Small fix

* small fix with multiple format options
also renamed the format options
This commit is contained in:
SPFab 2021-01-10 22:37:41 +01:00 committed by GitHub
parent 9f8bbe26e2
commit 07d42c9a80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui.go
View File

@ -663,10 +663,6 @@ func (ui *ui) drawPromptLine(nav *nav) {
sep := string(filepath.Separator) sep := string(filepath.Separator)
if !strings.HasSuffix(pwd, sep) {
pwd += sep
}
var fname string var fname string
curr, err := nav.currFile() curr, err := nav.currFile()
if err == nil { if err == nil {
@ -679,7 +675,7 @@ func (ui *ui) drawPromptLine(nav *nav) {
prompt = strings.Replace(prompt, "%h", gHostname, -1) prompt = strings.Replace(prompt, "%h", gHostname, -1)
prompt = strings.Replace(prompt, "%f", fname, -1) prompt = strings.Replace(prompt, "%f", fname, -1)
if printLength(strings.Replace(prompt, "%w", pwd, -1)) > ui.promptWin.w { if printLength(strings.Replace(strings.Replace(prompt, "%w", pwd, -1), "%d", pwd, -1)) > ui.promptWin.w {
names := strings.Split(pwd, sep) names := strings.Split(pwd, sep)
for i := range names { for i := range names {
if names[i] == "" { if names[i] == "" {
@ -687,7 +683,7 @@ func (ui *ui) drawPromptLine(nav *nav) {
} }
r, _ := utf8.DecodeRuneInString(names[i]) r, _ := utf8.DecodeRuneInString(names[i])
names[i] = string(r) names[i] = string(r)
if printLength(strings.Replace(prompt, "%w", strings.Join(names, sep), -1)) <= ui.promptWin.w { if printLength(strings.Replace(strings.Replace(prompt, "%w", strings.Join(names, sep), -1), "%d", strings.Join(names, sep), -1)) <= ui.promptWin.w {
break break
} }
} }
@ -695,6 +691,10 @@ func (ui *ui) drawPromptLine(nav *nav) {
} }
prompt = strings.Replace(prompt, "%w", pwd, -1) prompt = strings.Replace(prompt, "%w", pwd, -1)
if !strings.HasSuffix(pwd, sep) {
pwd += sep
}
prompt = strings.Replace(prompt, "%d", pwd, -1)
ui.promptWin.print(ui.screen, 0, 0, st, prompt) ui.promptWin.print(ui.screen, 0, 0, st, prompt)
} }