Skip to content

Commit 6688651

Browse files
committed
Merge remote-tracking branch 'mygithub/master'
2 parents 160a2eb + c469380 commit 6688651

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

build.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ dependencies {
1919
implementation("org.freemarker:freemarker:2.3.32")
2020
}
2121

22-
2322
intellij {
2423
version.set("2023.1.5")
2524

@@ -29,8 +28,8 @@ intellij {
2928
"Kotlin"
3029
)
3130

32-
pluginName = "Taboo Integration"
33-
updateSinceUntilBuild = true
31+
pluginName.set("Taboo Integration")
32+
updateSinceUntilBuild.set(false)
3433
}
3534

3635
kotlin {
@@ -52,7 +51,6 @@ shadowJar {
5251

5352
patchPluginXml {
5453
sinceBuild.set(properties("pluginSinceBuild"))
55-
untilBuild.set(properties("pluginUntilBuild"))
5654
}
5755

5856
withType<JavaCompile> {

gradle.properties

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
kotlin.stdlib.default.dependency=false
2-
3-
pluginSinceBuild = 222
4-
pluginUntilBuild = 241.*
5-
version=1.0.1-SNAPSHOT
6-
2+
pluginSinceBuild=222
3+
version=1.0.2-SNAPSHOT
74
kotlin.code.style=official
85
kotlin.experimental.tryK2=true
96
kapt.use.k2=true

src/main/kotlin/org/tabooproject/intellij/step/ConfigurationPropertiesStep.kt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class ConfigurationPropertiesStep(val context: WizardContext) : ModuleWizardStep
141141
}
142142

143143
override fun updateStep() {
144-
if (property.name == null){
144+
if (property.name == null) {
145145
property.name = context.projectName
146146
}
147147
}
@@ -161,11 +161,11 @@ class ConfigurationPropertiesStep(val context: WizardContext) : ModuleWizardStep
161161
*
162162
* @param text 要替换到主类名中的新文本。
163163
*/
164-
private fun autoChangeMainClass(text:String) {
165-
// 如果 mainClassTextField 未初始化则直接返回
164+
private fun autoChangeMainClass(text: String) {
165+
// 如果 mainClassTextField 未初始化, 则直接返回
166166
if (mainClassTextField == null) return
167167

168-
// 提取重复的字符串操作减少代码重复并提高性能
168+
// 提取重复的字符串操作, 减少代码重复并提高性能
169169
var baseClass = property.mainClass.substringBeforeLast(".")
170170
val currentLastPart = property.mainClass.substringAfterLast(".")
171171

@@ -177,11 +177,10 @@ class ConfigurationPropertiesStep(val context: WizardContext) : ModuleWizardStep
177177
else -> currentLastPart
178178
}
179179

180-
181180
val lastGroup = baseClass.substringAfterLast(".").let {
182-
if (it.lowercase() == property.name?.lowercase()){
181+
if (it.lowercase() == property.name?.lowercase()) {
183182
return@let text.lowercase()
184-
}else{
183+
} else {
185184
it
186185
}
187186
}
@@ -190,6 +189,5 @@ class ConfigurationPropertiesStep(val context: WizardContext) : ModuleWizardStep
190189

191190
// 更新 mainClassTextField 的文本
192191
mainClassTextField!!.text = "$baseClass.$lastGroup.$newLastPart"
193-
194192
}
195193
}

src/main/resources/META-INF/plugin.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@
55
<vendor>TabooLib</vendor>
66

77
<description><![CDATA[ plugin
8-
IntelliJ integration of TabooLib, Provides a project builder for quickly creating TabooLib projects.
8+
This IntelliJ plugin provides a Project Builder for <a href="https://github.com/TabooLib/taboolib">TabooLib</a>, enabling quick creation of TabooLib projects,
9+
with potential future integrations of more support specifically tailored for TabooLib projects.
910
]]></description>
1011

12+
<change-notes><![CDATA[
13+
Please report issues to <a href="https://github.com/TabooLib/taboolib-intellij/issues">the issue tracker</a>!
14+
]]></change-notes>
15+
1116
<depends>com.intellij.modules.platform</depends>
1217
<depends>com.intellij.modules.java</depends>
1318
<depends>org.jetbrains.kotlin</depends>

0 commit comments

Comments
 (0)