Fix completion within functions (#439)

MarkusAmshove · Dec 1, 2023 · d931fd9 · d931fd9
2 parents 59a49d2 + cfc68e0
commit d931fd9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/libs/natls/src/test/java/org/amshove/natls/completion/CompleteEndpointShould.java b/libs/natls/src/test/java/org/amshove/natls/completion/CompleteEndpointShould.java
@@ -310,4 +310,20 @@ void filterVariableCompletionBasedOnTypedQualificationOnTriggerCharWhenVariables
 			""")
 			.assertContainsVariableCompleting("#VARIABLE :(A10) (SUB)", "#VARIABLE");
 	}
+
+	@Test
+	void containAFunctionsImplicitReturnVariable()
+	{
+		assertCompletions("LIBONE", "FUNC.NS7", """
+			DEFINE FUNCTION FUNC RETURNS (A1)
+			DEFINE DATA LOCAL
+			1 #VAR (A10)
+			END-DEFINE
+			${}$
+			END-FUNCTION
+			END
+			""")
+			.assertContainsVariable("FUNC :(A1) (FUNC)")
+			.assertContainsVariable("#VAR :(A10) (FUNC)");
+	}
 }
diff --git a/libs/natparse/src/main/java/org/amshove/natparse/parsing/DefineDataNode.java b/libs/natparse/src/main/java/org/amshove/natparse/parsing/DefineDataNode.java
@@ -156,6 +156,14 @@ protected void nodeAdded(BaseSyntaxNode node)
 		}
 	}
 
+	/**
+	 * Do not use this, exists temporarly for functions
+	 */
+	void addVariable(IVariableNode variable)
+	{
+		variables.add(variable);
+	}
+
 	private void addAllVariablesFromUsing(IUsingNode usingNode)
 	{
 		if (usingNode.defineData() == null)

diff --git a/libs/natparse/src/main/java/org/amshove/natparse/parsing/NaturalParser.java b/libs/natparse/src/main/java/org/amshove/natparse/parsing/NaturalParser.java
@@ -69,7 +69,9 @@ private NaturalModule parseModule(NaturalFile file, IModuleProvider moduleProvid
 			topLevelNodes.add(parseDefineData(tokens, moduleProvider, naturalModule));
 			if (file.getFiletype() == NaturalFileType.FUNCTION && naturalModule.defineData() != null && functionReturnVariable != null)
 			{
-				((DefineDataNode) naturalModule.defineData()).addNode(functionReturnVariable);
+				var defineData = (DefineDataNode) naturalModule.defineData();
+				defineData.addVariable(functionReturnVariable);
+				naturalModule.addReferencableNodes(List.of(functionReturnVariable));
 			}
 		}