From 7ba65d45f9685e947541856ea83eb4e63461044a Mon Sep 17 00:00:00 2001 From: valis Date: Tue, 26 Nov 2024 14:11:25 +0300 Subject: [PATCH] Update to 2024.3 --- build.gradle.kts | 4 ++-- .../arend/module/starter/ArendCommonStarterInitialStep.kt | 2 +- .../org/arend/module/starter/ArendStarterModuleBuilder.kt | 4 ++-- .../kotlin/org/arend/project/ArendProjectImportBuilder.kt | 3 ++- .../kotlin/org/arend/project/ArendProjectOpenProcessor.kt | 2 +- src/main/kotlin/org/arend/tracer/ArendTraceProcess.kt | 6 +++--- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5174d9e93..fb07f30e0 100644 --- 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.1" +version = "1.10.0.3" plugins { idea @@ -38,7 +38,7 @@ dependencies { testCompileOnly("junit:junit:4.13.1") intellijPlatform { - create(IntelliJPlatformType.IntellijIdeaCommunity, "2024.2.1") + 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 index 8bc3693d2..c08cb6279 100644 --- 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 index df56d6dc3..4363930de 100644 --- 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 index 8a21dcd9d..936bcb48e 100644 --- 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() { 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 index 2c290dee2..993e3b3d2 100644 --- 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 index 7b0f8f713..1450421e7 100644 --- 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 }