From d6930becc633f7fc872bf5d8721732c405d97f07 Mon Sep 17 00:00:00 2001
From: IdanArye <idanarye@gmail.com>
Date: Fri, 31 Jan 2014 18:25:52 +0200
Subject: [PATCH] Fixed a bug with completion of "free" identifiers.

Turn out that when doing autocomple, Vim temporarily erases the
completed part from the buffer lines, so when I'm trying to write to
buffer lines to a temporary file the get written without that part, and
DCD can't read it.

Worked around it by storing that line beforehand(in the first call to
the completion function) and resetting the buffer before writing it
to the temp file.
---
 editors/vim/autoload/dcomplete.vim | 21 +++++++++++++++++----
 editors/vim/ftplugin/d.vim         |  1 +
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/editors/vim/autoload/dcomplete.vim b/editors/vim/autoload/dcomplete.vim
index 0d337e7..42f982e 100644
--- a/editors/vim/autoload/dcomplete.vim
+++ b/editors/vim/autoload/dcomplete.vim
@@ -1,6 +1,8 @@
 "The completion function
 function! dcomplete#Complete(findstart,base)
 	if a:findstart
+		"Vim temporarily deletes the current identifier from the file
+		let b:currentLineText=getline('.')
 
 		"We might need it for paren completion:
 		let b:closingParenExists=getline('.')[col('.')-1:-1]=~'^\s*)'
@@ -15,7 +17,7 @@ function! dcomplete#Complete(findstart,base)
 		let parenPos=searchpos("(","bn",line('.'))
 		if parenPos[0]
 			if getline('.')[parenPos[1]:col('.')-2]=~'^\s*\w*$'
-				let b:completionColumn=parenPos[1]
+				let b:completionColumn=parenPos[1]+1
 				return parenPos[1]
 			endif
 		endif
@@ -35,7 +37,10 @@ function! dcomplete#Complete(findstart,base)
 	else
 		let b:base=a:base
 		"Run DCD
+		let l:prevCurrentLineText=getline('.')
+		call setline('.',b:currentLineText)
 		let scanResult=s:runDCDToGetAutocompletion()
+		call setline('.',l:prevCurrentLineText)
 		"Split the result text to lines.
 		let resultLines=split(scanResult,"\n")
 		let b:res=resultLines
@@ -94,15 +99,23 @@ endfunction
 
 "Run DCD to get autocompletion results
 function! s:runDCDToGetAutocompletion()
+	return s:runDCDOnBufferBytePosition(line2byte('.')+b:completionColumn-2,'')
+endfunction
 
+"Run DCD on the current position in the buffer
+function! dcomplete#runDCDOnCurrentBufferPosition(args)
+	return s:runDCDOnBufferBytePosition(line2byte('.')+col('.')-1,a:args)
+endfunction
+
+"Run DCD on the current buffer with the supplied position
+function! s:runDCDOnBufferBytePosition(bytePosition,args)
 	let l:tmpFileName=tempname()
 	"Save the temp file in unix format for better reading of byte position.
 	let l:oldFileFormat=&fileformat
 	set fileformat=unix
-	let l:bytePosition=line2byte('.')+b:completionColumn-1
-	exec "write ".l:tmpFileName
+	silent exec "write ".l:tmpFileName
 	let &fileformat=l:oldFileFormat
-	let scanResult=system(dcomplete#DCDclient().' --cursorPos '.l:bytePosition.' <'.shellescape(l:tmpFileName))
+	let scanResult=system(dcomplete#DCDclient().' '.a:args.' --cursorPos='.a:bytePosition.' <'.shellescape(l:tmpFileName))
 	call delete(l:tmpFileName)
 	return scanResult
 endfunction
diff --git a/editors/vim/ftplugin/d.vim b/editors/vim/ftplugin/d.vim
index ba5bc2e..9ec9dd8 100644
--- a/editors/vim/ftplugin/d.vim
+++ b/editors/vim/ftplugin/d.vim
@@ -8,6 +8,7 @@ else
 				\ ' '.dcomplete#globImportPath([<f-args>]).' > /dev/null &'
 endif
 command! -buffer -nargs=? DCD execute '!'.dcomplete#DCDclient().' '.<q-args>
+command! -buffer -nargs=? DCDonCurrentBufferPosition echo dcomplete#runDCDOnCurrentBufferPosition(<q-args>)
 command! -buffer DCDstopServer DCD --shutdown
 command! -buffer -nargs=+ -complete=dir DCDaddPath execute 'DCD '.dcomplete#globImportPath([<f-args>])
 command! -buffer DCDclearCache DCD --clearCache