From bcba80ea1f127c2ffdb4a1100445a98f103a427f Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Fri, 3 May 2013 21:23:19 +0400 Subject: [PATCH] comment by block: fix intersection inference --- .../generation/CommentByBlockCommentHandler.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java index 6d287064b112..7fe93edca8fe 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java @@ -225,12 +225,13 @@ public class CommentByBlockCommentHandler implements CodeInsightActionHandler { } private boolean isWhiteSpaceOrComment(@NotNull PsiElement element, @NotNull TextRange range) { - TextRange intersection = range.intersection(element.getTextRange()); + final TextRange textRange = element.getTextRange(); + TextRange intersection = range.intersection(textRange); if (intersection == null) { return false; } - intersection = TextRange.from(Math.max(intersection.getStartOffset() - element.getTextRange().getStartOffset(), 0), - Math.min(intersection.getEndOffset() - element.getTextRange().getStartOffset(), element.getTextRange().getLength())); + intersection = TextRange.create(Math.max(intersection.getStartOffset() - textRange.getStartOffset(), 0), + Math.min(intersection.getEndOffset() - textRange.getStartOffset(), textRange.getLength())); return isWhiteSpaceOrComment(element) || intersection.substring(element.getText()).trim().length() == 0; }