adjustments for the new lsp4j notification api

Author: jcompagner

org.eclipse.wildwebdeveloper/META-INF/MANIFEST.MF

@@ -8,9 +8,9 @@ Bundle-Activator: org.eclipse.wildwebdeveloper.Activator
 Bundle-Vendor: Eclipse Wild Web Developer project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.lsp4e;bundle-version="0.5.0",
- org.eclipse.lsp4j.jsonrpc;bundle-version="0.5.0",
- org.eclipse.lsp4j;bundle-version="0.5.0",
+ org.eclipse.lsp4e;bundle-version="0.13.6",
+ org.eclipse.lsp4j.jsonrpc;bundle-version="0.12.0",
+ org.eclipse.lsp4j;bundle-version="0.12.0",
  org.eclipse.tm4e.registry;bundle-version="0.1.0",
  org.eclipse.ui.genericeditor;bundle-version="1.0.0",
  org.eclipse.tm4e.ui;bundle-version="0.1.0",

org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/angular/AngularClientImpl.java

@@ -8,6 +8,9 @@
 import org.eclipse.lsp4j.ProgressParams;
 import org.eclipse.lsp4j.WorkDoneProgressNotification;
 import org.eclipse.lsp4j.WorkDoneProgressReport;
+import org.eclipse.lsp4j.jsonrpc.messages.Either;
+
+import com.google.gson.JsonObject;
 
 public class AngularClientImpl extends LanguageClientImpl implements AngularLanguageServerExtention {
 
@@ -31,7 +34,6 @@ public void projectLanguageService(Map<String,Object> data) {
 	@Override
 	public void suggestIvyLanguageServiceMode(Object o) {
 		logMessage(new MessageParams(MessageType.Info, o.toString()));
-		// TODO should this propose a setting (in the preferences) that enables --experimental-ivy command in the AngularLanguageServer)
 	}
 
 	@Override
@@ -44,10 +46,20 @@ public void suggestStrictMode(Object o) {
 	@Override
 	public void notifyProgress(ProgressParams params) {
 		String message = null;
-		WorkDoneProgressNotification value = params.getValue();
-		if (value instanceof WorkDoneProgressReport) {
-			message = ((WorkDoneProgressReport) value).getMessage();
+		Either<WorkDoneProgressNotification, Object> either = params.getValue();
+		if (either.isLeft()) {
+			if (either.getLeft() instanceof WorkDoneProgressReport)
+				message = ((WorkDoneProgressReport) either.getLeft()).getMessage();
+		}
+		else if (either.getRight() instanceof JsonObject)
+		{
+			JsonObject json = (JsonObject) either.getRight();
+			if (json.has("message")) {
+				message = json.get("message").getAsString();
+			}
+		}
+		if (message != null) {
+			logMessage(new MessageParams(MessageType.Info, params.getToken().getLeft()  + ": " + (message == null? "done":message)));
 		}
-		logMessage(new MessageParams(MessageType.Info, params.getToken().getLeft()  + ": " + (message == null? "done":message)));
 	}
 }