From 43c1fc88d504dacf79742f8fd1d603a9c44dd1bd Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sat, 14 Jun 2025 18:06:56 +0900 Subject: [PATCH] Rename constants --- src/actiontype_string.go | 34 +++++++-------- src/options.go | 30 ++++++------- src/terminal.go | 94 ++++++++++++++++++++-------------------- 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/src/actiontype_string.go b/src/actiontype_string.go index d238dd49..2740399c 100644 --- a/src/actiontype_string.go +++ b/src/actiontype_string.go @@ -113,21 +113,21 @@ func _() { _ = x[actTransformPrompt-102] _ = x[actTransformQuery-103] _ = x[actTransformSearch-104] - _ = x[actAsyncTransform-105] - _ = x[actAsyncTransformBorderLabel-106] - _ = x[actAsyncTransformGhost-107] - _ = x[actAsyncTransformHeader-108] - _ = x[actAsyncTransformFooter-109] - _ = x[actAsyncTransformHeaderLabel-110] - _ = x[actAsyncTransformFooterLabel-111] - _ = x[actAsyncTransformInputLabel-112] - _ = x[actAsyncTransformListLabel-113] - _ = x[actAsyncTransformNth-114] - _ = x[actAsyncTransformPointer-115] - _ = x[actAsyncTransformPreviewLabel-116] - _ = x[actAsyncTransformPrompt-117] - _ = x[actAsyncTransformQuery-118] - _ = x[actAsyncTransformSearch-119] + _ = x[actBgTransform-105] + _ = x[actBgTransformBorderLabel-106] + _ = x[actBgTransformGhost-107] + _ = x[actBgTransformHeader-108] + _ = x[actBgTransformFooter-109] + _ = x[actBgTransformHeaderLabel-110] + _ = x[actBgTransformFooterLabel-111] + _ = x[actBgTransformInputLabel-112] + _ = x[actBgTransformListLabel-113] + _ = x[actBgTransformNth-114] + _ = x[actBgTransformPointer-115] + _ = x[actBgTransformPreviewLabel-116] + _ = x[actBgTransformPrompt-117] + _ = x[actBgTransformQuery-118] + _ = x[actBgTransformSearch-119] _ = x[actSearch-120] _ = x[actPreview-121] _ = x[actPreviewTop-122] @@ -168,9 +168,9 @@ func _() { _ = x[actAsync-157] } -const _actionType_name = "actIgnoreactStartactClickactInvalidactBracketedPasteBeginactBracketedPasteEndactCharactMouseactBeginningOfLineactAbortactAcceptactAcceptNonEmptyactAcceptOrPrintQueryactBackwardCharactBackwardDeleteCharactBackwardDeleteCharEofactBackwardWordactCancelactChangeBorderLabelactChangeGhostactChangeHeaderactChangeFooteractChangeHeaderLabelactChangeFooterLabelactChangeInputLabelactChangeListLabelactChangeMultiactChangeNthactChangePointeractChangePreviewactChangePreviewLabelactChangePreviewWindowactChangePromptactChangeQueryactClearScreenactClearQueryactClearSelectionactCloseactDeleteCharactDeleteCharEofactEndOfLineactFatalactForwardCharactForwardWordactKillLineactKillWordactUnixLineDiscardactUnixWordRuboutactYankactBackwardKillWordactSelectAllactDeselectAllactToggleactToggleSearchactToggleAllactToggleDownactToggleUpactToggleInactToggleOutactToggleTrackactToggleTrackCurrentactToggleHeaderactToggleWrapactToggleMultiLineactToggleHscrollactTrackCurrentactToggleInputactHideInputactShowInputactUntrackCurrentactDownactUpactPageUpactPageDownactPositionactHalfPageUpactHalfPageDownactOffsetUpactOffsetDownactOffsetMiddleactJumpactJumpAcceptactPrintQueryactRefreshPreviewactReplaceQueryactToggleSortactShowPreviewactHidePreviewactTogglePreviewactTogglePreviewWrapactTransformactTransformBorderLabelactTransformGhostactTransformHeaderactTransformFooteractTransformHeaderLabelactTransformFooterLabelactTransformInputLabelactTransformListLabelactTransformNthactTransformPointeractTransformPreviewLabelactTransformPromptactTransformQueryactTransformSearchactAsyncTransformactAsyncTransformBorderLabelactAsyncTransformGhostactAsyncTransformHeaderactAsyncTransformFooteractAsyncTransformHeaderLabelactAsyncTransformFooterLabelactAsyncTransformInputLabelactAsyncTransformListLabelactAsyncTransformNthactAsyncTransformPointeractAsyncTransformPreviewLabelactAsyncTransformPromptactAsyncTransformQueryactAsyncTransformSearchactSearchactPreviewactPreviewTopactPreviewBottomactPreviewUpactPreviewDownactPreviewPageUpactPreviewPageDownactPreviewHalfPageUpactPreviewHalfPageDownactPrevHistoryactPrevSelectedactPrintactPutactNextHistoryactNextSelectedactExecuteactExecuteSilentactExecuteMultiactSigStopactFirstactLastactReloadactReloadSyncactDisableSearchactEnableSearchactSelectactDeselectactUnbindactRebindactToggleBindactBecomeactShowHeaderactHideHeaderactBellactExcludeactExcludeMultiactAsync" +const _actionType_name = "actIgnoreactStartactClickactInvalidactBracketedPasteBeginactBracketedPasteEndactCharactMouseactBeginningOfLineactAbortactAcceptactAcceptNonEmptyactAcceptOrPrintQueryactBackwardCharactBackwardDeleteCharactBackwardDeleteCharEofactBackwardWordactCancelactChangeBorderLabelactChangeGhostactChangeHeaderactChangeFooteractChangeHeaderLabelactChangeFooterLabelactChangeInputLabelactChangeListLabelactChangeMultiactChangeNthactChangePointeractChangePreviewactChangePreviewLabelactChangePreviewWindowactChangePromptactChangeQueryactClearScreenactClearQueryactClearSelectionactCloseactDeleteCharactDeleteCharEofactEndOfLineactFatalactForwardCharactForwardWordactKillLineactKillWordactUnixLineDiscardactUnixWordRuboutactYankactBackwardKillWordactSelectAllactDeselectAllactToggleactToggleSearchactToggleAllactToggleDownactToggleUpactToggleInactToggleOutactToggleTrackactToggleTrackCurrentactToggleHeaderactToggleWrapactToggleMultiLineactToggleHscrollactTrackCurrentactToggleInputactHideInputactShowInputactUntrackCurrentactDownactUpactPageUpactPageDownactPositionactHalfPageUpactHalfPageDownactOffsetUpactOffsetDownactOffsetMiddleactJumpactJumpAcceptactPrintQueryactRefreshPreviewactReplaceQueryactToggleSortactShowPreviewactHidePreviewactTogglePreviewactTogglePreviewWrapactTransformactTransformBorderLabelactTransformGhostactTransformHeaderactTransformFooteractTransformHeaderLabelactTransformFooterLabelactTransformInputLabelactTransformListLabelactTransformNthactTransformPointeractTransformPreviewLabelactTransformPromptactTransformQueryactTransformSearchactBgTransformactBgTransformBorderLabelactBgTransformGhostactBgTransformHeaderactBgTransformFooteractBgTransformHeaderLabelactBgTransformFooterLabelactBgTransformInputLabelactBgTransformListLabelactBgTransformNthactBgTransformPointeractBgTransformPreviewLabelactBgTransformPromptactBgTransformQueryactBgTransformSearchactSearchactPreviewactPreviewTopactPreviewBottomactPreviewUpactPreviewDownactPreviewPageUpactPreviewPageDownactPreviewHalfPageUpactPreviewHalfPageDownactPrevHistoryactPrevSelectedactPrintactPutactNextHistoryactNextSelectedactExecuteactExecuteSilentactExecuteMultiactSigStopactFirstactLastactReloadactReloadSyncactDisableSearchactEnableSearchactSelectactDeselectactUnbindactRebindactToggleBindactBecomeactShowHeaderactHideHeaderactBellactExcludeactExcludeMultiactAsync" -var _actionType_index = [...]uint16{0, 9, 17, 25, 35, 57, 77, 84, 92, 110, 118, 127, 144, 165, 180, 201, 225, 240, 249, 269, 283, 298, 313, 333, 353, 372, 390, 404, 416, 432, 448, 469, 491, 506, 520, 534, 547, 564, 572, 585, 601, 613, 621, 635, 649, 660, 671, 689, 706, 713, 732, 744, 758, 767, 782, 794, 807, 818, 829, 841, 855, 876, 891, 904, 922, 938, 953, 967, 979, 991, 1008, 1015, 1020, 1029, 1040, 1051, 1064, 1079, 1090, 1103, 1118, 1125, 1138, 1151, 1168, 1183, 1196, 1210, 1224, 1240, 1260, 1272, 1295, 1312, 1330, 1348, 1371, 1394, 1416, 1437, 1452, 1471, 1495, 1513, 1530, 1548, 1565, 1593, 1615, 1638, 1661, 1689, 1717, 1744, 1770, 1790, 1814, 1843, 1866, 1888, 1911, 1920, 1930, 1943, 1959, 1971, 1985, 2001, 2019, 2039, 2061, 2075, 2090, 2098, 2104, 2118, 2133, 2143, 2159, 2174, 2184, 2192, 2199, 2208, 2221, 2237, 2252, 2261, 2272, 2281, 2290, 2303, 2312, 2325, 2338, 2345, 2355, 2370, 2378} +var _actionType_index = [...]uint16{0, 9, 17, 25, 35, 57, 77, 84, 92, 110, 118, 127, 144, 165, 180, 201, 225, 240, 249, 269, 283, 298, 313, 333, 353, 372, 390, 404, 416, 432, 448, 469, 491, 506, 520, 534, 547, 564, 572, 585, 601, 613, 621, 635, 649, 660, 671, 689, 706, 713, 732, 744, 758, 767, 782, 794, 807, 818, 829, 841, 855, 876, 891, 904, 922, 938, 953, 967, 979, 991, 1008, 1015, 1020, 1029, 1040, 1051, 1064, 1079, 1090, 1103, 1118, 1125, 1138, 1151, 1168, 1183, 1196, 1210, 1224, 1240, 1260, 1272, 1295, 1312, 1330, 1348, 1371, 1394, 1416, 1437, 1452, 1471, 1495, 1513, 1530, 1548, 1562, 1587, 1606, 1626, 1646, 1671, 1696, 1720, 1743, 1760, 1781, 1807, 1827, 1846, 1866, 1875, 1885, 1898, 1914, 1926, 1940, 1956, 1974, 1994, 2016, 2030, 2045, 2053, 2059, 2073, 2088, 2098, 2114, 2129, 2139, 2147, 2154, 2163, 2176, 2192, 2207, 2216, 2227, 2236, 2245, 2258, 2267, 2280, 2293, 2300, 2310, 2325, 2333} func (i actionType) String() string { if i < 0 || i >= actionType(len(_actionType_index)-1) { diff --git a/src/options.go b/src/options.go index 6f8c6790..8961bef4 100644 --- a/src/options.go +++ b/src/options.go @@ -1893,35 +1893,35 @@ func isExecuteAction(str string) actionType { case "transform-search": return actTransformSearch case "bg-transform": - return actAsyncTransform + return actBgTransform case "bg-transform-list-label": - return actAsyncTransformListLabel + return actBgTransformListLabel case "bg-transform-border-label": - return actAsyncTransformBorderLabel + return actBgTransformBorderLabel case "bg-transform-preview-label": - return actAsyncTransformPreviewLabel + return actBgTransformPreviewLabel case "bg-transform-input-label": - return actAsyncTransformInputLabel + return actBgTransformInputLabel case "bg-transform-header-label": - return actAsyncTransformHeaderLabel + return actBgTransformHeaderLabel case "bg-transform-footer-label": - return actAsyncTransformFooterLabel + return actBgTransformFooterLabel case "bg-transform-footer": - return actAsyncTransformFooter + return actBgTransformFooter case "bg-transform-header": - return actAsyncTransformHeader + return actBgTransformHeader case "bg-transform-ghost": - return actAsyncTransformGhost + return actBgTransformGhost case "bg-transform-nth": - return actAsyncTransformNth + return actBgTransformNth case "bg-transform-pointer": - return actAsyncTransformPointer + return actBgTransformPointer case "bg-transform-prompt": - return actAsyncTransformPrompt + return actBgTransformPrompt case "bg-transform-query": - return actAsyncTransformQuery + return actBgTransformQuery case "bg-transform-search": - return actAsyncTransformSearch + return actBgTransformSearch case "search": return actSearch } diff --git a/src/terminal.go b/src/terminal.go index b9296e0b..af8c8fae 100644 --- a/src/terminal.go +++ b/src/terminal.go @@ -581,21 +581,21 @@ const ( actTransformQuery actTransformSearch - actAsyncTransform - actAsyncTransformBorderLabel - actAsyncTransformGhost - actAsyncTransformHeader - actAsyncTransformFooter - actAsyncTransformHeaderLabel - actAsyncTransformFooterLabel - actAsyncTransformInputLabel - actAsyncTransformListLabel - actAsyncTransformNth - actAsyncTransformPointer - actAsyncTransformPreviewLabel - actAsyncTransformPrompt - actAsyncTransformQuery - actAsyncTransformSearch + actBgTransform + actBgTransformBorderLabel + actBgTransformGhost + actBgTransformHeader + actBgTransformFooter + actBgTransformHeaderLabel + actBgTransformFooterLabel + actBgTransformInputLabel + actBgTransformListLabel + actBgTransformNth + actBgTransformPointer + actBgTransformPreviewLabel + actBgTransformPrompt + actBgTransformQuery + actBgTransformSearch actSearch actPreview @@ -658,21 +658,21 @@ func processExecution(action actionType) bool { actTransformPrompt, actTransformQuery, actTransformSearch, - actAsyncTransform, - actAsyncTransformBorderLabel, - actAsyncTransformGhost, - actAsyncTransformHeader, - actAsyncTransformFooter, - actAsyncTransformHeaderLabel, - actAsyncTransformFooterLabel, - actAsyncTransformInputLabel, - actAsyncTransformListLabel, - actAsyncTransformNth, - actAsyncTransformPointer, - actAsyncTransformPreviewLabel, - actAsyncTransformPrompt, - actAsyncTransformQuery, - actAsyncTransformSearch, + actBgTransform, + actBgTransformBorderLabel, + actBgTransformGhost, + actBgTransformHeader, + actBgTransformFooter, + actBgTransformHeaderLabel, + actBgTransformFooterLabel, + actBgTransformInputLabel, + actBgTransformListLabel, + actBgTransformNth, + actBgTransformPointer, + actBgTransformPreviewLabel, + actBgTransformPrompt, + actBgTransformQuery, + actBgTransformSearch, actPreview, actChangePreview, actRefreshPreview, @@ -819,7 +819,7 @@ func mayTriggerPreview(opts *Options) bool { for _, actions := range opts.Keymap { for _, action := range actions { switch action.t { - case actPreview, actChangePreview, actTransform, actAsyncTransform: + case actPreview, actChangePreview, actTransform, actBgTransform: return true } } @@ -5334,7 +5334,7 @@ func (t *Terminal) Loop() error { // e.g. fzf --no-input --bind 'space:show-input+change-query(foo)+hide-input' currentInput := t.input capture := func(firstLineOnly bool, callback func(string)) { - if a.t >= actAsyncTransform { + if a.t >= actBgTransform { // &transform-* t.captureAsync(a.a, firstLineOnly, callback) } else if a.t >= actTransform { @@ -5448,13 +5448,13 @@ func (t *Terminal) Loop() error { t.previewed.version = 0 req(reqPreviewRefresh) } - case actTransformPrompt, actAsyncTransformPrompt: + case actTransformPrompt, actBgTransformPrompt: capture(true, func(prompt string) { t.promptString = prompt t.prompt, t.promptLen = t.parsePrompt(prompt) req(reqPrompt) }) - case actTransformQuery, actAsyncTransformQuery: + case actTransformQuery, actBgTransformQuery: capture(true, func(query string) { t.input = []rune(query) t.cx = len(t.input) @@ -5516,7 +5516,7 @@ func (t *Terminal) Loop() error { } t.multi = multi req(reqList, reqInfo) - case actChangeNth, actTransformNth, actAsyncTransformNth: + case actChangeNth, actTransformNth, actBgTransformNth: capture(true, func(expr string) { // Split nth expression tokens := strings.Split(expr, "|") @@ -5540,7 +5540,7 @@ func (t *Terminal) Loop() error { case actChangeQuery: t.input = []rune(a.a) t.cx = len(t.input) - case actChangeHeader, actTransformHeader, actAsyncTransformHeader: + case actChangeHeader, actTransformHeader, actBgTransformHeader: capture(false, func(header string) { if t.changeHeader(header) { if t.headerWindow != nil { @@ -5553,7 +5553,7 @@ func (t *Terminal) Loop() error { req(reqHeader) } }) - case actChangeFooter, actTransformFooter, actAsyncTransformFooter: + case actChangeFooter, actTransformFooter, actBgTransformFooter: capture(false, func(footer string) { if t.changeFooter(footer) { req(reqFullRedraw) @@ -5561,19 +5561,19 @@ func (t *Terminal) Loop() error { req(reqFooter) } }) - case actChangeHeaderLabel, actTransformHeaderLabel, actAsyncTransformHeaderLabel: + case actChangeHeaderLabel, actTransformHeaderLabel, actBgTransformHeaderLabel: capture(true, func(label string) { t.headerLabelOpts.label = label t.headerLabel, t.headerLabelLen = t.ansiLabelPrinter(label, &tui.ColHeaderLabel, false) req(reqRedrawHeaderLabel) }) - case actChangeFooterLabel, actTransformFooterLabel, actAsyncTransformFooterLabel: + case actChangeFooterLabel, actTransformFooterLabel, actBgTransformFooterLabel: capture(true, func(label string) { t.footerLabelOpts.label = label t.footerLabel, t.footerLabelLen = t.ansiLabelPrinter(label, &tui.ColFooterLabel, false) req(reqRedrawFooterLabel) }) - case actChangeInputLabel, actTransformInputLabel, actAsyncTransformInputLabel: + case actChangeInputLabel, actTransformInputLabel, actBgTransformInputLabel: capture(true, func(label string) { t.inputLabelOpts.label = label if t.inputBorder != nil { @@ -5581,7 +5581,7 @@ func (t *Terminal) Loop() error { req(reqRedrawInputLabel) } }) - case actChangeListLabel, actTransformListLabel, actAsyncTransformListLabel: + case actChangeListLabel, actTransformListLabel, actBgTransformListLabel: capture(true, func(label string) { t.listLabelOpts.label = label if t.wborder != nil { @@ -5589,7 +5589,7 @@ func (t *Terminal) Loop() error { req(reqRedrawListLabel) } }) - case actChangeBorderLabel, actTransformBorderLabel, actAsyncTransformBorderLabel: + case actChangeBorderLabel, actTransformBorderLabel, actBgTransformBorderLabel: capture(true, func(label string) { t.borderLabelOpts.label = label if t.border != nil { @@ -5597,7 +5597,7 @@ func (t *Terminal) Loop() error { req(reqRedrawBorderLabel) } }) - case actChangePreviewLabel, actTransformPreviewLabel, actAsyncTransformPreviewLabel: + case actChangePreviewLabel, actTransformPreviewLabel, actBgTransformPreviewLabel: capture(true, func(label string) { t.previewLabelOpts.label = label if t.pborder != nil { @@ -5605,7 +5605,7 @@ func (t *Terminal) Loop() error { req(reqRedrawPreviewLabel) } }) - case actTransform, actAsyncTransform: + case actTransform, actBgTransform: capture(false, func(body string) { if actions, err := parseSingleActionList(strings.Trim(body, "\r\n")); err == nil { // NOTE: We're not properly passing the return value here @@ -6033,7 +6033,7 @@ func (t *Terminal) Loop() error { override := []rune(a.a) t.inputOverride = &override changed = true - case actTransformSearch, actAsyncTransformSearch: + case actTransformSearch, actBgTransformSearch: capture(true, func(query string) { override := []rune(query) t.inputOverride = &override @@ -6378,14 +6378,14 @@ func (t *Terminal) Loop() error { } } } - case actChangeGhost, actTransformGhost, actAsyncTransformGhost: + case actChangeGhost, actTransformGhost, actBgTransformGhost: capture(true, func(ghost string) { t.ghost = ghost if len(t.input) == 0 { req(reqPrompt) } }) - case actChangePointer, actTransformPointer, actAsyncTransformPointer: + case actChangePointer, actTransformPointer, actBgTransformPointer: capture(true, func(pointer string) { length := uniseg.StringWidth(pointer) if length <= 2 {