Preference store per language

Signed-off-by: azerr <[email protected]>
eclipse-wildwebdeveloper · Nov 2, 2022 · 0cf7dfe · 0cf7dfe
1 parent f002ea8
commit 0cf7dfe
Show file tree

Hide file tree

Showing 35 changed files with 135 additions and 58 deletions.
diff --git a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/Activator.java b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/Activator.java
@@ -12,10 +12,16 @@
  *******************************************************************************/
 package org.eclipse.wildwebdeveloper;
 
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
+import org.eclipse.wildwebdeveloper.css.CSSLanguageServer;
+import org.eclipse.wildwebdeveloper.html.HTMLLanguageServer;
+import org.eclipse.wildwebdeveloper.yaml.YAMLLanguageServer;
 import org.osgi.framework.BundleContext;
 
 /**
@@ -28,6 +34,12 @@ public class Activator extends AbstractUIPlugin {
 
 	// The shared instance
 	private static Activator plugin;
+
+	private ScopedPreferenceStore cssPreferenceStore;
+
+	private ScopedPreferenceStore htmlPreferenceStore;
+
+	private ScopedPreferenceStore yamlPreferenceStore;
 
 	/**
 	 * The constructor
@@ -57,8 +69,8 @@ public static Activator getDefault() {
 	}
 
 	/**
-	 * Returns the currently active workbench window shell or <code>null</code>
-	 * if none.
+	 * Returns the currently active workbench window shell or <code>null</code> if
+	 * none.
 	 *
 	 * @return the currently active workbench window shell or <code>null</code>
 	 */
@@ -69,10 +81,69 @@ public static Shell getShell() {
 			if (windows.length > 0) {
 				return windows[0].getShell();
 			}
-		}
-		else {
+		} else {
 			return window.getShell();
 		}
 		return null;
 	}
+
+	/**
+	 * Returns the CSS preference store.
+	 * 
+	 * @return the CSS preference store.
+	 */
+	public IPreferenceStore getCSSPreferenceStore() {
+		// Create the preference store lazily.
+		ScopedPreferenceStore result = cssPreferenceStore;
+		if (result == null) { // First check (no locking)
+			synchronized (this) {
+				result = cssPreferenceStore;
+				if (result == null) { // Second check (with locking)
+					cssPreferenceStore = result = new ScopedPreferenceStore(InstanceScope.INSTANCE,
+							CSSLanguageServer.LANGUAGE_SERVER_ID);
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Returns the HTML preference store.
+	 * 
+	 * @return the HTML preference store.
+	 */
+	public IPreferenceStore getHTMLPreferenceStore() {
+		// Create the preference store lazily.
+		ScopedPreferenceStore result = htmlPreferenceStore;
+		if (result == null) { // First check (no locking)
+			synchronized (this) {
+				result = htmlPreferenceStore;
+				if (result == null) { // Second check (with locking)
+					htmlPreferenceStore = result = new ScopedPreferenceStore(InstanceScope.INSTANCE,
+							HTMLLanguageServer.LANGUAGE_SERVER_ID);
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Returns the YAML preference store.
+	 * 
+	 * @return the YAML preference store.
+	 */
+	public IPreferenceStore getYAMLPreferenceStore() {
+		// Create the preference store lazily.
+		ScopedPreferenceStore result = yamlPreferenceStore;
+		if (result == null) { // First check (no locking)
+			synchronized (this) {
+				result = yamlPreferenceStore;
+				if (result == null) { // Second check (with locking)
+					yamlPreferenceStore = result = new ScopedPreferenceStore(InstanceScope.INSTANCE,
+							YAMLLanguageServer.LANGUAGE_SERVER_ID);
+				}
+			}
+		}
+		return result;
+	}
 }
diff --git a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/css/CSSLanguageServer.java b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/css/CSSLanguageServer.java
@@ -32,12 +32,12 @@
 
 public class CSSLanguageServer extends ProcessStreamConnectionProviderWithPreference {
 
-	private static final String CSS_LANGUAGE_SERVER_ID = "org.eclipse.wildwebdeveloper.css";
+	public static final String LANGUAGE_SERVER_ID = "org.eclipse.wildwebdeveloper.css";
 
 	private static final String[] SUPPORTED_SECTIONS = { "css", "scss", "less" };
 
 	public CSSLanguageServer() {
-		super(CSS_LANGUAGE_SERVER_ID, Activator.getDefault().getPreferenceStore(), SUPPORTED_SECTIONS);
+		super(LANGUAGE_SERVER_ID, Activator.getDefault().getCSSPreferenceStore(), SUPPORTED_SECTIONS);
 		List<String> commands = new ArrayList<>();
 		commands.add(NodeJSManager.getNodeJsLocation().getAbsolutePath());
 		try {

diff --git a/...oper/src/org/eclipse/wildwebdeveloper/css/ui/preferences/CSSCompletionPreferencePage.java b/...oper/src/org/eclipse/wildwebdeveloper/css/ui/preferences/CSSCompletionPreferencePage.java
@@ -43,6 +43,6 @@ public void createFieldEditors() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 }
diff --git a/...eveloper/src/org/eclipse/wildwebdeveloper/css/ui/preferences/CSSFormatPreferencePage.java b/...eveloper/src/org/eclipse/wildwebdeveloper/css/ui/preferences/CSSFormatPreferencePage.java
@@ -58,6 +58,6 @@ public void createFieldEditors() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 }
diff --git a/...developer/src/org/eclipse/wildwebdeveloper/css/ui/preferences/CSSHoverPreferencePage.java b/...developer/src/org/eclipse/wildwebdeveloper/css/ui/preferences/CSSHoverPreferencePage.java
@@ -42,6 +42,6 @@ public void createFieldEditors() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 }
diff --git a/...ldwebdeveloper/src/org/eclipse/wildwebdeveloper/css/ui/preferences/CSSPreferencePage.java b/...ldwebdeveloper/src/org/eclipse/wildwebdeveloper/css/ui/preferences/CSSPreferencePage.java
@@ -29,7 +29,7 @@ public CSSPreferencePage() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 
 	@Override

diff --git a/...per/src/org/eclipse/wildwebdeveloper/css/ui/preferences/CSSPreferenceServerConstants.java b/...per/src/org/eclipse/wildwebdeveloper/css/ui/preferences/CSSPreferenceServerConstants.java
@@ -70,7 +70,7 @@ public class CSSPreferenceServerConstants {
 	public static final String CSS_PREFERENCES_LINT_UNKNOWNATRULES = "css.lint.unknownAtRules";
 
 	public static Settings getGlobalSettings() {
-		Settings settings = new Settings(Activator.getDefault().getPreferenceStore());
+		Settings settings = new Settings(getPreferenceStore());
 
 		// Completion settings
 		settings.fillAsBoolean(CSS_PREFERENCES_COMPLETION_TRIGGER_PROPERTY_VALUE_COMPLETION);
@@ -117,7 +117,7 @@ public static Settings getGlobalSettings() {
 	}
 
 	public static void initializeDefaultPreferences() {
-		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+		IPreferenceStore store = getPreferenceStore();
 
 		// Server settings
 
@@ -174,4 +174,14 @@ public static void initializeDefaultPreferences() {
 	public static boolean isMatchCssSection(String section) {
 		return isMatchSection(section, CSS_SECTION);
 	}
+
+	/**
+	 * Returns the CSS preference store.
+	 * 
+	 * @return the CSS preference store.
+	 */
+	public static IPreferenceStore getPreferenceStore() {
+		return Activator.getDefault().getPreferenceStore();
+	}
+
 }
diff --git a/...oper/src/org/eclipse/wildwebdeveloper/css/ui/preferences/CSSValidationPreferencePage.java b/...oper/src/org/eclipse/wildwebdeveloper/css/ui/preferences/CSSValidationPreferencePage.java
@@ -101,6 +101,6 @@ private void addSeverityField(String name, String labelText) {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 }
diff --git a/...rc/org/eclipse/wildwebdeveloper/css/ui/preferences/less/LESSCompletionPreferencePage.java b/...rc/org/eclipse/wildwebdeveloper/css/ui/preferences/less/LESSCompletionPreferencePage.java
@@ -43,6 +43,6 @@ public void createFieldEditors() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 }
diff --git a/...er/src/org/eclipse/wildwebdeveloper/css/ui/preferences/less/LESSFormatPreferencePage.java b/...er/src/org/eclipse/wildwebdeveloper/css/ui/preferences/less/LESSFormatPreferencePage.java
@@ -58,6 +58,6 @@ public void createFieldEditors() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 }
diff --git a/...per/src/org/eclipse/wildwebdeveloper/css/ui/preferences/less/LESSHoverPreferencePage.java b/...per/src/org/eclipse/wildwebdeveloper/css/ui/preferences/less/LESSHoverPreferencePage.java
@@ -42,6 +42,6 @@ public void createFieldEditors() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 }
diff --git a/...eveloper/src/org/eclipse/wildwebdeveloper/css/ui/preferences/less/LESSPreferencePage.java b/...eveloper/src/org/eclipse/wildwebdeveloper/css/ui/preferences/less/LESSPreferencePage.java
@@ -29,7 +29,7 @@ public LESSPreferencePage() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 
 	@Override

diff --git a/...c/org/eclipse/wildwebdeveloper/css/ui/preferences/less/LESSPreferenceServerConstants.java b/...c/org/eclipse/wildwebdeveloper/css/ui/preferences/less/LESSPreferenceServerConstants.java
@@ -70,7 +70,7 @@ public class LESSPreferenceServerConstants {
 	public static final String LESS_PREFERENCES_LINT_UNKNOWNATRULES = "less.lint.unknownAtRules";
 
 	public static Settings getGlobalSettings() {
-		Settings settings = new Settings(Activator.getDefault().getPreferenceStore());
+		Settings settings = new Settings(Activator.getDefault().getCSSPreferenceStore());
 
 		// Completion settings
 		settings.fillAsBoolean(LESS_PREFERENCES_COMPLETION_TRIGGER_PROPERTY_VALUE_COMPLETION);
@@ -117,7 +117,7 @@ public static Settings getGlobalSettings() {
 	}
 
 	public static void initializeDefaultPreferences() {
-		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+		IPreferenceStore store = Activator.getDefault().getCSSPreferenceStore();
 
 		// Server settings
 

diff --git a/...rc/org/eclipse/wildwebdeveloper/css/ui/preferences/less/LESSValidationPreferencePage.java b/...rc/org/eclipse/wildwebdeveloper/css/ui/preferences/less/LESSValidationPreferencePage.java
@@ -102,6 +102,6 @@ private void addSeverityField(String name, String labelText) {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 }
diff --git a/...rc/org/eclipse/wildwebdeveloper/css/ui/preferences/scss/SCSSCompletionPreferencePage.java b/...rc/org/eclipse/wildwebdeveloper/css/ui/preferences/scss/SCSSCompletionPreferencePage.java
@@ -43,6 +43,6 @@ public void createFieldEditors() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 }
diff --git a/...er/src/org/eclipse/wildwebdeveloper/css/ui/preferences/scss/SCSSFormatPreferencePage.java b/...er/src/org/eclipse/wildwebdeveloper/css/ui/preferences/scss/SCSSFormatPreferencePage.java
@@ -58,6 +58,6 @@ public void createFieldEditors() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 }
diff --git a/...per/src/org/eclipse/wildwebdeveloper/css/ui/preferences/scss/SCSSHoverPreferencePage.java b/...per/src/org/eclipse/wildwebdeveloper/css/ui/preferences/scss/SCSSHoverPreferencePage.java
@@ -42,6 +42,6 @@ public void createFieldEditors() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 }
diff --git a/...eveloper/src/org/eclipse/wildwebdeveloper/css/ui/preferences/scss/SCSSPreferencePage.java b/...eveloper/src/org/eclipse/wildwebdeveloper/css/ui/preferences/scss/SCSSPreferencePage.java
@@ -29,7 +29,7 @@ public SCSSPreferencePage() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 
 	@Override

diff --git a/...c/org/eclipse/wildwebdeveloper/css/ui/preferences/scss/SCSSPreferenceServerConstants.java b/...c/org/eclipse/wildwebdeveloper/css/ui/preferences/scss/SCSSPreferenceServerConstants.java
@@ -70,7 +70,7 @@ public class SCSSPreferenceServerConstants {
 	public static final String SCSS_PREFERENCES_LINT_UNKNOWNATRULES = "scss.lint.unknownAtRules";
 
 	public static Settings getGlobalSettings() {
-		Settings settings = new Settings(Activator.getDefault().getPreferenceStore());
+		Settings settings = new Settings(Activator.getDefault().getCSSPreferenceStore());
 
 		// Completion settings
 		settings.fillAsBoolean(SCSS_PREFERENCES_COMPLETION_TRIGGER_PROPERTY_VALUE_COMPLETION);
@@ -117,7 +117,7 @@ public static Settings getGlobalSettings() {
 	}
 
 	public static void initializeDefaultPreferences() {
-		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+		IPreferenceStore store = Activator.getDefault().getCSSPreferenceStore();
 
 		// Server settings
 

diff --git a/...rc/org/eclipse/wildwebdeveloper/css/ui/preferences/scss/SCSSValidationPreferencePage.java b/...rc/org/eclipse/wildwebdeveloper/css/ui/preferences/scss/SCSSValidationPreferencePage.java
@@ -102,6 +102,6 @@ private void addSeverityField(String name, String labelText) {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getCSSPreferenceStore());
 	}
 }
diff --git a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/html/HTMLLanguageServer.java b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/html/HTMLLanguageServer.java
@@ -34,12 +34,12 @@
  */
 public class HTMLLanguageServer extends ProcessStreamConnectionProviderWithPreference {
 
-	private static final String HTML_LANGUAGE_SERVER_ID = "org.eclipse.wildwebdeveloper.html";
+	public static final String LANGUAGE_SERVER_ID = "org.eclipse.wildwebdeveloper.html";
 
 	private static final String[] SUPPORTED_SECTIONS = { "html", "css", "javascript" };
 
 	public HTMLLanguageServer() {
-		super(HTML_LANGUAGE_SERVER_ID, Activator.getDefault().getPreferenceStore(), SUPPORTED_SECTIONS);
+		super(LANGUAGE_SERVER_ID, Activator.getDefault().getHTMLPreferenceStore(), SUPPORTED_SECTIONS);
 		List<String> commands = new ArrayList<>();
 		commands.add(NodeJSManager.getNodeJsLocation().getAbsolutePath());
 		try {

diff --git a/...bdeveloper/src/org/eclipse/wildwebdeveloper/html/autoinsert/HTMLAutoInsertReconciler.java b/...bdeveloper/src/org/eclipse/wildwebdeveloper/html/autoinsert/HTMLAutoInsertReconciler.java
@@ -139,11 +139,11 @@ private void autoInsert(DocumentEvent event) {
 	}
 
 	private boolean isAutoClosingTagEnabled() {
-		return Activator.getDefault().getPreferenceStore().getBoolean(HTML_PREFERENCES_AUTO_CLOSING_TAGS);
+		return Activator.getDefault().getHTMLPreferenceStore().getBoolean(HTML_PREFERENCES_AUTO_CLOSING_TAGS);
 	}
 
 	private boolean isAutoCreateQuotesEnabled() {
-		return Activator.getDefault().getPreferenceStore().getBoolean(HTML_PREFERENCES_AUTO_CREATE_QUOTES);
+		return Activator.getDefault().getHTMLPreferenceStore().getBoolean(HTML_PREFERENCES_AUTO_CREATE_QUOTES);
 	}
 
 	/**

diff --git a/...er/src/org/eclipse/wildwebdeveloper/html/ui/preferences/HTMLCompletionPreferencePage.java b/...er/src/org/eclipse/wildwebdeveloper/html/ui/preferences/HTMLCompletionPreferencePage.java
@@ -50,6 +50,6 @@ public void createFieldEditors() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getHTMLPreferenceStore());
 	}
 }
diff --git a/...eloper/src/org/eclipse/wildwebdeveloper/html/ui/preferences/HTMLFormatPreferencePage.java b/...eloper/src/org/eclipse/wildwebdeveloper/html/ui/preferences/HTMLFormatPreferencePage.java
@@ -80,6 +80,6 @@ public void createFieldEditors() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getHTMLPreferenceStore());
 	}
 }
diff --git a/...veloper/src/org/eclipse/wildwebdeveloper/html/ui/preferences/HTMLHoverPreferencePage.java b/...veloper/src/org/eclipse/wildwebdeveloper/html/ui/preferences/HTMLHoverPreferencePage.java
@@ -42,6 +42,6 @@ public void createFieldEditors() {
 
 	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setPreferenceStore(Activator.getDefault().getHTMLPreferenceStore());
 	}
 }
diff --git a/...webdeveloper/src/org/eclipse/wildwebdeveloper/html/ui/preferences/HTMLPreferencePage.java b/...webdeveloper/src/org/eclipse/wildwebdeveloper/html/ui/preferences/HTMLPreferencePage.java
@@ -32,17 +32,16 @@ public HTMLPreferencePage() {
 		super(GRID);
 	}
 
-	@Override
-	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
-	}
-
 	@Override
 	protected void createFieldEditors() {
 		addField(new BooleanFieldEditor(HTML_PREFERENCES_AUTO_CLOSING_TAGS, Messages.HTMLPreferencePage_autoClosingTags,
 				getFieldEditorParent()));
 		addField(new BooleanFieldEditor(HTML_PREFERENCES_AUTO_CREATE_QUOTES,
 				Messages.HTMLPreferencePage_autoCreateQuotes, getFieldEditorParent()));
+	}
 
+	@Override
+	public void init(IWorkbench workbench) {
+		setPreferenceStore(Activator.getDefault().getHTMLPreferenceStore());
 	}
 }