update option version before merging

Signed-off-by: Shi Chen <[email protected]>
eclipse-jdtls · Apr 13, 2023 · 8f0efa4 · 8f0efa4
1 parent dafe585
commit 8f0efa4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...se.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/FormatterPreferences.java b/...se.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/FormatterPreferences.java
@@ -16,9 +16,12 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
+import org.eclipse.jdt.internal.ui.preferences.formatter.ProfileVersionerCore;
 
 public class FormatterPreferences {
 
+	private static final int CURRENT_VERSION = 23;
+
 	// @formatter:off
 	// < JDTLS settings, eclipse settings >
 	private static Map<String, String> eclipseOptions = Map.ofEntries(
@@ -78,13 +81,14 @@ public class FormatterPreferences {
 	 * @return the converted eclipse formatter options
 	 */
 	public static Map<String, String> toEclipseOptions(Map<String, String> lsOptions) {
-		return lsOptions.entrySet().stream().filter(option -> eclipseOptions.containsKey(option.getKey())).collect(Collectors.toMap(option -> eclipseOptions.get(option.getKey()), option -> {
+		Map<String, String> options = lsOptions.entrySet().stream().filter(option -> eclipseOptions.containsKey(option.getKey())).collect(Collectors.toMap(option -> eclipseOptions.get(option.getKey()), option -> {
 			String value = option.getValue();
 			if (valueMap.containsKey(value)) {
 				return valueMap.get(value);
 			}
 			return value;
 		}));
+		return ProfileVersionerCore.updateAndComplete(options, CURRENT_VERSION);
 	}
 
 	/**