From 60b67d9e5124fa9f853bfe07a27d6d6dddee5634 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 15 Aug 2012 15:49:41 +0400
Subject: [PATCH] hard coded string literal: skip also super/this calls during
 check for exception messages (IDEA-90093)

---
 .../codeInspection/i18n/I18nInspection.java   | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java
index 84ab55e7a705..c18b1fb3734c 100644
--- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java
+++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java
@@ -23,6 +23,7 @@ import com.intellij.ExtensionPoints;
 import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.daemon.GroupNames;
+import com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil;
 import com.intellij.codeInsight.intention.AddAnnotationFix;
 import com.intellij.codeInspection.*;
 import com.intellij.codeInspection.ex.BaseLocalInspectionTool;
@@ -818,21 +819,32 @@ public class I18nInspection extends BaseLocalInspectionTool {
       return false;
     }
     final PsiElement grandparent = parent.getParent();
-    if (!(grandparent instanceof PsiNewExpression)) {
-      return false;
+    final PsiClass aClass;
+    if (grandparent instanceof PsiMethodCallExpression && HighlightUtil.isSuperOrThisMethodCall(grandparent)) {
+      final PsiMethod method = ((PsiMethodCallExpression)grandparent).resolveMethod();
+      if (method != null) {
+        aClass = method.getContainingClass();
+      } else {
+        return false;
+      }
+    } else {
+      if (!(grandparent instanceof PsiNewExpression)) {
+        return false;
+      }
+      final PsiJavaCodeReferenceElement reference = ((PsiNewExpression)grandparent).getClassReference();
+      if (reference == null) {
+        return false;
+      }
+      final PsiElement referent = reference.resolve();
+      if (!(referent instanceof PsiClass)) {
+        return false;
+      }
+
+      aClass = (PsiClass)referent;
     }
-    final PsiJavaCodeReferenceElement reference = ((PsiNewExpression)grandparent).getClassReference();
-    if (reference == null) {
-      return false;
-    }
-    final PsiElement referent = reference.resolve();
-    if (!(referent instanceof PsiClass)) {
-      return false;
-    }
-    final PsiClass aClass = (PsiClass)referent;
     final Project project = expression.getProject();
     final GlobalSearchScope scope = GlobalSearchScope.allScope(project);
-    final PsiClass throwable = JavaPsiFacade.getInstance(project).findClass("java.lang.Throwable", scope);
+    final PsiClass throwable = JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_THROWABLE, scope);
     return throwable != null && aClass.isInheritor(throwable, true);
   }