CPP-434 buildout isolation and move PyConstructorArgumentComplitionContributor to java-dependent module.

This commit is contained in:
Alexey Utkin
2015-12-14 20:35:59 +03:00
parent 36f2db70a9
commit ec996bc56c
5 changed files with 30 additions and 17 deletions

View File

@@ -19,5 +19,6 @@
<orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
<orderEntry type="module" module-name="educational" />
<orderEntry type="module" module-name="python-educational" />
<orderEntry type="module" module-name="python-configure" />
</component>
</module>

View File

@@ -1,6 +1,10 @@
<idea-plugin version="2">
<!-- Components and extensions declared in this file work ONLY in the Python plugin,
both Community and Professional versions. -->
<extensions defaultExtensionNs="com.intellij">
<completion.contributor language="Python" implementationClass="com.jetbrains.python.psi.impl.PyConstructorArgumentCompletionContributor"/>
</extensions>
<extensions defaultExtensionNs="Pythonid">
<importResolver implementation="com.jetbrains.python.psi.impl.PyJavaImportResolver"/>
<typeProvider implementation="com.jetbrains.python.psi.impl.PyJavaTypeProvider"/>

View File

@@ -0,0 +1,19 @@
<idea-plugin version="2">
<extensions defaultExtensionNs="com.intellij">
<!-- Buildout -->
<facetType implementation="com.jetbrains.python.buildout.BuildoutFacetType"/>
<framework.detector implementation="com.jetbrains.python.buildout.BuildoutFrameworkDetector"/>
<lang.parserDefinition language="BuildoutCfg" implementationClass="com.jetbrains.python.buildout.config.BuildoutCfgParserDefinition"/>
<fileTypeFactory implementation="com.jetbrains.python.buildout.config.BuildoutCfgFileTypeFactory"/>
<lang.syntaxHighlighterFactory language="BuildoutCfg"
implementationClass="com.jetbrains.python.buildout.config.BuildoutCfgHighlighterFactory"/>
<localInspection language="BuildoutCfg" shortName="BuildoutUnresolvedPartInspection" bundle="com.jetbrains.python.PyBundle"
key="buildout.unresolved.part.inspection" groupKey="buildout" enabledByDefault="true" level="WARNING"
implementationClass="com.jetbrains.python.buildout.config.inspection.BuildoutUnresolvedPartInspection"/>
<colorSettingsPage implementation="com.jetbrains.python.buildout.config.BuildoutCfgColorsPage"/>
<problemFileHighlightFilter implementation="com.jetbrains.python.buildout.config.BuildoutCfgProblemFileHighlightFilter"/>
</extensions>
</idea-plugin>

View File

@@ -539,26 +539,10 @@
<!-- User skeletons -->
<codeInsight.lineMarkerProvider language="Python" implementationClass="com.jetbrains.python.codeInsight.userSkeletons.PyUserSkeletonsLineMarkerProvider"/>
<!-- Buildout -->
<facetType implementation="com.jetbrains.python.buildout.BuildoutFacetType"/>
<framework.detector implementation="com.jetbrains.python.buildout.BuildoutFrameworkDetector"/>
<lang.parserDefinition language="BuildoutCfg" implementationClass="com.jetbrains.python.buildout.config.BuildoutCfgParserDefinition"/>
<fileTypeFactory implementation="com.jetbrains.python.buildout.config.BuildoutCfgFileTypeFactory"/>
<lang.syntaxHighlighterFactory language="BuildoutCfg"
implementationClass="com.jetbrains.python.buildout.config.BuildoutCfgHighlighterFactory"/>
<localInspection language="BuildoutCfg" shortName="BuildoutUnresolvedPartInspection" bundle="com.jetbrains.python.PyBundle"
key="buildout.unresolved.part.inspection" groupKey="buildout" enabledByDefault="true" level="WARNING"
implementationClass="com.jetbrains.python.buildout.config.inspection.BuildoutUnresolvedPartInspection"/>
<colorSettingsPage implementation="com.jetbrains.python.buildout.config.BuildoutCfgColorsPage"/>
<!-- TestRunnerService -->
<moduleService serviceInterface="com.jetbrains.python.testing.TestRunnerService"
serviceImplementation="com.jetbrains.python.testing.TestRunnerService"/>
<problemFileHighlightFilter implementation="com.jetbrains.python.buildout.config.BuildoutCfgProblemFileHighlightFilter"/>
<!-- PyDocstring -->
<languageInjector implementation="com.jetbrains.python.documentation.doctest.PyDocstringLanguageInjector"/>
<lang.parserDefinition language="PyDocstring" implementationClass="com.jetbrains.python.documentation.doctest.PyDocstringParserDefinition"/>

View File

@@ -0,0 +1,5 @@
<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- python-core-core.xml need to be the first for resource-bundle definition -->
<xi:include href="/META-INF/python-core-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/META-INF/python-core-buildout.xml" xpointer="xpointer(/idea-plugin/*)"/>
</idea-plugin>