add new currentDir params (#84)

- Add new parameters for Geminio's recipes and FTL templates

Author: user32338

README.md

@@ -4,7 +4,7 @@
 
 ### Список плагинов в репозитории
 
-- [hh-carnival](/plugins/hh-carnival) - плагин для быстрого создания нового feature-модуля, который также добавляет ещё немного полезных вещеё
+- [hh-carnival](/plugins/hh-carnival) - плагин для быстрого создания нового feature-модуля, который также добавляет ещё немного полезных вещей
 - [hh-garcon](/plugins/hh-garcon) - плагин для быстрого создания Page Object-ов из XML-вёрстки
 - [hh-geminio](/plugins/hh-geminio) - плагин, добавляющий возможность создавать свои шаблоны кода на основе FreeMarker-а
 

build-logic/idea-convention/src/main/kotlin/convention.idea-plugin-base.gradle.kts

@@ -24,7 +24,6 @@ configure<IntelliJPluginExtension> {
     plugins.set(currentVersion.pluginsNames)
 }
 
-@Suppress("UnstableApiUsage")
 tasks.getByName<IntelliJInstrumentCodeTask>("instrumentCode") {
     val currentVersion = Libs.chosenIdeaVersion
     if (currentVersion is ExternalLibrariesExtension.Product.LocalIde) {

build.gradle.kts

@@ -6,7 +6,11 @@ plugins {
 
 staticAnalysis {
     detekt {
-        configPath = files(project.rootDir.resolve("build-logic/static-analysis-convention/rules/detekt/detekt-config.yaml"))
-        baselinePath = file(project.rootDir.resolve("build-logic/static-analysis-convention/rules/detekt/detekt-baseline.xml"))
+        configPath = files(
+            project.rootDir.resolve("build-logic/static-analysis-convention/rules/detekt/detekt-config.yaml")
+        )
+        baselinePath = file(
+            project.rootDir.resolve("build-logic/static-analysis-convention/rules/detekt/detekt-baseline.xml")
+        )
     }
 }

gradle.properties

@@ -7,7 +7,7 @@ kotlin.code.style=official
 systemProp.gradleIntellijPluginVersion=1.12.0
 systemProp.gradleChangelogPluginVersion=1.3.1
 systemProp.kotlinVersion=1.8.0
-systemProp.detektVersion=1.21.0
+systemProp.detektVersion=1.22.0
 
 systemProp.androidStudioPath=/Applications/Android Studio.app/Contents
 systemProp.androidStudioCompilerVersion=221.6008.13

infra/scripts/build_all_plugins.sh

@@ -8,6 +8,11 @@ readonly repoUrl=$(prop "${PROPERTY_PLUGINS_REPO_URL}" "${PLUGINS_PROPERTIES_FIL
 
 logMessage "Build all plugins..."
 
-bash gradlew clean buildAllPlugins collectUpdatePluginsXmlTask --customRepositoryUrl="${repoUrl}"
+bash gradlew \
+  clean \
+  buildAllPlugins \
+  collectUpdatePluginsXmlTask \
+  --customRepositoryUrl="${repoUrl}" \
+  --no-configuration-cache
 
 logMessage "Successfully build all plugins"

plugins/hh-carnival/src/main/kotlin/ru/hh/android/plugin/actions/boilerplate/fragment_view_model/GenerateFragmentViewModelNames.kt

@@ -21,23 +21,24 @@ data class GenerateFragmentViewModelNames(
     companion object {
 
         fun from(featurePrefix: String, packageName: String): GenerateFragmentViewModelNames {
-            val (modelsPackageName, mviFeaturePackageName, mviFeatureElementPackageName) = if (packageName.isNotBlank()) {
-                val splitted = packageName.split(".")
-                val previous = if (splitted.isNotEmpty()) {
-                    packageName.removeSuffix(".${splitted.last()}")
+            val (modelsPackageName, mviFeaturePackageName, mviFeatureElementPackageName) =
+                if (packageName.isNotBlank()) {
+                    val splitted = packageName.split(".")
+                    val previous = if (splitted.isNotEmpty()) {
+                        packageName.removeSuffix(".${splitted.last()}")
+                    } else {
+                        packageName
+                    }
+
+                    Triple(
+                        "$packageName.model.",
+                        "$previous.feature.",
+                        "$previous.feature.element."
+                    )
                 } else {
-                    packageName
+                    Triple(String.EMPTY, String.EMPTY, String.EMPTY)
                 }
 
-                Triple(
-                    "$packageName.model.",
-                    "$previous.feature.",
-                    "$previous.feature.element."
-                )
-            } else {
-                Triple(String.EMPTY, String.EMPTY, String.EMPTY)
-            }
-
             val viewModelClassName = "${featurePrefix}ViewModel"
             val singleEventClassName = "${featurePrefix}Event"
             val uiStateClassName = "${featurePrefix}UiState"

plugins/hh-carnival/src/main/kotlin/ru/hh/android/plugin/config/view/PluginConfigEditor.kt

@@ -106,7 +106,9 @@ class PluginConfigEditor(
             initialJiraHostName != jiraHostNameTextField.text ||
             initialJiraUsername != jiraUsernameTextField.text ||
             initialJiraPassword != jiraPasswordTextField.text ||
-            initialJiraDevelopmentTeam != JiraDevelopmentTeam.fromLabel(jiraDevelopmentTeamComboBoxModel.selected.orEmpty())
+            initialJiraDevelopmentTeam != JiraDevelopmentTeam.fromLabel(
+            jiraDevelopmentTeamComboBoxModel.selected.orEmpty()
+        )
     }
 
     fun applyNewConfiguration(project: Project, pluginConfig: PluginConfig) {

plugins/hh-carnival/src/main/kotlin/ru/hh/android/plugin/core/model/enums/CodeStyleViewDeclaration.kt

@@ -1,6 +1,5 @@
 package ru.hh.android.plugin.core.model.enums
 
-
 private const val ANDROID_WIDGET_PKG = "android.widget"
 private const val ANDROIDX_APPCOMPAT_WIDGET_PKG = "androidx.appcompat.widget"
 

plugins/hh-carnival/src/main/kotlin/ru/hh/android/plugin/core/model/jira/JiraDevelopmentTeam.kt

@@ -14,6 +14,7 @@ enum class JiraDevelopmentTeam(
 
     companion object {
 
-        fun fromLabel(label: String): JiraDevelopmentTeam = values().firstOrNull { it.comboBoxLabel == label } ?: MOBILE_CORE
+        fun fromLabel(label: String): JiraDevelopmentTeam = values().firstOrNull { it.comboBoxLabel == label }
+            ?: MOBILE_CORE
     }
 }

plugins/hh-carnival/src/main/kotlin/ru/hh/android/plugin/extensions/PsiDirectoryExt.kt

@@ -21,7 +21,10 @@ fun PsiDirectory.findSubdirectoryByPackageName(moduleName: String, packageName:
     for (item in directoriesNames) {
         result = result.findSubdirectory(item)
             ?: throw CopyModuleActionException(
-                "Can't find main package directory in copying module. Please, check AndroidManifest.xml in \"${moduleName}\" module and make sure that main package name is \"${packageName}\""
+                """Can't find main package directory in copying module. 
+                    |Please, check AndroidManifest.xml in \"$moduleName\" 
+                    |module and make sure that main package name is \"$packageName\"""
+                    .trimMargin()
             )
     }
     return result