From 267ea6428f7339f90b25a5a00b586221333f9457 Mon Sep 17 00:00:00 2001 From: yasuda Date: Fri, 14 Oct 2022 10:09:10 +0900 Subject: [PATCH 1/6] Show tab working dir --- autoload/tabman.vim | 2 ++ syntax/tabman.vim | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/autoload/tabman.vim b/autoload/tabman.vim index 99e05ab..b3ceb1b 100644 --- a/autoload/tabman.vim +++ b/autoload/tabman.vim @@ -285,6 +285,8 @@ fu! s:render() cal setline(lnr, ['', 'Tab #'.(key == currtab ? key.'*' : key)]) cal extend(s:btlines, { lnr + 1 : 't'.key }) let lnr += 2 + cal setline(lnr, ['| ['.fnamemodify(getcwd(-1, key), ':t').']']) + let lnr += 1 for each in keys(buftabs[key]) | for winnr in buftabs[key][each][1:] cal setline(lnr, [(id == tlen ? '`' : '|')."-".buftabs[key][each][0]]) cal extend(s:btlines, { lnr : 't'.key.'b'.each.'w'.winnr }) diff --git a/syntax/tabman.vim b/syntax/tabman.vim index 1877e20..bb071f7 100644 --- a/syntax/tabman.vim +++ b/syntax/tabman.vim @@ -1,7 +1,7 @@ sy match TabManTName '^Tab #\d\+$\|^".*\zsTab#' sy match TabManCurTName '^Tab #\d\+\ze\*$' sy match TabManAtv '\*$' -sy match TabManLead '[|`]-' +sy match TabManLead '[|`]-\?' sy match TabManTag '+$' sy match TabManHKey '" \zs[^:]*\ze[:,]' sy match TabManHSpecial '\[[^ ]\+\]' From d1331913953b5470f711d52b0de3e19a8914ec46 Mon Sep 17 00:00:00 2001 From: yasuda Date: Tue, 13 Dec 2022 14:53:16 +0900 Subject: [PATCH 2/6] Fix to show tab dir name as abbreviated path --- autoload/tabman.vim | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/autoload/tabman.vim b/autoload/tabman.vim index b3ceb1b..8799e8a 100644 --- a/autoload/tabman.vim +++ b/autoload/tabman.vim @@ -285,7 +285,10 @@ fu! s:render() cal setline(lnr, ['', 'Tab #'.(key == currtab ? key.'*' : key)]) cal extend(s:btlines, { lnr + 1 : 't'.key }) let lnr += 2 - cal setline(lnr, ['| ['.fnamemodify(getcwd(-1, key), ':t').']']) + let l:sep = has('win32') ? '\' : '/' + let l:path = split(getcwd(-1, key), l:sep, v:true) + let l:path = join(map(l:path, 'v:key == len(l:path) - 1 ? v:val : v:val[0]'), '/') + cal setline(lnr, ['| ['.l:path.']']) let lnr += 1 for each in keys(buftabs[key]) | for winnr in buftabs[key][each][1:] cal setline(lnr, [(id == tlen ? '`' : '|')."-".buftabs[key][each][0]]) From f8681101a33645260c59dcaf1ba50fc4d4328563 Mon Sep 17 00:00:00 2001 From: yasuda Date: Tue, 13 Dec 2022 15:23:30 +0900 Subject: [PATCH 3/6] Fix path abbreviation for `.`-beginning dirname --- autoload/tabman.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/tabman.vim b/autoload/tabman.vim index 8799e8a..bbb512d 100644 --- a/autoload/tabman.vim +++ b/autoload/tabman.vim @@ -287,7 +287,7 @@ fu! s:render() let lnr += 2 let l:sep = has('win32') ? '\' : '/' let l:path = split(getcwd(-1, key), l:sep, v:true) - let l:path = join(map(l:path, 'v:key == len(l:path) - 1 ? v:val : v:val[0]'), '/') + let l:path = join(map(l:path, 'v:key == len(l:path) - 1 ? v:val : slice(v:val, 0, v:val[0] ==# "." ? 2 : 1)'), '/') cal setline(lnr, ['| ['.l:path.']']) let lnr += 1 for each in keys(buftabs[key]) | for winnr in buftabs[key][each][1:] From 22134bf501536c9d1d7ca6f47259b59af4863bf3 Mon Sep 17 00:00:00 2001 From: yasuda Date: Fri, 12 May 2023 10:38:10 +0900 Subject: [PATCH 4/6] Revert "Fix path abbreviation for `.`-beginning dirname" This reverts commit f8681101a33645260c59dcaf1ba50fc4d4328563. --- autoload/tabman.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/tabman.vim b/autoload/tabman.vim index bbb512d..8799e8a 100644 --- a/autoload/tabman.vim +++ b/autoload/tabman.vim @@ -287,7 +287,7 @@ fu! s:render() let lnr += 2 let l:sep = has('win32') ? '\' : '/' let l:path = split(getcwd(-1, key), l:sep, v:true) - let l:path = join(map(l:path, 'v:key == len(l:path) - 1 ? v:val : slice(v:val, 0, v:val[0] ==# "." ? 2 : 1)'), '/') + let l:path = join(map(l:path, 'v:key == len(l:path) - 1 ? v:val : v:val[0]'), '/') cal setline(lnr, ['| ['.l:path.']']) let lnr += 1 for each in keys(buftabs[key]) | for winnr in buftabs[key][each][1:] From b12f6c2c81104d914ee697dd690f05826f867c12 Mon Sep 17 00:00:00 2001 From: yasuda Date: Fri, 12 May 2023 10:38:20 +0900 Subject: [PATCH 5/6] Revert "Fix to show tab dir name as abbreviated path" This reverts commit d1331913953b5470f711d52b0de3e19a8914ec46. --- autoload/tabman.vim | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/autoload/tabman.vim b/autoload/tabman.vim index 8799e8a..b3ceb1b 100644 --- a/autoload/tabman.vim +++ b/autoload/tabman.vim @@ -285,10 +285,7 @@ fu! s:render() cal setline(lnr, ['', 'Tab #'.(key == currtab ? key.'*' : key)]) cal extend(s:btlines, { lnr + 1 : 't'.key }) let lnr += 2 - let l:sep = has('win32') ? '\' : '/' - let l:path = split(getcwd(-1, key), l:sep, v:true) - let l:path = join(map(l:path, 'v:key == len(l:path) - 1 ? v:val : v:val[0]'), '/') - cal setline(lnr, ['| ['.l:path.']']) + cal setline(lnr, ['| ['.fnamemodify(getcwd(-1, key), ':t').']']) let lnr += 1 for each in keys(buftabs[key]) | for winnr in buftabs[key][each][1:] cal setline(lnr, [(id == tlen ? '`' : '|')."-".buftabs[key][each][0]]) From e048b7476bd66c12d0e0ca42a7af96175a5c6eae Mon Sep 17 00:00:00 2001 From: yasuda Date: Fri, 12 May 2023 10:51:29 +0900 Subject: [PATCH 6/6] Use `pathshorten()` to get abbreviated path --- autoload/tabman.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/tabman.vim b/autoload/tabman.vim index b3ceb1b..8674612 100644 --- a/autoload/tabman.vim +++ b/autoload/tabman.vim @@ -285,7 +285,7 @@ fu! s:render() cal setline(lnr, ['', 'Tab #'.(key == currtab ? key.'*' : key)]) cal extend(s:btlines, { lnr + 1 : 't'.key }) let lnr += 2 - cal setline(lnr, ['| ['.fnamemodify(getcwd(-1, key), ':t').']']) + cal setline(lnr, ['| ['.pathshorten(getcwd(-1, key), 1).']']) let lnr += 1 for each in keys(buftabs[key]) | for winnr in buftabs[key][each][1:] cal setline(lnr, [(id == tlen ? '`' : '|')."-".buftabs[key][each][0]])