Use a dedicated keybinding for hunk navigation in the main view

Previously the patch_explorer and merge_conflicts controllers reused
Universal.PrevBlock/NextBlock for moving between hunks (or conflicts) in the
main view, sharing keys with the global side-window cycle. The two operations
are conceptually distinct: cycling side windows is a global navigation gesture,
while next/prev hunk acts on the diff in the main view. Tying them together also
blocks adding <tab>/<backtab> as side- window-cycle keys, because <tab> already
means "toggle panel" in the staging view.

Add Main.PrevHunk/NextHunk to the existing KeybindingMainConfig (which already
groups bindings for the main view across staging, patch building, and merge
conflicts) and switch both controllers to it. The defaults match the active key
set those controllers had before (<left>/<right>/h/l), so the user-visible
behavior is unchanged.

docs-master/Config.md

@@ -780,6 +780,8 @@ keybinding:
   commitFiles:
     checkoutCommitFile: c
   main:
+    prevHunk: [<left>, h]
+    nextHunk: [<right>, l]
     toggleSelectHunk: a
     pickBothHunks: b
     editSelectHunk: E

docs-master/keybindings/Keybindings_en.md

@@ -207,8 +207,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` b `` | Pick all hunks |  |
 | `` <up> `` | Previous hunk |  |
 | `` <down> `` | Next hunk |  |
-| `` <left> `` | Previous conflict |  |
-| `` <right> `` | Next conflict |  |
+| `` <left>, h `` | Previous conflict |  |
+| `` <right>, l `` | Next conflict |  |
 | `` z `` | Undo | Undo last merge conflict resolution. |
 | `` e `` | Edit file | Open file in external editor. |
 | `` o `` | Open file | Open file in default application. |
@@ -229,8 +229,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | Go to previous hunk |  |
-| `` <right> `` | Go to next hunk |  |
+| `` <left>, h `` | Go to previous hunk |  |
+| `` <right>, l `` | Go to next hunk |  |
 | `` v `` | Toggle range select |  |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | Copy selected text to clipboard |  |
@@ -245,8 +245,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | Go to previous hunk |  |
-| `` <right> `` | Go to next hunk |  |
+| `` <left>, h `` | Go to previous hunk |  |
+| `` <right>, l `` | Go to next hunk |  |
 | `` v `` | Toggle range select |  |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | Copy selected text to clipboard |  |

docs-master/keybindings/Keybindings_ja.md

@@ -248,8 +248,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | 前のハンクに移動 |  |
-| `` <right> `` | 次のハンクに移動 |  |
+| `` <left>, h `` | 前のハンクに移動 |  |
+| `` <right>, l `` | 次のハンクに移動 |  |
 | `` v `` | 範囲選択を切り替え |  |
 | `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | 選択したテキストをクリップボードにコピー |  |
@@ -270,8 +270,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | 前のハンクに移動 |  |
-| `` <right> `` | 次のハンクに移動 |  |
+| `` <left>, h `` | 前のハンクに移動 |  |
+| `` <right>, l `` | 次のハンクに移動 |  |
 | `` v `` | 範囲選択を切り替え |  |
 | `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | 選択したテキストをクリップボードにコピー |  |
@@ -290,8 +290,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` b `` | すべてのハンクを選択 |  |
 | `` <up> `` | 前のハンク |  |
 | `` <down> `` | 次のハンク |  |
-| `` <left> `` | 前のコンフリクト |  |
-| `` <right> `` | 次のコンフリクト |  |
+| `` <left>, h `` | 前のコンフリクト |  |
+| `` <right>, l `` | 次のコンフリクト |  |
 | `` z `` | 元に戻す | 最後のマージコンフリクト解決を元に戻します。 |
 | `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 |
 | `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 |

docs-master/keybindings/Keybindings_ko.md

@@ -146,8 +146,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` b `` | Pick all hunks |  |
 | `` <up> `` | 이전 hunk를 선택 |  |
 | `` <down> `` | 다음 hunk를 선택 |  |
-| `` <left> `` | 이전 충돌을 선택 |  |
-| `` <right> `` | 다음 충돌을 선택 |  |
+| `` <left>, h `` | 이전 충돌을 선택 |  |
+| `` <right>, l `` | 다음 충돌을 선택 |  |
 | `` z `` | 되돌리기 | Undo last merge conflict resolution. |
 | `` e `` | 파일 편집 | Open file in external editor. |
 | `` o `` | 파일 닫기 | Open file in default application. |
@@ -168,8 +168,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | 이전 hunk를 선택 |  |
-| `` <right> `` | 다음 hunk를 선택 |  |
+| `` <left>, h `` | 이전 hunk를 선택 |  |
+| `` <right>, l `` | 다음 hunk를 선택 |  |
 | `` v `` | 드래그 선택 전환 |  |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | 선택한 텍스트를 클립보드에 복사 |  |
@@ -184,8 +184,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | 이전 hunk를 선택 |  |
-| `` <right> `` | 다음 hunk를 선택 |  |
+| `` <left>, h `` | 이전 hunk를 선택 |  |
+| `` <right>, l `` | 다음 hunk를 선택 |  |
 | `` v `` | 드래그 선택 전환 |  |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | 선택한 텍스트를 클립보드에 복사 |  |

docs-master/keybindings/Keybindings_nl.md

@@ -215,8 +215,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` b `` | Kies beide stukken |  |
 | `` <up> `` | Selecteer bovenste hunk |  |
 | `` <down> `` | Selecteer onderste hunk |  |
-| `` <left> `` | Selecteer voorgaand conflict |  |
-| `` <right> `` | Selecteer volgende conflict |  |
+| `` <left>, h `` | Selecteer voorgaand conflict |  |
+| `` <right>, l `` | Selecteer volgende conflict |  |
 | `` z `` | Ongedaan maken | Undo last merge conflict resolution. |
 | `` e `` | Verander bestand | Open file in external editor. |
 | `` o `` | Open bestand | Open file in default application. |
@@ -237,8 +237,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | Selecteer de vorige hunk |  |
-| `` <right> `` | Selecteer de volgende hunk |  |
+| `` <left>, h `` | Selecteer de vorige hunk |  |
+| `` <right>, l `` | Selecteer de volgende hunk |  |
 | `` v `` | Toggle drag selecteer |  |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | Copy selected text to clipboard |  |
@@ -312,8 +312,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | Selecteer de vorige hunk |  |
-| `` <right> `` | Selecteer de volgende hunk |  |
+| `` <left>, h `` | Selecteer de vorige hunk |  |
+| `` <right>, l `` | Selecteer de volgende hunk |  |
 | `` v `` | Toggle drag selecteer |  |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | Copy selected text to clipboard |  |

docs-master/keybindings/Keybindings_pl.md

@@ -115,8 +115,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | Idź do poprzedniego fragmentu |  |
-| `` <right> `` | Idź do następnego fragmentu |  |
+| `` <left>, h `` | Idź do poprzedniego fragmentu |  |
+| `` <right>, l `` | Idź do następnego fragmentu |  |
 | `` v `` | Przełącz zaznaczenie zakresu |  |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | Kopiuj zaznaczony tekst do schowka |  |
@@ -191,8 +191,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` b `` | Wybierz wszystkie fragmenty |  |
 | `` <up> `` | Poprzedni fragment |  |
 | `` <down> `` | Następny fragment |  |
-| `` <left> `` | Poprzedni konflikt |  |
-| `` <right> `` | Następny konflikt |  |
+| `` <left>, h `` | Poprzedni konflikt |  |
+| `` <right>, l `` | Następny konflikt |  |
 | `` z `` | Cofnij | Cofnij ostatnie rozwiązanie konfliktu scalania. |
 | `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
 | `` o `` | Otwórz plik | Otwórz plik w domyślnej aplikacji. |
@@ -203,8 +203,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | Idź do poprzedniego fragmentu |  |
-| `` <right> `` | Idź do następnego fragmentu |  |
+| `` <left>, h `` | Idź do poprzedniego fragmentu |  |
+| `` <right>, l `` | Idź do następnego fragmentu |  |
 | `` v `` | Przełącz zaznaczenie zakresu |  |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | Kopiuj zaznaczony tekst do schowka |  |

docs-master/keybindings/Keybindings_pt.md

@@ -241,8 +241,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | Ir para o local anterior |  |
-| `` <right> `` | Ir para o próximo trecho |  |
+| `` <left>, h `` | Ir para o local anterior |  |
+| `` <right>, l `` | Ir para o próximo trecho |  |
 | `` v `` | Toggle range select |  |
 | `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
 | `` <ctrl+o> `` | Copiar texto selecionado para área de transferência |  |
@@ -275,8 +275,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` b `` | Pegar todos os pedaços |  |
 | `` <up> `` | Trecho anterior |  |
 | `` <down> `` | Próximo trecho |  |
-| `` <left> `` | Conflito anterior |  |
-| `` <right> `` | Próximo conflito |  |
+| `` <left>, h `` | Conflito anterior |  |
+| `` <right>, l `` | Próximo conflito |  |
 | `` z `` | Desfazer | Desfazer resolução de conflitos de última mesclagem. |
 | `` e `` | Editar arquivo | Abrir arquivo no editor externo. |
 | `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. |
@@ -287,8 +287,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | Ir para o local anterior |  |
-| `` <right> `` | Ir para o próximo trecho |  |
+| `` <left>, h `` | Ir para o local anterior |  |
+| `` <right>, l `` | Ir para o próximo trecho |  |
 | `` v `` | Toggle range select |  |
 | `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
 | `` <ctrl+o> `` | Copiar texto selecionado para área de transferência |  |

docs-master/keybindings/Keybindings_ru.md

@@ -80,8 +80,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | Выбрать предыдущую часть |  |
-| `` <right> `` | Выбрать следующую часть |  |
+| `` <left>, h `` | Выбрать предыдущую часть |  |
+| `` <right>, l `` | Выбрать следующую часть |  |
 | `` v `` | Переключить выборку перетаскивания |  |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | Скопировать выделенный текст в буфер обмена |  |
@@ -116,8 +116,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` b `` | Выбрать все части |  |
 | `` <up> `` | Выбрать предыдущую часть |  |
 | `` <down> `` | Выбрать следующую часть |  |
-| `` <left> `` | Выбрать предыдущий конфликт |  |
-| `` <right> `` | Выбрать следующий конфликт |  |
+| `` <left>, h `` | Выбрать предыдущий конфликт |  |
+| `` <right>, l `` | Выбрать следующий конфликт |  |
 | `` z `` | Отменить | Undo last merge conflict resolution. |
 | `` e `` | Редактировать файл | Open file in external editor. |
 | `` o `` | Открыть файл | Open file in default application. |
@@ -128,8 +128,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | Выбрать предыдущую часть |  |
-| `` <right> `` | Выбрать следующую часть |  |
+| `` <left>, h `` | Выбрать предыдущую часть |  |
+| `` <right>, l `` | Выбрать следующую часть |  |
 | `` v `` | Переключить выборку перетаскивания |  |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | Скопировать выделенный текст в буфер обмена |  |

docs-master/keybindings/Keybindings_zh-CN.md

@@ -252,8 +252,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | 选择上一个区块 |  |
-| `` <right> `` | 选择下一个区块 |  |
+| `` <left>, h `` | 选择上一个区块 |  |
+| `` <right>, l `` | 选择下一个区块 |  |
 | `` v `` | 切换拖动选择 |  |
 | `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
 | `` <ctrl+o> `` | 复制选中文本到剪贴板 |  |
@@ -296,8 +296,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` b `` | 选中所有区块 |  |
 | `` <up> `` | 选择顶部块 |  |
 | `` <down> `` | 选择底部块 |  |
-| `` <left> `` | 选择上一个冲突 |  |
-| `` <right> `` | 选择下一个冲突 |  |
+| `` <left>, h `` | 选择上一个冲突 |  |
+| `` <right>, l `` | 选择下一个冲突 |  |
 | `` z `` | 撤销 | 撤消上次合并冲突解决 |
 | `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
 | `` o `` | 打开文件 | 使用默认程序打开该文件 |
@@ -308,8 +308,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | 选择上一个区块 |  |
-| `` <right> `` | 选择下一个区块 |  |
+| `` <left>, h `` | 选择上一个区块 |  |
+| `` <right>, l `` | 选择下一个区块 |  |
 | `` v `` | 切换拖动选择 |  |
 | `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
 | `` <ctrl+o> `` | 复制选中文本到剪贴板 |  |

docs-master/keybindings/Keybindings_zh-TW.md

@@ -62,8 +62,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | 選擇上一段 |  |
-| `` <right> `` | 選擇下一段 |  |
+| `` <left>, h `` | 選擇上一段 |  |
+| `` <right>, l `` | 選擇下一段 |  |
 | `` v `` | 切換拖曳選擇 |  |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
@@ -92,8 +92,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` b `` | 挑選所有程式碼片段 |  |
 | `` <up> `` | 選擇上一段 |  |
 | `` <down> `` | 選擇下一段 |  |
-| `` <left> `` | 選擇上一個衝突 |  |
-| `` <right> `` | 選擇下一個衝突 |  |
+| `` <left>, h `` | 選擇上一個衝突 |  |
+| `` <right>, l `` | 選擇下一個衝突 |  |
 | `` z `` | 復原 | Undo last merge conflict resolution. |
 | `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
 | `` o `` | 開啟檔案 | 使用預設軟體開啟 |
@@ -104,8 +104,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <left> `` | 選擇上一段 |  |
-| `` <right> `` | 選擇下一段 |  |
+| `` <left>, h `` | 選擇上一段 |  |
+| `` <right>, l `` | 選擇下一段 |  |
 | `` v `` | 切換拖曳選擇 |  |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |

pkg/config/user_config.go

@@ -607,6 +607,8 @@ type KeybindingCommitFilesConfig struct {
 }
 
 type KeybindingMainConfig struct {
+	PrevHunk         Keybinding `yaml:"prevHunk"`
+	NextHunk         Keybinding `yaml:"nextHunk"`
 	ToggleSelectHunk Keybinding `yaml:"toggleSelectHunk"`
 	PickBothHunks    Keybinding `yaml:"pickBothHunks"`
 	EditSelectHunk   Keybinding `yaml:"editSelectHunk"`
@@ -1088,6 +1090,8 @@ func GetDefaultConfigForPlatform(platform string) *UserConfig {
 				CheckoutCommitFile: Keybinding{"c"},
 			},
 			Main: KeybindingMainConfig{
+				PrevHunk:         Keybinding{"<left>", "h"},
+				NextHunk:         Keybinding{"<right>", "l"},
 				ToggleSelectHunk: Keybinding{"a"},
 				PickBothHunks:    Keybinding{"b"},
 				EditSelectHunk:   Keybinding{"E"},

pkg/gui/controllers/merge_conflicts_controller.go

@@ -52,13 +52,13 @@ func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts)
 			DisplayOnScreen: true,
 		},
 		{
-			Keys:            opts.GetKeys(opts.Config.Universal.PrevBlock),
+			Keys:            opts.GetKeys(opts.Config.Main.PrevHunk),
 			Handler:         self.withRenderAndFocus(self.PrevConflict),
 			Description:     self.c.Tr.PrevConflict,
 			DisplayOnScreen: true,
 		},
 		{
-			Keys:            opts.GetKeys(opts.Config.Universal.NextBlock),
+			Keys:            opts.GetKeys(opts.Config.Main.NextHunk),
 			Handler:         self.withRenderAndFocus(self.NextConflict),
 			Description:     self.c.Tr.NextConflict,
 			DisplayOnScreen: true,
@@ -83,14 +83,6 @@ func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts)
 			Description: self.c.Tr.OpenFile,
 			Tooltip:     self.c.Tr.OpenFileTooltip,
 		},
-		{
-			Keys:    opts.GetKeys(opts.Config.Universal.PrevBlockAlt),
-			Handler: self.withRenderAndFocus(self.PrevConflict),
-		},
-		{
-			Keys:    opts.GetKeys(opts.Config.Universal.NextBlockAlt),
-			Handler: self.withRenderAndFocus(self.NextConflict),
-		},
 		{
 			Keys:    opts.GetKeys(opts.Config.Universal.PrevItemAlt),
 			Handler: self.withRenderAndFocus(self.PrevConflictHunk),

pkg/gui/controllers/patch_explorer_controller.go

@@ -72,23 +72,15 @@ func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts)
 			Description: self.c.Tr.RangeSelectDown,
 		},
 		{
-			Keys:        opts.GetKeys(opts.Config.Universal.PrevBlock),
+			Keys:        opts.GetKeys(opts.Config.Main.PrevHunk),
 			Handler:     self.withRenderAndFocus(self.HandlePrevHunk),
 			Description: self.c.Tr.PrevHunk,
 		},
 		{
-			Keys:    opts.GetKeys(opts.Config.Universal.PrevBlockAlt),
-			Handler: self.withRenderAndFocus(self.HandlePrevHunk),
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Universal.NextBlock),
+			Keys:        opts.GetKeys(opts.Config.Main.NextHunk),
 			Handler:     self.withRenderAndFocus(self.HandleNextHunk),
 			Description: self.c.Tr.NextHunk,
 		},
-		{
-			Keys:    opts.GetKeys(opts.Config.Universal.NextBlockAlt),
-			Handler: self.withRenderAndFocus(self.HandleNextHunk),
-		},
 		{
 			Keys:        opts.GetKeys(opts.Config.Universal.ToggleRangeSelect),
 			Handler:     self.withRenderAndFocus(self.HandleToggleSelectRange),

schema-master/config.json

@@ -1921,6 +1921,40 @@
     },
     "KeybindingMainConfig": {
       "properties": {
+        "prevHunk": {
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
+          ],
+          "default": [
+            "\u003cleft\u003e",
+            "h"
+          ]
+        },
+        "nextHunk": {
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
+          ],
+          "default": [
+            "\u003cright\u003e",
+            "l"
+          ]
+        },
         "toggleSelectHunk": {
           "oneOf": [
             {