MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-100722 Commenting block of Java code with EOL comments unfolds imports and top comment

Browse Source 
Use bulk processing only when number of lines to be commented is relatively big. 'Relatively big' might be tweaked via 'idea.bulk.comment.lines.trigger' property. Default value is 100. We need that change because the whole bulk processing is implemented in a way 'drop all cached info on bulk change start; re-calculate all necessary info on bulk update end'. I.e. there is no point in recalculating everything when, for example, one line is commented
This commit is contained in:
Denis.Zhdanov
2013-02-11 13:19:51 +04:00
parent 4f77be4afb
commit 09df3b6400
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java
+19 -14
View File
@@ -46,6 +46,7 @@ import com.intellij.psi.codeStyle.Indent;
import com.intellij.psi.util.PsiUtilBase;
import com.intellij.util.DocumentUtil;
import com.intellij.util.StringBuilderSpinAllocator;
import com.intellij.util.SystemProperties;
import com.intellij.util.containers.IntArrayList;
import com.intellij.util.text.CharArrayUtil;
import gnu.trove.THashMap;
@@ -55,19 +56,23 @@ import org.jetbrains.annotations.Nullable;
import java.util.Map;
public class CommentByLineCommentHandler implements CodeInsightActionHandler {
private Project myProject;
private PsiFile myFile;
private Document myDocument;
private Editor myEditor;
private int myStartOffset;
private int myEndOffset;
private int myStartLine;
private int myEndLine;
private int[] myStartOffsets;
private int[] myEndOffsets;
private Commenter[] myCommenters;
private static final int MIN_LINES_TO_COMMENT_TO_USE_BULK_PROCESSING
= SystemProperties.getIntProperty("idea.bulk.comment.lines.trigger", 100);
private Project myProject;
private PsiFile myFile;
private Document myDocument;
private Editor myEditor;
private int myStartOffset;
private int myEndOffset;
private int myStartLine;
private int myEndLine;
private int[] myStartOffsets;
private int[] myEndOffsets;
private Commenter[] myCommenters;
private Map<SelfManagingCommenter, CommenterDataHolder> myCommenterStateMap;
private CodeStyleManager myCodeStyleManager;
private CodeStyleManager myCodeStyleManager;
@Override
public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) {
@@ -419,7 +424,7 @@ public class CommentByLineCommentHandler implements CodeInsightActionHandler {
}
public void doDefaultCommenting(final Commenter commenter) {
DocumentUtil.executeInBulk(myDocument, true, new Runnable() {
DocumentUtil.executeInBulk(myDocument, myEndLine - myStartLine >= MIN_LINES_TO_COMMENT_TO_USE_BULK_PROCESSING, new Runnable() {
@Override
public void run() {
for (int line = myEndLine; line >= myStartLine; line--) {
@@ -435,7 +440,7 @@ public class CommentByLineCommentHandler implements CodeInsightActionHandler {
final FileType fileType = myFile.getFileType();
final Indent minIndent = computeMinIndent(myStartLine, myEndLine, chars, myCodeStyleManager, fileType);
DocumentUtil.executeInBulk(myDocument, true, new Runnable() {
DocumentUtil.executeInBulk(myDocument, myEndLine - myStartLine > MIN_LINES_TO_COMMENT_TO_USE_BULK_PROCESSING, new Runnable() {
@Override
public void run() {
for (int line = myEndLine; line >= myStartLine; line--) {