From a3ea47a017b915cc57f92a2cee02035e43f8b56c Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 7 Aug 2015 16:51:50 -0700 Subject: [PATCH] Fix #233 --- dsymbol | 2 +- src/server/autocomplete.d | 2 -- tests/tc013/expected1.txt | 2 ++ tests/tc013/expected2.txt | 2 ++ tests/tc013/file.d | 6 ++++++ tests/tc013/run.sh | 5 ++++- 6 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 tests/tc013/expected1.txt create mode 100644 tests/tc013/expected2.txt diff --git a/dsymbol b/dsymbol index ea0deb0..bd1425b 160000 --- a/dsymbol +++ b/dsymbol @@ -1 +1 @@ -Subproject commit ea0deb0ce566ffced71a427885e069998fc9220a +Subproject commit bd1425b5342a8d186bf47ba7982b74a62ddb993f diff --git a/src/server/autocomplete.d b/src/server/autocomplete.d index 69518cc..ba2ac99 100644 --- a/src/server/autocomplete.d +++ b/src/server/autocomplete.d @@ -889,11 +889,9 @@ void setCompletions(T)(ref AutocompleteResponse response, { if (symbols[0].kind == CompletionKind.aliasName) { - trace("Got here"); if (symbols[0].type is null) return; symbols = [symbols[0].type]; - trace("Got there", symbols[0].kind); } if (symbols[0].kind == CompletionKind.variableName) { diff --git a/tests/tc013/expected1.txt b/tests/tc013/expected1.txt new file mode 100644 index 0000000..64f1a1d --- /dev/null +++ b/tests/tc013/expected1.txt @@ -0,0 +1,2 @@ +calltips +void function(SDL_Window*, int*, int*) diff --git a/tests/tc013/expected2.txt b/tests/tc013/expected2.txt new file mode 100644 index 0000000..281a6e9 --- /dev/null +++ b/tests/tc013/expected2.txt @@ -0,0 +1,2 @@ +calltips +void function() diff --git a/tests/tc013/file.d b/tests/tc013/file.d index 41e6b63..8dc0ffe 100644 --- a/tests/tc013/file.d +++ b/tests/tc013/file.d @@ -1,7 +1,13 @@ alias da_SDL_GL_GetDrawableSize = void function( SDL_Window*, int*, int* ); da_SDL_GL_GetDrawableSize SDL_GL_GetDrawableSize; +void function() doStuff; unittest { SDL_GL_GetDrawableSize( } + +unittest +{ + doStuff( +} diff --git a/tests/tc013/run.sh b/tests/tc013/run.sh index e58d9a1..0648038 100755 --- a/tests/tc013/run.sh +++ b/tests/tc013/run.sh @@ -1,5 +1,8 @@ set -e set -u -dcd-client file.d -c162 > actual1.txt +dcd-client file.d -c187 > actual1.txt diff actual1.txt expected1.txt + +dcd-client file.d -c211 > actual2.txt +diff actual2.txt expected2.txt