idetools/filename_template
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make plugin compatible with idea version 2022.1

Browse Source
This commit is contained in:
Matthias Gugel 2022-04-14 00:46:15 +02:00
parent 4fc3b1a11a
commit ed602312de
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
fun properties(key: String) = project.findProperty(key).toString() fun properties(key: String) = project.findProperty(key).toString()
plugins { plugins {
id("org.jetbrains.intellij") version "1.3.0" id("org.jetbrains.intellij") version "1.5.2"
id("org.jetbrains.kotlin.jvm") version "1.5.10" id("org.jetbrains.kotlin.jvm") version "1.6.20"
} }
group = properties("pluginGroup") group = properties("pluginGroup")

6
gradle.properties
View File

@ -3,13 +3,13 @@ kotlin.code.style=official
pluginGroup = de.idetools pluginGroup = de.idetools
pluginName = filename_template pluginName = filename_template
pluginVersion = 1.2.0-213 pluginVersion = 1.2.0-221
platformVersion = 2021.3 platformVersion = 2022.1
# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3 # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
javaVersion = 11 javaVersion = 11
gradleVersion = 7.3 gradleVersion = 7.4.2
# Opt-out flag for bundling Kotlin standard library. # Opt-out flag for bundling Kotlin standard library.
# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details. # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

9
src/main/kotlin/de/idetools/filename_template/CreateFileWithFilenameTemplateAction.kt
View File

@ -4,7 +4,6 @@ import com.intellij.icons.AllIcons
import com.intellij.ide.IdeBundle import com.intellij.ide.IdeBundle
import com.intellij.ide.actions.CreateFileAction import com.intellij.ide.actions.CreateFileAction
import com.intellij.ide.ui.newItemPopup.NewItemPopupUtil import com.intellij.ide.ui.newItemPopup.NewItemPopupUtil
import com.intellij.lang.LangBundle
import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.InputValidatorEx import com.intellij.openapi.ui.InputValidatorEx
@ -41,7 +40,7 @@ class CreateFileWithFilenameTemplateAction :
override fun invokeDialog( override fun invokeDialog(
project: Project, project: Project,
directory: PsiDirectory, directory: PsiDirectory,
elementsConsumer: Consumer<Array<PsiElement?>?> elementsConsumer: Consumer<in Array<PsiElement>>
) { ) {
val settings: FilenameTemplateSettingsState = FilenameTemplateSettingsState.instance val settings: FilenameTemplateSettingsState = FilenameTemplateSettingsState.instance
settings.filenameTemplates.forEach { settings.filenameTemplates.forEach {
@ -68,11 +67,7 @@ class CreateFileWithFilenameTemplateAction :
popup.closeOk(event) popup.closeOk(event)
elementsConsumer.accept(validator.createdElements) elementsConsumer.accept(validator.createdElements)
} else { } else {
val errorMessage = val errorMessage = (validator as InputValidatorEx).getErrorText(name)
if (validator is InputValidatorEx)
(validator as InputValidatorEx).getErrorText(name)
else
LangBundle.message("incorrect.name")
contentPanel.setError(errorMessage) contentPanel.setError(errorMessage)
} }
} }