Fix call hierarchy position resolution eclipse-jdtls#2771

Author: gayanper

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

@@ -162,7 +162,12 @@ private IMember getCallHierarchyElement(String uri, int line, int character, IPr
 		int offset = JsonRpcHelpers.toOffset(root, line, character);
 		List<IJavaElement> selectedElements = codeResolve(root, offset);
 		Stream<IJavaElement> possibleElements = selectedElements.stream().filter(CallHierarchyCore::isPossibleInputElement);
-		Optional<IJavaElement> firstElement = possibleElements.findFirst();
+		Optional<IJavaElement> firstElement = possibleElements.findFirst().flatMap(element -> {
+			if (element instanceof IType) {
+				return tryFindEnclosingMethod(root, line, character).or(() -> Optional.of(element));
+			}
+			return Optional.of(element);
+		});
 		if (firstElement.isPresent() && firstElement.get() instanceof IMember member) {
 			candidate = member;
 		}
@@ -175,6 +180,15 @@ private IMember getCallHierarchyElement(String uri, int line, int character, IPr
 		return candidate;
 	}
 
+	private Optional<IJavaElement> tryFindEnclosingMethod(ITypeRoot root, int line, int character) {
+		final int offset = JsonRpcHelpers.toOffset(root, line, character);
+		boolean atLineStart = JsonRpcHelpers.toOffset(root, line, 0) == offset;
+		if (atLineStart) {
+			return Optional.ofNullable(getEnclosingMember(root, offset));
+		}
+		return Optional.empty();
+	}
+
 	private List<CallHierarchyIncomingCall> getIncomingCallItemsAt(String uri, int line, int character, IProgressMonitor monitor) throws JavaModelException {
 		SubMonitor sub = SubMonitor.convert(monitor, 2);
 		IMember candidate = getCallHierarchyElement(uri, line, character, sub.split(1));