MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

NPE

Browse Source 
GitOrigin-RevId: 9d7cde5d0f3c0d92633634e2fdd7b129219bd7e0
This commit is contained in:
Anna Kozlova
2021-12-09 15:17:58 +00:00
committed by intellij-monorepo-bot
parent 67de402617
commit 5fc7b9a900
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/vcs/changes/ChangeListsSearchScopeProvider.kt
+9 -7
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.vcs.changes
import com.intellij.openapi.actionSystem.CommonDataKeys
@@ -9,10 +9,10 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.project.displayUrlRelativeToProject
import com.intellij.openapi.vcs.VcsBundle
import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.PsiElement
import com.intellij.psi.search.DefaultSearchScopeProviders
import com.intellij.psi.search.SearchScope
import com.intellij.psi.search.SearchScopeProvider
import com.intellij.psi.util.PsiUtilCore
class ChangeListsSearchScopeProvider : SearchScopeProvider {
override fun getDisplayName(): String? {
@@ -39,11 +39,13 @@ class ChangeListsSearchScopeProvider : SearchScopeProvider {
?.let { PsiDocumentManager.getInstance(project).getPsiFile(it.document) }
if (psiFile != null) {
val virtualFile = psiFile.virtualFile
val localUrl = displayUrlRelativeToProject(virtualFile, virtualFile.presentableUrl, project, isIncludeFilePath = true,
moduleOnTheLeft = false)
result.add(
VcsChangesLocalSearchScope(project, VcsBundle.message("change.list.scope.provider.only.changes.in.file", localUrl), arrayOf(virtualFile), false))
val virtualFile = PsiUtilCore.getVirtualFile(psiFile)
if (virtualFile != null) {
val localUrl = displayUrlRelativeToProject(virtualFile, virtualFile.presentableUrl, project, isIncludeFilePath = true,
moduleOnTheLeft = false)
result.add(
VcsChangesLocalSearchScope(project, VcsBundle.message("change.list.scope.provider.only.changes.in.file", localUrl), arrayOf(virtualFile), false))
}
}
return result
}