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

AnalysisScope#getDisplayName can be shorter

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-05-18 10:11:14 +03:00
parent eb0dbeccae
commit c40584213f
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java
+7 -13
View File
@@ -207,8 +207,10 @@ public class AnalysisScope {
return fileIndex;
}
private static String displayProjectRelativePath(@NotNull VirtualFile virtualFile, @NotNull Project project) {
return ProjectUtilCore.displayUrlRelativeToProject(virtualFile, virtualFile.getPresentableUrl(), project, false, false);
private static String displayProjectRelativePath(@NotNull PsiFileSystemItem item) {
VirtualFile virtualFile = item.getVirtualFile();
LOG.assertTrue(virtualFile != null);
return ProjectUtilCore.displayUrlRelativeToProject(virtualFile, virtualFile.getPresentableUrl(), item.getProject(), true, false);
}
public boolean contains(@NotNull PsiElement psiElement) {
@@ -505,10 +507,9 @@ public class AnalysisScope {
return AnalysisScopeBundle.message("scope.project", myProject.getName());
case FILE:
return AnalysisScopeBundle.message("scope.file", getPresentableUrl((PsiFileSystemItem)myElement));
return AnalysisScopeBundle.message("scope.file", displayProjectRelativePath((PsiFileSystemItem)myElement));
case DIRECTORY:
return AnalysisScopeBundle.message("scope.directory", getPresentableUrl((PsiFileSystemItem)myElement));
return AnalysisScopeBundle.message("scope.directory", displayProjectRelativePath((PsiFileSystemItem)myElement));
case VIRTUAL_FILES:
return AnalysisScopeBundle.message("scope.virtual.files");
@@ -517,13 +518,6 @@ public class AnalysisScope {
return "";
}
@NotNull
private static String getPresentableUrl(@NotNull final PsiFileSystemItem element) {
final VirtualFile virtualFile = element.getVirtualFile();
assert virtualFile != null : element;
return virtualFile.getPresentableUrl();
}
@NotNull
public String getShortenName(){
switch (myType) {
@@ -564,7 +558,7 @@ public class AnalysisScope {
@Nullable
private String getRelativePath() {
final String relativePath = displayProjectRelativePath(((PsiFileSystemItem)myElement).getVirtualFile(), myElement.getProject());
final String relativePath = displayProjectRelativePath((PsiFileSystemItem)myElement);
if (relativePath.length() > 100) {
return null;
}