#191

funfried · funfried · commit 36894a3abd0f · 2022-02-01T22:31:44.000+01:00
Fixed erroneous formatting with Eclipse when "Override Tab Size" is active
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -9,6 +9,9 @@
 
 	<body>
 		<release version="1.14.4-SNAPSHOT" date="N/A" description="Bug fix release">
+			<action dev="bahlef" type="fix" issue="191">
+				Erroneous formatting with Eclipse when "Override Tab Size" is active
+			</action>
 		</release>
 
 		<release version="1.14.3" date="2022-01-22" description="Bug fix release">
diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/eclipse/EclipseJavaFormatterService.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/eclipse/EclipseJavaFormatterService.java
@@ -117,17 +117,14 @@ public Integer getIndentSize(Document document) {
 
 		Preferences preferences = Settings.getActivePreferences(document);
 		if (isUseFormatterIndentationSettings(preferences)) {
-			String value;
-
 			String tabChar = getEclipseFormatterProperty(preferences, document, "org.eclipse.jdt.core.formatter.tabulation.char");
 			if (Objects.equals(tabChar, "mixed")) {
-				value = getEclipseFormatterProperty(preferences, document, "org.eclipse.jdt.core.formatter.indentation.size");
+				String value = getEclipseFormatterProperty(preferences, document, "org.eclipse.jdt.core.formatter.indentation.size");
+				if (value != null) {
+					ret = Integer.valueOf(value);
+				}
 			} else {
-				value = getEclipseFormatterProperty(preferences, document, "org.eclipse.jdt.core.formatter.tabulation.size");
-			}
-
-			if (value != null) {
-				ret = Integer.valueOf(value);
+				ret = getSpacesPerTab(document);
 			}
 		}
 
diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/javascript/eclipse/EclipseJavascriptFormatterService.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/javascript/eclipse/EclipseJavascriptFormatterService.java
@@ -115,18 +115,16 @@ public Integer getIndentSize(Document document) {
 
 		Preferences preferences = Settings.getActivePreferences(document);
 		if (isUseFormatterIndentationSettings(preferences)) {
-			String value;
-
 			String tabChar = getEclipseFormatterProperty(preferences, document, "org.eclipse.wst.jsdt.core.formatter.tabulation.char");
 			if (Objects.equals(tabChar, "mixed")) {
-				value = getEclipseFormatterProperty(preferences, document, "org.eclipse.wst.jsdt.core.formatter.indentation.size");
+				String value = getEclipseFormatterProperty(preferences, document, "org.eclipse.wst.jsdt.core.formatter.indentation.size");
+				if (value != null) {
+					ret = Integer.valueOf(value);
+				}
 			} else {
-				value = getEclipseFormatterProperty(preferences, document, "org.eclipse.wst.jsdt.core.formatter.tabulation.size");
+				ret = getSpacesPerTab(document);
 			}
 
-			if (value != null) {
-				ret = Integer.valueOf(value);
-			}
 		}
 
 		return ret;
