IDEA-289528 platform: fix removing collection from property service

(cherry picked from commit 4e4803c43f81741e60918ba0faef82d834f2dee3)

GitOrigin-RevId: 0804de852481f99bd8adf0ebfa651cdbd7e7e958

platform/core-api/src/com/intellij/ide/util/PropertiesComponent.java

@@ -36,7 +36,7 @@ public abstract class PropertiesComponent {
   public abstract void setValue(@NonNls @NotNull String name, @NonNls @Nullable String value);
 
   /**
-   * Set value or unset if equals to default value
+   * Set value or unset if equals to default value or null
    */
   public abstract void setValue(@NonNls @NotNull String name, @NonNls @Nullable String value, @Nullable String defaultValue);
 

platform/platform-impl/src/com/intellij/ide/util/propertyService.kt

@@ -49,6 +49,7 @@ sealed class BasePropertyService : PropertiesComponent(), PersistentStateCompone
 
   override fun loadState(state: MyState) {
     keyToString.clear()
+    keyToStringList.clear()
     keyToString.putAll(state.keyToString)
     keyToStringList.putAll(state.keyToStringList)
   }
@@ -112,7 +113,8 @@ sealed class BasePropertyService : PropertiesComponent(), PersistentStateCompone
 
   override fun setValues(name: @NonNls String, values: Array<String>?) {
     if (values == null) {
-      unsetValue(name)
+      keyToStringList.remove(name)
+      tracker.incModificationCount()
     }
     else {
       keyToStringList.put(name, java.util.List.of(*values))
@@ -124,7 +126,8 @@ sealed class BasePropertyService : PropertiesComponent(), PersistentStateCompone
 
   override fun setList(name: String, values: MutableCollection<String>?) {
     if (values == null) {
-      unsetValue(name)
+      keyToStringList.remove(name)
+      tracker.incModificationCount()
     }
     else {
       // for possible backward compatibility to existing usages, allow to store empty collections