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

IDEA-337660 Read access is allowed from inside read-action when using search everywhere

Browse Source 
- get rid of PSI usages in HtmlGotoSymbolProvider

GitOrigin-RevId: 4fcdc103ec9088789fd4d090069d781f8f3cc66d
This commit is contained in:
Mikhail Sokolov
2023-11-23 12:46:39 +01:00
committed by intellij-monorepo-bot
parent 0637d0b1d5
commit f722acbf65
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/htmltools/src/com/intellij/htmltools/html/HtmlGotoSymbolProvider.java
View File

@@ -6,11 +6,10 @@ import com.intellij.navigation.ItemPresentation;
import com.intellij.navigation.NavigationItem;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.psi.presentation.java.SymbolPresentationUtil;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.Processor;
import com.intellij.util.indexing.FileBasedIndex;
@@ -20,7 +19,9 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.io.File;
import java.util.Objects;
import java.util.Optional;
public final class HtmlGotoSymbolProvider implements ChooseByNameContributorEx {
@Override
@@ -81,8 +82,10 @@ public final class HtmlGotoSymbolProvider implements ChooseByNameContributorEx {
@Override
public @Nullable String getLocationString() {
PsiFile psiFile = PsiManager.getInstance(myProject).findFile(myFile);
return psiFile != null ? "(" + SymbolPresentationUtil.getFilePathPresentation(psiFile) + ")" : null;
return Optional.ofNullable(ProjectUtil.guessProjectDir(myProject))
.map(projectDir -> VfsUtilCore.getRelativePath(myFile, projectDir, File.separatorChar))
.map(path -> "(" + path + ")")
.orElse(null);
}
@Override