From a2da3d416cdd160b9e102aecf55c55810c215439 Mon Sep 17 00:00:00 2001
From: Tobias Kahlert <tobias.kahlert@jetbrains.com>
Date: Wed, 24 Sep 2025 22:04:25 +0200
Subject: [PATCH] IDEA-379840 Make ExternalSystemNode comparable over ? instead
 of T

This gets rid of the raw type in the compareTo method.
Additionally, it's more correct anyway as the whole implementation
indicates that ExternalSystemNode is comparable regardless of the
held data.

GitOrigin-RevId: 4ecf8032e7e7d1cd6449cce7da03b69a0c641b9c
---
 .../openapi/externalSystem/view/ExternalSystemNode.java       | 4 ++--
 .../view/ExternalSystemViewDefaultContributor.java            | 2 +-
 .../com/intellij/openapi/externalSystem/view/ModuleNode.java  | 2 +-
 .../com/intellij/openapi/externalSystem/view/TasksNode.java   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemNode.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemNode.java
index 018031819efd..66fbd5804c97 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemNode.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemNode.java
@@ -35,7 +35,7 @@ import java.util.function.Function;
 /**
  * @author Vladislav.Soroka
  */
-public abstract class ExternalSystemNode<T> extends SimpleNode implements Comparable<ExternalSystemNode<T>> {
+public abstract class ExternalSystemNode<T> extends SimpleNode implements Comparable<ExternalSystemNode<?>> {
 
   static final int BUILTIN_TASKS_DATA_NODE_ORDER = 10;
   static final int BUILTIN_DEPENDENCIES_DATA_NODE_ORDER = BUILTIN_TASKS_DATA_NODE_ORDER + 10;
@@ -407,7 +407,7 @@ public abstract class ExternalSystemNode<T> extends SimpleNode implements Compar
   }
 
   @Override
-  public int compareTo(@NotNull ExternalSystemNode node) {
+  public int compareTo(@NotNull ExternalSystemNode<?> node) {
     return StringUtil.compare(this.getName(), node.getName(), true);
   }
 
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemViewDefaultContributor.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemViewDefaultContributor.java
index 943c612742d7..77586d936fc5 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemViewDefaultContributor.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemViewDefaultContributor.java
@@ -422,7 +422,7 @@ final class ExternalSystemViewDefaultContributor extends ExternalSystemViewContr
     }
 
     @Override
-    public int compareTo(@NotNull ExternalSystemNode node) {
+    public int compareTo(@NotNull ExternalSystemNode<?> node) {
       final T myData = getData();
       final Object thatData = node.getData();
       if (myData instanceof OrderAware && thatData instanceof OrderAware) {
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ModuleNode.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ModuleNode.java
index f247caf40ed7..5399ee57db9b 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ModuleNode.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ModuleNode.java
@@ -80,7 +80,7 @@ public class ModuleNode extends ExternalSystemNode<ModuleData> {
   }
 
   @Override
-  public int compareTo(@NotNull ExternalSystemNode node) {
+  public int compareTo(@NotNull ExternalSystemNode<?> node) {
     return myIsRoot ? -1 : (node instanceof ModuleNode && ((ModuleNode)node).myIsRoot) ? 1 : super.compareTo(node);
   }
 
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/TasksNode.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/TasksNode.java
index e41bc454e67d..b78606f34848 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/TasksNode.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/TasksNode.java
@@ -80,7 +80,7 @@ public class TasksNode extends ExternalSystemNode<Object> {
           }
 
           @Override
-          public int compareTo(@NotNull ExternalSystemNode node) {
+          public int compareTo(@NotNull ExternalSystemNode<?> node) {
             return "other".equals(group) ? 1 : super.compareTo(node);
           }
         };