IDEA-200275 Multiline TODO: support line Split in block comments

platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterInBlockCommentHandler.java

@@ -3,6 +3,7 @@
 package com.intellij.codeInsight.editorActions.enter;
 
 import com.intellij.codeInsight.editorActions.EnterHandler;
+import com.intellij.ide.todo.TodoConfiguration;
 import com.intellij.lang.CodeDocumentationAwareCommenter;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Document;
@@ -17,6 +18,7 @@ import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.util.DocumentUtil;
 import com.intellij.util.ObjectUtils;
 import com.intellij.util.text.CharArrayUtil;
 import org.jetbrains.annotations.NotNull;
@@ -63,6 +65,22 @@ public class EnterInBlockCommentHandler extends EnterHandlerDelegateAdapter {
       return Result.Default;
     }
 
+    int additionalIndent = 0;
+    if (TodoConfiguration.getInstance().isMultiLine()) {
+      int lineStartOffset = DocumentUtil.getLineStartOffset(caretOffset, document);
+      int todoOffset = EnterInCommentUtil.getTodoTextOffset(text, lineStartOffset, caretOffset);
+      if (todoOffset >= 0) {
+        int lineEndOffset = DocumentUtil.getLineEndOffset(caretOffset, document);
+        if (todoOffset == EnterInCommentUtil.getTodoTextOffset(text, lineStartOffset, lineEndOffset)) {
+          int nonWsLineStart = CharArrayUtil.shiftForward(text, lineStartOffset, WHITESPACE);
+          if (todoOffset >= nonWsLineStart) {
+            additionalIndent = todoOffset - nonWsLineStart + 1;
+            document.insertString(caretOffset, StringUtil.repeat(" ", additionalIndent));
+          }
+        }
+      }
+    }
+
     String linePrefix = commenter.getDocumentationCommentLinePrefix();
     if (linePrefix == null) return Result.Continue;
 
@@ -71,8 +89,10 @@ public class EnterInBlockCommentHandler extends EnterHandlerDelegateAdapter {
     if (StringUtil.startsWith(text, CharArrayUtil.shiftForward(text, refOffset, WHITESPACE), linePrefix)) {
       int endOffset = CharArrayUtil.shiftForward(text, caretOffset, WHITESPACE);
       if (endOffset < text.length() && text.charAt(endOffset) != '\n') endOffset = caretOffset;
-      document.replaceString(caretOffset, endOffset, linePrefix + " ");
-      caretAdvance.set(linePrefix.length() + 1);
+      int valueLength = linePrefix.length() + 1;
+      int endOffsetToReplace = endOffset > caretOffset ? endOffset : caretOffset + Math.min(additionalIndent, valueLength);
+      document.replaceString(caretOffset, endOffsetToReplace, linePrefix + " ");
+      caretAdvance.set(Math.max(valueLength, additionalIndent));
       return Result.DefaultForceIndent;
     }
     return Result.Continue;

platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterInCommentUtil.java

@@ -2,14 +2,18 @@
 package com.intellij.codeInsight.editorActions.enter;
 
 import com.intellij.codeInsight.editorActions.EnterHandler;
+import com.intellij.ide.todo.TodoConfiguration;
 import com.intellij.lang.CodeDocumentationAwareCommenter;
 import com.intellij.lang.Commenter;
 import com.intellij.lang.Language;
 import com.intellij.lang.LanguageCommenters;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.psi.search.TodoPattern;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.regex.Matcher;
+
 public class EnterInCommentUtil {
   @Nullable
   public static CodeDocumentationAwareCommenter getDocumentationAwareCommenter(@NotNull DataContext dataContext) {
@@ -20,4 +24,19 @@ public class EnterInCommentUtil {
     return languageCommenter instanceof CodeDocumentationAwareCommenter
            ? (CodeDocumentationAwareCommenter)languageCommenter : null;
   }
+
+  public static boolean isTodoText(@NotNull CharSequence text, int startOffset, int endOffset) {
+    return getTodoTextOffset(text, startOffset, endOffset) >= 0;
+  }
+
+  public static int getTodoTextOffset(@NotNull CharSequence text, int startOffset, int endOffset) {
+    CharSequence input = text.subSequence(startOffset, endOffset);
+    for (TodoPattern pattern : TodoConfiguration.getInstance().getTodoPatterns()) {
+      Matcher matcher = pattern.getPattern().matcher(input);
+      if (matcher.find()) {
+        return startOffset + matcher.start();
+      }
+    }
+    return -1;
+  }
 }

platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterInLineCommentHandler.java

@@ -29,7 +29,6 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.DocumentUtil;
-import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.text.CharArrayUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -76,8 +75,8 @@ public class EnterInLineCommentHandler extends EnterHandlerDelegateAdapter {
         int indentEnd = CharArrayUtil.shiftForward(text, indentStart, WHITESPACE);
         CharSequence currentLineSpacing = text.subSequence(indentStart, indentEnd);
         if (TodoConfiguration.getInstance().isMultiLine() &&
-            isTodoText(text, lineCommentStartOffset, caretOffset) &&
-            isTodoText(text, lineCommentStartOffset, DocumentUtil.getLineEndOffset(lineCommentStartOffset, document))) {
+            EnterInCommentUtil.isTodoText(text, lineCommentStartOffset, caretOffset) &&
+            EnterInCommentUtil.isTodoText(text, lineCommentStartOffset, DocumentUtil.getLineEndOffset(lineCommentStartOffset, document))) {
           spacing = currentLineSpacing + " ";
         }
         else if (currentLineSpacing.length() > 0) {
@@ -106,9 +105,4 @@ public class EnterInLineCommentHandler extends EnterHandlerDelegateAdapter {
     return iterator.getTokenType() == commenter.getLineCommentTokenType() &&
            (iterator.getStart() + (prefix == null ? 0 : prefix.length())) <= offset ? iterator.getStart() : -1;
   }
-
-  private static boolean isTodoText(@NotNull CharSequence text, int startOffset, int endOffset) {
-    CharSequence input = text.subSequence(startOffset, endOffset);
-    return ContainerUtil.exists(TodoConfiguration.getInstance().getTodoPatterns(), pattern -> pattern.getPattern().matcher(input).find());
-  }
 }