azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce live templates for main without arguments #KT-27461 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-10-16 10:52:34 +03:00
parent 1c761c7864
commit 0f94c0901f
14 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
+2 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.roots.ProjectFileIndex
import com.intellij.openapi.roots.ProjectRootModificationTracker
import com.intellij.openapi.util.Key
import com.intellij.openapi.util.io.FileUtil
import com.intellij.psi.PsiElement
import com.intellij.psi.util.CachedValue
import com.intellij.psi.util.CachedValueProvider
import com.intellij.psi.util.CachedValuesManager
@@ -248,7 +249,7 @@ fun MutableMap<LanguageFeature, LanguageFeature.State>.configureMultiplatformSup
}
val KtElement.languageVersionSettings: LanguageVersionSettings
val PsiElement.languageVersionSettings: LanguageVersionSettings
get() {
if (ServiceManager.getService(project, ProjectFileIndex::class.java) == null) {
return LanguageVersionSettingsImpl.DEFAULT
idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinMainArgumentsMacro.kt
+24
View File
@@ -0,0 +1,24 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.liveTemplates.macro
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.config.LanguageFeature
import org.jetbrains.kotlin.idea.project.languageVersionSettings
class KotlinMainArgumentsMacro : KotlinMacro() {
override fun getName() = "kotlinMainArguments"
override fun getPresentableName() = "kotlinMainArguments()"
override fun calculateResult(params: Array<Expression>, context: ExpressionContext): Result? {
val languageVersionSettings = context.psiElementAtStartOffset?.languageVersionSettings ?: return null
if (languageVersionSettings.supportsFeature(LanguageFeature.ExtendedMainConvention)) return TextResult("")
return TextResult("args: Array<String>")
}
}
idea/idea-live-templates/testData/main.exp.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
fun main(args: Array<String>) {
fun main() {
<caret>
}
idea/idea-live-templates/testData/maina.exp.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
fun main(args: Array<String>) {
<caret>
}
idea/idea-live-templates/testData/maina.kt
Vendored
+1
View File
@@ -0,0 +1 @@
<caret>
idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt
+4
View File
@@ -72,6 +72,10 @@ class LiveTemplatesTest : KotlinLightCodeInsightFixtureTestCase() {
paremeterless()
}
fun testMaina() {
paremeterless()
}
fun testSoutv() {
start()
idea/resources/liveTemplates/Kotlin.xml
+18
View File
@@ -2,6 +2,15 @@
<templateSet group="Kotlin">
<template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.main"
name="main" toReformat="true" toShortenFQNames="true"
value="fun main($ARGS$) {&#10; $END$&#10;}">
<variable name="ARGS" expression="kotlinMainArguments()" defaultValue="" alwaysStopAt="false" />
<context>
<option name="KOTLIN_TOPLEVEL" value="true" />
</context>
</template>
<template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.main"
name="maina" toReformat="true" toShortenFQNames="true"
value="fun main(args: Array&lt;String&gt;) {&#10; $END$&#10;}">
<context>
<option name="KOTLIN_TOPLEVEL" value="true" />
@@ -209,6 +218,15 @@
<!-- Synonym for main -->
<template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.main"
name="psvm" toReformat="true" toShortenFQNames="true"
value="fun main($ARGS$) {&#10; $END$&#10;}">
<variable name="ARGS" expression="kotlinMainArguments()" defaultValue="" alwaysStopAt="false" />
<context>
<option name="KOTLIN_TOPLEVEL" value="true" />
</context>
</template>
<template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.main"
name="psvma" toReformat="true" toShortenFQNames="true"
value="fun main(args: Array&lt;String&gt;) {&#10; $END$&#10;}">
<context>
<option name="KOTLIN_TOPLEVEL" value="true" />
idea/src/META-INF/plugin.xml
+1
View File
@@ -605,6 +605,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinClassNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinFunctionNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinPackageNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinMainArgumentsMacro"/>
<liveTemplateOptionalProcessor implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinShortenFQNamesProcessor"/>
<annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinPsiCheckerAndHighlightingUpdater"/>
idea/src/META-INF/plugin.xml.173
+1
View File
@@ -603,6 +603,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinClassNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinFunctionNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinPackageNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinMainArgumentsMacro"/>
<liveTemplateOptionalProcessor implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinShortenFQNamesProcessor"/>
<annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinPsiCheckerAndHighlightingUpdater"/>
idea/src/META-INF/plugin.xml.181
+1
View File
@@ -604,6 +604,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinClassNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinFunctionNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinPackageNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinMainArgumentsMacro"/>
<liveTemplateOptionalProcessor implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinShortenFQNamesProcessor"/>
<annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinPsiCheckerAndHighlightingUpdater"/>
idea/src/META-INF/plugin.xml.183
+1
View File
@@ -605,6 +605,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinClassNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinFunctionNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinPackageNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinMainArgumentsMacro"/>
<liveTemplateOptionalProcessor implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinShortenFQNamesProcessor"/>
<annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinPsiCheckerAndHighlightingUpdater"/>
idea/src/META-INF/plugin.xml.as31
+1
View File
@@ -603,6 +603,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinClassNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinFunctionNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinPackageNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinMainArgumentsMacro"/>
<liveTemplateOptionalProcessor implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinShortenFQNamesProcessor"/>
<annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinPsiCheckerAndHighlightingUpdater"/>
idea/src/META-INF/plugin.xml.as32
+1
View File
@@ -603,6 +603,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinClassNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinFunctionNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinPackageNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinMainArgumentsMacro"/>
<liveTemplateOptionalProcessor implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinShortenFQNamesProcessor"/>
<annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinPsiCheckerAndHighlightingUpdater"/>
idea/src/META-INF/plugin.xml.as33
+1
View File
@@ -604,6 +604,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinClassNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinFunctionNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinPackageNameMacro"/>
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.KotlinMainArgumentsMacro"/>
<liveTemplateOptionalProcessor implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinShortenFQNamesProcessor"/>
<annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinPsiCheckerAndHighlightingUpdater"/>