Merge tag 'v1.10.0.3'

JetBrains · Dec 4, 2024 · ada17a5 · ada17a5
2 parents d4791f5 + 7ba65d4
commit ada17a5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 val projectArend = gradle.includedBuild("Arend")
 group = "org.arend.lang"
-version = "1.10.0.2"
+version = "1.10.0.3"
 
 plugins {
     idea
@@ -38,7 +38,7 @@ dependencies {
     testCompileOnly("junit:junit:4.13.1")
 
     intellijPlatform {
-        create(IntelliJPlatformType.IntellijIdeaCommunity, "2024.2.3")
+        create(IntelliJPlatformType.IntellijIdeaCommunity, "2024.3")
         instrumentationTools()
         bundledPlugins("org.jetbrains.plugins.yaml", "com.intellij.java")
         plugins("IdeaVIM:2.16.0")

diff --git a/src/main/kotlin/org/arend/module/starter/ArendCommonStarterInitialStep.kt b/src/main/kotlin/org/arend/module/starter/ArendCommonStarterInitialStep.kt
@@ -186,7 +186,7 @@ abstract class ArendCommonStarterInitialStep(
             .withTextToPathConvertor(::getCanonicalPath)
         val title = IdeBundle.message("title.select.project.file.directory", wizardContext.presentationName)
         val property = locationProperty.transform(::getPresentablePath, ::getCanonicalPath)
-        return textFieldWithBrowseButton(title, wizardContext.project, fileChooserDescriptor)
+        return textFieldWithBrowseButton(fileChooserDescriptor.withTitle(title), wizardContext.project)
             .bindText(property)
     }
 }
diff --git a/src/main/kotlin/org/arend/module/starter/ArendStarterModuleBuilder.kt b/src/main/kotlin/org/arend/module/starter/ArendStarterModuleBuilder.kt
@@ -85,7 +85,7 @@ abstract class ArendStarterModuleBuilder : ModuleBuilder() {
         return true
     }
 
-    override fun isSuitableSdkType(sdkType: SdkTypeId?): Boolean {
+    override fun isSuitableSdkType(sdkType: SdkTypeId): Boolean {
         return sdkType is JavaSdkType && !sdkType.isDependent
     }
 
@@ -94,7 +94,7 @@ abstract class ArendStarterModuleBuilder : ModuleBuilder() {
         return null
     }
 
-    override fun createProject(name: String?, path: String?): Project? {
+    override fun createProject(name: String, path: String): Project? {
         val project = super.createProject(name, path)
         project?.let { setupProject(it) }
         return project

diff --git a/src/main/kotlin/org/arend/project/ArendProjectImportBuilder.kt b/src/main/kotlin/org/arend/project/ArendProjectImportBuilder.kt
@@ -22,7 +22,8 @@ class ArendProjectImportBuilder : ProjectImportBuilder<String>() {
 
     override fun getName(): String = "Arend project"
 
-    override fun isOpenProjectSettingsAfter() = parameters.openProjectSettingsAfter
+    override val isOpenProjectSettingsAfter
+        get() = parameters.openProjectSettingsAfter
 
     override fun setOpenProjectSettingsAfter(on: Boolean) {
         parameters.openProjectSettingsAfter = on

diff --git a/src/main/kotlin/org/arend/project/ArendProjectOpenProcessor.kt b/src/main/kotlin/org/arend/project/ArendProjectOpenProcessor.kt
@@ -37,7 +37,7 @@ class ArendProjectOpenProcessor : ProjectOpenProcessor() {
     override fun importProjectAfterwards(project: Project, file: VirtualFile) {
         val builder = builder
         try {
-            builder.isUpdate = false
+            builder.setUpdate(false)
             builder.fileToImport = (if (file.isDirectory) file else file.parent).toNioPath().toString()
             if (builder.validate(null, project)) {
                 builder.commit(project, null, ModulesProvider.EMPTY_MODULES_PROVIDER)

diff --git a/src/main/kotlin/org/arend/tracer/ArendTraceProcess.kt b/src/main/kotlin/org/arend/tracer/ArendTraceProcess.kt
@@ -179,7 +179,7 @@ class ArendTraceProcess(session: XDebugSession, private val tracingData: ArendTr
     }
 
     private inner class NextEntryActionHandler : XDebuggerSuspendedActionHandler() {
-        override fun perform(session: XDebugSession, dataContext: DataContext?) {
+        override fun perform(session: XDebugSession, dataContext: DataContext) {
             session.sessionResumed()
             val entry = trace.entries.getOrNull(++traceEntryIndex)
             if (entry == null) {
@@ -191,7 +191,7 @@ class ArendTraceProcess(session: XDebugSession, private val tracingData: ArendTr
     }
 
     private inner class PrevEntryActionHandler : XDebuggerSuspendedActionHandler() {
-        override fun perform(session: XDebugSession, dataContext: DataContext?) {
+        override fun perform(session: XDebugSession, dataContext: DataContext) {
             session.sessionResumed()
             val entry = trace.entries.getOrNull(--traceEntryIndex)
             if (entry == null) {
@@ -201,7 +201,7 @@ class ArendTraceProcess(session: XDebugSession, private val tracingData: ArendTr
             session.positionReached(ArendSuspendContext(entry, contextView))
         }
 
-        override fun isEnabled(project: Project, event: AnActionEvent?): Boolean =
+        override fun isEnabled(project: Project, event: AnActionEvent): Boolean =
             super.isEnabled(project, event) && traceEntryIndex > 0
     }