MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

[github] fix PR diff files validity check for renamed projects

Browse Source 
#IJPL-73041 Fixed

GitOrigin-RevId: d47d80654f5a7b4387d94f8afaa7819145a53da8
This commit is contained in:
Ivan Semenov
2024-07-05 17:55:21 +02:00
committed by intellij-monorepo-bot
parent dd5d76a359
commit a94de895e6
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/github/src/org/jetbrains/plugins/github/pullrequest/GHNewPRDiffVirtualFile.kt
View File

@@ -10,8 +10,9 @@ import com.intellij.openapi.project.Project
import com.intellij.vcs.editor.ComplexPathVirtualFileSystem
import org.jetbrains.plugins.github.api.GHRepositoryCoordinates
import org.jetbrains.plugins.github.i18n.GithubBundle
import org.jetbrains.plugins.github.pullrequest.data.GHPRDataContextRepository
import org.jetbrains.plugins.github.pullrequest.ui.diff.GHPRDiffService
import org.jetbrains.plugins.github.pullrequest.ui.toolwindow.model.GHPRToolWindowProjectViewModel
import org.jetbrains.plugins.github.pullrequest.ui.toolwindow.model.GHPRToolWindowViewModel
internal data class GHNewPRDiffVirtualFile(private val fileManagerId: String,
private val project: Project,
@@ -24,7 +25,7 @@ internal data class GHNewPRDiffVirtualFile(private val fileManagerId: String,
override fun getPresentablePath() = getPresentablePath(repository)
override fun getPresentableName() = GithubBundle.message("pull.request.new.diff.editor.title")
override fun isValid(): Boolean = isFileValid(fileManagerId, project, repository)
override fun isValid(): Boolean = findProjectVm() != null
override fun createViewer(project: Project): DiffEditorViewer {
val processor = if (CodeReviewAdvancedSettings.isCombinedDiffEnabled()) {
@@ -36,11 +37,9 @@ internal data class GHNewPRDiffVirtualFile(private val fileManagerId: String,
processor.context.putUserData(DiffUserDataKeysEx.COMBINED_DIFF_TOGGLE, CodeReviewAdvancedSettings.CodeReviewCombinedDiffToggle)
return processor
}
}
private fun isFileValid(fileManagerId: String, project: Project, repository: GHRepositoryCoordinates): Boolean {
val dataContext = GHPRDataContextRepository.getInstance(project).findContext(repository) ?: return false
return dataContext.filesManager.id == fileManagerId
private fun findProjectVm(): GHPRToolWindowProjectViewModel? =
project.service<GHPRToolWindowViewModel>().projectVm.value?.takeIf { it.repository == repository }
}
private fun getPresentablePath(repository: GHRepositoryCoordinates) =

11
plugins/github/src/org/jetbrains/plugins/github/pullrequest/GHPRDiffVirtualFile.kt
View File

@@ -10,9 +10,10 @@ import com.intellij.openapi.project.Project
import com.intellij.vcs.editor.ComplexPathVirtualFileSystem
import org.jetbrains.plugins.github.api.GHRepositoryCoordinates
import org.jetbrains.plugins.github.i18n.GithubBundle
import org.jetbrains.plugins.github.pullrequest.data.GHPRDataContextRepository
import org.jetbrains.plugins.github.pullrequest.data.GHPRIdentifier
import org.jetbrains.plugins.github.pullrequest.ui.diff.GHPRDiffService
import org.jetbrains.plugins.github.pullrequest.ui.toolwindow.model.GHPRToolWindowProjectViewModel
import org.jetbrains.plugins.github.pullrequest.ui.toolwindow.model.GHPRToolWindowViewModel
internal data class GHPRDiffVirtualFile(private val fileManagerId: String,
private val project: Project,
@@ -27,7 +28,7 @@ internal data class GHPRDiffVirtualFile(private val fileManagerId: String,
override fun getPresentablePath(): String = getPresentablePath(repository, pullRequest)
override fun getPresentableName(): String = GithubBundle.message("pull.request.diff.editor.title", pullRequest.number)
override fun isValid(): Boolean = isFileValid(fileManagerId, project, repository)
override fun isValid(): Boolean = findProjectVm() != null
override fun createViewer(project: Project): DiffEditorViewer {
val processor = if (CodeReviewAdvancedSettings.isCombinedDiffEnabled()) {
@@ -39,11 +40,9 @@ internal data class GHPRDiffVirtualFile(private val fileManagerId: String,
processor.context.putUserData(DiffUserDataKeysEx.COMBINED_DIFF_TOGGLE, CodeReviewAdvancedSettings.CodeReviewCombinedDiffToggle)
return processor
}
}
private fun isFileValid(fileManagerId: String, project: Project, repository: GHRepositoryCoordinates): Boolean {
val dataContext = GHPRDataContextRepository.getInstance(project).findContext(repository) ?: return false
return dataContext.filesManager.id == fileManagerId
private fun findProjectVm(): GHPRToolWindowProjectViewModel? =
project.service<GHPRToolWindowViewModel>().projectVm.value?.takeIf { it.repository == repository }
}
private fun getPresentablePath(repository: GHRepositoryCoordinates, pullRequest: GHPRIdentifier) =