#190

Fixed issue with blank lines in google-java-formatter

Author: funfried

src/main/java/de/funfried/netbeans/plugins/external/formatter/AbstractFormatJob.java

@@ -20,7 +20,6 @@
 import javax.swing.text.StyledDocument;
 
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.apache.commons.lang3.tuple.Pair;
 import org.netbeans.api.annotations.common.NonNull;
@@ -154,7 +153,15 @@ protected boolean setFormattedCode(String code, String formattedContent) throws
 	 * @return The content of the {@code document}
 	 */
 	protected String getCode() {
-		return StringUtils.trim(DocumentUtilities.getText(document).toString());
+		try {
+			// returns the actual content of the document
+			return document.getText(0, document.getLength());
+		} catch (BadLocationException ex) {
+			log.log(Level.WARNING, "Could not fetch text, falling back to utility method", ex);
+
+			// returns only the trimmed content of the document
+			return DocumentUtilities.getText(document).toString();
+		}
 	}
 
 	/**

src/main/java/de/funfried/netbeans/plugins/external/formatter/java/google/GoogleJavaFormatterWrapper.java

@@ -40,12 +40,12 @@ public final class GoogleJavaFormatterWrapper {
 	 * Formats the given {@code code} with the given configurations and returns
 	 * the formatted code.
 	 *
-	 * @param code            the unformatted code
-	 * @param codeStyle       the code {@link JavaFormatterOptions.Style} to use,
-	 *                        if {@code null} the {@link JavaFormatterOptions.Style#GOOGLE}
-	 *                        style will be used
+	 * @param code the unformatted code
+	 * @param codeStyle the code {@link JavaFormatterOptions.Style} to use,
+	 *        if {@code null} the {@link JavaFormatterOptions.Style#GOOGLE}
+	 *        style will be used
 	 * @param changedElements a {@link SortedSet} containing ranges as {@link Pair}
-	 *                        objects defining the offsets which should be formatted
+	 *        objects defining the offsets which should be formatted
 	 *
 	 * @return the formatted code
 	 *