add support for the Module Scope Operator, close #548 (#550)

add support for the Module Scope Operator, close #548
merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>

src/dcd/server/autocomplete/complete.d

@@ -24,6 +24,7 @@ import std.conv;
 import std.experimental.logger;
 import std.file;
 import std.path;
+import std.range : assumeSorted;
 import std.string;
 import std.typecons;
 
@@ -67,6 +68,52 @@ public AutocompleteResponse complete(const AutocompleteRequest request,
 		fakeIdent.type = tok!"identifier";
 	}
 
+	const bool dotId = beforeTokens.length >= 2 &&
+		beforeTokens[$-1] == tok!"identifier" && beforeTokens[$-2] == tok!".";
+
+	// detects if the completion request uses the current module `ModuleDeclaration`
+	// as access chain. In this case removes this access chain, and just keep the dot
+	// because within a module semantic is the same (`myModule.stuff` -> `.stuff`).
+	if (tokenArray.length >= 3 && tokenArray[0] == tok!"module" && beforeTokens.length &&
+		(beforeTokens[$-1] == tok!"." || dotId))
+	{
+		const upper = tokenArray.countUntil!(a => a.type == tok!";");
+		bool isSame = true;
+		// enough room for the module decl and the fqn...
+		if (upper != -1 && beforeTokens.length >= upper * 2)
+			foreach (immutable i; 0 .. upper)
+		{
+			const j = beforeTokens.length - upper + i - 1 - ubyte(dotId);
+			// verify that the chain is well located after an expr or a decl
+			if (i == 0)
+			{
+				if (beforeTokens[j].type.among(tok!"{", tok!"}", tok!";", tok!"[",
+					tok!"(", tok!",",  tok!":"))
+					continue;
+			}
+			// compare the end of the "before tokens" (access chain)
+			// with the firsts (ModuleDeclaration)
+			else if ((tokenArray[i].type == tok!"." && beforeTokens[j].type == tok!".") ||
+				(tokenArray[i].type == tok!"identifier" && tokenArray[i].text == beforeTokens[j].text))
+			{
+				continue;
+			}
+			isSame = false;
+			break;
+		}
+
+		// replace the "before tokens" with a pattern making the remaining
+		// parts of the completion process think that it's a "Module Scope Operator".
+		if (isSame)
+		{
+			if (dotId)
+				beforeTokens = assumeSorted([const Token(tok!"{"), const Token(tok!"."),
+					cast(const) beforeTokens[$-1]]);
+			else
+				beforeTokens = assumeSorted([const Token(tok!"{"), const Token(tok!".")]);
+		}
+	}
+
 	if (beforeTokens.length >= 2)
 	{
 		if (beforeTokens[$ - 1] == tok!"(" || beforeTokens[$ - 1] == tok!"["
@@ -163,11 +210,21 @@ AutocompleteResponse dotCompletion(T)(T beforeTokens, const(Token)[] tokenArray,
 		response.setCompletions(pair.scope_, getExpression(beforeTokens),
 			cursorPosition, CompletionType.identifiers, false, partial);
 		break;
-	case tok!"(":
+	//  these tokens before a "." mean "Module Scope Operator"
-	case tok!"{":
-	case tok!"[":
-	case tok!";":
 	case tok!":":
+	case tok!"(":
+	case tok!"[":
+	case tok!"{":
+	case tok!";":
+	case tok!"}":
+	case tok!",":
+		auto allocator = scoped!(ASTAllocator)();
+		RollbackAllocator rba;
+		ScopeSymbolPair pair = generateAutocompleteTrees(tokenArray, allocator,
+			&rba, 1, moduleCache);
+		scope(exit) pair.destroy();
+		response.setCompletions(pair.scope_, getExpression(beforeTokens),
+			1, CompletionType.identifiers, false, partial);
 		break;
 	default:
 		break;
@@ -466,6 +523,24 @@ void setCompletions(T)(ref AutocompleteResponse response,
 		response.completionType = CompletionType.identifiers;
 		return;
 	}
+	// "Module Scope Operator" : filter module decls
+	else if (tokens.length == 1 && tokens[0] == tok!".")
+	{
+		auto currentSymbols = completionScope.getSymbolsInCursorScope(cursorPosition);
+		foreach (s; currentSymbols.filter!(a => isPublicCompletionKind(a.kind)
+				// TODO: for now since "module.partial" is transformed into ".partial"
+				// we cant put the imported symbols that should be in the list.
+				&& a.kind != CompletionKind.importSymbol
+				&& a.kind != CompletionKind.dummy
+				&& a.symbolFile == "stdin"
+				&& (partial !is null && toUpper(a.name.data).startsWith(toUpper(partial))
+					|| partial is null)))
+		{
+			response.completions ~= makeSymbolCompletionInfo(s, s.kind);
+		}
+		response.completionType = CompletionType.identifiers;
+		return;
+	}
 
 	if (tokens.length == 0)
 		return;

src/dcd/server/autocomplete/util.d

@@ -198,13 +198,20 @@ DSymbol*[] getSymbolsByTokenChain(T)(Scope* completionScope,
 		if (tokens.length == 0) // workaround (#371)
 			return [];
 	}
-	else if (tokens[0] == tok!"." && tokens.length > 1)
+	else if (tokens[0] == tok!"." && tokens.length >= 1)
+	{
+		if (tokens.length == 1)
+		{
+			// Module Scope Operator
+			auto s = completionScope.getScopeByCursor(1);
+			return s.symbols.map!(a => a.ptr).filter!(a => a !is null).array;
+		}
+		else
 		{
 			tokens = tokens[1 .. $];
-		if (tokens.length == 0)	// workaround (#371)
-			return [];
 			symbols = completionScope.getSymbolsAtGlobalScope(stringToken(tokens[0]));
 		}
+	}
 	else
 		symbols = completionScope.getSymbolsByNameAndCursor(stringToken(tokens[0]), cursorPosition);
 

tests/tc_currmod_fqn/expected1.txt

@@ -0,0 +1,5 @@
+identifiers
+g	v
+main	f
+noLocals	f
+other	f

tests/tc_currmod_fqn/expected2.txt

@@ -0,0 +1,3 @@
+identifiers
+var1	v
+var2	v

tests/tc_currmod_fqn/file1.d

@@ -0,0 +1 @@
+module foo.bar; int g; void main(); void other(); void noLocals(){int i; foo.bar. }

tests/tc_currmod_fqn/file2.d

@@ -0,0 +1 @@
+module m; int var1, var2; auto a = [m.var1,m.v ];

tests/tc_currmod_fqn/run.sh

@@ -0,0 +1,7 @@
+set -e
+set -u
+
+../../bin/dcd-client $1 file1.d -c82 > actual1.txt
+diff actual1.txt expected1.txt
+../../bin/dcd-client $1 file2.d -c46 > actual2.txt
+diff actual2.txt expected2.txt

tests/tc_module_scope_op/expected1.txt

@@ -0,0 +1,5 @@
+identifiers
+g	v
+main	f
+noLocals	f
+other	f

tests/tc_module_scope_op/expected2.txt

@@ -0,0 +1,3 @@
+identifiers
+var1	v
+var2	v

tests/tc_module_scope_op/file1.d

@@ -0,0 +1 @@
+int g; void main(); void other(); void noLocals(){int i; . }

tests/tc_module_scope_op/file2.d

@@ -0,0 +1 @@
+module m; int var1, var2; auto a = [.var1,.v ];

tests/tc_module_scope_op/run.sh

@@ -0,0 +1,7 @@
+set -e
+set -u
+
+../../bin/dcd-client $1 file1.d -c59 > actual1.txt
+diff actual1.txt expected1.txt
+../../bin/dcd-client $1 file2.d -c44 > actual2.txt
+diff actual2.txt expected2.txt