Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with fzf.vim #14

Closed
wants to merge 41 commits into from
Closed

Sync with fzf.vim #14

wants to merge 41 commits into from

Conversation

fsouza
Copy link

@fsouza fsouza commented Jul 13, 2020

I got some conflicts in README.md, autoload/fzf/vim.vim and doc/fzf-vim.txt. I did a best effort based on the author's previous modifications.

Also, let me know if I should change g:fzf_preview_window to g:skim_preview_window.

In my tests, this fixes #9.

Also fixed fzf#vim#grep to use SKIM_DEFAULT_COMMAND instead of FZF_DEFAULT_COMMAND.

ptzz and others added 30 commits November 1, 2019 10:31
Related #907
Also junegunn/fzf#1750

function! RipgrepFzf(query, fullscreen)
  let command_fmt = 'rg --column --line-number --no-heading --color=always --smart-case %s || true'
  let initial_command = printf(command_fmt, shellescape(a:query))
  let reload_command = printf(command_fmt, '{q}')
  let options = {'options': ['--phony', '--query', a:query, '--bind', 'change:reload:'.reload_command]}
  call fzf#vim#grep(initial_command, 1, options, a:fullscreen)
endfunction

command! -nargs=* -bang RF call RipgrepFzf(<q-args>, <bang>0)
Since fzf v0.18.0 FZF_PREVIEW_LINES is preferred over LINES
Close #195
Close #799

Close #724
Close #955
Files is equivalent to running fzf without input pipe; fzf reads the
output of $FZF_DEFAULT_COMMAND

Related: #966
Fix #997

Co-authored-by: Ian Homer <ihomer@worth.systems>
kaworu and others added 11 commits May 6, 2020 00:53
Before this patch, a search pattern starting with a dash like
`:Rg -bang` would fail (or exhibit the wrong behaviour) because it would
be treated as a option. However, this case is very common when searching
for ->member in a project in C, C++, PHP, etc.

Co-authored-by: Alexandre Perrin <alex@atipik.ch>
* Rename and make `s:all_files` public for user fzf extension
Temporary perl script that parses output of help grep doesn't take into
account backward slash as windows path separator.

Fixes #987
* [fzf#vim#with_preview] support wsl bash

Close junegunn/fzf.vim#988
Close junegunn/fzf.vim#1009

* [fzf#vim#with_preview] use abs path for bin/

WSL has issues with relative filepaths.
Fix #1037

Function `ag_to_qf` is used to parse line produced by Grep, Ag or
Ripgrep. Implementation in quesition split it using regexp that doesn't
work for windows absolut paths.

A better approach is to use `matchlist` function.
This should fix that function.
@fsouza fsouza closed this Sep 14, 2020
@fsouza fsouza deleted the sync-fzf.vim branch September 14, 2020 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

preview doesn't work