Fixed red code example from our sources. Mixing type parameters from …

…Java with the same name.
JetBrains · Jan 21, 2014 · 410cf64 · 410cf64
1 parent 3262e70
commit 410cf64
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/org/jetbrains/plugins/scala/lang/psi/ScalaPsiUtil.scala b/src/org/jetbrains/plugins/scala/lang/psi/ScalaPsiUtil.scala
@@ -740,7 +740,15 @@ object ScalaPsiUtil {
     try {
       elem match {
         case tp: ScTypeParam => tp.getPsiElementId
-        case p: PsiTypeParameter => " in: Java" //Two parameters from Java can't be used with same name in same place
+        case p: PsiTypeParameter =>
+          val containingFile = Option(p.getContainingFile).map(_.getName).getOrElse("NoFile")
+          val containingClass =
+            (for {
+              owner <- Option(p.getOwner)
+              clazz <- Option(owner.getContainingClass)
+              name <- Option(clazz.getName)
+            } yield name).getOrElse("NoClass")
+          s" in:$containingFile:$containingClass" //Two parameters from Java can't be used with same name in same place
         case _ =>
           val containingFile: PsiFile = elem.getContainingFile
           " in:" + (if (containingFile != null) containingFile.name else "NoFile") + ":" +

diff --git a/src/org/jetbrains/plugins/scala/lang/psi/api/statements/params/ScTypeParam.scala b/src/org/jetbrains/plugins/scala/lang/psi/api/statements/params/ScTypeParam.scala
@@ -31,7 +31,7 @@ trait ScTypeParam extends ScalaPsiElement with ScPolymorphicElement with PsiType
   def typeParameterText: String
 
   def getPsiElementId: String = {
-    " in:" + getContainingFileName + ":" + getOffsetInFile
+    s" in:$getContainingFileName:$getOffsetInFile"
   }
 }