1
0
mirror of https://github.com/chylex/Rider-VCS-Group-By-Project.git synced 2024-11-26 01:42:45 +01:00

Compare commits

...

3 Commits

Author SHA1 Message Date
eb1a4dfdad
Release 1.0.3 2023-07-16 20:38:51 +02:00
ce55d81a0e
Update to Rider 2023.2 EAP
Closes #2
2023-07-16 20:20:58 +02:00
fdc20aa4ed
Update to Rider 2023.1 w/ Java 17 and Gradle 7.6.2 2023-07-16 20:10:55 +02:00
8 changed files with 21 additions and 19 deletions

5
.gitignore vendored
View File

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

View File

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

View File

@ -4,9 +4,6 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <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="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules"> <option name="modules">
<set> <set>

View File

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

View File

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

View File

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

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

View File

@ -12,6 +12,10 @@
]]></description> ]]></description>
<change-notes><![CDATA[ <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> <b>Version 1.0.2</b>
<ul> <ul>
<li>Updated for Rider 2022.2.</li> <li>Updated for Rider 2022.2.</li>