From 4e7c7fc625c2595df6802cb9ae7585b6a943123a Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Mon, 23 Jun 2014 14:56:58 +0400
Subject: [PATCH] Fixed KT-5299 J2K: When generating named this@type, do not
 insert FQN

 #KT-5299 Fixed
---
 .../org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt   | 8 ++++----
 .../testData/ast/superExpression/classAdotSuperFoo.java   | 2 ++
 .../testData/ast/superExpression/classAdotSuperFoo.kt     | 2 ++
 .../testData/ast/thisExpression/classAdotThisFoo.java     | 2 ++
 j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt | 2 ++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
index 52ad3fe0a75..2a17fa10bbd 100644
--- a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
@@ -358,13 +358,13 @@ class ExpressionVisitor(private val converter: Converter,
     }
 
     override fun visitSuperExpression(expression: PsiSuperExpression) {
-        val qualifier = expression.getQualifier()
-        result = SuperExpression(if (qualifier != null) Identifier(qualifier.getQualifiedName()!!) else Identifier.Empty)
+        val qualifier = expression.getQualifier()?.getReferenceName()
+        result = SuperExpression(if (qualifier != null) Identifier(qualifier) else Identifier.Empty)
     }
 
     override fun visitThisExpression(expression: PsiThisExpression) {
-        val qualifier = expression.getQualifier()
-        result = ThisExpression(if (qualifier != null) Identifier(qualifier.getQualifiedName()!!) else Identifier.Empty)
+        val qualifier = expression.getQualifier()?.getReferenceName()
+        result = ThisExpression(if (qualifier != null) Identifier(qualifier) else Identifier.Empty)
     }
 
     override fun visitTypeCastExpression(expression: PsiTypeCastExpression) {
diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.java b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.java
index 2f5f53113af..33cea2861b2 100644
--- a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.java
+++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.java
@@ -1,4 +1,6 @@
 //file
+package a.b;
+
 class Base {
   void foo();
 }
diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt
index dbbc9f934db..1585ecae8d1 100644
--- a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt
+++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt
@@ -1,3 +1,5 @@
+package a.b
+
 class Base() {
     fun foo()
 }
diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.java b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.java
index 0d2259d6e9b..fa564c172e7 100644
--- a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.java
+++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.java
@@ -1,4 +1,6 @@
 //file
+package a.b
+
 class Base {
   void foo() {}
 }
diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt
index f8802aeaba4..f32bed7d370 100644
--- a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt
+++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt
@@ -1,3 +1,5 @@
+package a.b
+
 class Base() {
     fun foo() {
     }