From 07b240b6869897d68f0546bc496075dc15a9dc01 Mon Sep 17 00:00:00 2001
From: Vladimir Panteleev <git@thecybershadow.net>
Date: Tue, 12 Apr 2016 10:16:07 +0000
Subject: [PATCH] autocomplete: Fix goto-declaration for import statements

---
 src/server/autocomplete.d | 1 +
 tests/tc032/expected1.txt | 1 +
 tests/tc032/file.d        | 1 +
 tests/tc032/run.sh        | 5 +++++
 4 files changed, 8 insertions(+)
 create mode 100644 tests/tc032/expected1.txt
 create mode 100644 tests/tc032/file.d
 create mode 100755 tests/tc032/run.sh

diff --git a/src/server/autocomplete.d b/src/server/autocomplete.d
index ad85ade..a871939 100644
--- a/src/server/autocomplete.d
+++ b/src/server/autocomplete.d
@@ -1153,6 +1153,7 @@ T getExpression(T)(T beforeTokens)
 		switch (beforeTokens[i].type)
 		{
 		case tok!"import":
+			i++;
 			break expressionLoop;
 		mixin (TYPE_IDENT_AND_LITERAL_CASES);
 			mixin (EXPRESSION_LOOP_BREAK);
diff --git a/tests/tc032/expected1.txt b/tests/tc032/expected1.txt
new file mode 100644
index 0000000..947e03f
--- /dev/null
+++ b/tests/tc032/expected1.txt
@@ -0,0 +1 @@
+/imports/std/stdio.d	0
diff --git a/tests/tc032/file.d b/tests/tc032/file.d
new file mode 100644
index 0000000..a73ac8d
--- /dev/null
+++ b/tests/tc032/file.d
@@ -0,0 +1 @@
+import std.stdio;
\ No newline at end of file
diff --git a/tests/tc032/run.sh b/tests/tc032/run.sh
new file mode 100755
index 0000000..beed304
--- /dev/null
+++ b/tests/tc032/run.sh
@@ -0,0 +1,5 @@
+set -e
+set -u
+
+../../bin/dcd-client $1 file.d -l -c 15 | sed s\""$(dirname "$(pwd)")"\"\" > actual1.txt
+diff actual1.txt expected1.txt