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

IG: optimization; try to avoid walking through text-only comment line by line

Browse Source 
GitOrigin-RevId: 572ed575a139baed49ef3e7d771576cadd994945
This commit is contained in:
Bas Leijdekkers
2020-10-13 22:14:36 +00:00
committed by intellij-monorepo-bot
parent 6d7d152e48
commit 551f4792bf
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/src/com/siyeh/ig/maturity/CommentedOutCodeInspection.java
+19 -5
View File
@@ -156,10 +156,14 @@ public class CommentedOutCodeInspection extends BaseInspection {
if (lines < minLines) {
return;
}
if (isCode(text, comment)) {
final Code code = isCode(text, comment);
if (code == Code.YES) {
registerErrorAtOffset(comment, 0, 2, lines);
return;
}
else if (code == Code.NO) {
return;
}
final PsiElement after = PsiTreeUtil.skipWhitespacesForward(comment);
if (!JavaCommentUtil.isEndOfLineComment(after)) {
break;
@@ -169,7 +173,7 @@ public class CommentedOutCodeInspection extends BaseInspection {
}
else {
final String text = getCommentText(comment);
if (StringUtil.countNewLines(text) + 1 < minLines || !isCode(text, comment)) {
if (StringUtil.countNewLines(text) + 1 < minLines || isCode(text, comment) != Code.YES) {
return;
}
registerErrorAtOffset(comment, 0, 2, StringUtil.countNewLines(text) + 1);
@@ -177,9 +181,13 @@ public class CommentedOutCodeInspection extends BaseInspection {
}
}
static boolean isCode(String text, PsiElement context) {
enum Code {
YES, NO, MAYBE
}
static Code isCode(String text, PsiElement context) {
if (text.isEmpty()) {
return false;
return Code.NO;
}
final Project project = context.getProject();
final JavaCodeFragmentFactory factory = JavaCodeFragmentFactory.getInstance(project);
@@ -210,7 +218,13 @@ public class CommentedOutCodeInspection extends BaseInspection {
fragment = factory.createCodeBlockCodeFragment(text, context, false);
}
final boolean allowDanglingElse = PsiTreeUtil.getPrevSiblingOfType(context, PsiStatement.class) instanceof PsiIfStatement;
return !isInvalidCode(fragment, allowDanglingElse);
if (!isInvalidCode(fragment, allowDanglingElse)) {
return Code.YES;
}
else if (PsiTreeUtil.getDeepestLast(fragment) instanceof PsiErrorElement) {
return Code.NO;
}
return Code.MAYBE;
}
static String getCommentText(PsiComment comment) {