Merge remote branch 'origin/master'

2026-09-27 10:03:11 +07:00 · 2012-07-20 18:27:35 +04:00
parent 5a5bf0b707 eda5ca9122
commit be89d60142
2 changed files with 1179 additions and 1197 deletions
@@ -151,6 +151,12 @@ public class CommentByBlockCommentHandler implements CodeInsightActionHandler {
      else if (selectionModel.hasSelection()) {
        int selectionStart = selectionModel.getSelectionStart();
        int selectionEnd = selectionModel.getSelectionEnd();
+        if (commenter instanceof IndentedCommenter) {
+          final Boolean value = ((IndentedCommenter)commenter).forceIndentedLineComment();
+          if (value != null && value == Boolean.TRUE) {
+            selectionStart = myDocument.getLineStartOffset(myDocument.getLineNumber(selectionStart));
+          }
+        }
        commentRange(selectionStart, selectionEnd, prefix, suffix, commenter);
      }
      else {