Use InstanceScope instead of using DefaultScope for workspace settings.

Fix angelozerr#101

Author: angelozerr

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/core/resources/AbstractTypeScriptSettings.java

@@ -17,7 +17,6 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
-import org.eclipse.core.runtime.preferences.InstanceScope;
 
 import ts.eclipse.ide.core.TypeScriptCorePlugin;
 import ts.utils.StringUtils;
@@ -40,15 +39,19 @@ public AbstractTypeScriptSettings(IProject project, String pluginId) {
 		this.pluginId = pluginId;
 		getProjectPreferences().addPreferenceChangeListener(this);
 		getWorkspacePreferences().addPreferenceChangeListener(this);
-		InstanceScope.INSTANCE.getNode(pluginId).addPreferenceChangeListener(this);
+		getWorkspaceDefaultPreferences().addPreferenceChangeListener(this);
 	}
 
 	public String getStringPreferencesValue(String key, String def) {
 		String value = getProjectPreferencesValue(key, def);
-		if (value == null) {
-			return getStringWorkspacePreferencesValue(key, def);
+		if (value != null) {
+			return value;
+		}
+		value = getStringWorkspacePreferencesValue(key, def);
+		if (value != null) {
+			return value;
 		}
-		return value;
+		return getStringWorkspaceDefaultPreferencesValue(key, def);
 	}
 
 	public String getProjectPreferencesValue(String key, String def) {
@@ -61,12 +64,21 @@ public String getStringWorkspacePreferencesValue(String key, String def) {
 		return node != null ? node.get(key, def) : null;
 	}
 
+	public String getStringWorkspaceDefaultPreferencesValue(String key, String def) {
+		IEclipsePreferences node = getWorkspaceDefaultPreferences();
+		return node != null ? node.get(key, def) : null;
+	}
+
 	public Boolean getBooleanPreferencesValue(String key, Boolean def) {
 		Boolean value = getProjectPreferencesValue(key, (Boolean) null);
 		if (value != null) {
 			return value;
 		}
-		return getBooleanWorkspacePreferencesValue(key, def);
+		value = getBooleanWorkspacePreferencesValue(key, (Boolean) null);
+		if (value != null) {
+			return value;
+		}
+		return getBooleanWorkspaceDefaultPreferencesValue(key, def);
 	}
 
 	public Boolean getProjectPreferencesValue(String key, Boolean def) {
@@ -79,6 +91,11 @@ public Boolean getBooleanWorkspacePreferencesValue(String key, Boolean def) {
 		return getBoolean(node, key, def);
 	}
 
+	public Boolean getBooleanWorkspaceDefaultPreferencesValue(String key, Boolean def) {
+		IEclipsePreferences node = getWorkspaceDefaultPreferences();
+		return getBoolean(node, key, def);
+	}
+
 	private Boolean getBoolean(IEclipsePreferences preferences, String key, Boolean def) {
 		if (preferences == null) {
 			return def;
@@ -99,7 +116,11 @@ public Integer getIntegerPreferencesValue(String key, Integer def) {
 		if (value != null) {
 			return value;
 		}
-		return getIntegerWorkspacePreferencesValue(key, def);
+		value = getIntegerWorkspacePreferencesValue(key, (Integer) null);
+		if (value != null) {
+			return value;
+		}
+		return getIntegerWorkspaceDefaultPreferencesValue(key, def);
 	}
 
 	public Integer getProjectPreferencesValue(String key, Integer def) {
@@ -112,6 +133,11 @@ public Integer getIntegerWorkspacePreferencesValue(String key, Integer def) {
 		return getInteger(node, key, def);
 	}
 
+	public Integer getIntegerWorkspaceDefaultPreferencesValue(String key, Integer def) {
+		IEclipsePreferences node = getWorkspaceDefaultPreferences();
+		return getInteger(node, key, def);
+	}
+
 	private Integer getInteger(IEclipsePreferences preferences, String key, Integer def) {
 		if (preferences == null) {
 			return def;
@@ -135,10 +161,14 @@ protected IEclipsePreferences getWorkspacePreferences() {
 		return WorkspaceTypeScriptSettingsHelper.getWorkspacePreferences(pluginId);
 	}
 
+	protected IEclipsePreferences getWorkspaceDefaultPreferences() {
+		return WorkspaceTypeScriptSettingsHelper.getWorkspaceDefaultPreferences(pluginId);
+	}
+
 	public void dispose() {
 		getProjectPreferences().removePreferenceChangeListener(this);
 		getWorkspacePreferences().removePreferenceChangeListener(this);
-		InstanceScope.INSTANCE.getNode(pluginId).removePreferenceChangeListener(this);
+		getWorkspaceDefaultPreferences().removePreferenceChangeListener(this);
 	}
 
 	public IProject getProject() {

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/core/resources/WorkspaceTypeScriptSettingsHelper.java

@@ -1,13 +1,28 @@
+/**
+ *  Copyright (c) 2015-2016 Angelo ZERR.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Angelo Zerr <[email protected]> - initial API and implementation
+ */
 package ts.eclipse.ide.core.resources;
 
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
+import org.eclipse.core.runtime.preferences.InstanceScope;
 
 import ts.eclipse.ide.core.TypeScriptCorePlugin;
 import ts.eclipse.ide.core.preferences.TypeScriptCorePreferenceConstants;
 
+/**
+ * Workspace TypeScript settings.
+ *
+ */
 public class WorkspaceTypeScriptSettingsHelper {
 
 	private static UseSalsa useSalsa;
@@ -33,6 +48,10 @@ public void preferenceChange(PreferenceChangeEvent event) {
 	}
 
 	public static IEclipsePreferences getWorkspacePreferences(String pluginId) {
+		return InstanceScope.INSTANCE.getNode(pluginId);
+	}
+
+	public static IEclipsePreferences getWorkspaceDefaultPreferences(String pluginId) {
 		return DefaultScope.INSTANCE.getNode(pluginId);
 	}
 

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/internal/core/preferences/TypeScriptCorePreferenceInitializer.java

@@ -37,7 +37,7 @@ public class TypeScriptCorePreferenceInitializer extends AbstractPreferenceIniti
 	@Override
 	public void initializeDefaultPreferences() {
 		IEclipsePreferences node = WorkspaceTypeScriptSettingsHelper
-				.getWorkspacePreferences(TypeScriptCorePlugin.PLUGIN_ID);
+				.getWorkspaceDefaultPreferences(TypeScriptCorePlugin.PLUGIN_ID);
 
 		// initialize properties for direct access of node.js server (start an
 		// internal process)