MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

JoinLinesHandler: convert end of line comments as a separate stage for all lines at once

Browse Source 
GitOrigin-RevId: 25aa0068b8a1bf4b2a2c08ccf8c086bb49aa30ae
This commit is contained in:
Tagir Valeev
2019-08-23 14:27:57 +07:00
committed by intellij-monorepo-bot
parent b0e2febac8
commit e8c5e2e3ec
4 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java-tests/testData/codeInsight/joinLines/ConvertManyEndOfLineComments.java Normal file
View File

@@ -0,0 +1,7 @@
class A {
void test() {
<selection>int foo; //foo
int bar; //bar
int baz; //baz</selection>
}
}

5
java/java-tests/testData/codeInsight/joinLines/ConvertManyEndOfLineComments_after.java Normal file
View File

@@ -0,0 +1,5 @@
class A {
void test() {
int foo; /*foo*/int bar; /*bar*/int baz; //baz
}
}

1
java/java-tests/testSrc/com/intellij/java/codeInsight/JoinLinesTest.java
View File

@@ -245,6 +245,7 @@ public class JoinLinesTest extends LightJavaCodeInsightTestCase {
public void testConvertComment() { doTest();}
public void testConvertComment2() { doTest();}
public void testConvertManyEndOfLineComments() { doTest();}
public void testJoiningMethodCallWhenItDoesntFit() {
CommonCodeStyleSettings settings = getJavaSettings();

53
platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java
View File

@@ -28,6 +28,9 @@ import com.intellij.util.text.CharArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import static com.intellij.codeInsight.editorActions.JoinLinesHandlerDelegate.CANNOT_JOIN;
public class JoinLinesHandler extends EditorActionHandler {
@@ -93,6 +96,8 @@ public class JoinLinesHandler extends EditorActionHandler {
Ref<Integer> caretRestoreOffset = new Ref<>(-1);
CodeEditUtil.setNodeReformatStrategy(node -> node.getTextRange().getStartOffset() >= startReformatOffset);
try {
convertEndComments(psiFile, doc, line, lineCount);
ProgressManager.checkCanceled();
int count = 0;
while (count < lineCount) {
indicator.checkCanceled();
@@ -139,11 +144,6 @@ public class JoinLinesHandler extends EditorActionHandler {
CharSequence text = doc.getCharsSequence();
JoinLinesOffsets offsets = calcJoinLinesOffsets(psiFile, doc, startLine);
if (offsets.isStartLineEndsWithComment() && !offsets.isNextLineStartsWithComment()) {
tryConvertEndOfLineComment(doc, offsets.elementAtStartLineEnd);
offsets = calcJoinLinesOffsets(psiFile, doc, startLine);
}
TextRange limits = findStartAndEnd(text, offsets.lastNonSpaceOffsetInStartLine, offsets.firstNonSpaceOffsetInNextLine);
int start = limits.getStartOffset();
int end = limits.getEndOffset();
@@ -268,31 +268,51 @@ public class JoinLinesHandler extends EditorActionHandler {
boolean isStartLineEndsWithComment() { return commentAtLineEnd != null; }
boolean isNextLineStartsWithComment() { return commentAtLineStart != null; }
boolean isJoiningSameComment() { return commentAtLineStart == commentAtLineEnd; }
PsiElement elementAtStartLineEnd;
}
private static JoinLinesOffsets calcJoinLinesOffsets(PsiFile psiFile, Document doc, int startLine) {
JoinLinesOffsets offsets = new JoinLinesOffsets();
CharSequence text = doc.getCharsSequence();
offsets.lineEndOffset = doc.getLineEndOffset(startLine);
offsets.firstNonSpaceOffsetInNextLine = doc.getLineStartOffset(startLine + 1);
while (offsets.firstNonSpaceOffsetInNextLine < text.length() - 1
&& (text.charAt(offsets.firstNonSpaceOffsetInNextLine) == ' ' || text.charAt(offsets.firstNonSpaceOffsetInNextLine) == '\t'))
{
offsets.firstNonSpaceOffsetInNextLine++;
}
offsets.firstNonSpaceOffsetInNextLine = StringUtil.skipWhitespaceForward(text, doc.getLineStartOffset(startLine + 1));
PsiElement elementAtNextLineStart = psiFile.findElementAt(offsets.firstNonSpaceOffsetInNextLine);
offsets.commentAtLineStart = getCommentElement(elementAtNextLineStart);
offsets.lastNonSpaceOffsetInStartLine = StringUtil.skipWhitespaceBackward(text, offsets.lineEndOffset);
int elemOffset = offsets.lastNonSpaceOffsetInStartLine > doc.getLineStartOffset(startLine) ? offsets.lastNonSpaceOffsetInStartLine - 1 : -1;
offsets.elementAtStartLineEnd = elemOffset == -1 ? null : psiFile.findElementAt(elemOffset);
offsets.commentAtLineEnd = getCommentElement(offsets.elementAtStartLineEnd);
offsets.commentAtLineEnd = getCommentElement(elemOffset == -1 ? null : psiFile.findElementAt(elemOffset));
return offsets;
}
private static void tryConvertEndOfLineComment(Document doc, PsiElement commentElement) {
private static void convertEndComments(PsiFile psiFile, Document doc, int startLine, int lineCount) {
List<PsiComment> endComments = new ArrayList<>();
CharSequence text = doc.getCharsSequence();
for (int i = 0; i < lineCount; i++) {
int line = startLine + i;
int lineEnd = doc.getLineEndOffset(line);
int lastNonSpaceOffset = StringUtil.skipWhitespaceBackward(text, lineEnd);
if (lastNonSpaceOffset > doc.getLineStartOffset(line)) {
PsiComment comment = getCommentElement(psiFile.findElementAt(lastNonSpaceOffset - 1));
if (comment != null) {
int nextStart = StringUtil.skipWhitespaceForward(text, doc.getLineStartOffset(line + 1));
if (getCommentElement(psiFile.findElementAt(nextStart)) == null) {
endComments.add(comment);
}
}
}
}
boolean changed = false;
for (PsiComment comment : endComments) {
changed |= tryConvertEndOfLineComment(comment);
ProgressManager.checkCanceled();
}
if (changed) {
PsiDocumentManager.getInstance(psiFile.getProject()).doPostponedOperationsAndUnblockDocument(doc);
}
}
private static boolean tryConvertEndOfLineComment(PsiElement commentElement) {
Commenter commenter = LanguageCommenters.INSTANCE.forLanguage(commentElement.getLanguage());
if (commenter instanceof CodeDocumentationAwareCommenter) {
CodeDocumentationAwareCommenter docCommenter = (CodeDocumentationAwareCommenter) commenter;
@@ -312,13 +332,14 @@ public class JoinLinesHandler extends EditorActionHandler {
PsiParserFacade parserFacade = PsiParserFacade.SERVICE.getInstance(project);
PsiComment newComment = parserFacade.createBlockCommentFromText(commentElement.getLanguage(), commentText);
commentElement.replace(newComment);
PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(doc);
return true;
}
catch (IncorrectOperationException e) {
LOG.info("Failed to replace line comment with block comment", e);
}
}
}
return false;
}
private static PsiComment getCommentElement(@Nullable final PsiElement element) {