diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-30 16:42:20 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-17 19:13:40 +1100 |
commit | 182c999ee0ccd845e49d3f5af7845daf683dcfaa (patch) | |
tree | fe05870749e30dea93589d0ce3aaff9200625f24 | |
parent | b5515da00b916bcf79f680b360d5c00e08932338 (diff) |
fix linting
-rw-r--r-- | docs/keybindings/Keybindings_en.md | 2 | ||||
-rw-r--r-- | docs/keybindings/Keybindings_nl.md | 1 | ||||
-rw-r--r-- | docs/keybindings/Keybindings_pl.md | 2 | ||||
-rw-r--r-- | docs/keybindings/Keybindings_zh.md | 2 | ||||
-rw-r--r-- | pkg/gui/gui.go | 4 | ||||
-rw-r--r-- | pkg/gui/presentation/files_test.go | 2 |
6 files changed, 5 insertions, 8 deletions
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 82eafdb1d..435f48806 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -172,7 +172,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Files Panel (Files) <pre> - <kbd>d</kbd>: view 'discard changes' options <kbd>D</kbd>: view reset options <kbd>f</kbd>: fetch <kbd>ctrl+o</kbd>: copy the file name to the clipboard @@ -186,6 +185,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <kbd>e</kbd>: edit file <kbd>o</kbd>: open file <kbd>i</kbd>: add to .gitignore + <kbd>d</kbd>: view 'discard changes' options <kbd>r</kbd>: refresh files <kbd>s</kbd>: stash changes <kbd>S</kbd>: view stash options diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index 0136a529b..b25c18fc5 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -180,6 +180,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <kbd>e</kbd>: verander bestand <kbd>o</kbd>: open bestand <kbd>i</kbd>: voeg toe aan .gitignore + <kbd>d</kbd>: bekijk 'veranderingen ongedaan maken' opties <kbd>r</kbd>: refresh bestanden <kbd>s</kbd>: stash-bestanden <kbd>S</kbd>: bekijk stash opties diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index 1d7f4f725..afc1d3c9c 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -172,7 +172,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Pliki Panel (Pliki) <pre> - <kbd>d</kbd>: pokaż opcje porzucania zmian <kbd>D</kbd>: wyświetl opcje resetu <kbd>f</kbd>: pobierz <kbd>ctrl+o</kbd>: copy the file name to the clipboard @@ -186,6 +185,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <kbd>e</kbd>: edytuj plik <kbd>o</kbd>: otwórz plik <kbd>i</kbd>: dodaj do .gitignore + <kbd>d</kbd>: pokaż opcje porzucania zmian <kbd>r</kbd>: odśwież pliki <kbd>s</kbd>: przechowaj zmiany <kbd>S</kbd>: wyświetl opcje schowka diff --git a/docs/keybindings/Keybindings_zh.md b/docs/keybindings/Keybindings_zh.md index cba13cfc4..cec585c66 100644 --- a/docs/keybindings/Keybindings_zh.md +++ b/docs/keybindings/Keybindings_zh.md @@ -172,7 +172,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## 文件 面板 (文件) <pre> - <kbd>d</kbd>: 查看'放弃更改‘选项 <kbd>D</kbd>: 查看重置选项 <kbd>f</kbd>: 抓取 <kbd>ctrl+o</kbd>: 将文件名复制到剪贴板 @@ -186,6 +185,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <kbd>e</kbd>: 编辑文件 <kbd>o</kbd>: 打开文件 <kbd>i</kbd>: 添加到 .gitignore + <kbd>d</kbd>: 查看'放弃更改‘选项 <kbd>r</kbd>: 刷新文件 <kbd>s</kbd>: 将所有更改加入贮藏 <kbd>S</kbd>: 查看隐藏选项 diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index b80ef9656..93b9a2862 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -270,10 +270,6 @@ type MergingPanelState struct { UserVerticalScrolling bool } -type filePanelState struct { - listPanelState -} - // TODO: consider splitting this out into the window and the branches view type branchPanelState struct { listPanelState diff --git a/pkg/gui/presentation/files_test.go b/pkg/gui/presentation/files_test.go index 8e9baf4e5..441ec7b69 100644 --- a/pkg/gui/presentation/files_test.go +++ b/pkg/gui/presentation/files_test.go @@ -127,7 +127,7 @@ M file1 for _, s := range scenarios { s := s t.Run(s.name, func(t *testing.T) { - viewModel := filetree.NewCommitFileTreeViewModel(s.files, utils.NewDummyLog(), true) + viewModel := filetree.NewCommitFileTreeViewModel(func() []*models.CommitFile { return s.files }, utils.NewDummyLog(), true) for _, path := range s.collapsedPaths { viewModel.ToggleCollapsed(path) } |