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

changes reverted

Browse Source
This commit is contained in:
nik
2014-02-11 13:21:33 +04:00
parent 800eaba9f6
commit 74fcddb3d0
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+5 -3
View File
@@ -1011,9 +1011,11 @@ public class PluginManagerCore {
final List<IdeaPluginDescriptorImpl> result = new ArrayList<IdeaPluginDescriptorImpl>();
final HashMap<String, String> disabledPluginNames = new HashMap<String, String>();
for (IdeaPluginDescriptorImpl descriptor : pluginDescriptors) {
final List<String> modules = descriptor.getModules();
if (modules != null) {
ourAvailableModules.addAll(modules);
if (descriptor.getPluginId().getIdString().equals(CORE_PLUGIN_ID)) {
final List<String> modules = descriptor.getModules();
if (modules != null) {
ourAvailableModules.addAll(modules);
}
}
if (!shouldSkipPlugin(descriptor, pluginDescriptors)) {
plugins/IntelliLang/src/META-INF/plugin.xml
+1
View File
@@ -11,6 +11,7 @@
<depends optional="true" config-file="intellilang-xml-support.xml">com.intellij.modules.xml</depends>
<depends optional="true" config-file="intellilang-js-support.xml">JavaScript</depends>
<depends optional="true" config-file="intellilang-python-support.xml">com.intellij.modules.python</depends>
<depends optional="true" config-file="intellilang-python-support.xml">Pythonid</depends>
<extensionPoints>
<extensionPoint name="languageSupport" interface="org.intellij.plugins.intelliLang.inject.LanguageInjectionSupport"/>
python/src/META-INF/pycharm-core.xml
+1
View File
@@ -24,6 +24,7 @@
</project-components>
<module value="com.intellij.modules.xml"/>
<module value="com.intellij.modules.python"/>
<extensions defaultExtensionNs="com.intellij">
<projectViewPane implementation="com.intellij.ide.projectView.impl.ProjectViewPane"/>
python/src/META-INF/python-core.xml
-2
View File
@@ -3,8 +3,6 @@
<resource-bundle>com.jetbrains.python.PyBundle</resource-bundle>
<module value="com.intellij.modules.python"/>
<extensions defaultExtensionNs="com.intellij">
<nameSuggestionProvider implementation="com.jetbrains.python.refactoring.PyNameSuggestionProvider"/>
<methodNavigationOffsetProvider implementation="com.jetbrains.python.codeInsight.PyMethodNavigationOffsetProvider"/>