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

[platform] prevents changing paths for loaded plugins

Browse Source
This commit is contained in:
Roman Shevchenko
2018-03-09 18:41:33 +01:00
parent 2a4ce1a3cb
commit ca9f0ecb5e
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
+4 -4
View File
@@ -45,7 +45,7 @@ public class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor {
private static final Logger LOG = Logger.getInstance("#com.intellij.ide.plugins.PluginDescriptor");
private File myPath;
private final File myPath;
private final boolean myBundled;
private final NullableLazyValue<String> myDescription = new NullableLazyValue<String>() {
@@ -105,6 +105,7 @@ public class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor {
}
return result;
}
@Nullable
private static List<Pair<String, Element>> copyChildrenAndNs(@Nullable Element[] elements) {
if (elements == null || elements.length == 0) {
@@ -139,9 +140,8 @@ public class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor {
return myPath;
}
public void setPath(@NotNull File path) {
myPath = path;
}
/** @deprecated changing a plugin path after loading is not expected (to be removed in IDEA 2019) */
public void setPath(@SuppressWarnings("unused") File path) { }
public void readExternal(@NotNull Document document, @NotNull URL url, @NotNull JDOMXIncluder.PathResolver pathResolver) throws InvalidDataException {
Application application = ApplicationManager.getApplication();
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+15 -11
View File
@@ -51,6 +51,8 @@ import java.util.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import static com.intellij.util.ObjectUtils.notNull;
public class PluginManagerCore {
private static final Logger LOG = Logger.getInstance(PluginManagerCore.class);
@@ -626,11 +628,14 @@ public class PluginManagerCore {
}
@Nullable
private static IdeaPluginDescriptorImpl loadDescriptorFromDir(@NotNull File file, @NotNull String pathName, boolean bundled) {
private static IdeaPluginDescriptorImpl loadDescriptorFromDir(@NotNull File file,
@NotNull String pathName,
@Nullable File pluginPath,
boolean bundled) {
File descriptorFile = new File(file, META_INF + '/' + pathName);
if (descriptorFile.exists()) {
try {
IdeaPluginDescriptorImpl descriptor = new IdeaPluginDescriptorImpl(file, bundled);
IdeaPluginDescriptorImpl descriptor = new IdeaPluginDescriptorImpl(notNull(pluginPath, file), bundled);
descriptor.readExternal(descriptorFile.toURI().toURL());
return descriptor;
}
@@ -648,7 +653,7 @@ public class PluginManagerCore {
private static IdeaPluginDescriptorImpl loadDescriptorFromJar(@NotNull File file, @NotNull String pathName, @SuppressWarnings("SameParameterValue") boolean bundled) {
try (LoadingContext context = new LoadingContext()) {
return loadDescriptorFromJar(file, pathName, JDOMXIncluder.DEFAULT_PATH_RESOLVER, context, bundled);
return loadDescriptorFromJar(file, pathName, JDOMXIncluder.DEFAULT_PATH_RESOLVER, context, null, bundled);
}
}
@@ -657,6 +662,7 @@ public class PluginManagerCore {
@NotNull String fileName,
@NotNull JDOMXIncluder.PathResolver pathResolver,
@NotNull LoadingContext context,
@Nullable File pluginPath,
boolean bundled) {
try {
URL jarURL = URLUtil.getJarEntryURL(file, FileUtil.toCanonicalPath(META_INF + '/' + fileName, '/'));
@@ -669,7 +675,7 @@ public class PluginManagerCore {
ZipEntry entry = zipFile.getEntry(META_INF + '/' + fileName);
if (entry != null) {
Document document = JDOMUtil.loadDocument(zipFile.getInputStream(entry));
IdeaPluginDescriptorImpl descriptor = new IdeaPluginDescriptorImpl(file, bundled);
IdeaPluginDescriptorImpl descriptor = new IdeaPluginDescriptorImpl(notNull(pluginPath, file), bundled);
descriptor.readExternal(document, jarURL, pathResolver);
context.myLastZipFileContainingDescriptor = file;
return descriptor;
@@ -720,7 +726,7 @@ public class PluginManagerCore {
boolean directory = file.isDirectory();
if (directory) {
descriptor = loadDescriptorFromDir(file, pathName, bundled);
descriptor = loadDescriptorFromDir(file, pathName, null, bundled);
if (descriptor == null) {
File libDir = new File(file, "lib");
@@ -737,28 +743,26 @@ public class PluginManagerCore {
PluginXmlPathResolver pathResolver = new PluginXmlPathResolver(files);
for (File f : files) {
if (FileUtil.isJarOrZip(f)) {
descriptor = loadDescriptorFromJar(f, pathName, pathResolver, context, bundled);
descriptor = loadDescriptorFromJar(f, pathName, pathResolver, context, file, bundled);
if (descriptor != null) {
descriptor.setPath(file);
break;
}
}
else if (f.isDirectory()) {
IdeaPluginDescriptorImpl descriptor1 = loadDescriptorFromDir(f, pathName, bundled);
IdeaPluginDescriptorImpl descriptor1 = loadDescriptorFromDir(f, pathName, file, bundled);
if (descriptor1 != null) {
if (descriptor != null) {
getLogger().info("Cannot load " + file + " because two or more plugin.xml's detected");
return null;
}
descriptor = descriptor1;
descriptor.setPath(file);
}
}
}
}
}
else if (StringUtil.endsWithIgnoreCase(file.getName(), ".jar") && file.isFile()) {
descriptor = loadDescriptorFromJar(file, pathName, JDOMXIncluder.DEFAULT_PATH_RESOLVER, context, bundled);
descriptor = loadDescriptorFromJar(file, pathName, JDOMXIncluder.DEFAULT_PATH_RESOLVER, context, null, bundled);
}
if (descriptor != null) {
@@ -1446,7 +1450,7 @@ public class PluginManagerCore {
public static void registerExtensionPointAndExtensions(@NotNull File pluginRoot, @NotNull String fileName, @NotNull ExtensionsArea area) {
IdeaPluginDescriptorImpl descriptor;
if (pluginRoot.isDirectory()) {
descriptor = loadDescriptorFromDir(pluginRoot, fileName, true);
descriptor = loadDescriptorFromDir(pluginRoot, fileName, null, true);
}
else {
descriptor = loadDescriptorFromJar(pluginRoot, fileName, true);