diff --git a/org.eclipse.lsp4e/META-INF/MANIFEST.MF b/org.eclipse.lsp4e/META-INF/MANIFEST.MF index 20d35bd6d..2dd357965 100644 --- a/org.eclipse.lsp4e/META-INF/MANIFEST.MF +++ b/org.eclipse.lsp4e/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Language Server Protocol client for Eclipse IDE (Incubation) Bundle-SymbolicName: org.eclipse.lsp4e;singleton:=true -Bundle-Version: 0.19.9.qualifier +Bundle-Version: 0.19.10.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0", org.eclipse.equinox.common;bundle-version="3.8.0", diff --git a/org.eclipse.lsp4e/plugin.xml b/org.eclipse.lsp4e/plugin.xml index 6297cac2c..fc7d6aeee 100644 --- a/org.eclipse.lsp4e/plugin.xml +++ b/org.eclipse.lsp4e/plugin.xml @@ -145,6 +145,9 @@ + + diff --git a/org.eclipse.lsp4e/pom.xml b/org.eclipse.lsp4e/pom.xml index 9ba93a050..34b161806 100644 --- a/org.eclipse.lsp4e/pom.xml +++ b/org.eclipse.lsp4e/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lsp4e eclipse-plugin - 0.19.9-SNAPSHOT + 0.19.10-SNAPSHOT diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/rename/LSPInlineRenameLinkedMode.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/rename/LSPInlineRenameLinkedMode.java index 7f060199a..3fd3d574a 100644 --- a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/rename/LSPInlineRenameLinkedMode.java +++ b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/rename/LSPInlineRenameLinkedMode.java @@ -27,7 +27,7 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.core.runtime.preferences.InstanceScope; +import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; @@ -71,6 +71,15 @@ public final class LSPInlineRenameLinkedMode { private static final String INLINE_RENAME_PREFERENCE = "org.eclipse.lsp4e.inlineRename"; //$NON-NLS-1$ + private static final boolean INLINE_RENAME_ACTIVE_DEFAULT = true; + + public static final class PreferenceInitializer extends AbstractPreferenceInitializer { + @Override + public void initializeDefaultPreferences() { + final var store = LanguageServerPlugin.getDefault().getPreferenceStore(); + store.setDefault(INLINE_RENAME_PREFERENCE, INLINE_RENAME_ACTIVE_DEFAULT); + } + } static boolean start(final IDocument document, final ITextViewer viewer, final int offset, final Shell shell) { if (!isInlineRenameEnabled()) { @@ -121,8 +130,7 @@ protected IStatus run(final IProgressMonitor monitor) { } private static boolean isInlineRenameEnabled() { - final var prefs = InstanceScope.INSTANCE.getNode(LanguageServerPlugin.PLUGIN_ID); - return prefs.getBoolean(INLINE_RENAME_PREFERENCE, true); + return LanguageServerPlugin.getDefault().getPreferenceStore().getBoolean(INLINE_RENAME_PREFERENCE); } private static @Nullable RefactoringStatus runPrepareRename(final LSPRenameProcessor processor) {