Feature Updated Dependencies for Version 2023.3

build.gradle.kts

@@ -16,7 +16,7 @@ fun environment(key: String) = providers.environmentVariable(key)
 plugins {
     id("java")
     kotlin("jvm") version "1.9.10"
-    id("org.jetbrains.intellij") version "1.16.0"
+    id("org.jetbrains.intellij") version "1.16.1"
 }
 
 java {
@@ -47,7 +47,7 @@ intellij {
     version.set(properties("platformVersion").get())
     // PythonCore: https://plugins.jetbrains.com/plugin/7322-python-community-edition/versions
     // Pythonid: https://plugins.jetbrains.com/plugin/631-python/versions
-    plugins.set(listOf("Git4Idea", "PythonCore:232.10203.2", "Pythonid:232.10203.10", "maven", "gradle"))
+    plugins.set(listOf("Git4Idea", "PythonCore:233.11799.241", "Pythonid:233.11799.241", "maven", "gradle"))
 }
 
 tasks {

gradle.properties

@@ -4,14 +4,14 @@ pluginGroup=de.tum.www1.artemis.plugin.intellij
 pluginName=orion
 pluginRepositoryUrl=https://github.com/ls1intum/Orion
 # SemVer format -> https://semver.org
-pluginVersion=1.2.8
+pluginVersion=1.2.9
 # Last 2 digits of the year and the major version digit, 211-211.* equals (20)21.1.*
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild=232
+pluginSinceBuild=233
 pluginUntilBuild=
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType=
-platformVersion=2023.2.4
+platformVersion=2023.3
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformPlugins=

src/main/java/de/tum/www1/orion/ui/assessment/OrionTemplateDiffEditorProvider.kt

@@ -1,7 +1,9 @@
+//@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 package de.tum.www1.orion.ui.assessment
 
 import com.intellij.diff.DiffRequestFactory
-import com.intellij.diff.editor.DiffEditorProvider
+import com.intellij.diff.editor.DiffRequestProcessorEditor
+import com.intellij.diff.editor.DiffVirtualFile
 import com.intellij.diff.editor.SimpleDiffVirtualFile
 import com.intellij.openapi.fileEditor.FileEditor
 import com.intellij.openapi.fileEditor.FileEditorPolicy
@@ -35,8 +37,9 @@ class OrionTemplateDiffEditorProvider : OrionEditorProvider() {
 
         val request = DiffRequestFactory.getInstance().createFromFiles(project, studentFile, templateFile)
         val diffFile = SimpleDiffVirtualFile(request)
-
-        return DiffEditorProvider().createEditor(project, diffFile)
+        // Copy from DiffEditorProvider
+        val processor = (diffFile as DiffVirtualFile).createProcessor(project)
+        return DiffRequestProcessorEditor(diffFile, processor)
     }
 
     override fun getEditorTypeId(): String = "ORION TEMPLATE DIFF EDITOR"

src/main/java/de/tum/www1/orion/ui/settings/OrionPluginSettings.kt

@@ -5,7 +5,7 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
 import com.intellij.openapi.options.SearchableConfigurable
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.TextFieldWithBrowseButton
-import com.intellij.openapi.util.io.toNioPath
+import com.intellij.openapi.util.io.toNioPathOrNull
 import com.intellij.ui.dsl.builder.Align
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.bindText
@@ -88,7 +88,7 @@ class OrionPluginSettings(private val project: Project) : SearchableConfigurable
                     translate("orion.settings.path.browser.title"),
                     null,
                     FileChooserDescriptorFactory.createSingleFolderDescriptor()
-                ).bindText({ currentProjectPath }) { it.toNioPath() }.align(Align.FILL).component
+                ).bindText({ currentProjectPath }) { it.toNioPathOrNull() }.align(Align.FILL).component
             }
             row {
                 label(translate("orion.settings.tutorPath.label"))
@@ -98,7 +98,7 @@ class OrionPluginSettings(private val project: Project) : SearchableConfigurable
                     translate("orion.settings.tutorPath.browser.title"),
                     null,
                     FileChooserDescriptorFactory.createSingleFolderDescriptor()
-                ).bindText({ currentTutorPath }) { it.toNioPath() }.align(Align.FILL).component
+                ).bindText({ currentTutorPath }) { it.toNioPathOrNull() }.align(Align.FILL).component
             }
             row {
                 label(translate("orion.settings.instructorPath.label"))
@@ -108,7 +108,7 @@ class OrionPluginSettings(private val project: Project) : SearchableConfigurable
                     translate("orion.settings.instructorPath.browser.title"),
                     null,
                     FileChooserDescriptorFactory.createSingleFolderDescriptor()
-                ).bindText({ currentInstructorPath }) { it.toNioPath() }.align(Align.FILL).component
+                ).bindText({ currentInstructorPath }) { it.toNioPathOrNull() }.align(Align.FILL).component
             }
             row {
                 label(translate("orion.settings.commit.message.title")).bold()

src/main/java/de/tum/www1/orion/ui/util/ImportPathChooser.kt

@@ -6,7 +6,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.TextFieldWithBrowseButton
 import com.intellij.openapi.util.io.FileUtil
-import com.intellij.openapi.util.io.toNioPath
+import com.intellij.openapi.util.io.toNioPathOrNull
 import com.intellij.ui.dsl.builder.Align
 import com.intellij.ui.dsl.builder.bindText
 import com.intellij.ui.dsl.builder.panel
@@ -48,7 +48,7 @@ class ImportPathChooser(val project: Project, val exercise: ProgrammingExercise,
                     translate("orion.dialog.pathchooser.browsedialog.title"),
                     null,
                     FileChooserDescriptorFactory.createSingleFolderDescriptor()
-                ).bindText({ suggestImportPath() }){it.toNioPath()}.align(Align.FILL).component
+                ).bindText({ suggestImportPath() }){it.toNioPathOrNull()}.align(Align.FILL).component
             }
         }