Merge pull request #193 from funfried/release/1.14.x

Author: funfried

pom.xml

@@ -147,7 +147,7 @@
 		<dependency>
 			<groupId>io.spring.javaformat</groupId>
 			<artifactId>spring-javaformat-formatter</artifactId>
-			<version>0.0.29</version>
+			<version>0.0.30</version>
 		</dependency>
 
 		<!-- Google Formatter -->
@@ -701,7 +701,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
 					<argLine>
-						${argLine} -Xmx1024m
+						-Xmx1024m
 						--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
 						--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
 						--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED

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/eclipse/EclipseJavaFormatterService.java

@@ -95,7 +95,7 @@ public Integer getContinuationIndentSize(Document document) {
 
 				Integer indentSize = getIndentSize(document);
 				if (indentSize != null) {
-					ret = Integer.valueOf(value) * indentSize;
+					ret *= indentSize;
 				}
 			}
 		}

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
 	 *

src/main/java/de/funfried/netbeans/plugins/external/formatter/java/spring/SpringJavaFormatterService.java

@@ -34,7 +34,7 @@
 import de.funfried.netbeans.plugins.external.formatter.java.spring.ui.SpringJavaFormatterOptionsPanel;
 import de.funfried.netbeans.plugins.external.formatter.ui.options.FormatterOptionsPanel;
 import de.funfried.netbeans.plugins.external.formatter.ui.options.Settings;
-import io.spring.javaformat.formatter.Formatter;
+import io.spring.javaformat.formatter.eclipse.EclipseCodeFormatter;
 
 /**
  * Spring implementation of the {@link AbstractJavaFormatterService}.
@@ -95,11 +95,16 @@ public Integer getContinuationIndentSize(Document document) {
 
 		Preferences preferences = Settings.getActivePreferences(document);
 		if (isUseFormatterIndentationSettings(preferences)) {
-			String propKey = "org.eclipse.jdt.core.formatter.continuation_indentation";
+			String propKey = "core.formatter.continuation_indentation";
 			String prop = this.getSpringFormatterProperty(propKey);
 			if (prop != null) {
 				try {
 					ret = Integer.parseInt(prop);
+
+					Integer indentSize = getIndentSize(document);
+					if (indentSize != null) {
+						ret *= indentSize;
+					}
 				} catch (NumberFormatException ex) {
 					log.log(Level.WARNING, "Property '" + propKey + "' is not an integer: " + prop, ex);
 				}
@@ -127,14 +132,19 @@ public Integer getIndentSize(Document document) {
 
 		Preferences preferences = Settings.getActivePreferences(document);
 		if (isUseFormatterIndentationSettings(preferences)) {
-			String propKey = "org.eclipse.jdt.core.formatter.indentation.size";
-			String prop = this.getSpringFormatterProperty(propKey);
-			if (prop != null) {
-				try {
-					ret = Integer.parseInt(prop);
-				} catch (NumberFormatException ex) {
-					log.log(Level.WARNING, "Property '" + propKey + "' is not an integer: " + prop, ex);
+			String tabChar = getSpringFormatterProperty("core.formatter.tabulation.char");
+			if (Objects.equals(tabChar, "mixed")) {
+				String propKey = "core.formatter.indentation.size";
+				String prop = this.getSpringFormatterProperty(propKey);
+				if (prop != null) {
+					try {
+						ret = Integer.parseInt(prop);
+					} catch (NumberFormatException ex) {
+						log.log(Level.WARNING, "Property '" + propKey + "' is not an integer: " + prop, ex);
+					}
 				}
+			} else {
+				ret = getSpacesPerTab(document);
 			}
 
 			if (ret == null) {
@@ -157,7 +167,7 @@ public Integer getRightMargin(Document document) {
 
 		Integer ret = 120;
 
-		String propKey = "org.eclipse.jdt.core.formatter.lineSplit";
+		String propKey = "core.formatter.lineSplit";
 		String prop = this.getSpringFormatterProperty(propKey);
 		if (prop != null) {
 			try {
@@ -195,7 +205,7 @@ public Integer getSpacesPerTab(Document document) {
 			if (preferences.getBoolean(Settings.OVERRIDE_TAB_SIZE, true)) {
 				ret = preferences.getInt(Settings.OVERRIDE_TAB_SIZE_VALUE, 4);
 			} else {
-				String propKey = "org.eclipse.jdt.core.formatter.tabulation.size";
+				String propKey = "core.formatter.tabulation.size";
 				String prop = this.getSpringFormatterProperty(propKey);
 				if (prop != null) {
 					try {
@@ -225,7 +235,7 @@ public Integer getSpacesPerTab(Document document) {
 	 */
 	private String getSpringFormatterProperty(String key) {
 		Properties props = new Properties();
-		try (InputStream is = Formatter.class.getResourceAsStream("formatter.prefs")) {
+		try (InputStream is = EclipseCodeFormatter.class.getResourceAsStream("formatter.prefs")) {
 			props.load(is);
 		} catch (IOException ex) {
 			log.log(Level.SEVERE, "Could not read internal Spring formatter configuration", ex);
@@ -248,7 +258,7 @@ public Boolean isExpandTabToSpaces(Document document) {
 
 		Preferences preferences = Settings.getActivePreferences(document);
 		if (isUseFormatterIndentationSettings(preferences)) {
-			String propKey = "org.eclipse.jdt.core.formatter.tabulation.size";
+			String propKey = "core.formatter.tabulation.char";
 			String prop = this.getSpringFormatterProperty(propKey);
 			if (prop != null) {
 				ret = Objects.equals(prop, "space");

src/main/java/de/funfried/netbeans/plugins/external/formatter/javascript/eclipse/EclipseJavascriptFormatterService.java

@@ -93,7 +93,7 @@ public Integer getContinuationIndentSize(Document document) {
 
 				Integer indentSize = getIndentSize(document);
 				if (indentSize != null) {
-					ret = Integer.valueOf(value) * indentSize;
+					ret *= indentSize;
 				}
 			}
 		}

src/test/java/de/funfried/netbeans/plugins/external/formatter/java/spring/SpringJavaFormatterServiceTest.java

@@ -58,7 +58,7 @@ public void testFormat() throws Exception {
 		Assert.assertNotNull(instance.createOptionsPanel(null));
 		Assert.assertEquals((long) 120L, (long) instance.getRightMargin(document));
 
-		Assert.assertEquals((long) 2L, (long) instance.getContinuationIndentSize(document));
+		Assert.assertEquals((long) 8L, (long) instance.getContinuationIndentSize(document));
 		Assert.assertEquals((long) 4L, (long) instance.getIndentSize(document));
 		Assert.assertEquals((long) 4L, (long) instance.getSpacesPerTab(document));
 		Assert.assertFalse(instance.isExpandTabToSpaces(document));