Upgraded versions to support newer rider with jdk 11

Author: ReallyLiri

.idea/codeStyles/Project.xml

@@ -12,8 +12,10 @@ Pairing C# interface files with implementations files in solution explorer for a
 
 ## Build
 
+Make sure you have jdk-11 properly configured.
+
 ```bash
-gradle build
+./gradlew build
 ```
 
 Plugin artifact will be written to
@@ -24,9 +26,9 @@ Plugin artifact will be written to
 
 ```bash
 export ORG_GRADLE_PROJECT_intellijPublishToken="..."
-gradle publishPlugin
+./gradlew publishPlugin
 ```
 
 ## Debug
 
-Open in IntelliJ to simply run and debug in a real Rider instance.
+Use `runIde` gradle task to debug on a Rider instance.

.idea/codeStyles/codeStyleConfig.xml

@@ -1,27 +1,37 @@
+buildscript {
+    repositories {
+        maven { url 'https://www.myget.org/F/rd-snapshots/maven/' }
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath("com.jetbrains.rd:rd-gen:0.201.57") // https://www.myget.org/feed/rd-snapshots/package/maven/com.jetbrains.rd/rd-gen
+    }
+}
+
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.3.50'
-    id 'org.jetbrains.intellij' version '0.4.10'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.61'
+    id 'org.jetbrains.intellij' version '0.4.19'
 }
 
 repositories {
-    maven { url "https://www.jetbrains.com/intellij-repository/releases" }
-    maven { url "https://jetbrains.bintray.com/intellij-third-party-dependencies" }
-    mavenCentral()
-    jcenter()
+    maven { url 'https://cache-redirector.jetbrains.com/intellij-repository/snapshots' }
+    maven { url 'https://cache-redirector.jetbrains.com/maven-central' }
 }
 
 instrumentCode {
-    compilerVersion = "192.6817.32" // latest build of com.jetbrains.intellij.java from https://www.jetbrains.com/intellij-repository/releases/
+    compilerVersion = "203.7717.56" // latest build of com.jetbrains.intellij.java from https://www.jetbrains.com/intellij-repository/releases/
 }
 
 group 'com.reallyliri.plugins'
-version '1.3'
+version '1.4'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 11
+targetCompatibility = 11
 
 compileKotlin {
-    kotlinOptions { jvmTarget = "1.8" }
+    kotlinOptions { jvmTarget = "11" }
 }
 
 dependencies {
@@ -31,8 +41,8 @@ dependencies {
 intellij {
     // see https://www.jetbrains.com/help/resharper/sdk/Products/Rider.html#plugin-project-jvm
     type = 'RD'
-    version = "2019.2-SNAPSHOT"
-    downloadSources = false
+    version = "2021.2-SNAPSHOT"
+    downloadSources = true
     intellij.updateSinceUntilBuild false
 }
 

.idea/compiler.xml

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

.idea/jarRepositories.xml

@@ -1,17 +1,21 @@
 package com.reallyliri.plugins.interfacepairing;
 
+import com.google.common.collect.Streams;
+import com.intellij.ide.projectView.PresentationData;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.jetbrains.rider.model.RdProjectFileDescriptor;
-import com.jetbrains.rider.projectView.nodes.ProjectModelNode;
 import com.jetbrains.rider.projectView.views.solutionExplorer.SolutionExplorerCustomization;
+import com.jetbrains.rider.projectView.workspace.ProjectModelEntity;
 import java.awt.EventQueue;
-import java.util.ArrayList;
+import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import kotlin.sequences.Sequence;
 import org.jetbrains.annotations.NotNull;
 
 public class InterfacePairingSolutionExplorerCustomization extends SolutionExplorerCustomization {
@@ -21,20 +25,36 @@ public InterfacePairingSolutionExplorerCustomization(@NotNull Project project) {
         super(project);
     }
 
+    @Override
+    public int compareNodes(@NotNull ProjectModelEntity x, @NotNull ProjectModelEntity y) {
+        return -1 * super.compareNodes(x, y);
+    }
+
+    @Override
+    public void updateNode(@NotNull PresentationData presentation, @NotNull VirtualFile virtualFile) {
+        super.updateNode(presentation, virtualFile);
+    }
+
+    @Override
+    public void updateNode(@NotNull PresentationData presentation, @NotNull ProjectModelEntity entity) {
+        super.updateNode(presentation, entity);
+    }
+
     @NotNull
     @Override
-    public List<AbstractTreeNode<?>> getChildren(@NotNull ProjectModelNode parentNode) {
+    public List<AbstractTreeNode<?>> getChildren(@NotNull ProjectModelEntity entity) {
         if (!EventQueue.isDispatchThread()) {
-            setInterfacePairingSortKeys(parentNode);
+            setInterfacePairingSortKeys(entity);
         }
-        return super.getChildren(parentNode); // always returns empty, but its fine
+        return super.getChildren(entity); // always returns empty, but its fine
     }
 
-    private void setInterfacePairingSortKeys(ProjectModelNode parentNode) {
-        ArrayList<ProjectModelNode> children = parentNode.getChildren(true, false);
-        Map<@NotNull String, ProjectModelNode> fileNodesByName = children.stream()
-            .filter(node -> node.getDescriptor() instanceof RdProjectFileDescriptor)
-            .collect(Collectors.toMap(ProjectModelNode::getName, node -> node, (node1, node2) -> node1));
+    private void setInterfacePairingSortKeys(ProjectModelEntity entity) {
+        Sequence<ProjectModelEntity> children = entity.getChildrenEntities();
+        Map<@NotNull String, ProjectModelEntity> fileNodesByName =
+            Streams.stream(children.iterator())
+                .filter(node -> node.getDescriptor() instanceof RdProjectFileDescriptor)
+                .collect(Collectors.toMap(ProjectModelEntity::getName, node -> node, (node1, node2) -> node1));
 
         if (fileNodesByName.isEmpty()) {
             return;
@@ -58,13 +78,13 @@ private void setInterfacePairingSortKeys(ProjectModelNode parentNode) {
 
         int sortKey = 0;
         for (String currentNodeName : orderedNonInterfaceNames) {
-            ProjectModelNode currentNode = fileNodesByName.get(currentNodeName);
+            ProjectModelEntity currentNode = fileNodesByName.get(currentNodeName);
             setNodeSortKey(currentNode, sortKey);
             sortKey++;
 
             String potentialInterfaceName = String.format("I%s", currentNodeName);
             if (interfacesSet.contains(potentialInterfaceName)) {
-                ProjectModelNode interfaceNode = fileNodesByName.get(potentialInterfaceName);
+                ProjectModelEntity interfaceNode = fileNodesByName.get(potentialInterfaceName);
                 setNodeSortKey(interfaceNode, sortKey);
                 sortKey++;
             }
@@ -73,20 +93,18 @@ private void setInterfacePairingSortKeys(ProjectModelNode parentNode) {
         assert sortKey == fileNodesByName.size();
     }
 
-    private void setNodeSortKey(ProjectModelNode node, int sortKey) {
+    private void setNodeSortKey(ProjectModelEntity node, int sortKey) {
         RdProjectFileDescriptor fileDescriptor = (RdProjectFileDescriptor) node.getDescriptor();
         if (fileDescriptor.getSortKey() != null && fileDescriptor.getSortKey() == sortKey) {
             return;
         }
-        RdProjectFileDescriptor newDescriptor = new RdProjectFileDescriptor(
-            fileDescriptor.isInternal(),
-            fileDescriptor.isLinked(),
-            fileDescriptor.getBuildAction(),
-            sortKey,
-            fileDescriptor.getUserData(),
-            fileDescriptor.getName(),
-            fileDescriptor.getLocation()
-        );
-        node.updateData(newDescriptor, node.getParent());
+
+        try {
+            Field sortKeyField = fileDescriptor.getClass().getDeclaredField("sortKey");
+            sortKeyField.setAccessible(true);
+            sortKeyField.set(fileDescriptor, sortKey);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
     }
 }

.idea/misc.xml

@@ -2,8 +2,8 @@
     <id>com.reallyliri.plugins.interfacepairing</id>
     <name>Interface Pairing</name>
     <vendor url="https://github.com/reallyliri">ReallyLiri</vendor>
-    <version>1.3</version>
-    <idea-version since-build="191" />
+    <version>1.4</version>
+    <idea-version since-build="203" />
 
     <description>Pairing C# interface files with implementations files in solution explorer for a better display experience.</description>