forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

async DCD get code completions handling - close #93

This commit is contained in:
Vadim Lopatin 2016-01-28 11:58:21 +03:00
parent 7ba06e6bfe
commit 13f2656550
5 changed files with 53 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/dlangide/tools/d/dcdinterface.d
View File

@ -19,7 +19,7 @@ enum DCDResult : int {
alias DocCommentsResultSet = Tuple!(DCDResult, "result", string[], "docComments"); alias DocCommentsResultSet = Tuple!(DCDResult, "result", string[], "docComments");
alias FindDeclarationResultSet = Tuple!(DCDResult, "result", string, "fileName", ulong, "offset"); alias FindDeclarationResultSet = Tuple!(DCDResult, "result", string, "fileName", ulong, "offset");
alias ResultSet = Tuple!(DCDResult, "result", dstring[], "output"); alias CompletionResultSet = Tuple!(DCDResult, "result", dstring[], "output");
import server.autocomplete; import server.autocomplete;
import common.messages; import common.messages;
@ -199,32 +199,43 @@ class DCDInterface : Thread {
return task; return task;
} }
ResultSet getCompletions(CustomEventTarget guiExecutor, in string[] importPaths, in string filename, in string content, int index) { /// DCD get code completions task
class GetCompletionsTask : DCDTask {
debug(DCD) Log.d("DCD Context: ", dumpContext(content, index)); protected void delegate(CompletionResultSet output) _callback;
ResultSet result; protected CompletionResultSet result;
AutocompleteRequest request;
request.sourceCode = cast(ubyte[])content;
request.fileName = filename;
request.cursorPosition = index;
AutocompleteResponse response = complete(request, *getModuleCache(importPaths)); this(CustomEventTarget guiExecutor, string[] importPaths, in string filename, in string content, int index, void delegate(CompletionResultSet output) callback) {
if(response.completions is null || response.completions.length == 0){ super(guiExecutor, importPaths, filename, content, index);
result.result = DCDResult.NO_RESULT; _callback = callback;
return result;
} }
result.result = DCDResult.SUCCESS; override void performRequest() {
result.output.length = response.completions.length; AutocompleteResponse response = complete(request, *getModuleCache(_importPaths));
int i=0; if(response.completions is null || response.completions.length == 0){
foreach(s;response.completions){ result.result = DCDResult.NO_RESULT;
result.output[i++]=to!dstring(s); return;
} }
debug(DCD) Log.d("DCD output:\n", response.completions);
return result; result.result = DCDResult.SUCCESS;
result.output.length = response.completions.length;
int i=0;
foreach(s;response.completions){
result.output[i++]=to!dstring(s);
}
debug(DCD) Log.d("DCD output:\n", response.completions);
}
override void postResults() {
_callback(result);
}
} }
DCDTask getCompletions(CustomEventTarget guiExecutor, string[] importPaths, string filename, string content, int index, void delegate(CompletionResultSet output) callback) {
debug(DCD) Log.d("DCD Context: ", dumpContext(content, index));
GetCompletionsTask task = new GetCompletionsTask(guiExecutor, importPaths, filename, content, index, callback);
_queue.put(task);
return task;
}
} }

27
src/dlangide/tools/d/deditortool.d
View File

@ -24,6 +24,7 @@ class DEditorTool : EditorTool
~this() { ~this() {
cancelGoToDefinition(); cancelGoToDefinition();
cancelGetDocComments(); cancelGetDocComments();
cancelGetCompletions();
} }
DCDTask _getDocCommentsTask; DCDTask _getDocCommentsTask;
@ -44,22 +45,26 @@ class DEditorTool : EditorTool
} }
override void cancelGetDocComments() { override void cancelGetDocComments() {
// override it
if (_getDocCommentsTask) { if (_getDocCommentsTask) {
_getDocCommentsTask.cancel(); _getDocCommentsTask.cancel();
_getDocCommentsTask = null; _getDocCommentsTask = null;
} }
} }
override void cancelGoToDefinition() { override void cancelGoToDefinition() {
// override it
if (_goToDefinitionTask) { if (_goToDefinitionTask) {
_goToDefinitionTask.cancel(); _goToDefinitionTask.cancel();
_goToDefinitionTask = null; _goToDefinitionTask = null;
} }
} }
override void cancelGetCompletions() {
if (_getCompletionsTask) {
_getCompletionsTask.cancel();
_getCompletionsTask = null;
}
}
DCDTask _goToDefinitionTask; DCDTask _goToDefinitionTask;
override void goToDefinition(DSourceEdit editor, TextPosition caretPosition) { override void goToDefinition(DSourceEdit editor, TextPosition caretPosition) {
cancelGoToDefinition(); cancelGoToDefinition();
@ -101,20 +106,16 @@ class DEditorTool : EditorTool
} }
override dstring[] getCompletions(DSourceEdit editor, TextPosition caretPosition) { DCDTask _getCompletionsTask;
override void getCompletions(DSourceEdit editor, TextPosition caretPosition, void delegate(dstring[]) callback) {
string[] importPaths = editor.importPaths(); string[] importPaths = editor.importPaths();
string content = toUTF8(editor.text); string content = toUTF8(editor.text);
auto byteOffset = caretPositionToByteOffset(content, caretPosition); auto byteOffset = caretPositionToByteOffset(content, caretPosition);
ResultSet output = _frame.dcdInterface.getCompletions(editor.window, importPaths, editor.filename, content, byteOffset); _getCompletionsTask = _frame.dcdInterface.getCompletions(editor.window, importPaths, editor.filename, content, byteOffset, delegate(CompletionResultSet output) {
switch(output.result) { callback(output.output);
//TODO: Show dialog _getCompletionsTask = null;
case DCDResult.FAIL: });
case DCDResult.NO_RESULT:
case DCDResult.SUCCESS:
default:
return output.output;
}
} }
private: private:

5
src/dlangide/tools/editortool.d
View File

@ -17,10 +17,11 @@ class EditorTool
//Since files might be unsaved, we must send all the text content. //Since files might be unsaved, we must send all the text content.
abstract void goToDefinition(DSourceEdit editor, TextPosition caretPosition); abstract void goToDefinition(DSourceEdit editor, TextPosition caretPosition);
abstract void getDocComments(DSourceEdit editor, TextPosition caretPosition, void delegate(string[]) callback); abstract void getDocComments(DSourceEdit editor, TextPosition caretPosition, void delegate(string[]) callback);
abstract dstring[] getCompletions(DSourceEdit editor, TextPosition caretPosition); abstract void getCompletions(DSourceEdit editor, TextPosition caretPosition, void delegate(dstring[]) callback);
void cancelGoToDefinition() {} void cancelGoToDefinition() {}
void cancelGetDocComments() {} void cancelGetDocComments() {}
void cancelGetCompletions() {}
protected IDEFrame _frame; protected IDEFrame _frame;
@ -36,7 +37,7 @@ class DefaultEditorTool : EditorTool
assert(0); //Go To Definition should not be called for normal files. assert(0); //Go To Definition should not be called for normal files.
} }
override dstring[] getCompletions(DSourceEdit editor, TextPosition caretPosition) { override void getCompletions(DSourceEdit editor, TextPosition caretPosition, void delegate(dstring[]) callback) {
assert(0); assert(0);
} }

1
src/dlangide/ui/dsourceedit.d
View File

@ -530,6 +530,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
popup.flags = PopupFlags.CloseOnClickOutside; popup.flags = PopupFlags.CloseOnClickOutside;
Log.d("Showing popup at ", textPosToClient(_caretPos).left, " ", textPosToClient(_caretPos).top); Log.d("Showing popup at ", textPosToClient(_caretPos).left, " ", textPosToClient(_caretPos).top);
window.update();
} }
} }

6
src/dlangide/ui/frame.d
View File

@ -895,8 +895,10 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
return true; return true;
case IDEActions.GetCompletionSuggestions: case IDEActions.GetCompletionSuggestions:
Log.d("Getting auto completion suggestions."); Log.d("Getting auto completion suggestions.");
auto results = currentEditor.editorTool.getCompletions(currentEditor, currentEditor.caretPos); currentEditor.editorTool.getCompletions(currentEditor, currentEditor.caretPos, delegate(dstring[] results) {
currentEditor.showCompletionPopup(results); if (currentEditor)
currentEditor.showCompletionPopup(results);
});
return true; return true;
case IDEActions.EditPreferences: case IDEActions.EditPreferences:
showPreferences(); showPreferences();