chylex/Rider-VCS-Group-By-Project
1
0
Fork 0
mirror of https://github.com/chylex/Rider-VCS-Group-By-Project.git synced 2024-10-18 11:42:54 +02:00
Code

Compare commits

base: chylex:eb1a4dfdadd4dd8a66e59663def2a6596d7dd7a8
Branches Tags
chylex:main
..
compare: chylex:58165311be7d6fcd4068e0e4663a9b419d0962d2
Branches Tags
chylex:main

No commits in common. "eb1a4dfdadd4dd8a66e59663def2a6596d7dd7a8" and "58165311be7d6fcd4068e0e4663a9b419d0962d2" have entirely different histories.
eb1a4dfdad ... 58165311be

8 changed files with 19 additions and 21 deletions
Show Stats Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,5 +1,8 @@
/.idea/*
!/.idea/runConfigurations
!/.idea/compiler.xml
!/.idea/encodings.xml
!/.idea/gradle.xml
!/.idea/vcs.xml
/.gradle/
/build/

2
.idea/compiler.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="17" />
<bytecodeTargetLevel target="11" />
</component>
</project>

3
.idea/gradle.xml
View File

@ -4,6 +4,9 @@
<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="modules">
<set>

17
build.gradle.kts
View File

@ -3,29 +3,25 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.8.0"
id("org.jetbrains.intellij") version "1.15.0"
kotlin("jvm") version "1.6.21"
id("org.jetbrains.intellij") version "1.7.0"
}
group = "com.chylex.intellij.rider.vcsgroupbyproject"
version = "1.0.3"
version = "1.0.2"
repositories {
mavenCentral()
}
kotlin {
jvmToolchain(17)
}
intellij {
type.set("RD")
version.set("2023.2-SNAPSHOT")
version.set("2022.2")
updateSinceUntilBuild.set(false)
}
tasks.patchPluginXml {
sinceBuild.set("232")
sinceBuild.set("222")
}
tasks.buildSearchableOptions {
@ -33,7 +29,8 @@ tasks.buildSearchableOptions {
}
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "11"
kotlinOptions.freeCompilerArgs = listOf(
"-Xjvm-default=all"
"-Xjvm-default=enable"
)
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

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

2
src/main/kotlin/com/chylex/intellij/rider/vcsgroupbyproject/ChangesBrowserProjectNode.kt
View File

@ -8,7 +8,6 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNodeRenderer
import com.jetbrains.rider.model.RdCustomLocation
import com.jetbrains.rider.model.RdProjectModelItemDescriptor
import java.io.File
import java.io.Serial
class ChangesBrowserProjectNode(private val descriptor: RdProjectModelItemDescriptor) : ChangesBrowserNode<RdProjectModelItemDescriptor>(descriptor) {
private val type = getType(descriptor)
@ -31,7 +30,6 @@ class ChangesBrowserProjectNode(private val descriptor: RdProjectModelItemDescri
}
companion object {
@Serial
private const val serialVersionUID = 2641007635909904963L
private fun getType(descriptor: RdProjectModelItemDescriptor): FileType? {

5
src/main/kotlin/com/chylex/intellij/rider/vcsgroupbyproject/ProjectChangesGroupingPolicy.kt
View File

@ -9,8 +9,8 @@ import com.intellij.openapi.vcs.changes.ui.ChangesGroupingPolicyFactory
import com.intellij.openapi.vcs.changes.ui.StaticFilePath
import com.intellij.openapi.vcs.changes.ui.TreeModelBuilder
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.platform.backend.workspace.WorkspaceModel
import com.intellij.vcsUtil.VcsUtil
import com.intellij.workspaceModel.ide.WorkspaceModel
import com.jetbrains.rider.model.RdCustomLocation
import com.jetbrains.rider.model.RdProjectDescriptor
import com.jetbrains.rider.model.RdProjectModelItemDescriptor
@ -64,10 +64,11 @@ class ProjectChangesGroupingPolicy(private val project: Project, private val mod
}
private companion object {
private val NODE_CACHE = NotNullLazyKey.createLazyKey<MutableMap<RdProjectModelItemDescriptor?, ChangesBrowserNode<*>>, ChangesBrowserNode<*>>("ChangesTree.ProjectCache") {
private val NODE_CACHE = NotNullLazyKey.create<MutableMap<RdProjectModelItemDescriptor?, ChangesBrowserNode<*>>, ChangesBrowserNode<*>>("ChangesTree.ProjectCache") {
mutableMapOf()
}
@Suppress("UnstableApiUsage")
private fun getSingleProjectEntity(file: VirtualFile, project: Project): ProjectModelEntity? {
val workspaceModel = WorkspaceModel.getInstance(project)
val entities = walkFileParentsUntilResultIsNotEmpty(file) { workspaceModel.getProjectModelEntities(it, project) }

4
src/main/resources/META-INF/plugin.xml
View File

@ -12,10 +12,6 @@
]]></description>
<change-notes><![CDATA[
<b>Version 1.0.3</b>
<ul>
<li>Updated for Rider 2023.2 EAP.</li>
</ul>
<b>Version 1.0.2</b>
<ul>
<li>Updated for Rider 2022.2.</li>