Skip to content

fix: Support GNU diff 3.11+ #55

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.

Sign up for GitHub

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

Open
andrey-starodubtsev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Support GNU diff 3.11+ #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions plugin/dirdiff.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ function! <SID>DirDiff(srcA, srcB)
let cmdarg = cmdarg." -i"
endif
if (g:DirDiffAddArgs != "")
let cmdarg = cmdarg." ".g:DirDiffAddArgs." "
let cmdarg = cmdarg." ".g:DirDiffAddArgs
endif
if (g:DirDiffExcludes != "")
let cmdarg = cmdarg.' -x"'.substitute(g:DirDiffExcludes, ',', '" -x"', 'g').'"'
Expand Down Expand Up @@ -784,7 +784,11 @@ function! <SID>GetFileNameFromLine(AB, line)
elseif <SID>IsDiffer(a:line)
let regex = '^.*' . s:DirDiffDifferLine . '\[A\]\(.*\)' . s:DirDiffDifferAndLine . '\[B\]\(.*\)' . s:DirDiffDifferEndLine . '.*$'
let fileToProcess = substitute(a:line, regex, '\1', '')
else
if fileToProcess == a:line
" Didn't match, try filename in apostrophes
let regex = '^.*' . s:DirDiffDifferLine . "'\\[A\\]\\(.*\\)'" . s:DirDiffDifferAndLine . "'\\[B\\]\\(.*\\)'" . s:DirDiffDifferEndLine . '.*$'
let fileToProcess = substitute(a:line, regex, '\1', '')
endif
endif

"echo "line : " . a:line. "AB = " . a:AB . " File to Process " . fileToProcess
Expand All @@ -799,12 +803,22 @@ endfunction

"Returns the source (A or B) of the "Only" line
function! <SID>ParseOnlySrc(line)
return substitute(a:line, '^.*' . s:DirDiffDiffOnlyLine . '\[\(.\)\].*' . s:DirDiffDiffOnlyLineCenter . '.*', '\1', '')
let result = substitute(a:line, '^.*' . s:DirDiffDiffOnlyLine . '\[\(.\)\].*' . s:DirDiffDiffOnlyLineCenter . '.*', '\1', '')
if (result == a:line)
" Didn't match, try filename in apostrophes
let result = substitute(a:line, '^.*' . s:DirDiffDiffOnlyLine . "'\\[\\(.\\)\\]'.*" . s:DirDiffDiffOnlyLineCenter . '.*', '\1', '')
endif
return result
endfunction

function! <SID>ParseOnlyFile(line)
let regex = '^.*' . s:DirDiffDiffOnlyLine . '\[.\]\(.*\)' . s:DirDiffDiffOnlyLineCenter . '\(.*\)'
let root = substitute(a:line, regex , '\1', '')
if (root == a:line)
" Didn't match, try filename in apostrophes
let regex = '^.*' . s:DirDiffDiffOnlyLine . "'\\[.\\]'\\(.*\\)" . s:DirDiffDiffOnlyLineCenter . "\\(.*\\)"
let root = substitute(a:line, regex , '\1', '')
endif
let file = root . s:sep . substitute(a:line, regex , '\2', '')
return file
endfunction
Expand Down