Cannot use provided schemas eclipse-wildwebdeveloper#461

Fixed preferernce listener installation Fixes: eclipse-wildwebdeveloper#461 Signed-off-by: Victor Rubezhny <vrubezhny@redhat.com>
vrubezhny · Jul 23, 2020 · 16b7cff · 16b7cff
1 parent 60c8616
commit 16b7cff
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/yaml/YAMLLanguageServer.java b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/yaml/YAMLLanguageServer.java
@@ -40,7 +40,6 @@
 
 @SuppressWarnings("restriction")
 public class YAMLLanguageServer extends ProcessStreamConnectionProvider {
-	private static final String SETTINGS_KEY = "settings";
 	private static final String YAML_KEY = "yaml";
 	private static final String VALIDATE_KEY = "validate";
 	private static final String COMPLETION_KEY = "completion";
@@ -53,22 +52,16 @@ public class YAMLLanguageServer extends ProcessStreamConnectionProvider {
 		@Override
 		public void propertyChange(PropertyChangeEvent event) {
 			if (YAMLPreferenceInitializer.YAML_SCHEMA_PREFERENCE.equals(event.getProperty())) {
-				Map<String, Object> yaml = getYamlSchemaOptions();
 				Map<String, Object> settings = new HashMap<>();
-				settings.put(YAML_KEY, yaml);
-				Map<String, Object> options = new HashMap<>();
-				options.put(SETTINGS_KEY, settings);
+				settings.put(YAML_KEY, getYamlConfigurationOptions());
+
 				DidChangeConfigurationParams params = new DidChangeConfigurationParams(settings);
 				LanguageServiceAccessor.getActiveLanguageServers(null).stream().filter(server -> yamlLsDefinition.equals(LanguageServiceAccessor.resolveServerDefinition(server).get()))
 					.forEach(ls -> ls.getWorkspaceService().didChangeConfiguration(params));
 			}
 		}
  	};
 
-	static {
-		store.addPropertyChangeListener(psListener);
-	}
-
 	public YAMLLanguageServer() {
 		List<String> commands = new ArrayList<>();
 		commands.add(NodeJSManager.getNodeJsLocation().getAbsolutePath());
@@ -91,15 +84,15 @@ public void handleMessage(Message message, LanguageServer languageServer, URI ro
 			ResponseMessage responseMessage = (ResponseMessage) message;
 			if (responseMessage.getResult() instanceof InitializeResult) {
 				Map<String, Object> settings = new HashMap<>();
-				settings.put(YAML_KEY, getYamlSchemaOptions());
+				settings.put(YAML_KEY, getYamlConfigurationOptions());
 
 				DidChangeConfigurationParams params = new DidChangeConfigurationParams(settings);
 				languageServer.getWorkspaceService().didChangeConfiguration(params);
 			}
 		}
 	}
 
-	private static Map<String, Object> getYamlSchemaOptions() {
+	private static Map<String, Object> getYamlConfigurationOptions() {
 		Map<String, Object> yaml = new HashMap<>();
 		IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore();
 		String schemaStr = preferenceStore.getString(YAMLPreferenceInitializer.YAML_SCHEMA_PREFERENCE);
@@ -116,6 +109,12 @@ public String toString() {
 		return "YAML Language Server: " + super.toString();
 	}
 
+	@Override
+	public void start() throws IOException {
+		super.start();
+		store.addPropertyChangeListener(psListener);
+	}
+
 	@Override
 	public void stop() {
 		store.removePropertyChangeListener(psListener);