mirror of
https://github.com/chylex/Rider-VCS-Group-By-Project.git
synced 2024-11-26 01:42:45 +01:00
Compare commits
No commits in common. "eb1a4dfdadd4dd8a66e59663def2a6596d7dd7a8" and "58165311be7d6fcd4068e0e4663a9b419d0962d2" have entirely different histories.
eb1a4dfdad
...
58165311be
5
.gitignore
vendored
5
.gitignore
vendored
@ -1,5 +1,8 @@
|
|||||||
/.idea/*
|
/.idea/*
|
||||||
!/.idea/runConfigurations
|
!/.idea/compiler.xml
|
||||||
|
!/.idea/encodings.xml
|
||||||
|
!/.idea/gradle.xml
|
||||||
|
!/.idea/vcs.xml
|
||||||
|
|
||||||
/.gradle/
|
/.gradle/
|
||||||
/build/
|
/build/
|
||||||
|
@ -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="17" />
|
<bytecodeTargetLevel target="11" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
@ -4,6 +4,9 @@
|
|||||||
<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>
|
||||||
|
@ -3,29 +3,25 @@
|
|||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm") version "1.8.0"
|
kotlin("jvm") version "1.6.21"
|
||||||
id("org.jetbrains.intellij") version "1.15.0"
|
id("org.jetbrains.intellij") version "1.7.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "com.chylex.intellij.rider.vcsgroupbyproject"
|
group = "com.chylex.intellij.rider.vcsgroupbyproject"
|
||||||
version = "1.0.3"
|
version = "1.0.2"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
|
||||||
jvmToolchain(17)
|
|
||||||
}
|
|
||||||
|
|
||||||
intellij {
|
intellij {
|
||||||
type.set("RD")
|
type.set("RD")
|
||||||
version.set("2023.2-SNAPSHOT")
|
version.set("2022.2")
|
||||||
updateSinceUntilBuild.set(false)
|
updateSinceUntilBuild.set(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.patchPluginXml {
|
tasks.patchPluginXml {
|
||||||
sinceBuild.set("232")
|
sinceBuild.set("222")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.buildSearchableOptions {
|
tasks.buildSearchableOptions {
|
||||||
@ -33,7 +29,8 @@ tasks.buildSearchableOptions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<KotlinCompile> {
|
tasks.withType<KotlinCompile> {
|
||||||
|
kotlinOptions.jvmTarget = "11"
|
||||||
kotlinOptions.freeCompilerArgs = listOf(
|
kotlinOptions.freeCompilerArgs = listOf(
|
||||||
"-Xjvm-default=all"
|
"-Xjvm-default=enable"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -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.6.2-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
@ -8,7 +8,6 @@ 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)
|
||||||
@ -31,7 +30,6 @@ 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? {
|
||||||
|
@ -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,10 +64,11 @@ class ProjectChangesGroupingPolicy(private val project: Project, private val mod
|
|||||||
}
|
}
|
||||||
|
|
||||||
private companion object {
|
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()
|
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) }
|
||||||
|
@ -12,10 +12,6 @@
|
|||||||
]]></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>
|
||||||
|
Loading…
Reference in New Issue
Block a user