Bump maven-release-plugin from 3.0.0-M1 to 3.0.0-M7

.gitignore

@@ -43,3 +43,6 @@ buildNumber.properties
 .Trash*
 
 **/adhoctest/
+lsp4xml.code-workspace
+.vscode/**
+mkdist

README.md

@@ -1,3 +1,8 @@
+**experimental**
+================
+
+attempts to implement a different formatting strategy where not every tag is in a new line, but some are kept inline (see https://github.com/eclipse/lemminx/issues/594).
+
 XML Language Server (LemMinX)
 ===========================
 [![Maven](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Frepo.eclipse.org%2Fcontent%2Frepositories%2Flemminx-releases%2Forg%2Feclipse%2Flemminx%2Forg.eclipse.lemminx%2Fmaven-metadata.xml&style=for-the-badge&logo=apachemaven&logoColor=white&color=informational)](https://repo.eclipse.org/content/repositories/lemminx-releases/org/eclipse/lemminx/org.eclipse.lemminx/)

org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/services/XMLFormatter.java

@@ -74,3 +74,9 @@ private Collection<IFormatterParticipant> getFormatterParticipants() {
 		return extensionsRegistry.getFormatterParticipants();
 	}
 }
+
+// Local Variables:
+// tab-width: 8
+// indent-tabs-mode: t
+// c-basic-offset: 8
+// End:

org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/services/format/XMLFormatterDocument.java

@@ -155,6 +155,37 @@ private boolean containsTextWithinStartTag() {
 		return ((DOMElement) fullNode).isInStartTag(fullDocOffset);
 	}
 
+	// ATSEC
+	private boolean putTagInline(String tag) {
+		if (tag == null) {
+			return false;
+		}
+		return (tag.equals("b")||
+			tag.equals("bibref")||
+			tag.equals("color")||
+			tag.equals("em")||
+			tag.equals("figure")||
+			tag.equals("i")||
+			tag.equals("it")||
+			tag.equals("link")||
+			tag.equals("mark")||
+			tag.equals("note")||
+			tag.equals("s")||
+			tag.equals("sub")||
+			tag.equals("sup")||
+			tag.equals("tt")||
+			tag.equals("u")||
+			tag.equals("xref")||
+			tag.equals("quote")||
+			tag.equals("show-number")||
+			tag.equals("show-page")||
+			tag.equals("show-id")||
+			tag.equals("show-label")||
+			tag.equals("footnote")||
+			tag.equals("code") ||
+			tag.equals("show-title"));
+	}
+
 	private void adjustOffsetToStartTag() throws BadLocationException {
 		int tagContentOffset = this.rangeDomDocument.getChild(0).getStart();
 		int fullDocOffset = getFullOffsetFromRangeOffset(tagContentOffset);
@@ -281,23 +312,81 @@ private void format(DOMNode node) throws BadLocationException {
 		}
 
 		if (node.getNodeType() != DOMNode.DOCUMENT_NODE) {
-			boolean doLineFeed = !node.getOwnerDocument().isDTD()
-					&& !(node.isComment() && ((DOMComment) node).isCommentSameLineEndTag())
-					&& (!node.isText() || (!((DOMText) node).isWhitespace() && ((DOMText) node).hasSiblings()));
+			boolean doLineFeed;
+			if (node.getOwnerDocument().isDTD()) {
+				doLineFeed = false;
+			} else {
+				// ATSEC
+				// if (node.isComment()) {
+				// 	this.xmlBuilder.addContent("+isComment+");
+				// 	if (((DOMComment) node).isCommentSameLineEndTag()) {
+				// 		this.xmlBuilder.addContent("+commentSameLine+");
+				// 	}
+				// }
+				// if (node.isText()) {
+				// 	this.xmlBuilder.addContent("+isText+");
+				// 	if (((DOMText) node).isWhitespace()) {
+				// 		this.xmlBuilder.addContent("+WS+");
+				// 	}
+				// 	if (((DOMText) node).hasSiblings()) {
+				// 		this.xmlBuilder.addContent("+SIBL+");
+				// 	}
+				// }
+				doLineFeed = //!node.getOwnerDocument().isDTD() &&
+					!(node.isComment() && ((DOMComment) node).isCommentSameLineEndTag())
+					&& (
+						!node.isText() ||
+						(
+						 !((DOMText) node).isWhitespace() &&
+						 ((DOMText) node).hasSiblings()
+						 )
+						);
+			}
+			if (node.isElement()) {
+				DOMElement element = (DOMElement) node;
+				String tag = element.getTagName();
+				if (putTagInline(tag)) {
+					doLineFeed = false;
+					//this.xmlBuilder.addContent("[trace-4]");
+					if (!node.isText()) {
+						//this.xmlBuilder.appendSpace();
+					}
+				}
+			}
+
+			if (node.isCDATA()) {
+				doLineFeed = false;
+			}
 
 			if (this.indentLevel > 0 && doLineFeed) {
 				// add new line + indent
 				if (!node.isChildOfOwnerDocument() || node.getPreviousNonTextSibling() != null) {
-					this.xmlBuilder.linefeed();
+					if (node.isElement()) {
+						DOMElement element = (DOMElement) node;
+						String tag = element.getTagName();
+						if (!putTagInline(tag)) {
+							//this.xmlBuilder.addContent("[trace-1]");
+							this.xmlBuilder.linefeed();
+						}
+					} else {
+						if (!node.isText()) {
+							//this.xmlBuilder.addContent("[trace-2]");
+							this.xmlBuilder.linefeed();
+						}
+					}
 				}
 
 				if (!startTagExistsInRangeDocument(node) && startTagExistsInFullDocument(node)) {
 					DOMNode startNode = getFullDocElemFromRangeElem((DOMElement) node);
 					int currentIndentLevel = getNodeIndentLevel(startNode);
+					//this.xmlBuilder.addContent("[trace-5]");
 					this.xmlBuilder.indent(currentIndentLevel);
 					this.indentLevel = currentIndentLevel;
 				} else {
-					this.xmlBuilder.indent(this.indentLevel);
+					if (!node.isText()) {
+						//this.xmlBuilder.addContent("[trace-3]");
+						this.xmlBuilder.indent(this.indentLevel);
+					}
 				}
 			}
 			if (node.isElement()) {
@@ -801,4 +890,4 @@ private static void addPrologAttributes(DOMNode node, XMLBuilder xmlBuilder) {
 			xmlBuilder.addPrologAttribute(attr);
 		}
 	}
-}
+}

org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/utils/StringUtils.java

@@ -104,6 +104,43 @@ public static void normalizeSpace(String str, StringBuilder b) {
 		}
 	}
 
+	// ATSEC
+	/**
+	 * Normalizes the whitespace characters of a given string differently and applies it to the
+	 * given string builder.
+	 * @param str
+	 * @return the result of normalize space of the given string.
+	 */
+	public static void normalizeSpace2(String str, StringBuilder b) {
+		int i = 0, len = str.length();
+		boolean lastWasSpace = false;
+
+		while (i < len) {
+			char c = str.charAt(i);
+			if ((c != '\n') && (c != '\r')) {
+				boolean isWS = Character.isWhitespace(c);
+				if (isWS) {
+					for (int j = i + 1; j < len && Character.isWhitespace(str.charAt(j)); ++j) {
+						i = j;
+					}
+				}
+				// normalize to " " not the first WS char
+				if (isWS) {
+					c = ' ';
+				}
+				b.append(c);
+				lastWasSpace = isWS;
+			} else {
+				// do not append a space twice
+				if (!lastWasSpace) {
+					b.append(" ");
+					lastWasSpace = true;
+				}
+			}
+			i++;
+		}
+	}
+
 	/**
 	 * Returns the result of normalize space of the given string.
 	 *
@@ -116,6 +153,14 @@ public static String normalizeSpace(String str) {
 		return b.toString();
 	}
 
+	// ATSEC
+	public static String normalizeSpace2(String str) {
+		StringBuilder b = new StringBuilder(str.length());
+		normalizeSpace2(str, b);
+		return b.toString();
+	}
+
+
 	/**
 	 * Returns the start whitespaces of the given line text.
 	 *
@@ -506,3 +551,9 @@ public static boolean isSimilar(String reference, String current) {
 		return levenshteinDistance.apply(reference, current) != -1;
 	}
 }
+
+// Local Variables:
+// tab-width: 8
+// indent-tabs-mode: t
+// c-basic-offset: 8
+// End:

org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/utils/XMLBuilder.java

@@ -13,7 +13,7 @@
 package org.eclipse.lemminx.utils;
 
 import static org.eclipse.lemminx.utils.StringUtils.normalizeSpace;
-
+import static org.eclipse.lemminx.utils.StringUtils.normalizeSpace2;
 import java.util.Collection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -300,30 +300,44 @@ public XMLBuilder addContent(String text) {
 	 *         <code>isWhitespaceContent</code>, <code>hasSiblings</code> and
 	 *         <code>delimiter</code>
 	 */
-	public XMLBuilder addContent(String text, boolean isWhitespaceContent, boolean hasSiblings, String delimiter) {
-		if (!isWhitespaceContent) {
-			if (isJoinContentLines()) {
-				text = StringUtils.normalizeSpace(text);
+	public XMLBuilder addContent(String text, Boolean isWhitespaceContent, Boolean hasSiblings, String delimiter) {
+        if (isWhitespaceContent) {
+			// whoah: terrible, but this one seems to preserve single space.
+			if (text.length() == 1) {
+				// xml.append("+");
+				xml.append(text);
+			}
+		}
+	    // "compatible" if() follow, changes are based on basically no understanding what's really going on here.
+	    if (!isWhitespaceContent) {
+		    if(isJoinContentLines()) {
+			    // ATSEC
+			    //xml.append("A:");
+			    text = normalizeSpace2(text);
 			} else if (hasSiblings) {
+				//xml.append("B:");
 				text = text.trim();
+				//	} else {
+				// 	xml.append("C:");
 			}
 			if (isTrimTrailingWhitespace()) {
 				text = trimTrailingSpacesEachLine(text);
 			}
-			append(text);
-		} else if (!hasSiblings && isPreserveEmptyContent()) {
-			append(text);
-		} else if (hasSiblings) {
-			int preservedNewLines = getPreservedNewlines();
-			if (preservedNewLines > 0) {
-				int newLineCount = StringUtils.getNumberOfNewLines(text, isWhitespaceContent, delimiter,
-						preservedNewLines);
-				for (int i = 0; i < newLineCount - 1; i++) { // - 1 because the node after will insert a delimiter
-					append(delimiter);
-				}
-			}
-		}
-		return this;
+		    //xml.append("-["+text+"]-");
+		    xml.append(text);
+        } else if (!hasSiblings && isPreserveEmptyContent()) {
+		    xml.append(text);
+        } else if (hasSiblings) {
+		    int preservedNewLines = getPreservedNewlines();
+		    if (preservedNewLines > 0) {
+			    int newLineCount = StringUtils.getNumberOfNewLines(text, isWhitespaceContent, delimiter, preservedNewLines);
+			    for (int i = 0; i < newLineCount - 1; i++) { // - 1 because the node after will insert a delimiter
+				    //xml.append("+");
+				    xml.append(delimiter);
+			    }
+		    }
+        }
+            return this;
 	}
 
 	public XMLBuilder indent(int level) {
@@ -333,7 +347,8 @@ public XMLBuilder indent(int level) {
 					appendSpace();
 				}
 			} else {
-				append("\t");
+				xml.append("\t");
+				//xml.append("y");
 			}
 		}
 		return this;
@@ -578,3 +593,9 @@ public SharedSettings getSharedSettings() {
 	}
 
 }
+
+// Local Variables:
+// tab-width: 8
+// indent-tabs-mode: t
+// c-basic-offset: 8
+// End:

pom.xml

@@ -185,7 +185,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>3.0.0-M6</version>
+					<version>3.0.0-M7</version>
 					<configuration>
 						<tagNameFormat>@{project.version}</tagNameFormat>
 						<arguments>-DskipTests=true -Dcbi.jarsigner.skip=false -Pci,generate-p2</arguments>