Merge branches 'master' and 'pycharm/folding' of git.labs.intellij.net:idea/community appcode/144.2283 appcode/144.2294 clion/144.2284 clion/144.2293 dbe/144.2282 idea/144.2285 phpstorm/144.2280 pycharm/144.2289 rubymine/144.2288 webstorm/144.2290
authorliana.bakradze <liana.bakradze@jetbrains.com>
Thu, 17 Dec 2015 19:06:06 +0000 (21:06 +0200)
committerliana.bakradze <liana.bakradze@jetbrains.com>
Thu, 17 Dec 2015 19:06:06 +0000 (21:06 +0200)
# Conflicts:
# python/src/META-INF/python-core.xml

1  2 
python/src/META-INF/python-core.xml

index 5ba9c42250b3a334ac620a47131d355ea8b1ffba,3e4ba4cb5750887d2e97db52c8b869fbd9dcbf9a..58c6d91fa15463995179401147f61ebf6f458811
@@@ -15,6 -15,7 +15,6 @@@
      <nameSuggestionProvider implementation="com.jetbrains.python.refactoring.PyNameSuggestionProvider"/>
      <methodNavigationOffsetProvider implementation="com.jetbrains.python.codeInsight.PyMethodNavigationOffsetProvider"/>
      <copyPastePreProcessor implementation="com.jetbrains.python.editor.PythonCopyPasteProcessor"/>
 -    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
      <fileTypeFactory implementation="com.jetbrains.python.PythonFileTypeFactory"/>
      <fileTypeDetector implementation="com.jetbrains.python.PyFileTypeDetector"/>
      <editorHighlighterProvider filetype="Python" implementationClass="com.jetbrains.python.PyEditorHighlighterProvider"/>
@@@ -79,9 -80,6 +79,9 @@@
      <completion.contributor language="Python"
                              implementationClass="com.jetbrains.python.codeInsight.completion.PyStructuralTypeAttributesCompletionContributor"/>
  
 +    <completion.contributor language="Python"
 +                            implementationClass="com.jetbrains.python.codeInsight.completion.PyStringFormatCompletionContributor" />
 +
      <lang.tokenSeparatorGenerator language="Python" implementationClass="com.jetbrains.python.PyTokenSeparatorGenerator"/>
      <lang.elementManipulator forClass="com.jetbrains.python.psi.PyReferenceExpression"
                               implementationClass="com.jetbrains.python.psi.impl.PyReferenceExpressionManipulator"/>
      <xdebugger.breakpointType implementation="com.jetbrains.python.debugger.PyExceptionBreakpointType"/>
  
      <configurationType implementation="com.jetbrains.python.testing.PythonTestConfigurationType"/>
 +    <configurationType implementation="com.jetbrains.python.testing.tox.PyToxConfigurationType"/>
  
      <runConfigurationProducer implementation="com.jetbrains.python.testing.unittest.PythonUnitTestConfigurationProducer"/>
      <runConfigurationProducer implementation="com.jetbrains.python.testing.pytest.PyTestConfigurationProducer"/>
      <runConfigurationProducer implementation="com.jetbrains.python.testing.doctest.PythonDocTestConfigurationProducer"/>
 +    <runConfigurationProducer implementation="com.jetbrains.python.testing.tox.PyToxConfigurationProducer"/>
      <runConfigurationProducer implementation="com.jetbrains.python.testing.nosetest.PythonNoseTestConfigurationProducer"/>
      <runConfigurationProducer implementation="com.jetbrains.python.testing.attest.PythonAtTestConfigurationProducer"/>
  
      <moduleService serviceInterface="com.jetbrains.python.documentation.PyDocumentationSettings"
                     serviceImplementation="com.jetbrains.python.documentation.PyDocumentationSettings"/>
      <psi.referenceContributor implementation="com.jetbrains.python.documentation.docstrings.DocStringReferenceContributor"/>
 +    <psi.referenceContributor implementation="com.jetbrains.python.codeInsight.PythonFormattedStringReferenceContributor"/>
      <completion.contributor language="Python" implementationClass="com.jetbrains.python.documentation.docstrings.DocStringTagCompletionContributor"/>
      <completion.contributor language="Python" implementationClass="com.jetbrains.python.documentation.docstrings.DocStringSectionHeaderCompletionContributor"/>
  
  
      <lang.inspectionSuppressor language="Python" implementationClass="com.jetbrains.python.inspections.PyInspectionsSuppressor"/>
      <refactoring.invertBoolean implementation="com.jetbrains.python.refactoring.invertBoolean.PyInvertBooleanDelegate"/>
 +    <backspaceHandlerDelegate implementation="com.jetbrains.python.codeInsight.editorActions.PyTripleQuoteBackspaceDelegate"/>
++
+     <!--folding-->
+     <codeFoldingOptionsProvider instance="com.jetbrains.python.PythonFoldingOptionsProvider"/>
+     <applicationService serviceInterface="com.jetbrains.python.PythonFoldingSettings"
+                         serviceImplementation="com.jetbrains.python.PythonFoldingSettings"/>
    </extensions>
  
    <extensionPoints>
    <extensions defaultExtensionNs="Pythonid">
      <testLocator implementation="com.jetbrains.python.testing.PythonUnitTestTestIdUrlProvider"/>
      <testLocator implementation="com.jetbrains.python.testing.nosetest.PythonNoseTestUrlProvider"/>
 +    <testLocator implementation="com.jetbrains.python.testing.tox.PyToxTestLocator"/>
      <pySuperMethodsSearch implementation="com.jetbrains.python.psi.search.PySuperMethodsSearchExecutor"/>
      <pyClassInheritorsSearch implementation="com.jetbrains.python.psi.search.PyClassInheritorsSearchExecutor"/>
      <pyOverridingMethodsSearch implementation="com.jetbrains.python.psi.search.PyOverridingMethodsSearchExecutor"/>
      <typeProvider implementation="com.jetbrains.python.debugger.PyCallSignatureTypeProvider"/>
      <pyReferenceResolveProvider implementation="com.jetbrains.python.psi.resolve.PythonBuiltinReferenceResolveProvider"/>
  
-     
 +    <!-- NumPy -->
 +    <pyModuleMembersProvider implementation="com.jetbrains.numpy.codeInsight.NumpyModuleMembersProvider"/>
 +    <typeProvider implementation="com.jetbrains.numpy.codeInsight.NumpyDocStringTypeProvider"/>
 +    <resolveResultRater implementation="com.jetbrains.numpy.codeInsight.NumpyResolveRater"/>
++
      <!-- PyDocstring -->
 +    <typeProvider implementation="com.jetbrains.python.documentation.docstrings.PyDocStringTypeProvider"/>
      <dialectsTokenSetContributor implementation="com.jetbrains.python.documentation.doctest.PyDocstringTokenSetContributor"/>
      <visitorFilter language="PyDocstring" implementationClass="com.jetbrains.python.documentation.doctest.PyDocstringVisitorFilter"/>
  
  
      <!-- PyQt -->
      <typeProvider implementation="com.jetbrains.pyqt.PyQtTypeProvider"/>
 -
 -    <!-- NumPy -->
 -    <pyModuleMembersProvider implementation="com.jetbrains.numpy.codeInsight.NumpyModuleMembersProvider"/>
 -    <typeProvider implementation="com.jetbrains.numpy.codeInsight.NumpyDocStringTypeProvider"/>
 -    <resolveResultRater implementation="com.jetbrains.numpy.codeInsight.NumpyResolveRater"/>
    </extensions>
  
    <project-components>