From 551f4792bfdd02cd7d39630ee17e7a0c368a3ffd Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Tue, 13 Oct 2020 17:17:52 +0200
Subject: [PATCH] IG: optimization; try to avoid walking through text-only
 comment line by line

GitOrigin-RevId: 572ed575a139baed49ef3e7d771576cadd994945
---
 .../maturity/CommentedOutCodeInspection.java  | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/CommentedOutCodeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/CommentedOutCodeInspection.java
index 538caa866afe..8a9ec0587ae4 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/CommentedOutCodeInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/CommentedOutCodeInspection.java
@@ -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) {