From 5cdbcf8feb7bb15ec35cd2233f32ac40c3f9dd21 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 20 Dec 2018 16:19:05 +0100
Subject: [PATCH] Cleanup (unneeded delegation; formatting; typos)

---
 .../codeInsight/javadoc/JavaDocExternalFilter.java |  4 ++--
 .../codeInsight/javadoc/JavaDocInfoGenerator.java  |  7 ++-----
 .../documentation/AbstractExternalFilter.java      | 14 ++++++--------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocExternalFilter.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocExternalFilter.java
index 1d900e60d3b0..33abb6e6dd85 100644
--- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocExternalFilter.java
+++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocExternalFilter.java
@@ -78,9 +78,9 @@ public class JavaDocExternalFilter extends AbstractExternalFilter {
     return text == null ? null : PlatformDocumentationUtil.fixupText(text);
   }
 
-  @Override
   @Nullable
-   public String getExternalDocInfoForElement(@NotNull String docURL, PsiElement element) throws Exception {
+  @Override
+  public String getExternalDocInfoForElement(@NotNull String docURL, PsiElement element) throws Exception {
     String externalDoc = null;
     myElement = element;
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
index 0af0f44ecfd5..b0394ec11476 100644
--- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
@@ -224,7 +224,8 @@ public class JavaDocInfoGenerator {
       int groupStart = matcher.start(1);
       int groupEnd = matcher.end(1);
       result.append(text, prev, groupStart);
-      result.append(convertReference(text.substring(groupStart, groupEnd)));
+      String href = text.substring(groupStart, groupEnd);
+      result.append(ObjectUtils.notNull(createReferenceForRelativeLink(href, myElement), href));
       prev = groupEnd;
     }
     if (result.length() == 0) return text; // don't copy text over, if there are no matches
@@ -232,10 +233,6 @@ public class JavaDocInfoGenerator {
     return result.toString();
   }
 
-  private String convertReference(String href) {
-    return ObjectUtils.notNull(createReferenceForRelativeLink(href, myElement), href);
-  }
-
   /**
    * Converts a relative link into {@link DocumentationManagerProtocol#PSI_ELEMENT_PROTOCOL PSI_ELEMENT_PROTOCOL}-type link if possible
    */
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/AbstractExternalFilter.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/AbstractExternalFilter.java
index 8cc3d880d4f2..dc31d86a3f7e 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/AbstractExternalFilter.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/AbstractExternalFilter.java
@@ -91,8 +91,8 @@ public abstract class AbstractExternalFilter {
 
   public CharSequence correctRefs(String root, CharSequence read) {
     CharSequence result = read;
-    for (RefConvertor myReferenceConvertor : getRefConverters()) {
-      result = myReferenceConvertor.refFilter(root, result);
+    for (RefConvertor converter : getRefConverters()) {
+      result = converter.refFilter(root, result);
     }
     return result;
   }
@@ -187,16 +187,14 @@ public abstract class AbstractExternalFilter {
     }
     while (read != null && matchStart && !startSection.matcher(StringUtil.toUpperCase(read)).find());
 
-    if (input instanceof MyReader && contentEncoding != null && !contentEncoding.equalsIgnoreCase(CharsetToolkit.UTF8) &&
-        !contentEncoding.equals(((MyReader)input).getEncoding())) {
+    if (input instanceof MyReader && contentEncoding != null &&
+        !(contentEncoding.equalsIgnoreCase(CharsetToolkit.UTF8) || contentEncoding.equals(((MyReader)input).getEncoding()))) {
       //restart page parsing with correct encoding
       try {
         data.setLength(0);
         doBuildFromStream(url, new MyReader(((MyReader)input).myInputStream, contentEncoding), data, false, true);
       }
-      catch (ProcessCanceledException e) {
-        return;
-      }
+      catch (ProcessCanceledException ignored) { }
       return;
     }
 
@@ -268,7 +266,7 @@ public abstract class AbstractExternalFilter {
   }
 
   private static boolean skipBlockList(String read) {
-    return StringUtil.toUpperCase(read).contains(HR) ||
+    return StringUtil.containsIgnoreCase(read, HR) ||
            StringUtil.containsIgnoreCase(read, "<ul class=\"blockList\">") ||
            StringUtil.containsIgnoreCase(read, "<li class=\"blockList\">");
   }