From e32edbda88ec060ece985b691bf6bfcb2b3c4cf8 Mon Sep 17 00:00:00 2001 From: Daisuke Maki Date: Fri, 20 Feb 2026 22:27:01 +0900 Subject: [PATCH] remove named return values from Compile and MovePage --- filter/regexp.go | 4 +++- layout.go | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/filter/regexp.go b/filter/regexp.go index f5bd454..ec919ab 100644 --- a/filter/regexp.go +++ b/filter/regexp.go @@ -168,7 +168,7 @@ func (f *regexpQueryFactory) evictLRU(targetSize int) { // Compile parses the query string into positive and negative regexp slices, // caching compiled results for reuse within the expiry threshold. -func (f *regexpQueryFactory) Compile(s string, flags regexpFlags, quotemeta bool) (positive, negative []*regexp.Regexp, err error) { +func (f *regexpQueryFactory) Compile(s string, flags regexpFlags, quotemeta bool) ([]*regexp.Regexp, []*regexp.Regexp, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -184,12 +184,14 @@ func (f *regexpQueryFactory) Compile(s string, flags regexpFlags, quotemeta bool var posRxs, negRxs []*regexp.Regexp if len(posTerms) > 0 { + var err error posRxs, err = termsToRegexps(posTerms, s, flags, quotemeta) if err != nil { return nil, nil, fmt.Errorf("failed to compile positive regular expressions: %w", err) } } if len(negTerms) > 0 { + var err error negRxs, err = termsToRegexps(negTerms, s, flags, quotemeta) if err != nil { return nil, nil, fmt.Errorf("failed to compile negative regular expressions: %w", err) diff --git a/layout.go b/layout.go index d5501b2..9201186 100644 --- a/layout.go +++ b/layout.go @@ -972,14 +972,13 @@ func (l *BasicLayout) linesPerPage() int { } // MovePage scrolls the screen -func (l *BasicLayout) MovePage(state *Peco, p hub.PagingRequest) (moved bool) { +func (l *BasicLayout) MovePage(state *Peco, p hub.PagingRequest) bool { switch p.Type() { case hub.ToScrollLeft, hub.ToScrollRight: - moved = horizontalScroll(state, l, p) + return horizontalScroll(state, l, p) default: - moved = verticalScroll(state, l, p) + return verticalScroll(state, l, p) } - return } // computeNewLineNumber calculates the new line number based on the paging