From a578189c3dd15472e2d6f5e5caf795f6f9d02ded Mon Sep 17 00:00:00 2001
From: Nils Andresen <nils@nils-andresen.de>
Date: Tue, 22 Aug 2023 20:39:00 +0200
Subject: [PATCH 1/2] (#325) bumped rider version to 2023.1

---
 src/dotnet/Directory.Build.props            | 2 +-
 src/dotnet/cake-rider/CakePredefinedType.cs | 6 +++---
 src/rider/.idea/gradle.xml                  | 4 ----
 src/rider/.idea/kotlinc.xml                 | 2 +-
 src/rider/build.gradle.kts                  | 6 +++---
 src/rider/gradle.properties                 | 8 ++++----
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/dotnet/Directory.Build.props b/src/dotnet/Directory.Build.props
index 32ad9c53..9586f09b 100644
--- a/src/dotnet/Directory.Build.props
+++ b/src/dotnet/Directory.Build.props
@@ -6,7 +6,7 @@
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <DebugType>pdbonly</DebugType>
         <!-- will be injected by gradle at build -->
-        <SdkVersion Condition="'$(SdkVersion)' == ''">2022.2.0</SdkVersion>
+        <SdkVersion Condition="'$(SdkVersion)' == ''">2023.1.0</SdkVersion>
         <WaveVersion>$(SdkVersion.Substring(2,2))$(SdkVersion.Substring(5,1)).0.0</WaveVersion>
         <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     </PropertyGroup>
diff --git a/src/dotnet/cake-rider/CakePredefinedType.cs b/src/dotnet/cake-rider/CakePredefinedType.cs
index 0fcd6a06..cd735c99 100644
--- a/src/dotnet/cake-rider/CakePredefinedType.cs
+++ b/src/dotnet/cake-rider/CakePredefinedType.cs
@@ -64,7 +64,7 @@ private IDeclaredType CreateType(int index, IClrTypeName clrName)
         {
             lock (_types)
             {
-                _types[index] ??= new PredefinedDeclaredTypeFromClrName(clrName, NullableAnnotation.Unknown, _module);
+                _types[index] ??= new PredefinedDeclaredTypeFromClrName(clrName, _module);
             }
         }
 
@@ -73,8 +73,8 @@ private IDeclaredType CreateType(int index, IClrTypeName clrName)
 
     private class PredefinedDeclaredTypeFromClrName : DeclaredTypeFromCLRName
     {
-        public PredefinedDeclaredTypeFromClrName(IClrTypeName clrName, NullableAnnotation annotation, IPsiModule module)
-            : base(clrName, annotation, module)
+        public PredefinedDeclaredTypeFromClrName(IClrTypeName clrName, IPsiModule module)
+            : base(clrName, module)
         {
         }
 
diff --git a/src/rider/.idea/gradle.xml b/src/rider/.idea/gradle.xml
index 3f024907..776aeac3 100644
--- a/src/rider/.idea/gradle.xml
+++ b/src/rider/.idea/gradle.xml
@@ -4,11 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/src/rider/.idea/kotlinc.xml b/src/rider/.idea/kotlinc.xml
index 4251b727..2b8a50fc 100644
--- a/src/rider/.idea/kotlinc.xml
+++ b/src/rider/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.7.22" />
+    <option name="version" value="1.8.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts
index 8ed4dff5..2b157093 100644
--- a/src/rider/build.gradle.kts
+++ b/src/rider/build.gradle.kts
@@ -9,10 +9,10 @@ plugins {
     id("java")
     // Kotlin support
     // do NOT update kotlin - kotlin version must match platform version, see https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
-    id("org.jetbrains.kotlin.jvm") version "1.7.0"
+    id("org.jetbrains.kotlin.jvm") version "1.8.0"
     // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
     id("org.jetbrains.intellij") version "1.13.3"
-    id("com.jetbrains.rdgen") version "2022.3.0"
+    id("com.jetbrains.rdgen") version "2023.1.2"
     // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
     id("org.jetbrains.changelog") version "2.0.0"
     // detekt linter - read more: https://detekt.github.io/detekt/gradle.html
@@ -24,7 +24,7 @@ plugins {
 }
 
 val jvmVersion = "17"
-val kotlinVersion = "1.7" // should match org.jetbrains.kotlin.jvm (major.minor)
+val kotlinVersion = "1.8" // should match org.jetbrains.kotlin.jvm (major.minor)
 
 group = properties("pluginGroup")
 version = properties("pluginVersion")
diff --git a/src/rider/gradle.properties b/src/rider/gradle.properties
index a5f5380b..396afba4 100644
--- a/src/rider/gradle.properties
+++ b/src/rider/gradle.properties
@@ -4,15 +4,15 @@
 pluginGroup = net.cakebuild
 pluginName = cake-rider
 pluginVersion = 0.1.0-alpha.1
-pluginSinceBuild = 223
-pluginUntilBuild = 223.*
+pluginSinceBuild = 231
+pluginUntilBuild = 231.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
 # or https://data.services.jetbrains.com/products?fields=name,releases.downloads,releases.version,releases.build,releases.type&code=RD
-pluginVerifierIdeVersions = RD-2022.3
+pluginVerifierIdeVersions = RD-2023.1
 
 platformType = RD
-platformVersion = 2022.3.1
+platformVersion = 2023.1.4
 platformDownloadSources = true
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

From e23d7e52966eae2af322795eb9f07413573fac8e Mon Sep 17 00:00:00 2001
From: Nils Andresen <nils@nils-andresen.de>
Date: Wed, 23 Aug 2023 22:33:08 +0200
Subject: [PATCH 2/2] (#325) Changed the way icons are loaded

This is probably due to the change in UI on the intellij-side.
It seems the builtin add/remove icons were removed and replaced by new
ones. These needed a different kind of "loading".
---
 .../net/cakebuild/settings/CakeRunnerSettingsEditor.form    | 2 --
 .../net/cakebuild/settings/CakeRunnerSettingsEditor.java    | 3 +++
 .../cakebuild/settings/controls/SimpleAddEditControl.form   | 2 --
 .../cakebuild/settings/controls/SimpleAddEditControl.java   | 4 ++++
 src/rider/src/main/kotlin/icons/CakeIcons.kt                | 6 ++++++
 src/rider/src/main/resources/META-INF/plugin.xml            | 2 +-
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.form b/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.form
index a69dfc05..df917cd7 100644
--- a/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.form
+++ b/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.form
@@ -86,7 +86,6 @@
                   <gridbag weightx="0.0" weighty="0.0"/>
                 </constraints>
                 <properties>
-                  <icon value="general/add.png"/>
                   <maximumSize width="30" height="30"/>
                   <minimumSize width="30" height="30"/>
                   <preferredSize width="30" height="30"/>
@@ -99,7 +98,6 @@
                   <gridbag weightx="0.0" weighty="0.0"/>
                 </constraints>
                 <properties>
-                  <icon value="general/remove.png"/>
                   <label value=""/>
                   <maximumSize width="30" height="30"/>
                   <minimumSize width="30" height="30"/>
diff --git a/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.java b/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.java
index 660d4515..815b24b7 100644
--- a/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.java
+++ b/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.java
@@ -1,5 +1,6 @@
 package net.cakebuild.settings;
 
+import icons.CakeIcons;
 import net.cakebuild.shared.ui.RegexCellEditor;
 
 import javax.swing.JButton;
@@ -45,6 +46,7 @@ public CakeRunnerSettingsEditor() {
         regexCellEditor.setOnValidationError(s -> { setValidationError(s); return null; });
         regexCellEditor.setOnValidationSuccess(() -> { setValidationError(null); return null; });
         overrides.getColumnModel().getColumn(0).setCellEditor(regexCellEditor);
+        addButton.setIcon(CakeIcons.GeneralAdd);
         addButton.addActionListener(e -> {
             model.addRow(new Object[]{"",""});
             int row = model.getRowCount()-1;
@@ -54,6 +56,7 @@ public CakeRunnerSettingsEditor() {
             Component textEdit = overrides.prepareEditor(editor, row, 0);
             textEdit.requestFocus();
         });
+        removeButton.setIcon(CakeIcons.GeneralRemove);
         removeButton.setEnabled(false);
         removeButton.addActionListener(e -> {
             int row = overrides.getSelectedRow();
diff --git a/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.form b/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.form
index 784f0f53..d54703bf 100644
--- a/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.form
+++ b/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.form
@@ -29,7 +29,6 @@
               <gridbag weightx="0.0" weighty="0.0"/>
             </constraints>
             <properties>
-              <icon value="general/add.png"/>
               <maximumSize width="30" height="30"/>
               <minimumSize width="30" height="30"/>
               <opaque value="true"/>
@@ -43,7 +42,6 @@
               <gridbag weightx="0.0" weighty="0.0"/>
             </constraints>
             <properties>
-              <icon value="general/remove.png"/>
               <label value=""/>
               <maximumSize width="30" height="30"/>
               <minimumSize width="30" height="30"/>
diff --git a/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.java b/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.java
index 47a5a418..4a42799b 100644
--- a/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.java
+++ b/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.java
@@ -1,5 +1,7 @@
 package net.cakebuild.settings.controls;
 
+import icons.CakeIcons;
+
 import javax.swing.*;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellEditor;
@@ -34,6 +36,7 @@ public SimpleAddEditControl(String[] headers, Supplier<String[]> newItemGenerato
             int row = table.getSelectedRow();
             removeItem.setEnabled(row >= 0);
         });
+        addItem.setIcon(CakeIcons.GeneralAdd);
         addItem.addActionListener(e -> {
             model.addRow(newItemGenerator.get());
             int row = model.getRowCount()-1;
@@ -43,6 +46,7 @@ public SimpleAddEditControl(String[] headers, Supplier<String[]> newItemGenerato
             Component textEdit = table.prepareEditor(editor, row, 0);
             textEdit.requestFocus();
         });
+        removeItem.setIcon(CakeIcons.GeneralRemove);
         removeItem.setEnabled(false);
         removeItem.addActionListener(e -> {
             int row = table.getSelectedRow();
diff --git a/src/rider/src/main/kotlin/icons/CakeIcons.kt b/src/rider/src/main/kotlin/icons/CakeIcons.kt
index a365fd47..35060c14 100644
--- a/src/rider/src/main/kotlin/icons/CakeIcons.kt
+++ b/src/rider/src/main/kotlin/icons/CakeIcons.kt
@@ -14,4 +14,10 @@ object CakeIcons {
 
     @JvmField
     val CakeTestProjectTemplate = IconLoader.getIcon("/icons/CakeTestProject.svg", CakeIcons.javaClass)
+
+    @JvmField
+    val GeneralAdd = IconLoader.getIcon("/general/add.svg", CakeIcons.javaClass)
+
+    @JvmField
+    val GeneralRemove = IconLoader.getIcon("/general/remove.svg", CakeIcons.javaClass)
 }
diff --git a/src/rider/src/main/resources/META-INF/plugin.xml b/src/rider/src/main/resources/META-INF/plugin.xml
index fd7634ff..50b5c73b 100644
--- a/src/rider/src/main/resources/META-INF/plugin.xml
+++ b/src/rider/src/main/resources/META-INF/plugin.xml
@@ -18,7 +18,7 @@
     <projectConfigurable parentId="build" instance="net.cakebuild.settings.CakeGeneralSettingsConfigurable"
                          id="net.cakebuild.settings.cake" displayName="Cake" nonDefaultProject="false" />
     <projectConfigurable parentId="net.cakebuild.settings.cake" instance="net.cakebuild.settings.CakeSearchPathSettingsConfigurable"
-                         id="net.cakebuild.settings.cake.runner.paths" displayName="Search paths" nonDefaultProject="false" />
+                         id="net.cakebuild.settings.cake.runner.paths" displayName="Search Paths" nonDefaultProject="false" />
     <projectConfigurable parentId="net.cakebuild.settings.cake" instance="net.cakebuild.settings.CakeRunnerSettingsConfigurable"
                          id="net.cakebuild.settings.cake.runner" displayName="Runner" nonDefaultProject="false" />
     <projectService serviceImplementation="net.cakebuild.settings.CakeSettings" />