use data field in CodeAction

Signed-off-by: Shi Chen <[email protected]>

Author: CsCherrYY

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

@@ -226,15 +226,21 @@ private void populateDataFields(List<Either<Command, CodeAction>> codeActions) {
 		codeActions.forEach(action -> {
 			if (action.isRight()) {
 				Either<ChangeCorrectionProposal, CodeActionProposal> proposal = null;
-				if (action.getRight().getData() instanceof ChangeCorrectionProposal) {
-					proposal = Either.forLeft((ChangeCorrectionProposal) action.getRight().getData());
-				} else if (action.getRight().getData() instanceof CodeActionProposal) {
-					proposal = Either.forRight((CodeActionProposal) action.getRight().getData());
+				Object originalData = action.getRight().getData();
+				if (originalData instanceof CodeActionData) {
+					Object originalProposal = ((CodeActionData) originalData).getProposal();
+					if (originalProposal instanceof ChangeCorrectionProposal) {
+						proposal = Either.forLeft((ChangeCorrectionProposal) originalProposal);
+					} else if (originalProposal instanceof CodeActionProposal) {
+						proposal = Either.forRight((CodeActionProposal) originalProposal);
+					} else {
+						action.getRight().setData(null);
+						return;
+					}
 				} else {
 					action.getRight().setData(null);
 					return;
 				}
-
 				Map<String, String> data = new HashMap<>();
 				data.put(CodeActionResolveHandler.DATA_FIELD_REQUEST_ID, String.valueOf(response.getId()));
 				data.put(CodeActionResolveHandler.DATA_FIELD_PROPOSAL_ID, String.valueOf(proposals.size()));
@@ -277,7 +283,7 @@ private Optional<Either<Command, CodeAction>> getCodeActionFromProposal(ChangeCo
 			CodeAction codeAction = new CodeAction(name);
 			codeAction.setKind(proposal.getKind());
 			if (command == null) { // lazy resolve the edit.
-				codeAction.setData(proposal);
+				codeAction.setData(new CodeActionData(proposal));
 			} else {
 				codeAction.setCommand(command);
 			}
@@ -358,4 +364,27 @@ private static boolean containsKind(List<String> codeActionKinds, String baseKin
 		return codeActionKinds.stream().anyMatch(kind -> kind.startsWith(baseKind));
 	}
 
+	public static class CodeActionData {
+		private final Object proposal;
+		private final int priority;
+
+		public CodeActionData(Object proposal) {
+			this.proposal = proposal;
+			this.priority = 0;
+		}
+
+		public CodeActionData(Object proposal, int priority) {
+			this.proposal = proposal;
+			this.priority = priority;
+		}
+
+		public Object getProposal() {
+			return proposal;
+		}
+
+		public int getPriority() {
+			return priority;
+		}
+	}
+
 }

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/QuickAssistComparator.java

@@ -12,70 +12,39 @@
 *******************************************************************************/
 package org.eclipse.jdt.ls.core.internal.text.correction;
 
-import java.util.Arrays;
 import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
-import org.eclipse.jdt.ls.core.internal.Messages;
-import org.eclipse.jdt.ls.core.internal.corrections.CorrectionMessages;
+import org.eclipse.jdt.ls.core.internal.handlers.CodeActionHandler.CodeActionData;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.Command;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 
 public class QuickAssistComparator implements Comparator<Either<Command, CodeAction>> {
 
-	public enum ContextType {
-		FIELD_DECLARATION,
-		TYPE_DECLARATION,
-		IMPORT_DECLARATION
-	}
-
-	private List<String> prioritiesList;
-
-	private static Map<ContextType, List<String>> prioritiesMap = new HashMap<>();
-
-	static {
-		prioritiesMap.put(ContextType.FIELD_DECLARATION, Arrays.asList(
-			ActionMessages.GenerateGetterSetterAction_templateLabel,
-			ActionMessages.GenerateGetterAction_templateLabel,
-			ActionMessages.GenerateSetterAction_templateLabel,
-			ActionMessages.GenerateConstructorsAction_ellipsisLabel,
-			ActionMessages.GenerateConstructorsAction_label));
-
-		prioritiesMap.put(ContextType.TYPE_DECLARATION, Arrays.asList(
-			ActionMessages.GenerateConstructorsAction_ellipsisLabel,
-			ActionMessages.GenerateConstructorsAction_label,
-			ActionMessages.OverrideMethodsAction_label,
-			ActionMessages.GenerateGetterSetterAction_templateLabel,
-			ActionMessages.GenerateGetterAction_templateLabel,
-			ActionMessages.GenerateSetterAction_templateLabel,
-			ActionMessages.GenerateHashCodeEqualsAction_label,
-			ActionMessages.GenerateToStringAction_ellipsisLabel
-		));
-
-		prioritiesMap.put(ContextType.IMPORT_DECLARATION, Arrays.asList(
-			CorrectionMessages.ReorgCorrectionsSubProcessor_organizeimports_description
-		));
-	}
-
-	public QuickAssistComparator(ContextType contextType, String fieldName) {
-		this.prioritiesList = prioritiesMap.get(contextType).stream().map(message -> Messages.format(message, fieldName)).collect(Collectors.toList());
-	}
+	public static int ORGANIZE_IMPORTS_PRIORITY = 0;
+	public static int GENERATE_ACCESSORS_PRIORITY = 100;
+	public static int GENERATE_CONSTRUCTORS_PRIORITY = 200;
+	public static int GENERATE_HASHCODE_EQUALS_PRIORITY = 300;
+	public static int GENERATE_TOSTRING_PRIORITY = 400;
+	public static int GENERATE_OVERRIDE_IMPLEMENT_PRIORITY = 500;
+	public static int GENERATE_DELEGATE_METHOD_PRIORITY = 600;
+	public static int CHANGE_MODIFIER_TO_FINAL_PRIORITY = 700;
+	public static int MAX_PRIORITY = 1000;
 
 	public int compare(Either<Command, CodeAction> e1, Either<Command, CodeAction> e2) {
-		String title1 = e1.isLeft() ? e1.getLeft().getTitle() : e1.isRight() ? e1.getRight().getTitle() : null;
-		String title2 = e2.isLeft() ? e2.getLeft().getTitle() : e2.isRight() ? e2.getRight().getTitle() : null;
-		if (title1 == null || title2 == null) {
-			return 0;
-		}
-		int index1 = this.prioritiesList.indexOf(title1);
-		int index2 = this.prioritiesList.indexOf(title2);
-		if (index1 == -1 || index2 == -1) {
-			return 0;
+		if (e1.isRight() && e2.isRight()) {
+			Object data1 = e1.getRight().getData();
+			Object data2 = e2.getRight().getData();
+			if (data1 instanceof CodeActionData && data2 instanceof CodeActionData) {
+				int priority1 = ((CodeActionData) data1).getPriority();
+				int priority2 = ((CodeActionData) data2).getPriority();
+				return priority1 - priority2;
+			} else if (data1 instanceof CodeActionData) {
+				return -100;
+			} else if (data2 instanceof CodeActionData) {
+				return 100;
+			}
 		}
-		return index1 - index2;
+		return 0;
 	}
 }