From bb779bdacefa6b48412726c549e3e934164f2625 Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Tue, 29 Aug 2017 11:32:06 +0300
Subject: [PATCH 1/3] AnnotateOverriddenMethodsPredicate use optimized
 overriding method search as in missing override annotation inspection

---
 .../siyeh/ig/JavaOverridingMethodUtil.java    | 15 ++++++-
 .../MissingOverrideAnnotationInspection.java  | 13 ++----
 .../AnnotateOverriddenMethodsPredicate.java   | 43 +++++++++++--------
 .../AnnotateOverriddenMethods/Method.java     | 29 +++++++++++++
 .../Method_after.java                         | 30 +++++++++++++
 .../NotAvailable.java                         | 30 +++++++++++++
 .../AnnotateOverriddenMethods/Parameter.java  | 28 ++++++++++++
 .../Parameter_after.java                      | 28 ++++++++++++
 ...nnotateOverriddenMethodsIntentionTest.java | 43 +++++++++++++++++++
 9 files changed, 230 insertions(+), 29 deletions(-)
 create mode 100644 plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Method.java
 create mode 100644 plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Method_after.java
 create mode 100644 plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/NotAvailable.java
 create mode 100644 plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Parameter.java
 create mode 100644 plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Parameter_after.java
 create mode 100644 plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsIntentionTest.java

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/JavaOverridingMethodUtil.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/JavaOverridingMethodUtil.java
index f34dd99959d2..034155361c70 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/JavaOverridingMethodUtil.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/JavaOverridingMethodUtil.java
@@ -17,7 +17,7 @@ package com.siyeh.ig;
 
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiMethod;
+import com.intellij.psi.*;
 import com.intellij.psi.impl.java.stubs.index.JavaStubIndexKeys;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.GlobalSearchScopeUtil;
@@ -74,4 +74,17 @@ public class JavaOverridingMethodUtil {
 
     return methods.stream().filter(candidate -> PsiSuperMethodUtil.isSuperMethod(candidate, method));
   }
+
+  public static boolean containsAnnotationWithName(@NotNull PsiModifierListOwner modifierListOwner, @NotNull String shortAnnotationName) {
+    PsiModifierList list = modifierListOwner.getModifierList();
+    if (list != null) {
+      for (PsiAnnotation annotation : list.getAnnotations()) {
+        PsiJavaCodeReferenceElement ref = annotation.getNameReferenceElement();
+        if (ref != null && shortAnnotationName.equals(ref.getReferenceName())) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
 }
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/MissingOverrideAnnotationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/MissingOverrideAnnotationInspection.java
index d2baaabf9981..c4a82bb4528a 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/MissingOverrideAnnotationInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/MissingOverrideAnnotationInspection.java
@@ -40,6 +40,7 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import java.util.Arrays;
 import java.util.Objects;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 public class MissingOverrideAnnotationInspection extends BaseJavaBatchLocalInspectionTool implements CleanupLocalInspectionTool{
@@ -134,16 +135,8 @@ public class MissingOverrideAnnotationInspection extends BaseJavaBatchLocalInspe
 
         GlobalSearchScope scope = getLanguageLevelScope(minimal, project);
         if (scope == null) return;
-        Stream<PsiMethod> overridingMethods = JavaOverridingMethodUtil
-          .getOverridingMethodsIfCheapEnough(method, scope, m -> {
-          for (PsiAnnotation annotation : m.getModifierList().getAnnotations()) {
-            PsiJavaCodeReferenceElement ref = annotation.getNameReferenceElement();
-            if (ref != null && OVERRIDE_SHORT_NAME.equals(ref.getReferenceName())) {
-              return false;
-            }
-          }
-          return true;
-        });
+        Predicate<PsiMethod> preFilter = m -> !JavaOverridingMethodUtil.containsAnnotationWithName(m, OVERRIDE_SHORT_NAME);
+        Stream<PsiMethod> overridingMethods = JavaOverridingMethodUtil.getOverridingMethodsIfCheapEnough(method, scope, preFilter);
         if (overridingMethods == null) return;
         result.hierarchyAnnotated = ThreeState.fromBoolean(!overridingMethods.findAny().isPresent());
       }
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsPredicate.java
index 7b017c58c527..0fea7b92f3cb 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsPredicate.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsPredicate.java
@@ -16,15 +16,16 @@
 package com.siyeh.ipp.annotation;
 
 import com.intellij.codeInsight.AnnotationUtil;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
-import com.intellij.psi.search.searches.OverridingMethodsSearch;
-import com.siyeh.ig.psiutils.DeclarationSearchUtils;
+import com.siyeh.ig.JavaOverridingMethodUtil;
 import com.siyeh.ipp.base.PsiElementPredicate;
 
-import java.util.Collection;
+import java.util.Iterator;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 class AnnotateOverriddenMethodsPredicate implements PsiElementPredicate {
-
   @Override
   public boolean satisfiedBy(PsiElement element) {
     if (!(element instanceof PsiAnnotation)) {
@@ -65,20 +66,27 @@ class AnnotateOverriddenMethodsPredicate implements PsiElementPredicate {
       parameterIndex = -1;
       method = (PsiMethod)grandParent;
     }
-    if (DeclarationSearchUtils.isTooExpensiveToSearch(method, true)) {
-      // skip expensive check and just offer the intention when it might not be needed
-      return true;
-    }
-    final Collection<PsiMethod> overridingMethods =
-      OverridingMethodsSearch.search(method).findAll();
-    if (overridingMethods.isEmpty()) {
-      return false;
-    }
-    for (PsiMethod overridingMethod : overridingMethods) {
+
+    String annotationShortName = StringUtil.getShortName(annotationName);
+    Predicate<PsiMethod> preFilter = m -> {
+      if (parameterIndex == -1) {
+        return !JavaOverridingMethodUtil.containsAnnotationWithName(m, annotationShortName);
+      }
+      else {
+        PsiModifierListOwner parameter = (PsiModifierListOwner)m.getParameters()[parameterIndex];
+        return !JavaOverridingMethodUtil.containsAnnotationWithName(parameter, annotationShortName);
+      }
+    };
+    Stream<PsiMethod> overridenMethods = JavaOverridingMethodUtil.getOverridingMethodsIfCheapEnough(method, null, preFilter);
+    // skip expensive check and just offer the intention when it might not be needed
+    if (overridenMethods == null) return true;
+
+    Iterator<PsiMethod> it = overridenMethods.iterator();
+    while (it.hasNext()) {
+      PsiMethod overridingMethod = it.next();
       if (parameterIndex == -1) {
         final PsiAnnotation foundAnnotation =
-          AnnotationUtil.findAnnotation(overridingMethod,
-                                        annotationName);
+          AnnotationUtil.findAnnotation(overridingMethod, annotationName);
         if (foundAnnotation == null) {
           return true;
         }
@@ -89,8 +97,7 @@ class AnnotateOverriddenMethodsPredicate implements PsiElementPredicate {
         final PsiParameter[] parameters = parameterList.getParameters();
         final PsiParameter parameter = parameters[parameterIndex];
         final PsiAnnotation foundAnnotation =
-          AnnotationUtil.findAnnotation(parameter,
-                                        annotationName);
+          AnnotationUtil.findAnnotation(parameter, annotationName);
         if (foundAnnotation == null) {
           return true;
         }
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Method.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Method.java
new file mode 100644
index 000000000000..58dccd7f835e
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Method.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@interface SomeAnnotation {}
+
+public class X {
+  @SomeAnnotat<caret>ion
+  public void method() {
+
+  }
+}
+
+public class Y extends X {
+  public void method() {
+
+  }
+}
\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Method_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Method_after.java
new file mode 100644
index 000000000000..93314ebc38b0
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Method_after.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@interface SomeAnnotation {}
+
+public class X {
+  @SomeAnnotation
+  public void method() {
+
+  }
+}
+
+public class Y extends X {
+  @SomeAnnotation
+  public void method() {
+
+  }
+}
\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/NotAvailable.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/NotAvailable.java
new file mode 100644
index 000000000000..353087f2387c
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/NotAvailable.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@interface SomeAnnotation {}
+
+public class X {
+  @SomeAn<caret>notation
+  public void method() {
+
+  }
+}
+
+public class Y extends X {
+  @SomeAnnotation
+  public void method() {
+
+  }
+}
\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Parameter.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Parameter.java
new file mode 100644
index 000000000000..43b876788357
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Parameter.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@interface SomeAnnotation {}
+
+public class X {
+  public void method(@Som<caret>eAnnotation String x) {
+
+  }
+}
+
+public class Y extends X {
+  public void method(String x) {
+
+  }
+}
\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Parameter_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Parameter_after.java
new file mode 100644
index 000000000000..cc6dc03795eb
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/annotation/AnnotateOverriddenMethods/Parameter_after.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@interface SomeAnnotation {}
+
+public class X {
+  public void method(@SomeAnnotation String x) {
+
+  }
+}
+
+public class Y extends X {
+  public void method(@SomeAnnotation String x) {
+
+  }
+}
\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsIntentionTest.java b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsIntentionTest.java
new file mode 100644
index 000000000000..f9be4973ad9c
--- /dev/null
+++ b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsIntentionTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.siyeh.ipp.annotation;
+
+import com.siyeh.IntentionPowerPackBundle;
+import com.siyeh.ipp.IPPTestCase;
+
+public class AnnotateOverriddenMethodsIntentionTest extends IPPTestCase {
+  public void testMethod() {
+    doTest();
+  }
+
+  public void testParameter() {
+    doTest(IntentionPowerPackBundle.message("annotate.overridden.methods.intention.parameters.name", "@SomeAnnotation"));
+  }
+
+  public void testNotAvailable() {
+    assertIntentionNotAvailable();
+  }
+
+  @Override
+  protected String getRelativePath() {
+    return "annotation/AnnotateOverriddenMethods";
+  }
+
+  @Override
+  protected String getIntentionName() {
+    return IntentionPowerPackBundle.message("annotate.overridden.methods.intention.method.name", "@SomeAnnotation");
+  }
+}
\ No newline at end of file

From a60937244492997edb6a67dec9671d1b83a405ab Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Tue, 29 Aug 2017 11:53:01 +0300
Subject: [PATCH 2/3] don't fail on broken regex (WEB-27269)

---
 .../lib/editorconfig-core-java.jar            | Bin 13569 -> 13625 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/plugins/editorconfig/lib/editorconfig-core-java.jar b/plugins/editorconfig/lib/editorconfig-core-java.jar
index 2cecdf5f9ad81ef2432aed4d9e84ebd342113743..c4067aef15ad6a66476ac73a0b3119420ab43a5a 100644
GIT binary patch
delta 7865
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
XCPCg`LNFY{3xw|r5n)sPIrIMk+SG`#

delta 7823
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
G^#1_6^HxLv


From 6293dccc2b525c7ff680404f150bfdd4753d777a Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Tue, 29 Aug 2017 12:04:15 +0300
Subject: [PATCH 3/3] recognize 'none' values for editorconfig (WEB-18555)

---
 plugins/editorconfig/src/org/editorconfig/Utils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/editorconfig/src/org/editorconfig/Utils.java b/plugins/editorconfig/src/org/editorconfig/Utils.java
index ed7886bc9e38..75817890e2c2 100644
--- a/plugins/editorconfig/src/org/editorconfig/Utils.java
+++ b/plugins/editorconfig/src/org/editorconfig/Utils.java
@@ -37,7 +37,8 @@ public class Utils {
   public static String configValueForKey(List<OutPair> outPairs, String key) {
     for (OutPair outPair : outPairs) {
       if (outPair.getKey().equals(key)) {
-        return outPair.getVal();
+        String val = outPair.getVal();
+        return "none".equals(val) ? "" : val;
       }
     }
     return "";