Merge branch 'vlan/pyi'
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Wed, 9 Sep 2015 08:46:04 +0000 (11:46 +0300)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Wed, 9 Sep 2015 08:46:04 +0000 (11:46 +0300)
1  2 
python/src/META-INF/python-core.xml
python/src/com/jetbrains/python/psi/PyUtil.java

index 29489c86a6184c49a6f845828b41c2b11f6e5a64,8ee1429e194c452beb163bcf727217059c728e02..ef7f6fb1efc91681d126ce648e7d8269a0ed78c0
  
      <!-- typing -->
      <multiHostInjector implementation="com.jetbrains.python.codeInsight.PyTypingAnnotationInjector"/>
+     <lang.parserDefinition language="PythonStub" implementationClass="com.jetbrains.python.pyi.PyiParserDefinition"/>
+     <fileTypeFactory implementation="com.jetbrains.python.pyi.PyiFileTypeFactory"/>
+     <codeInsight.lineMarkerProvider language="Python" implementationClass="com.jetbrains.python.pyi.PyiRelatedItemLineMarkerProvider"/>
  
      <lang.inspectionSuppressor language="Python" implementationClass="com.jetbrains.python.inspections.PyInspectionsSuppressor"/>
 +    <refactoring.invertBoolean implementation="com.jetbrains.python.refactoring.invertBoolean.PyInvertBooleanDelegate"/>
    </extensions>
  
    <extensionPoints>