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

plugin descriptor: add classes from production to PluginClassLoader iff corresponding option is on

Browse Source 
DEA-CR-60974

GitOrigin-RevId: 9b1ad155e25d6fb2e12973211d54c2f585733ae2
This commit is contained in:
Anna Kozlova
2020-04-01 12:31:42 +00:00
committed by intellij-monorepo-bot
parent c933c60b50
commit dd3433cd18
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
+15 -8
View File
@@ -855,14 +855,21 @@ public final class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor, Plu
}
List<Path> result = new ArrayList<>();
Path productionDirectory = myPath.getParent();
if (productionDirectory.endsWith("production")) {
result.add(myPath);
String moduleName = myPath.toFile().getName();
String[] additionalPaths = ourAdditionalLayoutMap.get(moduleName);
if (additionalPaths != null) {
for (String path : additionalPaths) {
result.add(productionDirectory.resolve(path));
Path classesDir = myPath.resolve("classes");
if (Files.exists(classesDir)) {
result.add(classesDir);
}
if (PluginManagerCore.usePluginClassLoader) {
Path productionDirectory = myPath.getParent();
if (productionDirectory.endsWith("production")) {
result.add(myPath);
String moduleName = myPath.toFile().getName();
String[] additionalPaths = ourAdditionalLayoutMap.get(moduleName);
if (additionalPaths != null) {
for (String path : additionalPaths) {
result.add(productionDirectory.resolve(path));
}
}
}
}