Fix bean completion invocation case

Author: BoykoAlex

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeanCompletionProvider.java

@@ -66,7 +66,7 @@ public BeanCompletionProvider(JavaProjectFinder javaProjectFinder, SpringMetamod
 	@Override
 	public void provideCompletions(ASTNode node, int offset, TextDocument doc, Collection<ICompletionProposal> completions) {
 		if (config.isBeanInjectionCompletionEnabled() 
-				&& (node instanceof SimpleName || node instanceof Block || node instanceof FieldAccess)) {
+				&& (node instanceof SimpleName || node instanceof Block || node instanceof FieldAccess || node instanceof ThisExpression)) {
 			try {
 
 				if (node instanceof SimpleName) {

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/jpa/queries/JpqlSemanticTokens.java

@@ -50,7 +50,7 @@
 public class JpqlSemanticTokens implements SemanticTokensDataProvider {
 
 	private static List<String> TOKEN_TYPES = List.of("keyword", "type", "class", "string", "number", "operator",
-			"variable", "method", "regexp", "parameter");
+			"variable", "method", "parameter");
 
 	private final Optional<SpelSemanticTokens> optSpelTokens;
 

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/jpa/queries/MySqlSemanticTokens.java

@@ -46,7 +46,7 @@
 public class MySqlSemanticTokens implements SemanticTokensDataProvider {
 
 	private static List<String> TOKEN_TYPES = List.of("keyword", "type", "string", "number", "operator",
-			"variable", "regexp", "comment", "parameter", "method");
+			"variable", "comment", "parameter", "method");
 
 	private final Optional<SpelSemanticTokens> optSpelTokens;
 	private final Optional<Consumer<RecognitionException>> parseErrorHandler;

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaCompletionEngine.java

@@ -21,6 +21,7 @@
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.NodeFinder;
 import org.eclipse.jdt.core.dom.SimpleName;
+import org.eclipse.jdt.core.dom.ThisExpression;
 import org.springframework.ide.vscode.boot.java.snippets.JavaSnippetManager;
 import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache;
 import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionEngine;
@@ -90,7 +91,8 @@ private ASTNode findNode(TextDocument document, int offset, CompilationUnit cu)
 
 			if (numberOfSpaces > 0) {
 				ASTNode leftNode = NodeFinder.perform(cu, offset - numberOfSpaces, 0);
-				if (leftNode instanceof SimpleName && $MISSING$.equals(((SimpleName)leftNode).getIdentifier())) {
+				if ((leftNode instanceof SimpleName && $MISSING$.equals(((SimpleName)leftNode).getIdentifier()))
+						|| leftNode instanceof ThisExpression) {
 					node = leftNode;
 				}
 			}

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/BeanCompletionProviderTest.java

@@ -1069,6 +1069,47 @@ public TestBeanCompletionClass(OwnerRepository ownerRepository) {
 				""");
 	}
 
+	@Test
+	public void methodReturnStatementAfterThisStatementWithoutPrefix() throws Exception {
+		String content = """
+				package org.sample.test;
+				
+				import org.springframework.web.bind.annotation.RestController;
+				
+				@RestController
+				public class TestBeanCompletionClass {
+					String TestBeanCompletionClass() {
+						this.<*>
+						return new String("oo");
+					}
+				}
+				""";
+		
+		
+		assertCompletions(content, new String[] {"ownerRepository", "ownerService", "petService", "testIntBean", "visitRepository", "visitService"}, 0, 
+				"""
+				package org.sample.test;
+				
+				import org.springframework.samples.petclinic.owner.OwnerRepository;
+				import org.springframework.web.bind.annotation.RestController;
+				
+				@RestController
+				public class TestBeanCompletionClass {
+				
+				    private final OwnerRepository ownerRepository;
+					
+				    TestBeanCompletionClass(OwnerRepository ownerRepository) {
+				        this.ownerRepository = ownerRepository;
+				    }
+					String TestBeanCompletionClass() {
+						this.ownerRepository<*>
+						return new String("oo");
+					}
+				}
+				""");
+	}
+
+	
 	@Test
 	public void constructorNoThisNoPrefix() throws Exception {
 		String content = """