Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fzf for openSUSE:Factory checked in at 2021-02-03 19:56:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fzf (Old) and /work/SRC/openSUSE:Factory/.fzf.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fzf" Wed Feb 3 19:56:45 2021 rev:14 rq:868989 version:0.25.1 Changes: -------- --- /work/SRC/openSUSE:Factory/fzf/fzf.changes 2021-01-03 21:27:32.779634395 +0100 +++ /work/SRC/openSUSE:Factory/.fzf.new.28504/fzf.changes 2021-02-03 19:56:48.889753498 +0100 @@ -1,0 +2,8 @@ +Wed Feb 3 16:30:05 UTC 2021 - Matej Cepl <mc...@suse.com> + +- Update to 0.25.1: + - Added `close` action + - Close preview window if open, abort fzf otherwise + - Bug fixes and improvements + +------------------------------------------------------------------- Old: ---- 0.25.0.tar.gz New: ---- 0.25.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fzf.spec ++++++ --- /var/tmp/diff_new_pack.pLaTj9/_old 2021-02-03 19:56:49.733754514 +0100 +++ /var/tmp/diff_new_pack.pLaTj9/_new 2021-02-03 19:56:49.737754519 +0100 @@ -17,7 +17,7 @@ Name: fzf -Version: 0.25.0 +Version: 0.25.1 Release: 0 Summary: A command-line fuzzy finder License: MIT ++++++ 0.25.0.tar.gz -> 0.25.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/.github/workflows/codeql-analysis.yml new/fzf-0.25.1/.github/workflows/codeql-analysis.yml --- old/fzf-0.25.0/.github/workflows/codeql-analysis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/fzf-0.25.1/.github/workflows/codeql-analysis.yml 2021-02-03 14:32:52.000000000 +0100 @@ -0,0 +1,36 @@ +# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning +name: CodeQL + +on: + push: + branches: [ master, devel ] + pull_request: + branches: [ master ] + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + language: ['go'] + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + + - name: Autobuild + uses: github/codeql-action/autobuild@v1 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/.github/workflows/linux.yml new/fzf-0.25.1/.github/workflows/linux.yml --- old/fzf-0.25.0/.github/workflows/linux.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/fzf-0.25.1/.github/workflows/linux.yml 2021-02-03 14:32:52.000000000 +0100 @@ -0,0 +1,47 @@ +--- +name: Test fzf on Linux + +on: + push: + branches: [ master, devel ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + go: [1.14, 1.15] + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: ${{ matrix.go }} + + - name: fish-actions/install-fish + uses: fish-actions/install-fish@v1.0.0 + + - name: Setup Ruby + uses: ruby/setup-ruby@v1.62.0 + with: + ruby-version: 3.0.0 + + - name: Install packages + run: sudo apt-get install --yes zsh tmux + + - name: Install Ruby gems + run: sudo gem install --no-document minitest:5.14.2 rubocop:1.0.0 rubocop-minitest:0.10.1 rubocop-performance:1.8.1 + + - name: Rubocop + run: rubocop --require rubocop-minitest --require rubocop-performance + + - name: Unit test + run: make test + + - name: Integration test + run: make install && ./install --all && LC_ALL=C tmux new-session -d && ruby test/test_go.rb --verbose diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/.github/workflows/macos.yml new/fzf-0.25.1/.github/workflows/macos.yml --- old/fzf-0.25.0/.github/workflows/macos.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/fzf-0.25.1/.github/workflows/macos.yml 2021-02-03 14:32:52.000000000 +0100 @@ -0,0 +1,44 @@ +--- +name: Test fzf on macOS + +on: + push: + branches: [ master, devel ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: macos-latest + strategy: + matrix: + go: [1.14, 1.15] + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: ${{ matrix.go }} + + - name: Setup Ruby + uses: ruby/setup-ruby@v1.62.0 + with: + ruby-version: 3.0.0 + + - name: Install packages + run: HOMEBREW_NO_INSTALL_CLEANUP=1 brew install fish zsh tmux + + - name: Install Ruby gems + run: gem install --no-document minitest:5.14.2 rubocop:1.0.0 rubocop-minitest:0.10.1 rubocop-performance:1.8.1 + + - name: Rubocop + run: rubocop --require rubocop-minitest --require rubocop-performance + + - name: Unit test + run: make test + + - name: Integration test + run: make install && ./install --all && LC_ALL=C tmux new-session -d && ruby test/test_go.rb --verbose diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/.travis.yml new/fzf-0.25.1/.travis.yml --- old/fzf-0.25.0/.travis.yml 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -language: go -go: - - "1.14" -env: GO111MODULE=on -os: - - linux - - osx -dist: bionic -osx_image: xcode12.2 -addons: - apt: - packages: - - fish - - zsh - sources: - sourceline: ppa:fish-shell/release-3 - homebrew: - packages: - - fish - - tmux -install: gem install --no-document minitest:5.14.2 rubocop:1.0.0 rubocop-minitest:0.10.1 rubocop-performance:1.8.1 -script: - - make test - # LC_ALL=C to avoid escape codes in - # printf %q $'\355\205\214\354\212\244\355\212\270' on macOS. Bash on - # macOS is built without HANDLE_MULTIBYTE? - - make install && ./install --all && LC_ALL=C tmux new-session -d && ruby test/test_go.rb --verbose - - rubocop --require rubocop-minitest --require rubocop-performance diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/BUILD.md new/fzf-0.25.1/BUILD.md --- old/fzf-0.25.0/BUILD.md 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/BUILD.md 2021-02-03 14:32:52.000000000 +0100 @@ -6,7 +6,7 @@ ### Prerequisites -- Go 1.11 or above +- Go 1.13 or above ### Using Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/CHANGELOG.md new/fzf-0.25.1/CHANGELOG.md --- old/fzf-0.25.0/CHANGELOG.md 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/CHANGELOG.md 2021-02-03 14:32:52.000000000 +0100 @@ -1,6 +1,12 @@ CHANGELOG ========= +0.25.1 +------ +- Added `close` action + - Close preview window if open, abort fzf otherwise +- Bug fixes and improvements + 0.25.0 ------ - Text attributes set in `--color` are not reset when fzf sees another diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/Makefile new/fzf-0.25.1/Makefile --- old/fzf-0.25.0/Makefile 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/Makefile 2021-02-03 14:32:52.000000000 +0100 @@ -27,6 +27,7 @@ endif BUILD_FLAGS := -a -ldflags "-s -w -X main.version=$(VERSION) -X main.revision=$(REVISION)" -tags "$(TAGS)" +BINARY32 := fzf-$(GOOS)_386 BINARY64 := fzf-$(GOOS)_amd64 BINARYARM5 := fzf-$(GOOS)_arm5 BINARYARM6 := fzf-$(GOOS)_arm6 @@ -40,6 +41,10 @@ BINARY := $(BINARY64) else ifeq ($(UNAME_M),amd64) BINARY := $(BINARY64) +else ifeq ($(UNAME_M),i686) + BINARY := $(BINARY32) +else ifeq ($(UNAME_M),i386) + BINARY := $(BINARY32) else ifeq ($(UNAME_M),armv5l) BINARY := $(BINARYARM5) else ifeq ($(UNAME_M),armv6l) @@ -110,6 +115,9 @@ clean: $(RM) -r dist target +target/$(BINARY32): $(SOURCES) + GOARCH=386 $(GO) build $(BUILD_FLAGS) -o $@ + target/$(BINARY64): $(SOURCES) GOARCH=amd64 $(GO) build $(BUILD_FLAGS) -o $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/README-VIM.md new/fzf-0.25.1/README-VIM.md --- old/fzf-0.25.0/README-VIM.md 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/README-VIM.md 2021-02-03 14:32:52.000000000 +0100 @@ -362,7 +362,7 @@ to it, so that something like `:LS /tmp` is possible. ```vim -command! -bang -complete=dir -nargs=* LS +command! -bang -complete=dir -nargs=? LS \ call fzf#run(fzf#wrap({'source': 'ls', 'dir': <q-args>}, <bang>0)) ``` @@ -372,7 +372,7 @@ ```vim " The query history for this command will be stored as 'ls' inside g:fzf_history_dir. " The name is ignored if g:fzf_history_dir is not defined. -command! -bang -complete=dir -nargs=* LS +command! -bang -complete=dir -nargs=? LS \ call fzf#run(fzf#wrap('ls', {'source': 'ls', 'dir': <q-args>}, <bang>0)) ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/README.md new/fzf-0.25.1/README.md --- old/fzf-0.25.0/README.md 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/README.md 2021-02-03 14:32:52.000000000 +0100 @@ -1,4 +1,4 @@ -<img src="https://raw.githubusercontent.com/junegunn/i/master/fzf.png"; height="170" alt="fzf - a command-line fuzzy finder"> [](https://travis-ci.org/junegunn/fzf) +<img src="https://raw.githubusercontent.com/junegunn/i/master/fzf.png"; height="170" alt="fzf - a command-line fuzzy finder"> [](https://github.com/junegunn/fzf/actions) === fzf is a general-purpose command-line fuzzy finder. @@ -17,7 +17,7 @@ - The most comprehensive feature set - Flexible layout - Batteries included - - Vim/Neovim plugin, key bindings and fuzzy auto-completion + - Vim/Neovim plugin, key bindings, and fuzzy auto-completion Table of Contents ----------------- @@ -166,12 +166,12 @@ Upgrading fzf ------------- -fzf is being actively developed and you might want to upgrade it once in a +fzf is being actively developed, and you might want to upgrade it once in a while. Please follow the instruction below depending on the installation method used. - git: `cd ~/.fzf && git pull && ./install` -- brew: `brew update; brew reinstall fzf` +- brew: `brew update; brew upgrade fzf` - macports: `sudo port upgrade fzf` - chocolatey: `choco upgrade fzf` - vim-plug: `:PlugUpdate fzf` @@ -217,7 +217,7 @@ vim $(fzf --height 40%) ``` -Also check out `--reverse` and `--layout` options if you prefer +Also, check out `--reverse` and `--layout` options if you prefer "top-down" layout instead of the default "bottom-up" layout. ```sh @@ -264,6 +264,13 @@ - `FZF_DEFAULT_COMMAND` - Default command to use when input is tty - e.g. `export FZF_DEFAULT_COMMAND='fd --type f'` + - > :warning: This variable is not used by shell extensions due to the + > slight difference in requirements. + > + > (e.g. `CTRL-T` runs `$FZF_CTRL_T_COMMAND` instead, `vim **<tab>` runs + > `_fzf_compgen_path()`, and `cd **<tab>` runs `_fzf_compgen_dir()`) + > + > The available options are described later in this document. - `FZF_DEFAULT_OPTS` - Default options - e.g. `export FZF_DEFAULT_OPTS="--layout=reverse --inline-info"` @@ -331,7 +338,7 @@ - Set `FZF_ALT_C_COMMAND` to override the default command - Set `FZF_ALT_C_OPTS` to pass additional options -If you're on a tmux session, you can start fzf in a tmux split pane or in +If you're on a tmux session, you can start fzf in a tmux split-pane or in a tmux popup window by setting `FZF_TMUX_OPTS` (e.g. `-d 40%`). See `fzf-tmux --help` for available options. @@ -343,12 +350,12 @@ #### Files and directories Fuzzy completion for files and directories can be triggered if the word before -the cursor ends with the trigger sequence which is by default `**`. +the cursor ends with the trigger sequence, which is by default `**`. - `COMMAND [DIRECTORY/][FUZZY_PATTERN]**<TAB>` ```sh -# Files under current directory +# Files under the current directory # - You can select multiple items with TAB key vim **<TAB> @@ -372,7 +379,7 @@ #### Process IDs Fuzzy completion for PIDs is provided for kill command. In this case, -there is no trigger sequence, just press tab key after kill command. +there is no trigger sequence; just press the tab key after the kill command. ```sh # Can select multiple processes with <TAB> or <Shift-TAB> keys @@ -381,7 +388,7 @@ #### Host names -For ssh and telnet commands, fuzzy completion for host names is provided. The +For ssh and telnet commands, fuzzy completion for hostnames is provided. The names are extracted from /etc/hosts and ~/.ssh/config. ```sh @@ -469,11 +476,11 @@ - The arguments before `--` are the options to fzf. - After `--`, simply pass the original completion arguments unchanged (`"$@"`). -- Then write a set of commands that generates the completion candidates and +- Then, write a set of commands that generates the completion candidates and feed its output to the function using process substitution (`< <(...)`). zsh will automatically pick up the function using the naming convention but in -bash you have to manually associate the function with the command using +bash you have to manually associate the function with the command using the `complete` command. ```sh @@ -509,12 +516,12 @@ fzf is fast and is [getting even faster][perf]. Performance should not be a problem in most use cases. However, you might want to be aware of the -options that affect the performance. +options that affect performance. -- `--ansi` tells fzf to extract and parse ANSI color codes in the input and it +- `--ansi` tells fzf to extract and parse ANSI color codes in the input, and it makes the initial scanning slower. So it's not recommended that you add it to your `$FZF_DEFAULT_OPTS`. -- `--nth` makes fzf slower as fzf has to tokenize each line. +- `--nth` makes fzf slower because it has to tokenize each line. - `--with-nth` makes fzf slower as fzf has to tokenize and reassemble each line. - If you absolutely need better performance, you can consider using @@ -563,7 +570,7 @@ #### 3. Interactive ripgrep integration The following example uses fzf as the selector interface for ripgrep. We bound -`reload` action to `change` event, so every time you type on fzf, ripgrep +`reload` action to `change` event, so every time you type on fzf, the ripgrep process will restart with the updated query string denoted by the placeholder expression `{q}`. Also, note that we used `--phony` option so that fzf doesn't perform any secondary filtering. @@ -573,7 +580,7 @@ RG_PREFIX="rg --column --line-number --no-heading --color=always --smart-case " FZF_DEFAULT_COMMAND="$RG_PREFIX '$INITIAL_QUERY'" \ fzf --bind "change:reload:$RG_PREFIX {q} || true" \ - --ansi --phony --query "$INITIAL_QUERY" \ + --ansi --disabled --query "$INITIAL_QUERY" \ --height=50% --layout=reverse ``` @@ -589,7 +596,7 @@ The window can be scrolled using the mouse or custom key bindings. ```bash -# {} is replaced to the single-quoted string of the focused line +# {} is replaced with the single-quoted string of the focused line fzf --preview 'cat {}' ``` @@ -661,7 +668,7 @@ export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" ``` -If you want the command to follow symbolic links, and don't want it to exclude +If you want the command to follow symbolic links and don't want it to exclude hidden files, use the following command: ```sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/install new/fzf-0.25.1/install --- old/fzf-0.25.0/install 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/install 2021-02-03 14:32:52.000000000 +0100 @@ -2,7 +2,7 @@ set -u -version=0.25.0 +version=0.25.1 auto_completion= key_bindings= update_config=2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/install.ps1 new/fzf-0.25.1/install.ps1 --- old/fzf-0.25.0/install.ps1 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/install.ps1 2021-02-03 14:32:52.000000000 +0100 @@ -1,4 +1,4 @@ -$version="0.25.0" +$version="0.25.1" $fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition @@ -43,7 +43,11 @@ $url="https://github.com/junegunn/fzf/releases/download/$version/$file"; $temp=$env:TMP + "\fzf.zip" [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - (New-Object Net.WebClient).DownloadFile($url, $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath("$temp")) + if ($PSVersionTable.PSVersion.Major -ge 3) { + Invoke-WebRequest -Uri $url -OutFile $temp + } else { + (New-Object Net.WebClient).DownloadFile($url, $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath("$temp")) + } if ($?) { (Microsoft.PowerShell.Archive\Expand-Archive -Path $temp -DestinationPath .); (Remove-Item $temp) } else { @@ -53,7 +57,7 @@ $binary_error="Failed to download $file" return } - check_binary >$null + echo y | icacls $fzf_base\bin\fzf.exe /grant Administrator:F ; check_binary >$null } download "fzf-$version-windows_amd64.zip" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/main.go new/fzf-0.25.1/main.go --- old/fzf-0.25.0/main.go 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/main.go 2021-02-03 14:32:52.000000000 +0100 @@ -5,7 +5,7 @@ "github.com/junegunn/fzf/src/protector" ) -var version string = "0.24" +var version string = "0.25" var revision string = "devel" func main() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/man/man1/fzf-tmux.1 new/fzf-0.25.1/man/man1/fzf-tmux.1 --- old/fzf-0.25.0/man/man1/fzf-tmux.1 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/man/man1/fzf-tmux.1 2021-02-03 14:32:52.000000000 +0100 @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .. -.TH fzf-tmux 1 "Jan 2021" "fzf 0.25.0" "fzf-tmux - open fzf in tmux split pane" +.TH fzf-tmux 1 "Feb 2021" "fzf 0.25.1" "fzf-tmux - open fzf in tmux split pane" .SH NAME fzf-tmux - open fzf in tmux split pane diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/man/man1/fzf.1 new/fzf-0.25.1/man/man1/fzf.1 --- old/fzf-0.25.0/man/man1/fzf.1 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/man/man1/fzf.1 2021-02-03 14:32:52.000000000 +0100 @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .. -.TH fzf 1 "Jan 2021" "fzf 0.25.0" "fzf - a command-line fuzzy finder" +.TH fzf 1 "Feb 2021" "fzf 0.25.1" "fzf - a command-line fuzzy finder" .SH NAME fzf - a command-line fuzzy finder @@ -74,7 +74,7 @@ .BI "--disabled" Do not perform search. With this option, fzf becomes a simple selector interface rather than a "fuzzy finder". You can later enable the search using -\fBenable-search\fR or `\fBtoggle-search\R action. +\fBenable-search\fR or \fBtoggle-search\fR action. .SS Search result .TP .B "+s, --no-sort" @@ -570,7 +570,8 @@ .TP .B FZF_DEFAULT_COMMAND Default command to use when input is tty. On *nix systems, fzf runs the command -with \fBsh -c\fR, so make sure that it's POSIX-compliant. +with \fB$SHELL -c\fR if \fBSHELL\fR is set, otherwise with \fBsh -c\fR, so in +this case make sure that the command is POSIX-compliant. .TP .B FZF_DEFAULT_OPTS Default options. e.g. \fBexport FZF_DEFAULT_OPTS="--extended --cycle"\fR @@ -779,6 +780,7 @@ \fBchange-prompt(...)\fR (change prompt to the given string) \fBclear-screen\fR \fIctrl-l\fR \fBclear-selection\fR (clear multi-selection) + \fBclose\fR (close preview window if open, abort fzf otherwise) \fBclear-query\fR (clear query string) \fBdelete-char\fR \fIdel\fR \fBdelete-char/eof\fR \fIctrl-d\fR (same as \fBdelete-char\fR except aborts fzf if query is empty) @@ -890,6 +892,10 @@ responsive until the command is complete. For asynchronous execution, start your command as a background process (i.e. appending \fB&\fR). +On *nix systems, fzf runs the command with \fB$SHELL -c\fR if \fBSHELL\fR is +set, otherwise with \fBsh -c\fR, so in this case make sure that the command is +POSIX-compliant. + .SS RELOAD INPUT \fBreload(...)\fR action is used to dynamically update the input list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/plugin/fzf.vim new/fzf-0.25.1/plugin/fzf.vim --- old/fzf-0.25.0/plugin/fzf.vim 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/plugin/fzf.vim 2021-02-03 14:32:52.000000000 +0100 @@ -424,10 +424,10 @@ throw v:exception endtry - if !has_key(dict, 'dir') + if !s:present(dict, 'dir') let dict.dir = s:fzf_getcwd() endif - if has('win32unix') && has_key(dict, 'dir') + if has('win32unix') && s:present(dict, 'dir') let dict.dir = fnamemodify(dict.dir, ':p') endif @@ -792,6 +792,8 @@ call self.switch_back(1) else if bufnr('') == self.buf + " Exit terminal mode first (see neovim#13769) + call feedkeys("\<C-\>\<C-n>", 'n') " We use close instead of bd! since Vim does not close the split when " there's no other listed buffer (nvim +'set nobuflisted') close diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/shell/completion.zsh new/fzf-0.25.1/shell/completion.zsh --- old/fzf-0.25.0/shell/completion.zsh 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/shell/completion.zsh 2021-02-03 14:32:52.000000000 +0100 @@ -211,7 +211,6 @@ if [ -n "$matches" ]; then LBUFFER="$lbuf$matches" fi - zle reset-prompt command rm -f "$fifo" } @@ -302,6 +301,7 @@ if eval "type _fzf_complete_${cmd} > /dev/null"; then prefix="$prefix" eval _fzf_complete_${cmd} ${(q)lbuf} + zle reset-prompt elif [ ${d_cmds[(i)$cmd]} -le ${#d_cmds} ]; then _fzf_dir_completion "$prefix" "$lbuf" else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/shell/key-bindings.zsh new/fzf-0.25.1/shell/key-bindings.zsh --- old/fzf-0.25.0/shell/key-bindings.zsh 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/shell/key-bindings.zsh 2021-02-03 14:32:52.000000000 +0100 @@ -68,16 +68,6 @@ zle -N fzf-file-widget bindkey '^T' fzf-file-widget -# Ensure precmds are run after cd -fzf-redraw-prompt() { - local precmd - for precmd in $precmd_functions; do - $precmd - done - zle reset-prompt -} -zle -N fzf-redraw-prompt - # ALT-C - cd into the selected directory fzf-cd-widget() { local cmd="${FZF_ALT_C_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \ @@ -88,16 +78,12 @@ zle redisplay return 0 fi - if [ -z "$BUFFER" ]; then - BUFFER="cd ${(q)dir}" - zle accept-line - else - print -sr "cd ${(q)dir}" - cd "$dir" - fi + zle push-line # Clear buffer. Auto-restored on next prompt. + BUFFER="cd ${(q)dir}" + zle accept-line local ret=$? unset dir # ensure this doesn't end up appearing in prompt expansion - zle fzf-redraw-prompt + zle reset-prompt return $ret } zle -N fzf-cd-widget diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/src/ansi.go new/fzf-0.25.1/src/ansi.go --- old/fzf-0.25.0/src/ansi.go 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/src/ansi.go 2021-02-03 14:32:52.000000000 +0100 @@ -201,7 +201,7 @@ state = &ansiState{prevState.fg, prevState.bg, prevState.attr, prevState.lbg} } if ansiCode[0] != '\x1b' || ansiCode[1] != '[' || ansiCode[len(ansiCode)-1] != 'm' { - if strings.HasSuffix(ansiCode, "0K") { + if strings.HasSuffix(ansiCode, "0K") && prevState != nil { state.lbg = prevState.bg } return state diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/src/history_test.go new/fzf-0.25.1/src/history_test.go --- old/fzf-0.25.0/src/history_test.go 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/src/history_test.go 2021-02-03 14:32:52.000000000 +0100 @@ -3,7 +3,6 @@ import ( "io/ioutil" "os" - "os/user" "runtime" "testing" ) @@ -12,16 +11,12 @@ maxHistory := 50 // Invalid arguments - user, _ := user.Current() var paths []string if runtime.GOOS == "windows" { // GOPATH should exist, so we shouldn't be able to override it paths = []string{os.Getenv("GOPATH")} } else { paths = []string{"/etc", "/proc"} - if user.Name != "root" { - paths = append(paths, "/etc/sudoers") - } } for _, path := range paths { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/src/options.go new/fzf-0.25.1/src/options.go --- old/fzf-0.25.0/src/options.go 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/src/options.go 2021-02-03 14:32:52.000000000 +0100 @@ -449,7 +449,7 @@ errorExit(message) } - str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string(escapedComma)) + str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string([]rune{escapedComma})) tokens := strings.Split(str, ",") if str == "," || strings.HasPrefix(str, ",,") || strings.HasSuffix(str, ",,") || strings.Contains(str, ",,,") { tokens = append(tokens, ",") @@ -460,7 +460,7 @@ if len(key) == 0 { continue // ignore } - key = strings.ReplaceAll(key, string(escapedComma), ",") + key = strings.ReplaceAll(key, string([]rune{escapedComma}), ",") lkey := strings.ToLower(key) add := func(e tui.EventType) { chords[e.AsEvent()] = key @@ -883,6 +883,8 @@ appendAction(actSelectAll) case "deselect-all": appendAction(actDeselectAll) + case "close": + appendAction(actClose) case "toggle": appendAction(actToggle) case "down": diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/src/result.go new/fzf-0.25.1/src/result.go --- old/fzf-0.25.0/src/result.go 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/src/result.go 2021-02-03 14:32:52.000000000 +0100 @@ -164,7 +164,7 @@ // combination of either [hl and bg] or [hl+ and bg+]. // // If the original text already has background color, and the - // forground color of colMatch is -1, we shouldn't only apply the + // foreground color of colMatch is -1, we shouldn't only apply the // background color of colMatch. // e.g. echo -e "\x1b[32;7mfoo\x1b[mbar" | fzf --ansi --color bg+:1,hl+:-1:underline // echo -e "\x1b[42mfoo\x1b[mbar" | fzf --ansi --color bg+:1,hl+:-1:underline diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/src/terminal.go new/fzf-0.25.1/src/terminal.go --- old/fzf-0.25.0/src/terminal.go 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/src/terminal.go 2021-02-03 14:32:52.000000000 +0100 @@ -221,6 +221,7 @@ actClearScreen actClearQuery actClearSelection + actClose actDeleteChar actDeleteCharEOF actEndOfLine @@ -2222,6 +2223,8 @@ case actTogglePreviewWrap: if t.hasPreviewWindow() { t.previewOpts.wrap = !t.previewOpts.wrap + // Reset preview version so that full redraw occurs + t.previewed.version = 0 req(reqPreviewRefresh) } case actToggleSort: @@ -2332,6 +2335,12 @@ } req(reqList, reqInfo) } + case actClose: + if t.isPreviewEnabled() { + togglePreview(false) + } else { + req(reqQuit) + } case actToggle: if t.multi > 0 && t.merger.Length() > 0 && toggle() { req(reqList) @@ -2632,18 +2641,16 @@ } func (t *Terminal) constrain() { + // count of items to display allowed by filtering count := t.merger.Length() + // count of lines can be displayed height := t.maxItems() - diffpos := t.cy - t.offset t.cy = util.Constrain(t.cy, 0, count-1) - t.offset = util.Constrain(t.offset, t.cy-height+1, t.cy) - // Adjustment - if count-t.offset < height { - t.offset = util.Max(0, count-height) - t.cy = util.Constrain(t.offset+diffpos, 0, count-1) - } - t.offset = util.Max(0, t.offset) + + minOffset := t.cy - height + 1 + maxOffset := util.Max(util.Min(count-height, t.cy), 0) + t.offset = util.Constrain(t.offset, minOffset, maxOffset) } func (t *Terminal) vmove(o int, allowCycle bool) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/src/tokenizer.go new/fzf-0.25.1/src/tokenizer.go --- old/fzf-0.25.0/src/tokenizer.go 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/src/tokenizer.go 2021-02-03 14:32:52.000000000 +0100 @@ -35,7 +35,7 @@ str *string } -// String returns the string representation of a Delimeter. +// String returns the string representation of a Delimiter. func (d Delimiter) String() string { return fmt.Sprintf("Delimiter{regex: %v, str: &%q}", d.regex, *d.str) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.25.0/test/test_go.rb new/fzf-0.25.1/test/test_go.rb --- old/fzf-0.25.0/test/test_go.rb 2021-01-02 16:56:11.000000000 +0100 +++ new/fzf-0.25.1/test/test_go.rb 2021-02-03 14:32:52.000000000 +0100 @@ -148,14 +148,15 @@ def prepare tries = 0 begin - self.until do |lines| - send_keys ' ', 'C-u', :Enter, 'hello', :Left, :Right - lines[-1] == 'hello' + self.until(true) do |lines| + message = "Prepare[#{tries}]" + send_keys ' ', 'C-u', :Enter, message, :Left, :Right + lines[-1] == message end rescue Minitest::Assertion (tries += 1) < 5 ? retry : raise end - send_keys 'C-u' + send_keys 'C-u', 'C-l' end private @@ -1863,6 +1864,32 @@ tmux.send_keys "#{FZF} --preview 'seq 1000 | nl' --preview-window down:noborder:follow", :Enter tmux.until { |lines| assert_equal '1000 1000', lines[-1].strip } end + + def test_toggle_preview_wrap + tmux.send_keys "#{FZF} --preview 'for i in $(seq $FZF_PREVIEW_COLUMNS); do echo -n .; done; echo wrapped; echo 2nd line' --bind ctrl-w:toggle-preview-wrap", :Enter + 2.times do + tmux.until { |lines| assert_includes lines[2], '2nd line' } + tmux.send_keys 'C-w' + tmux.until do |lines| + assert_includes lines[2], 'wrapped' + assert_includes lines[3], '2nd line' + end + tmux.send_keys 'C-w' + end + end + + def test_close + tmux.send_keys "seq 100 | #{FZF} --preview 'echo foo' --bind ctrl-c:close", :Enter + tmux.until { |lines| assert_equal 100, lines.match_count } + tmux.until { |lines| assert_includes lines[1], 'foo' } + tmux.send_keys 'C-c' + tmux.until { |lines| refute_includes lines[1], 'foo' } + tmux.send_keys '10' + tmux.until { |lines| assert_equal 2, lines.match_count } + tmux.send_keys 'C-c' + tmux.send_keys 'C-l', 'closed' + tmux.until { |lines| assert_includes lines[0], 'closed' } + end end module TestShell ++++++ vendor.tar.xz ++++++
![https://raw.githubusercontent.com/junegunn/i/master/fzf.png"](https://raw.githubusercontent.com/junegunn/i/master/fzf.png"){kind=link}
