[platform] Refactor: Replace repeated regex string literals with compiled Patterns and improve version comparisons

Author: kamilkrzywanski

java/java-impl/src/com/intellij/codeInsight/NonCodeAnnotationsLineMarkerProvider.java

@@ -43,13 +43,15 @@
 import javax.swing.*;
 import java.awt.event.MouseEvent;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static com.intellij.lang.documentation.QuickDocHighlightingHelper.CODE_BLOCK_PREFIX;
 import static com.intellij.lang.documentation.QuickDocHighlightingHelper.CODE_BLOCK_SUFFIX;
 
 public abstract class NonCodeAnnotationsLineMarkerProvider extends LineMarkerProviderDescriptor {
   protected enum LineMarkerType { External, InferredNullability, InferredContract }
+  private static final Pattern CODE_TAG_PATTERN = Pattern.compile("</?code>");
 
   private static LineMarkerType getAnnotationLineMarkerType(Collection<? extends AnnotationDocGenerator> nonCodeAnnotations) {
     if (ContainerUtil.find(nonCodeAnnotations, (anno) -> !anno.isInferred()) != null) {
@@ -117,7 +119,9 @@ private LineMarkerInfo<?> buildLineMarkerInfo(@NotNull PsiElement element) {
 
     String tooltip = XmlStringUtil.wrapInHtml(
       "<p>" + NonCodeAnnotationGenerator.getNonCodeHeaderAvailable(nonCodeAnnotations) + CommonXmlStrings.NBSP + JavaBundle.message("non.code.annotations.explanation.full.signature") + "\n" +
-      CODE_BLOCK_PREFIX + JavaDocInfoGeneratorFactory.create(owner.getProject(), owner).generateSignature(owner).replaceAll("</?code>", "") + CODE_BLOCK_SUFFIX);
+      CODE_BLOCK_PREFIX +
+      CODE_TAG_PATTERN.matcher(JavaDocInfoGeneratorFactory.create(owner.getProject(), owner).generateSignature(owner)).replaceAll("") +
+      CODE_BLOCK_SUFFIX);
     return new LineMarkerInfo<>(element, element.getTextRange(), AllIcons.Gutter.ExtAnnotation, __ -> tooltip, MyIconGutterHandler.INSTANCE,
                                 GutterIconRenderer.Alignment.RIGHT);
   }

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java

@@ -57,6 +57,7 @@ public abstract class ImportClassFixBase<T extends PsiElement, R extends PsiRefe
   private final PsiFile myContainingPsiFile;
   private final boolean myInContent;
   private final ThreeState extensionsAllowToChangeFileSilently;
+  private static final Pattern NO_AUTO_IMPORT_PATTERN = Pattern.compile(DaemonCodeAnalyzerSettings.getInstance().NO_AUTO_IMPORT_PATTERN);
 
   @RequiresBackgroundThread
   @RequiresReadLock
@@ -96,7 +97,7 @@ protected boolean isStillAvailable() {
     }
     // ok, something did change. but can we still import? (in case of auto-import there maybe multiple fixes wanting to be executed)
     List<? extends PsiClass> classesToImport = getClassesToImport(true);
-    return myContainingPsiFile.isValid() && !classesToImport.isEmpty() && 
+    return myContainingPsiFile.isValid() && !classesToImport.isEmpty() &&
            !isClassDefinitelyPositivelyImportedAlready(myContainingPsiFile, classesToImport.get(0));
   }
 
@@ -407,8 +408,7 @@ private boolean isReferenceNameForbiddenForAutoImport() {
     try {
       String name = getQualifiedName(myReferenceElement);
       if (name != null) {
-        Pattern pattern = Pattern.compile(DaemonCodeAnalyzerSettings.getInstance().NO_AUTO_IMPORT_PATTERN);
-        Matcher matcher = pattern.matcher(name);
+        Matcher matcher = NO_AUTO_IMPORT_PATTERN.matcher(name);
         if (matcher.matches()) {
           return true;
         }

java/java-impl/src/com/siyeh/ig/naming/ClassNamingConvention.java

@@ -25,10 +25,11 @@ public final class ClassNamingConvention extends NamingConvention<PsiClass> {
   public static final @NonNls String CLASS_NAMING_CONVENTION_SHORT_NAME = "ClassNamingConvention";
   private static final int DEFAULT_MIN_LENGTH = 8;
   private static final int DEFAULT_MAX_LENGTH = 64;
+  private static final @NonNls NamingConventionBean DEFAULT_BEAN = new NamingConventionBean("[A-Z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
 
   @Override
   public NamingConventionBean createDefaultBean() {
-    return new NamingConventionBean("[A-Z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
+    return DEFAULT_BEAN;
   }
 
   @Override

java/java-impl/src/com/siyeh/ig/naming/InstanceMethodNamingConvention.java

@@ -27,10 +27,10 @@ public final class InstanceMethodNamingConvention extends NamingConvention<PsiMe
   private static final int DEFAULT_MIN_LENGTH = 4;
   private static final int DEFAULT_MAX_LENGTH = 32;
   public static final @NonNls String INSTANCE_METHOD_NAMING_CONVENTION = "InstanceMethodNamingConvention";
-
+  private static final @NonNls NamingConventionBean DEFAULT_BEAN = new NamingConventionBean("[a-z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
   @Override
   public NamingConventionBean createDefaultBean() {
-    return new NamingConventionBean("[a-z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
+    return DEFAULT_BEAN;
   }
 
   @Override
@@ -47,4 +47,4 @@ public boolean isApplicable(PsiMethod member) {
   public String getShortName() {
     return INSTANCE_METHOD_NAMING_CONVENTION;
   }
-}
+}

java/java-impl/src/com/siyeh/ig/naming/NativeMethodNamingConvention.java

@@ -20,11 +20,13 @@
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiModifier;
 import com.siyeh.InspectionGadgetsBundle;
+import org.jetbrains.annotations.NonNls;
 
 public final class NativeMethodNamingConvention extends NamingConvention<PsiMethod>{
 
   private static final int DEFAULT_MIN_LENGTH = 4;
   private static final int DEFAULT_MAX_LENGTH = 32;
+  private static final @NonNls NamingConventionBean DEFAULT_BEAN = new NamingConventionBean("[a-z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
 
   @Override
   public String getElementDescription() {
@@ -33,7 +35,7 @@ public String getElementDescription() {
 
   @Override
   public NamingConventionBean createDefaultBean() {
-    return new NamingConventionBean("[a-z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
+    return DEFAULT_BEAN;
   }
 
   @Override
@@ -45,4 +47,4 @@ public boolean isApplicable(PsiMethod member) {
   public String getShortName() {
     return "NativeMethodNamingConvention";
   }
-}
+}

java/java-impl/src/com/siyeh/ig/naming/StaticMethodNamingConvention.java

@@ -20,13 +20,15 @@
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiModifier;
 import com.siyeh.InspectionGadgetsBundle;
+import org.jetbrains.annotations.NonNls;
 
 public final class StaticMethodNamingConvention extends NamingConvention<PsiMethod> {
 
 
 
   private static final int DEFAULT_MIN_LENGTH = 4;
   private static final int DEFAULT_MAX_LENGTH = 32;
+  private static final @NonNls NamingConventionBean DEFAULT_BEAN = new NamingConventionBean("[a-z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
 
   @Override
   public String getElementDescription() {
@@ -35,7 +37,7 @@ public String getElementDescription() {
 
   @Override
   public NamingConventionBean createDefaultBean() {
-    return new NamingConventionBean("[a-z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
+    return DEFAULT_BEAN;
   }
 
   @Override

java/java-impl/src/com/siyeh/ig/naming/TypeParameterNamingConvention.java

@@ -20,15 +20,17 @@
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiTypeParameter;
 import com.siyeh.InspectionGadgetsBundle;
+import org.jetbrains.annotations.NonNls;
 
 public final class TypeParameterNamingConvention extends NamingConvention<PsiClass> {
 
   private static final int DEFAULT_MIN_LENGTH = 1;
   private static final int DEFAULT_MAX_LENGTH = 1;
+  private static final @NonNls NamingConventionBean DEFAULT_BEAN = new NamingConventionBean("[A-Z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
 
   @Override
   public NamingConventionBean createDefaultBean() {
-    return new NamingConventionBean("[A-Z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
+    return DEFAULT_BEAN;
   }
 
   @Override

java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java

@@ -32,6 +32,9 @@ public final class JavaDocUtil {
   private static final Logger LOG = Logger.getInstance(JavaDocUtil.class);
 
   private static final @NonNls Pattern ourTypePattern = Pattern.compile("[ ]+[^ ^\\[^\\]]");
+  private static final Pattern STAR_PATTERN = Pattern.compile("[*]");
+  private static final Pattern LEADING_HASH = Pattern.compile("^#");
+  private static final Pattern ALL_HASHES = Pattern.compile("#");
   private static final String JAVA_LANG = "java.lang.";
 
   private JavaDocUtil() {
@@ -211,7 +214,7 @@ private static PsiJavaModule findModuleFromRef(@NotNull PsiManager manager,
       if (rparenIndex == -1) return null;
 
       String parmsText = memberRefText.substring(parenthIndex + 1, rparenIndex).trim();
-      StringTokenizer tokenizer = new StringTokenizer(parmsText.replaceAll("[*]", ""), ",");
+      StringTokenizer tokenizer = new StringTokenizer(STAR_PATTERN.matcher(parmsText).replaceAll(""), ",");
       PsiType[] types = PsiType.createArray(tokenizer.countTokens());
       int i = 0;
       PsiElementFactory factory = JavaPsiFacade.getElementFactory(aClass.getProject());
@@ -369,7 +372,8 @@ public static String getLabelText(Project project, PsiManager manager, String re
       return refText;
     }
     if (refElement == null) {
-      return refText.replaceFirst("^#", "").replaceAll("#", ".");
+      String withoutLeading = LEADING_HASH.matcher(refText).replaceFirst("");
+      return ALL_HASHES.matcher(withoutLeading).replaceAll(".");
     }
     int poundIndex = refText.indexOf('#');
     if (poundIndex < 0) {

platform/analysis-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionActionWrapper.java

@@ -23,9 +23,11 @@
 
 import java.util.Collection;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 public final class IntentionActionWrapper implements IntentionAction, ShortcutProvider, IntentionActionDelegate, Comparable<IntentionAction> {
   private final IntentionActionBean extension;
+  private static final Pattern DOLLAR_PATTERN = Pattern.compile("\\$");
   private IntentionAction instance;
   private String fullFamilyName;
 
@@ -41,7 +43,7 @@ public IntentionActionWrapper(@NotNull IntentionActionBean extension) {
 
   @ApiStatus.Internal
   public static @NotNull String getDescriptionDirectoryName(@NotNull String fqn) {
-    return fqn.substring(fqn.lastIndexOf('.') + 1).replaceAll("\\$", "");
+    return DOLLAR_PATTERN.matcher(fqn.substring(fqn.lastIndexOf('.') + 1)).replaceAll("");
   }
 
   @Override

platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java

@@ -26,6 +26,7 @@
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.*;
+import java.util.regex.Pattern;
 
 /**
  * Various utility methods for working with {@link VirtualFile}.
@@ -40,6 +41,7 @@ public class VfsUtilCore {
   public static final String VFS_SEPARATOR = "/";
 
   private static final String PROTOCOL_DELIMITER = ":";
+  private static final Pattern VFS_URL_SPLIT = Pattern.compile("://");
 
   /**
    * @param strict if {@code false} then this method returns {@code true} if {@code ancestor} and {@code file} are equal
@@ -578,7 +580,7 @@ else if (c == ':') {
       }
     }
 
-    String[] split = vfsUrl.split("://");
+    String[] split = VFS_URL_SPLIT.split(vfsUrl);
 
     if (split.length != 2) {
       LOG.debug("Malformed VFS URL: " + vfsUrl);
@@ -789,7 +791,7 @@ else if (isOrphan2) {
     }
     return 0;
   }
-  
+
   public static boolean hasInvalidFiles(@NotNull Iterable<? extends VirtualFile> files) {
     for (VirtualFile file : files) {
       if (!file.isValid()) {