Merge pull request #1 from vushu/applied_more_test_cases_and_handling_life_time

Updated tests added return info update

Author: vushu

dsymbol/src/dsymbol/conversion/first.d

@@ -132,6 +132,14 @@ final class FirstPass : ASTVisitor
 		currentSymbol.acSymbol.protection = protection.current;
 		currentSymbol.acSymbol.doc = makeDocumentation(dec.comment);
 		currentSymbol.acSymbol.qualifier = SymbolQualifier.func;
+		foreach (sc; dec.storageClasses)
+		{
+			if (sc.token.type == tok!"ref")
+			{
+				currentSymbol.acSymbol.returnIsRef = true;
+				break;
+			}
+		}
 
 		istring lastComment = this.lastComment;
 		this.lastComment = istring.init;
@@ -172,6 +180,11 @@ final class FirstPass : ASTVisitor
 			block.startLocation, null);
 		scope(exit) popSymbol();
 
+		if (exp.returnRefType == ReturnRefType.ref_)
+		{
+			currentSymbol.acSymbol.returnIsRef = true;
+		}
+
 		pushScope(block.startLocation, block.endLocation);
 		scope (exit) popScope();
 		processParameters(currentSymbol, exp.returnType,

dsymbol/src/dsymbol/symbol.d

@@ -443,7 +443,8 @@ struct DSymbol
 		bool, "_flag8", 1,
 		bool, "_flag9", 1,
 		bool, "_flag10", 1,
-		uint, "", 3,
+		bool, "_flag11", 1,
+		uint, "", 2,
 	));
 	// dfmt on
 
@@ -463,6 +464,8 @@ struct DSymbol
 	alias parameterIsOut = _flag9;
 	/// Only valid for parameters: the parameter has storage class `in`
 	alias parameterIsIn = _flag10;
+	/// If the return type is a ref
+	alias returnIsRef = _flag11;
 
 	deprecated bool isPointer()
 	{

dsymbol/src/dsymbol/ufcs.d

@@ -15,9 +15,16 @@ import std.string;
 import std.regex;
 import containers.hashset : HashSet;
 import std.experimental.logger;
-
 alias SortedTokens = SortedRange!(const(Token)[], "a < b");
 
+struct ExpressionInfo
+{
+    const(DSymbol)* type;
+    bool assumingLvalue; // We only assume else we need to do life time analysis.
+    bool isFromFunction;
+    string name;
+}
+
 enum CompletionContext
 {
     UnknownCompletion,
@@ -128,8 +135,8 @@ private const(DSymbol)* deduceExpressionType(
             symbolNameToTypeName(STRING_LITERAL_SYMBOL_NAME), cursorPosition);
     }
 
-    auto currentType =
-        deduceSymbolTypeByToken(completionScope, *firstToken, cursorPosition);
+    auto currentType = deduceSymbolTypeByToken(completionScope, *firstToken, cursorPosition);
+
 
     if (currentType is null)
         return null;
@@ -174,8 +181,18 @@ private const(DSymbol)* deduceExpressionType(
             auto name = istring(exprTokens[i + 1].text);
 
             // Get UFCS candidates for current type
+            ExpressionInfo beforeDotType;
+            beforeDotType.type = currentType;
+            beforeDotType.assumingLvalue = false;
+            // check if there it's from a function
+            auto functionSymbol = completionScope.getFirstSymbolByNameAndCursor(istring(firstToken.text), cursorPosition);
+            if (functionSymbol) {
+                beforeDotType.isFromFunction = functionSymbol.qualifier == SymbolQualifier.func;
+                beforeDotType.name = functionSymbol.name;
+            }
+
             auto candidates = getUFCSSymbolsForDotCompletion(
-                currentType,
+                beforeDotType,
                 completionScope,
                 cursorPosition,
                 ""
@@ -207,23 +224,6 @@ private const(DSymbol)* deduceExpressionType(
     return currentType;
 }
 
-void printTokenType(const(Token)* token)
-{
-    if (token is null)
-    {
-        return;
-    }
-    switch (token.type)
-    {
-    case tok!"":
-
-        break;
-
-    default:
-        break;
-    }
-}
-
 private const(DSymbol)* deduceSymbolTypeByToken(Scope* completionScope, scope ref const(Token) significantToken, size_t cursorPosition)
 {
 
@@ -429,14 +429,15 @@ DSymbol*[] getUFCSSymbolsForCursor(Scope* completionScope, scope ref const(Token
         return [];
     }
 
-    const(DSymbol)* deducedSymbolType = deduceExpressionType(completionScope, tokenCursorResult.expressionTokens, cursorPosition);
+    ExpressionInfo deducedSymbolType;
+    deducedSymbolType.type = deduceExpressionType(completionScope, tokenCursorResult.expressionTokens, cursorPosition);
 
-    if (deducedSymbolType is null)
+    if (deducedSymbolType.type is null)
     {
         return [];
     }
 
-    if (deducedSymbolType.isInvalidForUFCSCompletion)
+    if (deducedSymbolType.type.isInvalidForUFCSCompletion)
     {
         trace("CursorSymbolType isn't valid for UFCS completion");
         return [];
@@ -454,7 +455,7 @@ DSymbol*[] getUFCSSymbolsForCursor(Scope* completionScope, scope ref const(Token
 
 }
 
-private DSymbol*[] getUFCSSymbolsForDotCompletion(const(DSymbol)* symbolType, Scope* completionScope, size_t cursorPosition, string partial)
+private DSymbol*[] getUFCSSymbolsForDotCompletion(ExpressionInfo symbolType, Scope* completionScope, size_t cursorPosition, string partial)
 {
     // local appender
     FilteredAppender!((DSymbol* a) =>
@@ -472,7 +473,7 @@ private DSymbol*[] getUFCSSymbolsForDotCompletion(const(DSymbol)* symbolType, Sc
     return localAppender.data ~ globalAppender.data;
 }
 
-private DSymbol*[] getUFCSSymbolsForParenCompletion(const(DSymbol)* symbolType, Scope* completionScope, istring searchWord, size_t cursorPosition)
+private DSymbol*[] getUFCSSymbolsForParenCompletion(ExpressionInfo symbolType, Scope* completionScope, istring searchWord, size_t cursorPosition)
 {
     // local appender
     FilteredAppender!(a => a.isCallableWithArg(symbolType) && a.name.among(searchWord), DSymbol*[]) localAppender;
@@ -644,10 +645,10 @@ private bool matchSymbolType(const(DSymbol)* firstParameter, const(DSymbol)* sig
  *     `true` if `incomingSymbols`' first parameter matches `beforeDotType`
  *     `false` otherwise
  */
-bool isCallableWithArg(const(DSymbol)* incomingSymbol, const(DSymbol)* beforeDotType, bool isGlobalScope = false)
+bool isCallableWithArg(const(DSymbol)* incomingSymbol, ExpressionInfo beforeDotType, bool isGlobalScope = false)
 {
     if (incomingSymbol is null
-        || beforeDotType is null
+        || beforeDotType.type is null
         || isGlobalScope && incomingSymbol.protection is tok!"private") // don't show private functions if we are in global scope
         {
         return false;
@@ -656,7 +657,8 @@ bool isCallableWithArg(const(DSymbol)* incomingSymbol, const(DSymbol)* beforeDot
     if (incomingSymbol.kind is CompletionKind.functionName && !incomingSymbol.functionParameters.empty && incomingSymbol
         .functionParameters.front.type)
     {
-        return matchSymbolType(incomingSymbol.functionParameters.front, beforeDotType);
+        auto firstParam = incomingSymbol.functionParameters.front;
+        return matchSymbolType(firstParam, beforeDotType.type);
     }
     return false;
 }

tests/tc_ufcs_function_chaining_completion/expected_completion_test.txt

@@ -5,6 +5,9 @@ baz	F
 foo	F
 init	k
 mangleof	k
+qux	F
+refFoo	F
+refFoo2	F
 sizeof	k
 stringof	k
 tupleof	k

tests/tc_ufcs_function_chaining_completion/expected_completion_test2.txt

@@ -0,0 +1,7 @@
+identifiers
+bar	F
+baz	F
+foo	F
+qux	F
+refFoo	F
+refFoo2	F

tests/tc_ufcs_function_chaining_completion/expected_completion_test3.txt

@@ -0,0 +1,7 @@
+identifiers
+bar	F
+baz	F
+foo	F
+qux	F
+refFoo	F
+refFoo2	F

tests/tc_ufcs_function_chaining_completion/expected_completion_test4.txt

@@ -0,0 +1,7 @@
+identifiers
+bar	F
+baz	F
+foo	F
+qux	F
+refFoo	F
+refFoo2	F

tests/tc_ufcs_function_chaining_completion/expected_completion_test5.txt

@@ -0,0 +1,13 @@
+identifiers
+alignof	k
+bar	F
+baz	F
+foo	F
+init	k
+mangleof	k
+qux	F
+refFoo	F
+refFoo2	F
+sizeof	k
+stringof	k
+tupleof	k

tests/tc_ufcs_function_chaining_completion/file.d

@@ -11,9 +11,41 @@ Foo baz(Foo f) {
 	return f;
 }
 
+Foo qux(Foo f) {
+	return f;
+}
+
+ref refFoo(ref Foo f) {
+	return f;
+}
+
+ref refFoo2(ref Foo f) {
+	return f;
+}
 
 void main()
 {
 	Foo f;
 	Foo foo = baz(f.foo().bar()).
-}
+}
+
+void another() {
+	Foo f;
+	Foo foo = f.foo().bar().baz().
+}
+
+void yetAnother() {
+	Foo f;
+	Foo foo = f.foo.bar().baz.qux.
+}
+
+void justAnother() {
+	Foo f;
+	Foo foo = f.foo().baz().qux()
+	.
+}
+
+void refTest() {
+	Foo f;
+	f.
+}

tests/tc_ufcs_function_chaining_completion/run.sh

@@ -1,5 +1,17 @@
 set -e
 set -u
 
-../../bin/dcd-client $1 -c158 file.d > actual_completion_test.txt
-diff actual_completion_test.txt expected_completion_test.txt
+../../bin/dcd-client $1 -c265 file.d > actual_completion_test.txt
+diff actual_completion_test.txt expected_completion_test.txt --strip-trailing-cr
+
+../../bin/dcd-client $1 -c325 file.d > actual_completion_test2.txt
+diff actual_completion_test2.txt expected_completion_test2.txt --strip-trailing-cr
+
+../../bin/dcd-client $1 -c388 file.d > actual_completion_test3.txt
+diff actual_completion_test3.txt expected_completion_test3.txt --strip-trailing-cr
+
+../../bin/dcd-client $1 -c454 file.d > actual_completion_test4.txt
+diff actual_completion_test4.txt expected_completion_test4.txt --strip-trailing-cr
+
+../../bin/dcd-client $1 -c486 file.d > actual_completion_test5.txt
+diff actual_completion_test5.txt expected_completion_test5.txt --strip-trailing-cr