From 2a5dd5f7382997dc8d8a14043156ec74d1f47df4 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 30 Oct 2015 11:32:54 -0700 Subject: [PATCH] Fix #263 --- src/server/autocomplete.d | 4 ++- tests/tc022/expected.txt | 65 +++++++++++++++++++++++++++++++++++++++ tests/tc022/file.d | 1 + tests/tc022/run.sh | 5 +++ 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 tests/tc022/expected.txt create mode 100644 tests/tc022/file.d create mode 100755 tests/tc022/run.sh diff --git a/src/server/autocomplete.d b/src/server/autocomplete.d index 21602f6..af126c8 100644 --- a/src/server/autocomplete.d +++ b/src/server/autocomplete.d @@ -501,7 +501,9 @@ body if (kind == ImportKind.normal) { - while (beforeTokens[i].type != tok!"," && beforeTokens[i].type != tok!"import") i--; + while (beforeTokens[i].type != tok!"," && beforeTokens[i].type != tok!"import" + && beforeTokens[i].type != tok!"=" ) + i--; setImportCompletions(beforeTokens[i .. $], response, moduleCache); return response; } diff --git a/tests/tc022/expected.txt b/tests/tc022/expected.txt new file mode 100644 index 0000000..5d27efb --- /dev/null +++ b/tests/tc022/expected.txt @@ -0,0 +1,65 @@ +identifiers +algorithm M +array M +ascii M +base64 M +bigint M +bitmanip M +c P +compiler M +complex M +concurrency M +container M +conv M +cstream M +csv M +d P +datetime M +demangle M +digest P +encoding M +exception M +experimental P +file M +format M +functional M +getopt M +internal P +json M +lexer M +math M +mathspecial M +metastrings M +mmfile M +net P +numeric M +outbuffer M +parallelism M +path M +process M +random M +range M +regex M +signals M +socket M +socketstream M +stdint M +stdio M +stdiobase M +stream M +string M +syserror M +system M +traits M +typecons M +typelist M +typetuple M +uni M +uri M +utf M +uuid M +variant M +windows P +xml M +zip M +zlib M diff --git a/tests/tc022/file.d b/tests/tc022/file.d new file mode 100644 index 0000000..d14fc00 --- /dev/null +++ b/tests/tc022/file.d @@ -0,0 +1 @@ +import io = std. diff --git a/tests/tc022/run.sh b/tests/tc022/run.sh new file mode 100755 index 0000000..7964eb9 --- /dev/null +++ b/tests/tc022/run.sh @@ -0,0 +1,5 @@ +set -e +set -u + +../../bin/dcd-client file.d -c16 > actual.txt +diff actual.txt expected.txt