[#120] Clangd options in preference/project properties not changeable (…

…#126) Provide explicit default scope
eclipse-cdt · Jun 14, 2023 · 22b3a89 · 22b3a89
1 parent 5973ee2
commit 22b3a89
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 23 deletions.
diff --git a/...cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.internal.clangd.ClangdConfigurationAccess.xml b/...cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.internal.clangd.ClangdConfigurationAccess.xml
@@ -3,7 +3,6 @@
    <service>
       <provide interface="org.eclipse.cdt.lsp.clangd.ClangdConfiguration"/>
    </service>
-   <reference cardinality="1..1" field="preferences" interface="org.eclipse.core.runtime.preferences.IPreferencesService" name="preferences"/>
    <reference cardinality="1..1" field="workspace" interface="org.eclipse.core.resources.IWorkspace" name="workspace"/>
    <implementation class="org.eclipse.cdt.lsp.internal.clangd.ClangdConfigurationAccess"/>
 </scr:component>
diff --git a/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdConfiguration.java b/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdConfiguration.java
@@ -28,6 +28,13 @@
  */
 public interface ClangdConfiguration {
 
+	/**
+	 * Returns the clangd defaults
+	 *
+	 * @return clangd defaults
+	 */
+	ClangdOptions defaults();
+
 	/**
 	 * Returns the clangd options for the given context like {@link IResource} or {@link URI}, must not return <code>null</code>
 	 * @param context to be adapter to the proper scope

diff --git a/...pse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdConfigurationAccess.java b/...pse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdConfigurationAccess.java
@@ -21,9 +21,9 @@
 import org.eclipse.cdt.lsp.clangd.ClangdQualifier;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IPreferenceMetadataStore;
-import org.eclipse.core.runtime.preferences.IPreferencesService;
 import org.eclipse.core.runtime.preferences.IScopeContext;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.core.runtime.preferences.OsgiPreferenceMetadataStore;
@@ -40,9 +40,6 @@ public final class ClangdConfigurationAccess implements ClangdConfiguration {
 	@Reference
 	private IWorkspace workspace;
 
-	@Reference
-	private IPreferencesService preferences;
-
 	public ClangdConfigurationAccess() {
 		this.qualifier = new ClangdQualifier().get();
 		this.metadata = new ClangdMetadataDefaults();
@@ -53,16 +50,21 @@ public ClangdMetadata metadata() {
 		return metadata;
 	}
 
+	@Override
+	public ClangdOptions defaults() {
+		return new ClangdPreferredOptions(qualifier, new IScopeContext[] { DefaultScope.INSTANCE }, metadata);
+	}
+
 	@Override
 	public ClangdOptions options(Object context) {
 		Optional<ProjectScope> project = projectScope(context);
 		IScopeContext[] scopes;
 		if (project.isPresent()) {
-			scopes = new IScopeContext[] { project.get(), InstanceScope.INSTANCE };
+			scopes = new IScopeContext[] { project.get(), InstanceScope.INSTANCE, DefaultScope.INSTANCE };
 		} else {
-			scopes = new IScopeContext[] { InstanceScope.INSTANCE };
+			scopes = new IScopeContext[] { InstanceScope.INSTANCE, DefaultScope.INSTANCE };
 		}
-		return new ClangdPreferredOptions(preferences, qualifier, scopes, metadata);
+		return new ClangdPreferredOptions(qualifier, scopes, metadata);
 	}
 
 	@Override

diff --git a/...clipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdMetadataDefaults.java b/...clipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdMetadataDefaults.java
@@ -47,7 +47,6 @@ public PreferenceMetadata<String> clangdPath() {
 	public PreferenceMetadata<Boolean> useTidy() {
 		return new PreferenceMetadata<>(Boolean.class, //
 				"use_tidy", //$NON-NLS-1$
-				//FIXME: AF: support override from vendor
 				true, //
 				"Enable clang-tidy diagnostics", //
 				"Enable clang-tidy diagnostics");

diff --git a/...clipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdPreferredOptions.java b/...clipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdPreferredOptions.java
@@ -20,21 +20,17 @@
 
 import org.eclipse.cdt.lsp.clangd.ClangdMetadata;
 import org.eclipse.cdt.lsp.clangd.ClangdOptions;
-import org.eclipse.core.runtime.preferences.IPreferencesService;
 import org.eclipse.core.runtime.preferences.IScopeContext;
 import org.eclipse.core.runtime.preferences.PreferenceMetadata;
 import org.eclipse.osgi.util.NLS;
 
 final class ClangdPreferredOptions implements ClangdOptions {
 
-	private final IPreferencesService service;
 	private final String qualifier;
 	private final IScopeContext[] scopes;
 	private final ClangdMetadata metadata;
 
-	ClangdPreferredOptions(IPreferencesService service, String qualifier, IScopeContext[] scopes,
-			ClangdMetadata metadata) {
-		this.service = Objects.requireNonNull(service);
+	ClangdPreferredOptions(String qualifier, IScopeContext[] scopes, ClangdMetadata metadata) {
 		this.qualifier = Objects.requireNonNull(qualifier);
 		this.scopes = Objects.requireNonNull(scopes);
 		this.metadata = Objects.requireNonNull(metadata);
@@ -80,7 +76,7 @@ private String stringValue(PreferenceMetadata<?> meta) {
 		for (int i = scopes.length - 1; i >= 0; i--) {
 			IScopeContext scope = scopes[i];
 			String previous = actual;
-			actual = service.getString(qualifier, meta.identifer(), previous, new IScopeContext[] { scope });
+			actual = scope.getNode(qualifier).get(meta.identifer(), previous);
 		}
 		return actual;
 	}

diff --git a/...dt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/editor/ClangdConfigurationPage.java b/...dt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/editor/ClangdConfigurationPage.java
@@ -17,6 +17,7 @@
 import java.util.Optional;
 
 import org.eclipse.cdt.lsp.clangd.ClangdConfiguration;
+import org.eclipse.cdt.lsp.clangd.ClangdOptions;
 import org.eclipse.cdt.lsp.internal.clangd.ResolveProjectScope;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ProjectScope;
@@ -113,7 +114,7 @@ protected Label createDescriptionLabel(Composite parent) {
 
 	private void specificSelected() {
 		enableProjectSpecificSettings(specific.getSelection());
-		refreshWidgets();
+		refreshWidgets(configuration.options(getElement()));
 	}
 
 	private Link createLink(Composite composite, String text) {
@@ -125,7 +126,7 @@ private Link createLink(Composite composite, String text) {
 			public void widgetSelected(SelectionEvent e) {
 				if (PreferencesUtil.createPreferenceDialogOn(getShell(), id, new String[] { id }, null)
 						.open() == Window.OK) {
-					refreshWidgets();
+					refreshWidgets(configuration.options(getElement()));
 				}
 			}
 		});
@@ -143,7 +144,7 @@ protected Control createContents(Composite parent) {
 		if (projectScope().isPresent()) {
 			enableProjectSpecificSettings(hasProjectSpecificOptions());
 		}
-		refreshWidgets();
+		refreshWidgets(configuration.options(getElement()));
 		Dialog.applyDialogFont(composite);
 		return composite;
 	}
@@ -156,9 +157,9 @@ private Control createPreferenceContent(Composite parent) {
 		return composite;
 	}
 
-	private void refreshWidgets() {
+	private void refreshWidgets(ClangdOptions options) {
 		setErrorMessage(null);
-		area.load(configuration.options(getElement()));
+		area.load(options);
 	}
 
 	private Optional<ProjectScope> projectScope() {
@@ -178,7 +179,7 @@ protected void performDefaults() {
 		} catch (BackingStoreException e) {
 			Platform.getLog(getClass()).error("Unable to restore default values.", e); //$NON-NLS-1$
 		}
-		refreshWidgets();
+		refreshWidgets(configuration.defaults());
 		super.performDefaults();
 	}
 
@@ -189,8 +190,7 @@ public boolean performOk() {
 			prefs = manager.getWorkingCopy(projectScope().get().getNode(configuration.qualifier()));
 			if (!useProjectSettings()) {
 				try {
-					String[] keys = prefs.keys();
-					for (String key : keys) {
+					for (String key : prefs.keys()) {
 						prefs.remove(key);
 					}
 				} catch (BackingStoreException e) {