Include array access in extract subroutine

libs/natls/src/main/java/org/amshove/natls/languageserver/LspUtil.java

@@ -3,6 +3,7 @@
 import org.amshove.natls.DiagnosticOriginalUri;
 import org.amshove.natparse.IDiagnostic;
 import org.amshove.natparse.IPosition;
+import org.amshove.natparse.NodeUtil;
 import org.amshove.natparse.lexing.SyntaxToken;
 import org.amshove.natparse.natural.INaturalModule;
 import org.amshove.natparse.natural.ISyntaxNode;
@@ -102,7 +103,7 @@ public static Range toRange(SyntaxToken token)
 	public static Range toRange(ISyntaxNode node)
 	{
 		var firstNode = node.descendants().first();
-		var lastNode = node.descendants().last();
+		var lastNode = NodeUtil.deepFindLeaf(node.descendants().last());
 		return new Range(
 			new Position(firstNode.position().line(), firstNode.position().offsetInLine()),
 			new Position(lastNode.position().line(), lastNode.position().offsetInLine() + lastNode.position().length())

libs/natls/src/test/java/org/amshove/natls/refactorings/ExtractSubroutineRefactoringShould.java

@@ -67,6 +67,37 @@ void extractASubroutineFromASingleStatementWhenCursorIsNotOnWholeStatement()
 				""");
 	}
 
+	@Test
+	void notForgetToExtractArrayAccesses()
+	{
+		assertCodeActionWithTitle(
+			"Extract inline subroutine", "LIBONE", "SUBN.NSN",
+			"""
+				DEFINE DATA LOCAL
+				1 #ARR (A10/*)
+				END-DEFINE
+				#A${R}$R(2) := #ARR(1)
+				END
+				"""
+		)
+			.resultsApplied("""
+				DEFINE DATA LOCAL
+				1 #ARR (A10/*)
+				END-DEFINE
+				PERFORM EXTRACTED
+				/***********************************************************************
+				DEFINE SUBROUTINE EXTRACTED
+				/***********************************************************************
+
+				#ARR(2) := #ARR(1)
+
+
+				END-SUBROUTINE
+
+				END
+				""");
+	}
+
 	@Test
 	void extractASubroutineFromMultipleStatements()
 	{