KT-15320 Live templates: please add function which returns the "outer" class name

idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinClassNameMacro.kt

@@ -20,6 +20,7 @@ import com.intellij.codeInsight.template.Expression
 import com.intellij.codeInsight.template.ExpressionContext
 import com.intellij.codeInsight.template.Result
 import com.intellij.codeInsight.template.TextResult
+import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
 
@@ -28,7 +29,9 @@ class KotlinClassNameMacro : KotlinMacro() {
     override fun getPresentableName() = "kotlinClassName()"
 
     override fun calculateResult(params: Array<Expression>, context: ExpressionContext): Result? {
-        val element = context.psiElementAtStartOffset?.parentsWithSelf?.firstOrNull { it is KtClassOrObject && it.name != null } ?: return null
+        val element = context.psiElementAtStartOffset?.parentsWithSelf?.firstOrNull {
+            it is KtClassOrObject && it.name != null && !it.hasModifier(KtTokens.COMPANION_KEYWORD)
+        } ?: return null
         return TextResult((element as KtClassOrObject).name!!)
     }
 }

idea/idea-live-templates/testData/soutf.exp.kt

@@ -0,0 +1,5 @@
+class Test() {
+    fun test() {
+        println("Test.test")<caret>
+    }
+}

idea/idea-live-templates/testData/soutf.kt

@@ -0,0 +1,5 @@
+class Test() {
+    fun test() {
+        <caret>
+    }
+}

idea/idea-live-templates/testData/soutf_InCompanion.exp.kt

@@ -0,0 +1,7 @@
+class Test() {
+    companion object {
+        fun test() {
+            println("Test.test")<caret>
+        }
+    }
+}

idea/idea-live-templates/testData/soutf_InCompanion.kt

@@ -0,0 +1,7 @@
+class Test() {
+    companion object {
+        fun test() {
+            <caret>
+        }
+    }
+}

idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt

@@ -73,6 +73,14 @@ class LiveTemplatesTest : KotlinLightCodeInsightFixtureTestCase() {
         paremeterless()
     }
 
+    fun testSoutf() {
+        paremeterless()
+    }
+
+    fun testSoutf_InCompanion() {
+        paremeterless()
+    }
+
     fun testSerr() {
         paremeterless()
     }