changes for review comments

Signed-off-by: Arun Venmany <[email protected]>
OpenLiberty · Dec 17, 2024 · b96280f · b96280f
1 parent 4d037ac
commit b96280f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/lemminx-liberty/src/it/variable-processing-ol-it/src/test/java/LibertyWorkspaceIT.java b/lemminx-liberty/src/it/variable-processing-ol-it/src/test/java/LibertyWorkspaceIT.java
@@ -181,7 +181,15 @@ public void testInvalidVariableDiagnosticWithCodeAction() throws IOException, Ba
                     .get(0).getLeft().getTextDocument()
                     .setUri(serverXmlFile.toURI().toString());
         }
-
-        XMLAssert.testCodeActionsFor(serverXML, serverXmlFile.toURI().toString(), invalid1, codeActions.get(0));
+        TextEdit texted = te(8, 9,
+                8, 9, " ");
+
+        CodeAction invalidCodeAction = ca(invalid1, texted);
+        invalidCodeAction.getEdit()
+                .getDocumentChanges()
+                .get(0).getLeft().getTextDocument()
+                .setUri(serverXmlFile.toURI().toString());
+        codeActions.add(invalidCodeAction);
+        XMLAssert.testCodeActionsFor(serverXML, serverXmlFile.toURI().toString(), invalid1, codeActions.get(0),codeActions.get(1));
     }
 }
diff --git a/...iberty/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyHoverParticipant.java b/...iberty/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyHoverParticipant.java
@@ -59,7 +59,7 @@ public Hover onAttributeValue(IHoverRequest request, CancelChecker cancelChecker
                 stringBuilder.append(String.format("%s = %s", variable.getValue(), variableMap.get(variable.getValue())));
             }
             if (varIter.hasNext()) {
-                stringBuilder.append(System.lineSeparator());
+                stringBuilder.append("<br />");
             }
         }
         if (!stringBuilder.isEmpty()) {

diff --git a/...ty/src/main/java/io/openliberty/tools/langserver/lemminx/codeactions/ReplaceVariable.java b/...ty/src/main/java/io/openliberty/tools/langserver/lemminx/codeactions/ReplaceVariable.java
@@ -19,8 +19,10 @@
 import org.eclipse.lemminx.dom.DOMDocument;
 import org.eclipse.lemminx.services.extensions.codeaction.ICodeActionParticipant;
 import org.eclipse.lemminx.services.extensions.codeaction.ICodeActionRequest;
+import org.eclipse.lemminx.utils.XMLPositionUtility;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.Diagnostic;
+import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.jsonrpc.CancelChecker;
 
 import java.util.List;
@@ -64,10 +66,12 @@ public void doCodeAction(ICodeActionRequest request, List<CodeAction> codeAction
                     String variableInDoc = String.format("${%s}", nextVariable.getKey().toString());
                     codeActions.add(CodeActionFactory.replace(title, diagnostic.getRange(), variableInDoc, document.getTextDocument(), diagnostic));
                 }
-                /*for (Map.Entry<Object, Object> nextVariable : existingVariables.entrySet()) {
-                    String title = "Replace Variable with " + nextVariable.getKey() + " with value = " + nextVariable.getValue();
-                    codeActions.add(CodeActionFactory.replace(title, diagnostic.getRange(), nextVariable.getKey().toString(), document.getTextDocument(), diagnostic));
-                }*/
+                // use special code action to reload variable diagnostics
+                Range range = XMLPositionUtility.createRange(document.getDocumentElement().getEndTagCloseOffset(), document.getDocumentElement().getEndTagCloseOffset()+1,
+                        document);
+                String title = "Reload Diagnostics";
+                codeActions.add(CodeActionFactory.insert(title, range.getEnd(), " ",
+                        document.getTextDocument(), diagnostic));
             }
         } catch (Exception e) {
             // BadLocationException not expected

diff --git a/lemminx-liberty/src/test/java/io/openliberty/LibertyDiagnosticTest.java b/lemminx-liberty/src/test/java/io/openliberty/LibertyDiagnosticTest.java
@@ -966,8 +966,16 @@ public void testInvalidVariableDiagnosticWithCodeAction() throws BadLocationExce
                     .get(0).getLeft().getTextDocument()
                     .setUri(serverXMLURI);
         }
-
-        XMLAssert.testCodeActionsFor(serverXML, serverXMLURI, invalid1, codeActions.get(0));
+        TextEdit texted = te(8, 9,
+                8, 9, " ");
+
+        CodeAction invalidCodeAction = ca(invalid1, texted);
+        invalidCodeAction.getEdit()
+                .getDocumentChanges()
+                .get(0).getLeft().getTextDocument()
+                .setUri(serverXMLURI);
+        codeActions.add(invalidCodeAction);
+        XMLAssert.testCodeActionsFor(serverXML, serverXMLURI, invalid1, codeActions.get(0),codeActions.get(1));
     }