feat: provide completion for Resource Bundle keys

Signed-off-by: Fred Bricon <fbricon@gmail.com>

Author: fbricon

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/contentassist/ResourceBundleCompletionProposal.java

@@ -48,6 +48,7 @@
 import org.eclipse.jdt.ls.core.internal.contentassist.CompletionProposalRequestor;
 import org.eclipse.jdt.ls.core.internal.contentassist.CompletionProposalUtils;
 import org.eclipse.jdt.ls.core.internal.contentassist.JavadocCompletionProposal;
+import org.eclipse.jdt.ls.core.internal.contentassist.ResourceBundleCompletionProposal;
 import org.eclipse.jdt.ls.core.internal.contentassist.SnippetCompletionProposal;
 import org.eclipse.jdt.ls.core.internal.contentassist.SortTextHelper;
 import org.eclipse.jdt.ls.core.internal.preferences.PreferenceManager;
@@ -298,6 +299,9 @@ public boolean isCanceled() {
 						proposals.addAll(SnippetCompletionProposal.getSnippets(unit, collector, subMonitor));
 					}
 					proposals.addAll(new JavadocCompletionProposal().getProposals(unit, offset, collector, subMonitor));
+					if (manager.getPreferences().isResourceBundleCompletionEnabled()) {
+						proposals.addAll(new ResourceBundleCompletionProposal().getProposals(unit, offset, collector, subMonitor));
+					}
 				} catch (OperationCanceledException e) {
 					monitor.setCanceled(true);
 				}
@@ -307,6 +311,7 @@ public boolean isCanceled() {
 		List<CompletionItem> tempProposals = proposals.stream().filter(prop -> prop.getKind() == CompletionItemKind.Keyword || prop.getKind() == CompletionItemKind.Snippet).collect(Collectors.toList());
 		tempProposals.sort(LABEL_COMPARATOR);
 		int newSortText = SortTextHelper.CEILING;
+		boolean foundMatch = false;
 		for (int i = 0; i < tempProposals.size() - 1; i++) {
 			CompletionItem currentItem = tempProposals.get(i);
 			CompletionItem nextItem = tempProposals.get(i + 1);
@@ -319,10 +324,11 @@ public boolean isCanceled() {
 				}
 				if (tempSortText < newSortText) {
 					newSortText = tempSortText;
+					foundMatch = true;
 				}
 			}
 		}
-		if (newSortText != -1) {
+		if (foundMatch) {
 			String finalSortText = Integer.toString(newSortText);
 			tempProposals.stream().filter(prop -> prop.getKind() == CompletionItemKind.Snippet).forEach(p -> p.setSortText(finalSortText));
 		}

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

@@ -539,6 +539,11 @@ public class Preferences {
 	 */
 	public static final String CHAIN_COMPLETION_KEY = "java.completion.chain.enabled";
 
+	/**
+	 * Preference key to enable/disable resource bundle completion.
+	 */
+	public static final String RESOURCE_BUNDLE_COMPLETION_KEY = "java.completion.resourceBundle.enabled";
+
 	/**
 	 * Preference key to set the scope value to use when searching java code. Allowed value are
 	 * <ul>
@@ -717,6 +722,7 @@ public class Preferences {
 	private boolean telemetryEnabled;
 	private boolean validateAllOpenBuffersOnChanges;
 	private boolean chainCompletionEnabled;
+	private boolean resourceBundleCompletionEnabled;
 	private List<String> diagnosticFilter;
 	private SearchScope searchScope;
 	private boolean inlayHintsSuppressedWhenSameNameNumberedParameter;
@@ -977,6 +983,7 @@ public Preferences() {
 		extractInterfaceReplaceEnabled = false;
 		telemetryEnabled = false;
 		validateAllOpenBuffersOnChanges = true;
+		resourceBundleCompletionEnabled = true;
 		diagnosticFilter = new ArrayList<>();
 		searchScope = SearchScope.all;
 	}
@@ -1139,6 +1146,7 @@ public Preferences clone() {
 		prefs.telemetryEnabled = this.telemetryEnabled;
 		prefs.validateAllOpenBuffersOnChanges = this.validateAllOpenBuffersOnChanges;
 		prefs.chainCompletionEnabled = this.chainCompletionEnabled;
+		prefs.resourceBundleCompletionEnabled = this.resourceBundleCompletionEnabled;
 		prefs.searchScope = this.searchScope;
 
 		// Deep copy collections
@@ -1806,6 +1814,11 @@ public static Preferences updateFrom(Preferences existing, Map<String, Object> c
 			prefs.setChainCompletionEnabled(chainCompletionEnabled);
 		}
 
+		if (getValue(configuration, RESOURCE_BUNDLE_COMPLETION_KEY) != null) {
+			boolean resourceBundleCompletionEnabled = getBoolean(configuration, RESOURCE_BUNDLE_COMPLETION_KEY, existing.resourceBundleCompletionEnabled);
+			prefs.setResourceBundleCompletionEnabled(resourceBundleCompletionEnabled);
+		}
+
 		if (getValue(configuration, JAVA_DIAGNOSTIC_FILER) != null) {
 			List<String> diagnosticFilter = getList(configuration, JAVA_DIAGNOSTIC_FILER, existing.diagnosticFilter);
 			prefs.setDiagnosticFilter(diagnosticFilter);
@@ -2907,6 +2920,14 @@ public boolean isChainCompletionEnabled() {
 		return this.chainCompletionEnabled;
 	}
 
+	public void setResourceBundleCompletionEnabled(boolean resourceBundleCompletionEnabled) {
+		this.resourceBundleCompletionEnabled = resourceBundleCompletionEnabled;
+	}
+
+	public boolean isResourceBundleCompletionEnabled() {
+		return this.resourceBundleCompletionEnabled;
+	}
+
 	/**
 	 * update the null analysis options of all projects based on the null analysis mode
 	 * Returns the list of enabled clean ups.

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
+
+

org.eclipse.jdt.ls.tests/projects/eclipse/resourcebundle/.classpath

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>resourcebundle</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
+
+

org.eclipse.jdt.ls.tests/projects/eclipse/resourcebundle/.project

@@ -0,0 +1,14 @@
+package org.sample;
+
+import java.util.ResourceBundle;
+
+public class ResourceBundleTest {
+	private ResourceBundle bundle;
+
+	public void testResourceBundle() {
+		bundle = ResourceBundle.getBundle("resources.messages");
+		String value = bundle.getString("");
+	}
+}
+
+

org.eclipse.jdt.ls.tests/projects/eclipse/resourcebundle/src/org/sample/ResourceBundleTest.java

@@ -0,0 +1,15 @@
+# Resource bundle messages
+greeting.hello=Hello
+greeting.goodbye=Goodbye
+error.notfound=Not found
+error.unauthorized=Unauthorized access
+info.loading=Loading...
+info.success=Success
+user.name=Name
+user.email=Email
+user.phone=Phone
+app.title=Application Title
+app.version=Version
+message.multiline=This is a multiline message.\nIt has multiple lines.\nEach line should be displayed separately.
+
+

org.eclipse.jdt.ls.tests/projects/eclipse/resourcebundle/src/resources/messages.properties

@@ -0,0 +1,7 @@
+# English resource bundle messages
+greeting.hello=Hello
+greeting.goodbye=Goodbye
+error.notfound=Not found
+error.unauthorized=Unauthorized access
+
+

org.eclipse.jdt.ls.tests/projects/eclipse/resourcebundle/src/resources/messages_en.properties

@@ -0,0 +1,8 @@
+# Validation messages
+validation.required=This field is required
+validation.email=Invalid email address
+validation.phone=Invalid phone number
+validation.minlength=Minimum length is {0}
+validation.maxlength=Maximum length is {0}
+
+