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

analyze dependencies: display lib root name (IDEA-203484)

Browse Source
This commit is contained in:
Anna.Kozlova
2018-12-03 15:19:11 +01:00
parent d2042376d2
commit 05d04d91b6
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/java-tests/testData/dependencies/dependencies/src/com/package1/Class2.java
View File

@@ -1,4 +1,5 @@
package com.package1;
public class Class2 {
String s;
}

6
java/java-tests/testSrc/com/intellij/java/dependencies/DependenciesPanelTest.java
View File

@@ -77,7 +77,11 @@ public class DependenciesPanelTest extends TestSourceBasedTestCase {
" -dependencies\n" +
" -src\n" +
" com/package1\n",
"Root\n");
"-Root\n" +
" -External Dependencies\n" +
" -src.zip\n" +
" -java/lang\n" +
" String.java");
}
private void doTestDependenciesTrees(AnalysisScope scope, String expectedLeftTree, String expectedRightTree) {

15
platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/FilePatternPackageSet.java
View File

@@ -26,10 +26,14 @@ import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;
public class FilePatternPackageSet extends PatternBasedPackageSet {
@@ -196,13 +200,14 @@ public class FilePatternPackageSet extends PatternBasedPackageSet {
}
public static String getLibRelativePath(final VirtualFile virtualFile, final ProjectFileIndex index) {
StringBuilder relativePath = new StringBuilder(100);
List<String> path = new ArrayList<>();
VirtualFile directory = virtualFile;
while (directory != null && index.isInLibraryClasses(directory)) {
relativePath.insert(0, '/');
relativePath.insert(0, directory.getName());
while (directory != null && index.isInLibrary(directory)) {
path.add(directory.getName());
directory = directory.getParent();
}
return relativePath.toString();
if (path.isEmpty()) return "";
Collections.reverse(path);
return StringUtil.join(ArrayUtil.toStringArray(path), 1, path.size(), "/");
}
}

7
platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java
View File

@@ -71,7 +71,12 @@ public class DirectoryNode extends PackageDependenciesNode {
}
}
else {
myFQName = FilePatternPackageSet.getLibRelativePath(myVDirectory, index);
if (myVDirectory.equals(index.getSourceRootForFile(myVDirectory)) || myVDirectory.equals(index.getClassRootForFile(myVDirectory))) {
myFQName = dirName;
}
else {
myFQName = FilePatternPackageSet.getLibRelativePath(myVDirectory, index);
}
}
dirName = myFQName;
} else {