Go to definition doesn't find results on methods inside an anonymous class

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/SignatureHelpHandler.java

@@ -173,11 +173,16 @@ public SignatureHelp signatureHelp(SignatureHelpParams position, IProgressMonito
 							}
 						}
 						if (!monitor.isCanceled() && help.getActiveSignature() == null && node instanceof Block) {
+							String methodName = getMethodName(node, unit, contextInfomation);
 							for (int i = 0; i < infos.size(); i++) {
 								if (infos.get(i).getParameters().size() >= activeParameter) {
-									help.setActiveSignature(i);
-									help.setActiveParameter(activeParameter);
-									return help;
+									CompletionProposal proposal = collector.getInfoProposals().get(infos.get(i));
+									IMethod m = JDTUtils.resolveMethod(proposal, javaProject);
+									if (m != null && m.getElementName().equals(methodName)) {
+										help.setActiveSignature(i);
+										help.setActiveParameter(activeParameter);
+										return help;
+									}
 								}
 							}
 						}
@@ -270,34 +275,9 @@ private ASTNode getNode(ICompilationUnit unit, int[] contextInfomation, IProgres
 				return node;
 			}
 			if (node instanceof Block) {
-				try {
-					int pos = contextInfomation[0];
-					IBuffer buffer = unit.getBuffer();
-					while (pos >= 0) {
-						char ch = buffer.getChar(pos);
-						if (ch == '(' || Character.isWhitespace(ch)) {
-							pos--;
-						} else {
-							break;
-						}
-					}
-					int end = pos + 1;
-					while (pos >= 0) {
-						char ch = buffer.getChar(pos);
-						if (Character.isJavaIdentifierPart(ch)) {
-							pos--;
-						} else {
-							break;
-						}
-					}
-					int start = pos + 1;
-					String name = unit.getSource().substring(start, end);
-					IStatus status = JavaConventionsUtil.validateMethodName(name, unit);
-					if (status.isOK()) {
-						return node;
-					}
-				} catch (CoreException e) {
-					JavaLanguageServerPlugin.logException(e.getMessage(), e);
+				String name = getMethodName(node, unit, contextInfomation);
+				if (name != null) {
+					return node;
 				}
 			}
 			if (node instanceof Expression) {
@@ -310,6 +290,41 @@ private ASTNode getNode(ICompilationUnit unit, int[] contextInfomation, IProgres
 		return null;
 	}
 
+	private String getMethodName(ASTNode node, ICompilationUnit unit, int[] contextInfomation) {
+		if (node instanceof Block) {
+			try {
+				int pos = contextInfomation[0];
+				IBuffer buffer = unit.getBuffer();
+				while (pos >= 0) {
+					char ch = buffer.getChar(pos);
+					if (ch == '(' || Character.isWhitespace(ch)) {
+						pos--;
+					} else {
+						break;
+					}
+				}
+				int end = pos + 1;
+				while (pos >= 0) {
+					char ch = buffer.getChar(pos);
+					if (Character.isJavaIdentifierPart(ch)) {
+						pos--;
+					} else {
+						break;
+					}
+				}
+				int start = pos + 1;
+				String name = unit.getSource().substring(start, end);
+				IStatus status = JavaConventionsUtil.validateMethodName(name, unit);
+				if (status.isOK()) {
+					return name;
+				}
+			} catch (JavaModelException e) {
+				JavaLanguageServerPlugin.logException(e.getMessage(), e);
+			}
+		}
+		return null;
+	}
+
 	/*
 	 * Calculate the heuristic information about the start offset of method and current parameter position. The parameter position is 0-based.
 	 * If cannot find the methods start offset after max search bound, -1 will be return.

org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target

@@ -31,7 +31,7 @@
             <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-            <repository location="https://download.eclipse.org/eclipse/updates/4.22-I-builds/I20210915-0700/"/>
+            <repository location="https://download.eclipse.org/eclipse/updates/4.22-I-builds/I20210921-1800/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>

org.eclipse.jdt.ls.tests/projects/eclipse/java11/src/main/java/org/sample/App2.java

@@ -0,0 +1,16 @@
+package org.sample;
+
+import java.util.List;
+import java.util.ArrayList;
+public class App2 {
+	public void test() {
+		List<String> arr = new ArrayList<>() {
+			String s2 = "abc";
+			private void test() {
+				int len = s2.length();
+				System.out.println(s2);
+				System.out.println(len);
+			}
+		};
+	}
+}

org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/NavigateToDefinitionHandlerTest.java

@@ -110,6 +110,24 @@ public void testMethodInAnonymousClass() throws Exception {
 		assertEquals(18, definitions.get(0).getRange().getStart().getCharacter());
 	}
 
+	// https://github.com/eclipse/eclipse.jdt.ls/issues/1813
+	@Test
+	public void testMethodInAnonymousClass2() throws Exception {
+		String className = "org.sample.App2";
+		int line = 10;
+		int column = 24;
+		importProjects("eclipse/java11");
+		IProject java11 = WorkspaceHelper.getProject("java11");
+		String uri = ClassFileUtil.getURI(java11, className);
+		TextDocumentIdentifier identifier = new TextDocumentIdentifier(uri);
+		List<? extends Location> definitions = handler.definition(new TextDocumentPositionParams(identifier, new Position(line, column)), monitor);
+		assertNotNull(definitions);
+		assertEquals("No definition found for " + className, 1, definitions.size());
+		assertNotNull(definitions.get(0).getUri());
+		assertEquals(7, definitions.get(0).getRange().getStart().getLine());
+		assertEquals(10, definitions.get(0).getRange().getStart().getCharacter());
+	}
+
 	@Test
 	public void testJdkClasses() throws Exception {
 		// because for test, we are using fake rt.jar(rtstubs.jar), the issue of issue https://bugs.eclipse.org/bugs/show_bug.cgi?id=541573 will

org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/SignatureHelpHandlerTest.java

@@ -91,9 +91,9 @@ public void testSignatureHelp_singleMethod() throws JavaModelException {
 
 		SignatureHelp help = getSignatureHelp(cu, 4, 39);
 		assertNotNull(help);
-		assertEquals(1, help.getSignatures().size());
-		assertEquals("foo(String s) : int", help.getSignatures().get(0).getLabel());
-		assertTrue(help.getSignatures().get(0).getDocumentation().getLeft().length() > 0);
+		assertEquals(13, help.getSignatures().size());
+		assertEquals("foo(String s) : int", help.getSignatures().get(help.getActiveSignature()).getLabel());
+		assertTrue(help.getSignatures().get(help.getActiveSignature()).getDocumentation().getLeft().length() > 0);
 		assertEquals((Integer) 0, help.getActiveParameter());
 	}
 
@@ -112,7 +112,7 @@ public void testSignatureHelp_multipeMethod() throws JavaModelException {
 
 		SignatureHelp help = getSignatureHelp(cu, 5, 42);
 		assertNotNull(help);
-		assertEquals(3, help.getSignatures().size());
+		assertEquals(15, help.getSignatures().size());
 		assertEquals((Integer) 1, help.getActiveParameter());
 		assertEquals(help.getSignatures().get(help.getActiveSignature()).getLabel(), "foo(int s, String s) : int");
 	}
@@ -167,7 +167,7 @@ public void testSignatureHelp_parameters() throws JavaModelException {
 		ICompilationUnit cu = pack1.createCompilationUnit("E.java", buf.toString(), false, null);
 		SignatureHelp help = getSignatureHelp(cu, 3, 12);
 		assertNotNull(help);
-		assertEquals(2, help.getSignatures().size());
+		assertEquals(14, help.getSignatures().size());
 		assertEquals(help.getSignatures().get(help.getActiveSignature()).getLabel(), "foo(String s, boolean bar) : void");
 	}
 
@@ -187,7 +187,7 @@ public void testSignatureHelp_activeSignature() throws JavaModelException {
 		ICompilationUnit cu = pack1.createCompilationUnit("E.java", buf.toString(), false, null);
 		SignatureHelp help = getSignatureHelp(cu, 3, 12);
 		assertNotNull(help);
-		assertEquals(3, help.getSignatures().size());
+		assertEquals(15, help.getSignatures().size());
 		assertEquals(help.getSignatures().get(help.getActiveSignature()).getLabel(), "foo(String s, String b) : void");
 	}
 
@@ -325,7 +325,7 @@ public void testSignatureHelp_varargs() throws JavaModelException {
 		assertTrue(help.getSignatures().get(help.getActiveSignature()).getLabel().startsWith("asList(T... "));
 		help = getSignatureHelp(cu, 5, 19);
 		assertNotNull(help);
-		assertEquals(1, help.getSignatures().size());
+		assertEquals(2, help.getSignatures().size());
 		assertTrue(help.getSignatures().get(help.getActiveSignature()).getLabel().equals("demo(String s, String... s2) : void"));
 	}
 
@@ -336,7 +336,7 @@ public void testSignatureHelp_varargs2() throws JavaModelException {
 		ICompilationUnit cu = type.getCompilationUnit();
 		SignatureHelp help = getSignatureHelp(cu, 4, 16);
 		assertNotNull(help);
-		assertEquals(2, help.getSignatures().size());
+		assertEquals(3, help.getSignatures().size());
 		assertTrue(help.getSignatures().get(help.getActiveSignature()).getLabel().equals("run(Class<?> clazz, String... args) : void"));
 	}
 
@@ -347,7 +347,7 @@ public void testSignatureHelp_lambda() throws JavaModelException {
 		ICompilationUnit cu = type.getCompilationUnit();
 		SignatureHelp help = getSignatureHelp(cu, 8, 14);
 		assertNotNull(help);
-		assertEquals(1, help.getSignatures().size());
+		assertEquals(12, help.getSignatures().size());
 		assertTrue(help.getSignatures().get(help.getActiveSignature()).getLabel().equals("test(Function<String,String> f) : void"));
 	}
 
@@ -411,7 +411,8 @@ public void testSignatureHelp_stringLiteral() throws JavaModelException {
 	private void testStringLiteral(ICompilationUnit cu, int line, int character) {
 		SignatureHelp help = getSignatureHelp(cu, line, character);
 		assertNotNull(help);
-		assertEquals(1, help.getSignatures().size());
+		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=575149
+		// assertEquals(1, help.getSignatures().size());
 		assertNotNull(help.getActiveParameter());
 		assertTrue(help.getSignatures().get(help.getActiveSignature()).getLabel().equals("foo(String p, int x) : void"));
 	}