MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] IJPL-165127 Exclude ignored files from git tracked scope

Browse Source 
(cherry picked from commit c00bb120deb041fa25bdcd4f188023f69eaebffa)

IJ-CR-147722

GitOrigin-RevId: 8d024fa1343278209b816c002f5176d4f961c58e
This commit is contained in:
Ilia.Shulgin
2024-10-24 18:58:23 +02:00
committed by intellij-monorepo-bot
parent e8514ef109
commit 1dd218de70
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/git4idea/src/git4idea/search/GitTrackedSearchScope.kt
View File

@@ -8,6 +8,7 @@ import com.intellij.openapi.vcs.ProjectLevelVcsManager
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.search.ProjectScopeImpl
import git4idea.i18n.GitBundle
import git4idea.ignore.GitRepositoryIgnoredFilesHolder
import git4idea.index.vfs.filePath
import git4idea.repo.GitRepository
import git4idea.repo.GitRepositoryManager
@@ -17,7 +18,7 @@ import org.jetbrains.annotations.VisibleForTesting
internal class GitTrackedSearchScope(
private val project: Project,
private val rootToUntrackedFiles: Map<VirtualFile, GitUntrackedFilesHolder>,
private val rootToFilesHolders: Map<VirtualFile, Pair<GitUntrackedFilesHolder, GitRepositoryIgnoredFilesHolder>>,
) : ProjectScopeImpl(project, FileIndexFacade.getInstance(project)) {
@Nls
override fun getDisplayName(): String = GitBundle.message("search.scope.project.git.tracked")
@@ -28,8 +29,8 @@ internal class GitTrackedSearchScope(
fun isTracked(file: VirtualFile): Boolean {
val filePath = file.filePath()
val gitRoot = ProjectLevelVcsManager.getInstance(project).getVcsRootFor(file) ?: return false
val untrackedFilesHolder = rootToUntrackedFiles[gitRoot] ?: return false
return !untrackedFilesHolder.containsUntrackedFile(filePath)
val (untrackedFilesHolder, ignoredFilesHolder) = rootToFilesHolders[gitRoot] ?: return false
return !untrackedFilesHolder.containsUntrackedFile(filePath) && !ignoredFilesHolder.containsFile(filePath)
}
companion object {
@@ -39,19 +40,19 @@ internal class GitTrackedSearchScope(
internal fun getSearchScope(project: Project): GitTrackedSearchScope? {
val repositories = GitRepositoryManager.getInstance(project).repositories
if (repositories.isEmpty()) return null
val repoToUntrackedFiles = getUntrackedFilesMapping(repositories) ?: return null
return GitTrackedSearchScope(project, repoToUntrackedFiles)
val rootToFilesHolders = getFilesHoldersMapping(repositories) ?: return null
return GitTrackedSearchScope(project, rootToFilesHolders)
}
private fun getUntrackedFilesMapping(repositories: List<GitRepository>): Map<VirtualFile, GitUntrackedFilesHolder>? =
private fun getFilesHoldersMapping(repositories: List<GitRepository>): Map<VirtualFile, Pair<GitUntrackedFilesHolder, GitRepositoryIgnoredFilesHolder>>? =
repositories.associate { repo ->
if (!repo.untrackedFilesHolder.isInitialized) {
if (!repo.untrackedFilesHolder.isInitialized || !repo.ignoredFilesHolder.initialized) {
if (LOG.isDebugEnabled) {
LOG.debug("Untracked files holder is not initialized for $repo")
}
return null
}
repo.root to repo.untrackedFilesHolder
repo.root to Pair(repo.untrackedFilesHolder, repo.ignoredFilesHolder)
}
}
}

8
plugins/git4idea/tests/git4idea/scope/GitTrackedSearchScopeTest.kt
View File

@@ -2,6 +2,7 @@
package git4idea.scope
import git4idea.index.vfs.filePath
import git4idea.repo.GitRepositoryFiles.GITIGNORE
import git4idea.search.GitTrackedSearchScope
import git4idea.test.GitSingleRepoTest
import git4idea.test.add
@@ -36,6 +37,13 @@ class GitTrackedSearchScopeTest : GitSingleRepoTest() {
assertFalse(scope.isTracked(file))
}
fun `test ignored files are not in scope`() {
val ignoredFile = repo.root.createFile("ignored")
repo.root.createFile(GITIGNORE, ignoredFile.name)
assertFalse(getGitUntrackedSearchScope().isTracked(ignoredFile))
}
private fun getGitUntrackedSearchScope(): GitTrackedSearchScope {
awaitEvents()
return checkNotNull(GitTrackedSearchScope.getSearchScope(project))