Skip to content

Commit fed2074

Browse files
Merge pull request #365 from ThemiraChathumina/fix-lag
Fix lagging issues in the version 0.96.0
2 parents aee337b + 9297c04 commit fed2074

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/main/java/org/wso2/lsp4intellij/client/DefaultLanguageClient.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import org.eclipse.lsp4j.WorkDoneProgressCreateParams;
4545
import org.eclipse.lsp4j.WorkDoneProgressEnd;
4646
import org.eclipse.lsp4j.WorkDoneProgressNotification;
47+
import org.eclipse.lsp4j.WorkDoneProgressReport;
4748
import org.eclipse.lsp4j.WorkspaceFolder;
4849
import org.eclipse.lsp4j.services.LanguageClient;
4950
import org.jetbrains.annotations.NotNull;
@@ -302,7 +303,7 @@ public CompletableFuture<Void> createProgress(WorkDoneProgressCreateParams param
302303
}
303304
Tuple2<String, String> progressNotificationItem = new Tuple2<>("LSP Progress Notification", "");
304305
progressNotificationItems.put(token, progressNotificationItem);
305-
return null;
306+
return CompletableFuture.completedFuture(null);
306307
}
307308

308309
@Override
@@ -330,6 +331,11 @@ public void notifyProgress(ProgressParams params) {
330331
} else {
331332
progressNotificationItems.put(token, progressNotificationItem);
332333
}
334+
} else if (progressNotification instanceof WorkDoneProgressReport) {
335+
message = ((WorkDoneProgressReport) progressNotification).getMessage();
336+
if (progressNotificationItems.containsKey(token)) {
337+
title = progressNotificationItems.get(token).getFirst();
338+
}
333339
} else if (progressNotification instanceof WorkDoneProgressEnd) {
334340
message = ((WorkDoneProgressEnd) progressNotification).getMessage();
335341
if (progressNotificationItems.containsKey(token)) {

src/main/java/org/wso2/lsp4intellij/client/languageserver/wrapper/MessageHandler.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ public MessageConsumer apply(MessageConsumer messageConsumer) {
4343
return message -> {
4444
if(isRunning.getAsBoolean()) {
4545
handleMessage(message);
46-
try {
47-
messageConsumer.consume(message);
48-
} catch (Exception e) {
49-
Log.warn("Error while consuming message", e);
50-
}
46+
messageConsumer.consume(message);
5147
}
5248
};
5349
}

0 commit comments

Comments
 (0)