Provide basic experimental formatter which supports invalid XML

Fixes eclipse-lemminx#1195 Signed-off-by: azerr <azerr@redhat.com>
angelozerr · Apr 16, 2022 · 41b77f9 · 41b77f9
1 parent 6113791
commit 41b77f9
Show file tree

Hide file tree

Showing 18 changed files with 4,952 additions and 817 deletions.
diff --git a/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/XMLTextDocumentService.java b/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/XMLTextDocumentService.java
@@ -323,27 +323,17 @@ public CompletableFuture<List<Either<SymbolInformation, DocumentSymbol>>> docume
 
 	@Override
 	public CompletableFuture<List<? extends TextEdit>> formatting(DocumentFormattingParams params) {
-		return computeAsync((cancelChecker) -> {
-			String uri = params.getTextDocument().getUri();
-			TextDocument document = getDocument(uri);
-			if (document == null) {
-				return null;
-			}
+		return computeDOMAsync(params.getTextDocument(), (cancelChecker, xmlDocument) -> {
 			CompositeSettings settings = new CompositeSettings(getSharedSettings(), params.getOptions());
-			return getXMLLanguageService().format(document, null, settings);
+			return getXMLLanguageService().format(xmlDocument, null, settings);
 		});
 	}
 
 	@Override
 	public CompletableFuture<List<? extends TextEdit>> rangeFormatting(DocumentRangeFormattingParams params) {
-		return computeAsync((cancelChecker) -> {
-			String uri = params.getTextDocument().getUri();
-			TextDocument document = getDocument(uri);
-			if (document == null) {
-				return null;
-			}
+		return computeDOMAsync(params.getTextDocument(), (cancelChecker, xmlDocument) -> {
 			CompositeSettings settings = new CompositeSettings(getSharedSettings(), params.getOptions());
-			return getXMLLanguageService().format(document, params.getRange(), settings);
+			return getXMLLanguageService().format(xmlDocument, params.getRange(), settings);
 		});
 	}
 

diff --git a/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/commons/TextDocument.java b/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/commons/TextDocument.java
@@ -78,6 +78,12 @@ public String lineText(int lineNumber) throws BadLocationException {
 		return text.substring(line.offset, line.offset + line.length);
 	}
 
+	public int lineOffsetAt(int position) throws BadLocationException {
+		ILineTracker lineTracker = getLineTracker();
+		Line line = lineTracker.getLineInformationOfOffset(position);
+		return line.offset;
+	}
+
 	public String lineDelimiter(int lineNumber) throws BadLocationException {
 		ILineTracker lineTracker = getLineTracker();
 		String lineDelimiter = lineTracker.getLineDelimiter(lineNumber);

diff --git a/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/dom/DOMText.java b/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/dom/DOMText.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.lemminx.dom;
 
+import org.eclipse.lemminx.utils.StringUtils;
 import org.w3c.dom.DOMException;
 
 /**
@@ -61,7 +62,8 @@ public String getWholeText() {
 	 */
 	@Override
 	public boolean isElementContentWhitespace() {
-		throw new UnsupportedOperationException();
+		String text = getOwnerDocument().getOwnerDocument().getText();
+		return StringUtils.isWhitespace(text, getStart(), getEnd());
 	}
 
 	/*