From 91fb9d7799c4f3a3d1e9387dfaf9ea1811ec2be0 Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 22 Mar 2024 15:38:44 -0400 Subject: [PATCH] Unit tests harness account for MarkupContent for hovers --- .../languageserver/testharness/Editor.java | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java index cbcf3fd7e..1703111c8 100644 --- a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java +++ b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java @@ -621,20 +621,24 @@ public class Editor { StringBuilder buf = new StringBuilder(); boolean first = true; Either>, MarkupContent> contents = hover.getContents(); - for (Either block : contents.getLeft()) { - if (!first) { - buf.append("\n\n"); + if (contents.isLeft()) { + for (Either block : contents.getLeft()) { + if (!first) { + buf.append("\n\n"); + } + if (block.isLeft()) { + String s = block.getLeft(); + buf.append(s); + } else if (block.isRight()) { + MarkedString ms = block.getRight(); + buf.append("```"+ms.getLanguage()+"\n"); + buf.append(ms.getValue()); + buf.append("\n```"); + } + first = false; } - if (block.isLeft()) { - String s = block.getLeft(); - buf.append(s); - } else if (block.isRight()) { - MarkedString ms = block.getRight(); - buf.append("```"+ms.getLanguage()+"\n"); - buf.append(ms.getValue()); - buf.append("\n```"); - } - first = false; + } else { + buf.append(contents.getRight().getValue()); } return buf.toString(); }