From 202fad318fe1862247cab1ad389e8a6b80deb20d Mon Sep 17 00:00:00 2001
From: Vasily Romanikhin <vasily.romanikhin@jetbrains.com>
Date: Wed, 18 Apr 2018 15:37:04 +0300
Subject: [PATCH 1/3] CPP-744: fixed FileUtil.FILE_HASHING_STRATEGY

---
 platform/util/src/com/intellij/openapi/util/io/FileUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
index 79d5d641511d..e52276339714 100644
--- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
@@ -59,7 +59,7 @@ public class FileUtil extends FileUtilRt {
   public static final TObjectHashingStrategy<String> PATH_HASHING_STRATEGY = FilePathHashingStrategy.create();
 
   public static final TObjectHashingStrategy<File> FILE_HASHING_STRATEGY =
-    SystemInfo.isFileSystemCaseSensitive ? ContainerUtil.<File>canonicalStrategy() : new TObjectHashingStrategy<File>() {
+    new TObjectHashingStrategy<File>() {
       @Override
       public int computeHashCode(File object) {
         return fileHashCode(object);

From 9ca4cdbb4adacca5b15f4b8777946fe530d3c937 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 3 May 2018 15:58:43 +0300
Subject: [PATCH 2/3] make "use bounded wildcards" inspection off by default,
 enable in our project profile instead

---
 .idea/inspectionProfiles/idea_default.xml                | 1 +
 .../InspectionGadgets/src/META-INF/InspectionGadgets.xml | 2 +-
 .../com/siyeh/ig/style/BoundedWildcardInspection.java    | 4 ++++
 .../com/siyeh/igtest/style/bounded_wildcard/Simple.java  | 9 +++++++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index 6d0023466ae4..fbdb5d97b9ee 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -158,6 +158,7 @@
     <inspection_tool class="BeforeOrAfterIsPublicVoidNoArg" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="BindingAnnotationWithoutInject" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BoundedWildcard" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="BpmnConfigDomInspection" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="BuildoutUnresolvedPartInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="BusyWait" enabled="true" level="WARNING" enabled_by_default="true" />
diff --git a/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml b/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml
index 8af7166a00e4..e1e98a4ad774 100644
--- a/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml
+++ b/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml
@@ -2281,7 +2281,7 @@
                      key="assert.message.not.string.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.style.AssertMessageNotStringInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="BoundedWildcard" bundle="com.siyeh.InspectionGadgetsBundle" key="bounded.wildcard.display.name"
-                     groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues" enabledByDefault="true"
+                     groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.style.BoundedWildcardInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="CallToStringConcatCanBeReplacedByOperator" bundle="com.siyeh.InspectionGadgetsBundle"
                      key="call.to.string.concat.can.be.replaced.by.operator.display.name" groupBundle="messages.InspectionsBundle"
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/BoundedWildcardInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/BoundedWildcardInspection.java
index e752181618a2..44b780119043 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/BoundedWildcardInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/BoundedWildcardInspection.java
@@ -308,6 +308,9 @@ public class BoundedWildcardInspection extends AbstractBaseJavaLocalInspectionTo
         else {
           boolean canBeSuperT = isPassedToMethodWhichAlreadyAcceptsQuestionT(ref, superT, method);
           boolean canBeExtendsT = isPassedToMethodWhichAlreadyAcceptsQuestionT(ref, extendsT, method);
+          if (canBeExtendsT && canBeSuperT) {
+            return true; // ignore e.g. recursive call
+          }
           // otherwise it can be just "foo(Object)" to which anything can be passed - not very interesting
           if (canBeSuperT != canBeExtendsT || v[0] != Variance.NOVARIANT) {
             if (canBeSuperT && (v[0] == Variance.NOVARIANT || v[0] == Variance.CONTRAVARIANT)) {
@@ -319,6 +322,7 @@ public class BoundedWildcardInspection extends AbstractBaseJavaLocalInspectionTo
               return true;
             }
           }
+
           // some strange usage. do not highlight
           v[0] = Variance.INVARIANT;
         }
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/bounded_wildcard/Simple.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/bounded_wildcard/Simple.java
index 715b8fd9ca7d..1f0d0af69272 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/bounded_wildcard/Simple.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/bounded_wildcard/Simple.java
@@ -113,6 +113,15 @@ public class Simple<T> {
       //buffer.append(" [...]\n");
     }
   }
+  ///////// recursive 2
+  public static boolean isBackpointerReference(Object expression, Processor<<warning descr="Can generalize to '? super Number'">Number</warning>> numberCond) {
+    if (expression instanceof Number) {
+      final String contents = expression.toString();
+      return isBackpointerReference(contents, numberCond);
+    }
+    return expression instanceof Number && numberCond.process((Number)expression);
+  }
+
 
   ///////// can't deduce anything - too general
   private static String findNonCodeAnnotation(Collection<String> annotationNames, Map<Collection<String>, String> map ) {

From a5571185f5b115bebed8c68308dab3df880271fd Mon Sep 17 00:00:00 2001
From: Ivan Semenov <ivan.semenov@jetbrains.com>
Date: Sat, 28 Apr 2018 16:58:15 +0300
Subject: [PATCH 3/3] [ui] Allow running `UIUtil.fixFormattedField` in headless
 mode

Otherwise TraverseUI fails on Mac
---
 platform/util/src/com/intellij/util/ui/UIUtil.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java
index ec14a1f75839..9daf20485d62 100644
--- a/platform/util/src/com/intellij/util/ui/UIUtil.java
+++ b/platform/util/src/com/intellij/util/ui/UIUtil.java
@@ -23,6 +23,7 @@ import com.intellij.util.ui.accessibility.ScreenReader;
 import org.intellij.lang.annotations.JdkConstants;
 import org.intellij.lang.annotations.Language;
 import org.jetbrains.annotations.*;
+import sun.awt.HeadlessToolkit;
 import sun.java2d.SunGraphicsEnvironment;
 
 import javax.sound.sampled.AudioInputStream;
@@ -3359,6 +3360,7 @@ public class UIUtil {
   public static void fixFormattedField(JFormattedTextField field) {
     if (SystemInfo.isMac) {
       final Toolkit toolkit = Toolkit.getDefaultToolkit();
+      if (toolkit instanceof HeadlessToolkit) return;
       final int commandKeyMask = toolkit.getMenuShortcutKeyMask();
       final InputMap inputMap = field.getInputMap();
       final KeyStroke copyKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_C, commandKeyMask);