Merge branch 'master' into PY-9727
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 9 Dec 2015 20:20:27 +0000 (23:20 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 9 Dec 2015 20:20:27 +0000 (23:20 +0300)
1  2 
python/src/META-INF/python-core.xml

index 12ef08852ae2994852cff71c76f01c9e3c87528d,72222837670b59f73240555cef95071b2ddc60a0..6b5c77424663bac9b5c705dfb500458e42acd6f8
@@@ -80,6 -80,9 +80,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"/>
    </extensions>
  
    <extensionPoints>