Skip to content

Commit 8ae6fd0

Browse files
committed
refactor: replace deprecated createOptionsConfigurable methods
1 parent 11cec0d commit 8ae6fd0

2 files changed

Lines changed: 28 additions & 10 deletions

File tree

src/main/kotlin/com/github/lppedd/cc/inspection/CommitFormatInspection.kt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ import com.intellij.codeInspection.ProblemDescriptor
1414
import com.intellij.codeInspection.ProblemHighlightType.GENERIC_ERROR_OR_WARNING
1515
import com.intellij.codeInspection.ProblemHighlightType.WARNING
1616
import com.intellij.codeInspection.ProblemsHolder
17+
import com.intellij.openapi.Disposable
1718
import com.intellij.openapi.components.service
1819
import com.intellij.openapi.editor.Document
19-
import com.intellij.openapi.options.ConfigurableUi
2020
import com.intellij.openapi.project.Project
2121
import com.intellij.openapi.util.TextRange
2222
import com.intellij.openapi.vcs.ui.CommitMessage
2323
import com.intellij.psi.PsiDocumentManager
2424
import com.intellij.psi.PsiElement
2525
import com.intellij.psi.PsiElementVisitor
26+
import com.intellij.ui.dsl.builder.Panel
2627

2728
/**
2829
* @author Edoardo Luppi
@@ -34,10 +35,18 @@ internal class CommitFormatInspection : CommitBaseInspection() {
3435
override fun isEnabledByDefault(): Boolean =
3536
true
3637

37-
@Suppress("UnstableApiUsage")
38-
@Deprecated("Implement {@link #createOptions} instead")
39-
override fun createOptionsConfigurable(): ConfigurableUi<Project> =
40-
CommitFormatInspectionOptions()
38+
override fun Panel.createOptions(project: Project, disposable: Disposable): Boolean {
39+
val ui = CommitFormatInspectionOptions()
40+
41+
row {
42+
cell(ui.component)
43+
.onApply { ui.apply(project) }
44+
.onReset { ui.reset(project) }
45+
.onIsModified { ui.isModified(project) }
46+
}
47+
48+
return false
49+
}
4150

4251
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
4352
val document = holder.file.document

src/main/kotlin/com/github/lppedd/cc/inspection/CommitNamingConventionInspection.kt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ import com.github.lppedd.cc.language.psi.ConventionalCommitTypePsiElement
1010
import com.github.lppedd.cc.util.RangeValidator
1111
import com.intellij.codeInspection.ProblemHighlightType.GENERIC_ERROR_OR_WARNING
1212
import com.intellij.codeInspection.ProblemsHolder
13+
import com.intellij.openapi.Disposable
1314
import com.intellij.openapi.components.service
1415
import com.intellij.openapi.editor.Document
15-
import com.intellij.openapi.options.ConfigurableUi
1616
import com.intellij.openapi.project.Project
1717
import com.intellij.openapi.util.TextRange
1818
import com.intellij.openapi.vcs.ui.CommitMessage
1919
import com.intellij.psi.PsiElementVisitor
20+
import com.intellij.ui.dsl.builder.Panel
2021

2122
/**
2223
* Checks if symbols outside the legal ones, specified in the inspection options
@@ -32,10 +33,18 @@ internal class CommitNamingConventionInspection : CommitBaseInspection() {
3233
override fun isEnabledByDefault(): Boolean =
3334
true
3435

35-
@Suppress("UnstableApiUsage")
36-
@Deprecated("Implement {@link #createOptions} instead")
37-
override fun createOptionsConfigurable(): ConfigurableUi<Project> =
38-
CommitNamingConventionInspectionOptions()
36+
override fun Panel.createOptions(project: Project, disposable: Disposable): Boolean {
37+
val ui = CommitNamingConventionInspectionOptions()
38+
39+
row {
40+
cell(ui.component)
41+
.onApply { ui.apply(project) }
42+
.onReset { ui.reset(project) }
43+
.onIsModified { ui.isModified(project) }
44+
}
45+
46+
return false
47+
}
3948

4049
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
4150
val document = holder.file.document

0 commit comments

Comments
 (0)