optimize source location

CsCherrYY · CsCherrYY · commit 922df185e82c · 2021-09-06T15:12:23.000+08:00
Signed-off-by: Shi Chen &lt;chenshi@microsoft.com&gt;
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/HashCodeEqualsHandler.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/HashCodeEqualsHandler.java
@@ -22,15 +22,19 @@
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.dom.IMethodBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.IVariableBinding;
+import org.eclipse.jdt.core.dom.NodeFinder;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.jdt.core.manipulation.CoreASTProvider;
 import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
 import org.eclipse.jdt.internal.corext.codemanipulation.GenerateHashCodeEqualsOperation;
 import org.eclipse.jdt.internal.corext.dom.ASTNodes;
 import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
+import org.eclipse.jdt.ls.core.internal.corrections.DiagnosticsHelper;
 import org.eclipse.jdt.ls.core.internal.handlers.JdtDomModels.LspVariableBinding;
 import org.eclipse.jdt.ls.core.internal.preferences.Preferences;
 import org.eclipse.jdt.ls.core.internal.text.correction.SourceAssistProcessor;
@@ -113,8 +117,10 @@ public static TextEdit generateHashCodeEqualsTextEdit(IType type, LspVariableBin
 				CodeGenerationSettings codeGenSettings = new CodeGenerationSettings();
 				codeGenSettings.createComments = generateComments;
 				codeGenSettings.overrideAnnotation = true;
+				ASTNode node = NodeFinder.perform(astRoot, DiagnosticsHelper.getStartOffset(type.getCompilationUnit(), cursor), DiagnosticsHelper.getLength(type.getCompilationUnit(), cursor));
+				ASTNode declarationNode = SourceAssistProcessor.getDeclarationNode(node);
 				// If cursor position is not specified, then insert to the last by default.
-				IJavaElement insertPosition = CodeGenerationUtils.findInsertElement(type, cursor);
+				IJavaElement insertPosition = (declarationNode instanceof TypeDeclaration) ? CodeGenerationUtils.findInsertElement(type, null) : CodeGenerationUtils.findInsertElement(type, cursor);
 				GenerateHashCodeEqualsOperation operation = new GenerateHashCodeEqualsOperation(typeBinding, variableBindings, astRoot, insertPosition, codeGenSettings, useInstanceof, useJava7Objects, regenerate, false, false);
 				operation.setUseBlocksForThen(useBlocks);
 				operation.run(null);
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/SourceAssistProcessor.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/SourceAssistProcessor.java
@@ -573,7 +573,7 @@ public static ICompilationUnit getCompilationUnit(CodeActionParams params) {
 		return JDTUtils.resolveCompilationUnit(params.getTextDocument().getUri());
 	}
 
-	private static ASTNode getDeclarationNode(ASTNode node) {
+	public static ASTNode getDeclarationNode(ASTNode node) {
 		if (node == null) {
 			return null;
 		}

Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,7 @@ public static ICompilationUnit getCompilationUnit(CodeActionParams params) {`
`573`	`573`	`return JDTUtils.resolveCompilationUnit(params.getTextDocument().getUri());`
`574`	`574`	`}`
`575`	`575`
`576`		`- private static ASTNode getDeclarationNode(ASTNode node) {`
	`576`	`+ public static ASTNode getDeclarationNode(ASTNode node) {`
`577`	`577`	`if (node == null) {`
`578`	`578`	`return null;`
`579`	`579`	`}`