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

Fix loading configurables without identifiers or names

Browse Source
This commit is contained in:
Sergey Malenkov
2014-12-18 22:40:56 +03:00
parent 01f5116737
commit 725b9f3bb3
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/META-INF/LangExtensions.xml
+3 -1
View File
@@ -871,7 +871,9 @@
<applicationService serviceImplementation="com.intellij.codeInsight.template.postfix.settings.PostfixTemplatesSettings"/>
<customLiveTemplate implementation="com.intellij.codeInsight.template.postfix.templates.PostfixLiveTemplate"/>
<lookup.actionProvider implementation="com.intellij.codeInsight.template.postfix.completion.PostfixTemplateLookupActionProvider"/>
<editorOptionsProvider id="editing.postfixCompletion" instance="com.intellij.codeInsight.template.postfix.settings.PostfixTemplatesConfigurable"/>
<editorOptionsProvider instance="com.intellij.codeInsight.template.postfix.settings.PostfixTemplatesConfigurable"
id="reference.settingsdialog.IDE.editor.postfix.templates"
displayName="Postfix Completion"/>
<completion.contributor language="any" implementationClass="com.intellij.codeInsight.template.postfix.completion.PostfixTemplateCompletionContributor"/>
<projectService serviceInterface="com.intellij.execution.ExecutionManager" serviceImplementation="com.intellij.execution.impl.ExecutionManagerImpl"/>
platform/platform-resources/src/META-INF/XmlPlugin.xml
+4 -1
View File
@@ -158,7 +158,10 @@
<codeInsight.lineMarkerProvider language="XHTML" implementationClass="com.intellij.html.HtmlLineMarkerProvider"/>
<breadcrumbsInfoProvider implementation="com.intellij.xml.breadcrumbs.XmlLanguageBreadcrumbsInfoProvider"/>
<editorSmartKeysConfigurable instance="com.intellij.application.options.editor.WebEditorOptionsProvider"/>
<editorSmartKeysConfigurable instance="com.intellij.application.options.editor.WebEditorOptionsProvider"
id="editor.preferences.webOptions"
key="web.editor.configuration.title"
bundle="messages.XmlBundle"/>
<editorAppearanceConfigurable instance="com.intellij.application.options.editor.WebEditorAppearanceConfigurable"
id="WebEditorAppearanceConfigurable"/>
python/src/META-INF/pycharm-core.xml
+16 -4
View File
@@ -37,10 +37,22 @@
<projectAttachProcessor implementation="com.intellij.platform.ModuleAttachProcessor"/>
<projectConfigurable groupId="project" instance="com.jetbrains.python.configuration.PythonContentEntriesConfigurable"/>
<projectConfigurable groupId="build" instance="com.jetbrains.python.buildout.BuildoutModulesConfigurable"/>
<projectConfigurable groupId="project" instance="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"/>
<projectConfigurable groupId="project" instance="com.jetbrains.python.configuration.PyDependenciesConfigurable"/>
<projectConfigurable groupId="project"
id="com.jetbrains.python.configuration.PythonContentEntriesConfigurable"
displayName="Project Structure"
instance="com.jetbrains.python.configuration.PythonContentEntriesConfigurable"/>
<projectConfigurable groupId="build"
id="com.jetbrains.python.buildout.BuildoutModulesConfigurable"
displayName="Buildout Support"
instance="com.jetbrains.python.buildout.BuildoutModulesConfigurable"/>
<projectConfigurable groupId="project"
id="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
displayName="Project Interpreter"
instance="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"/>
<projectConfigurable groupId="project"
id="com.jetbrains.python.configuration.PyDependenciesConfigurable"
displayName="Project Dependencies"
instance="com.jetbrains.python.configuration.PyDependenciesConfigurable"/>
<directoryProjectConfigurator implementation="com.jetbrains.python.PythonSdkConfigurator" id="sdk"
order="after PlatformProjectConfigurator"/>
resources/src/META-INF/IdeaPlugin.xml
+4 -1
View File
@@ -1082,7 +1082,10 @@
<quoteHandler fileType="JAVA" className="com.intellij.codeInsight.editorActions.JavaQuoteHandler"/>
<typedHandler implementation="com.intellij.codeInsight.editorActions.JavaTypedHandler" id="java"/>
<typedHandler implementation="com.intellij.codeInsight.editorActions.JavadocTypedHandler" id="javadoc"/>
<editorSmartKeysConfigurable instance="com.intellij.application.options.JavadocOptionsProvider"/>
<editorSmartKeysConfigurable instance="com.intellij.application.options.JavadocOptionsProvider"
id="editor.preferences.javadocOptions"
key="javadoc.generate.message.title"
bundle="messages.JavadocBundle"/>
<joinLinesHandler implementation="com.intellij.codeInsight.editorActions.LiteralJoinLinesHandler"/>
<joinLinesHandler implementation="com.intellij.codeInsight.editorActions.DeclarationJoinLinesHandler"/>