From 9d87e8473d727f3d8294e90e9888896812cef3ab Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Thu, 13 Aug 2015 00:25:19 -0700
Subject: [PATCH] Minor code cleanup

---
 src/server/autocomplete.d | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/server/autocomplete.d b/src/server/autocomplete.d
index cb1a074..bf011b3 100644
--- a/src/server/autocomplete.d
+++ b/src/server/autocomplete.d
@@ -184,18 +184,12 @@ public AutocompleteResponse symbolSearch(const AutocompleteRequest request,
 	}
 
 	SearchResults results;
-
 	foreach (symbol; pair.scope_.symbols)
-	{
 		symbol.getAllPartsNamed(request.searchName, results);
-	}
 	foreach (s; moduleCache.getAllSymbols())
-	{
 		s.symbol.getAllPartsNamed(request.searchName, results);
-	}
 
 	AutocompleteResponse response;
-
 	foreach (result; results.tree[])
 	{
 		response.locations ~= result.symbol.location;
@@ -260,7 +254,7 @@ AutocompleteResponse dotCompletion(T)(T beforeTokens, const(Token)[] tokenArray,
 	case tok!"stringLiteral":
 	case tok!"wstringLiteral":
 	case tok!"dstringLiteral":
-		foreach (symbol; (cast() arraySymbols)[])
+		foreach (symbol; arraySymbols)
 		{
 			response.completionKinds ~= symbol.kind;
 			response.completions ~= symbol.name.dup;
@@ -398,9 +392,9 @@ AutocompleteResponse parenCompletion(T)(T beforeTokens,
 		completions = pragmas;
 	fillResponse:
 		response.completionType = CompletionType.identifiers;
-		for (size_t i = 0; i < completions.length; i++)
+		foreach (completion; completions)
 		{
-			response.completions ~= completions[i];
+			response.completions ~= completion;
 			response.completionKinds ~= CompletionKind.keyword;
 		}
 		break;
@@ -544,20 +538,11 @@ body
 		return response;
 	}
 
-	string path;
-	{
-		size_t k = 0;
-		foreach (token; beforeTokens[i + 1 .. j])
-		{
-			if (token.type == tok!"identifier")
-			{
-				if (k != 0)
-					path ~= "/";
-				path ~= token.text;
-			}
-			k++;
-		}
-	}
+	immutable string path = beforeTokens[i + 1 .. j]
+		.filter!(token => token.type == tok!"identifier")
+		.map!(token => cast() token.text)
+		.joiner(dirSeparator)
+		.text();
 
 	string resolvedLocation = moduleCache.resolveImportLocation(path);
 	if (resolvedLocation is null)