Fixes krasa#145 Javadoc indent broken after hitting return in first line

Author: krasa

META-INF/plugin.xml

@@ -4,7 +4,7 @@
 
 	<name>Eclipse Code Formatter</name>
 	<id>EclipseCodeFormatter</id>
-	<version>17.0.132.637.1</version>
+    <version>17.1.132.637.0</version>
 
 
     <!--145	IntelliJ IDEA 2016.1, AppCode 2016.1, CLion 2016.1, DataGrip 2016.1, PhpStorm 2016.1, PyCharm 2016.1, RubyMine 2016.1, WebStorm 2016.1-->
@@ -40,6 +40,9 @@
 	</vendor>
 
 	<change-notes><![CDATA[
+        <br>17.1 (2017-07-14)
+        <br>- Javadoc indent fix
+        <br>- Improved performance
         <br>17.0 (2017-07-07)
         <br>- Bundled formatters from Eclipse 4.7
         <br>- Introduced Project Specific profile

src/java/krasa/formatter/plugin/DelegatingCodeStyleManager.java

@@ -192,4 +192,16 @@ public void reformatTextWithContext(@NotNull PsiFile psiFile, @NotNull ChangedRa
     public void reformatTextWithContext(@NotNull PsiFile psiFile, @NotNull Collection<TextRange> collection) throws IncorrectOperationException {
         original.reformatTextWithContext(psiFile, collection);
     }
+
+	//  2017.2
+	@Override
+	public int getSpacing(@NotNull PsiFile file, int offset) {
+		return original.getSpacing(file, offset);
+	}
+
+	//  2017.2
+	@Override
+	public int getMinLineFeeds(@NotNull PsiFile file, int offset) {
+		return original.getMinLineFeeds(file, offset);
+	}
 }

src/java/krasa/formatter/plugin/ManualCodeStyleManagerDelegator.java

@@ -0,0 +1,58 @@
+package krasa.formatter.plugin;
+
+import com.intellij.formatting.FormattingMode;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.codeStyle.CodeStyleManager;
+import com.intellij.psi.codeStyle.FormattingModeAwareIndentAdjuster;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+
+public class ManualCodeStyleManagerDelegator extends DelegatingCodeStyleManager implements FormattingModeAwareIndentAdjuster {
+	private static final Logger log = Logger.getInstance(ManualCodeStyleManagerDelegator.class.getName());
+
+	private final EclipseCodeStyleManager eclipseCodeStyleManager;
+
+
+	public ManualCodeStyleManagerDelegator(@NotNull CodeStyleManager original, EclipseCodeStyleManager eclipseCodeStyleManager) {
+		super(original);
+		this.eclipseCodeStyleManager = eclipseCodeStyleManager;
+	}
+
+	@Override
+	public void reformatTextWithContext(@NotNull PsiFile psiFile, @NotNull Collection<TextRange> collection) throws IncorrectOperationException {
+		eclipseCodeStyleManager.reformatTextWithContext(psiFile, collection);
+	}
+
+	@Override
+	public void reformatText(@NotNull PsiFile psiFile, @NotNull Collection<TextRange> textRanges) throws IncorrectOperationException {
+		eclipseCodeStyleManager.reformatText(psiFile, textRanges);
+	}
+
+	@Override
+	public void reformatText(@NotNull PsiFile psiFile, int startOffset, int endOffset) throws IncorrectOperationException {
+		eclipseCodeStyleManager.reformatText(psiFile, startOffset, endOffset);
+	}
+
+	@Override
+	public int adjustLineIndent(@NotNull Document document, int offset, FormattingMode formattingMode) {
+		if (original instanceof FormattingModeAwareIndentAdjuster) {
+			return ((FormattingModeAwareIndentAdjuster) original).adjustLineIndent(document, offset, formattingMode);
+		} else {
+			return offset;
+		}
+	}
+
+	@Override
+	public FormattingMode getCurrentFormattingMode() {
+		if (original instanceof FormattingModeAwareIndentAdjuster) {
+			return ((FormattingModeAwareIndentAdjuster) original).getCurrentFormattingMode();
+		} else {
+			return FormattingMode.REFORMAT;
+		}
+	}
+}

src/java/krasa/formatter/plugin/ProjectCodeStyleInstaller.java

@@ -8,16 +8,14 @@
 
 package krasa.formatter.plugin;
 
-import static krasa.formatter.plugin.ProxyUtils.createProxy;
-
-import org.jetbrains.annotations.NotNull;
-import org.picocontainer.MutablePicoContainer;
-
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.codeStyle.CodeStyleManager;
-
 import krasa.formatter.settings.Settings;
+import org.jetbrains.annotations.NotNull;
+import org.picocontainer.MutablePicoContainer;
+
+import static krasa.formatter.plugin.ProxyUtils.createProxy;
 
 /**
  * Switches a project's {@link CodeStyleManager} to a eclipse formatter and back.
@@ -53,6 +51,7 @@ public EclipseCodeStyleManager install(@NotNull Settings settings) {
 			overridingObject = new EclipseCodeStyleManager(currentManager, settings);
 		}
 		CodeStyleManager proxy = createProxy(currentManager, overridingObject);
+//		CodeStyleManager proxy = new ManualCodeStyleManagerDelegator(currentManager, overridingObject);
 
 		LOG.info("Overriding " + currentManager.getClass().getCanonicalName() + " with " + overridingObject.getClass().getCanonicalName() + "' for project '"
 				+ project.getName() + "' using CGLIB proxy");

src/java/krasa/formatter/plugin/ProxyUtils.java

@@ -2,11 +2,25 @@
 
 
 import com.intellij.psi.codeStyle.CodeStyleManager;
+import com.intellij.psi.codeStyle.FormattingModeAwareIndentAdjuster;
+import org.jetbrains.annotations.NotNull;
 
 public class ProxyUtils {
 	public static CodeStyleManager createProxy(CodeStyleManager manager, EclipseCodeStyleManager overridingObject) {
-		return (CodeStyleManager) net.sf.cglib.proxy.Enhancer.create(CodeStyleManager.class, new ProxyCodeStyleManagerDelegator(manager, overridingObject));
-    }
+		return (CodeStyleManager) net.sf.cglib.proxy.Enhancer.create(CodeStyleManager.class,
+				getInterfaces(),
+				new ProxyCodeStyleManagerDelegator(manager, overridingObject));
+	}
+
+	@NotNull
+	private static Class[] getInterfaces() {
+		try {
+			return new Class[]{FormattingModeAwareIndentAdjuster.class};
+		} catch (Throwable e) {
+			//old API < IJ ~2017
+			return new Class[]{};
+		}
+	}
 
 
 }