Add new expressions to template

Added two missing expressions for live-templates, the className(), and
the functionName()

Changelog.md

@@ -20,4 +20,5 @@
 - Add non-null assertions on call site for non-null parameters
 
 ### IDE
-- Debugger can distinguish nested inline arguments
+- Debugger can distinguish nested inline arguments
+- Add kotlinClassName() and kotlinFunctionName() macros for use in live templates

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2015 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 org.jetbrains.kotlin.idea.liveTemplates.macro
+
+import com.intellij.codeInsight.template.*
+import org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType
+import org.jetbrains.kotlin.psi.KtClassOrObject
+import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
+
+class KotlinClassNameMacro : Macro() {
+    override fun getName() = "kotlinClassName"
+    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
+        return TextResult((element as KtClassOrObject).name!!)
+    }
+
+    override fun isAcceptableInContext(context: TemplateContextType?): Boolean = context is KotlinTemplateContextType
+}

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2015 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 org.jetbrains.kotlin.idea.liveTemplates.macro
+
+import com.intellij.codeInsight.template.*
+import org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType
+import org.jetbrains.kotlin.psi.KtNamedFunction
+import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
+
+class KotlinFunctionNameMacro : Macro() {
+    override fun getName() = "kotlinFunctionName"
+    override fun getPresentableName() = "kotlinFunctionName()"
+
+    override fun calculateResult(params: Array<Expression>, context: ExpressionContext): Result? {
+        val element = context.psiElementAtStartOffset?.getNonStrictParentOfType<KtNamedFunction>()
+        val name = element?.name ?: return null
+        return TextResult(name)
+    }
+
+    override fun isAcceptableInContext(context: TemplateContextType?) = context is KotlinTemplateContextType
+
+}

idea/src/META-INF/plugin.xml

@@ -432,6 +432,8 @@
     <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.FunctionParametersMacro"/>
     <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.AnonymousSuperMacro"/>
     <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.SuggestVariableNameMacro"/>
+    <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinClassNameMacro"/>
+    <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinFunctionNameMacro"/>
     <liveTemplateOptionalProcessor implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinShortenFQNamesProcessor"/>
 
     <annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinPsiCheckerAndHighlightingUpdater"/>