Merge remote-tracking branch 'origin/uta/lexerIndent'
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Thu, 15 Feb 2018 17:09:14 +0000 (20:09 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Thu, 15 Feb 2018 17:09:14 +0000 (20:09 +0300)
commit1524ffd9e36aa6b9f102fbcc31e22d06ef7abf6f
treea17405dfb69c67782414c9b7eab646c251e6eb88
parentb08c71c8868ff490580fcc76e8b65084d06f1c17
parent0b64604813573946449ebe40045bb1b8e15186d8
Merge remote-tracking branch 'origin/uta/lexerIndent'

# Conflicts:
# platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/IndentCalculator.java
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/IndentCalculator.java
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/JavaLikeLangLineIndentProvider.java
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/platform-resources/src/META-INF/LangExtensions.xml
python/src/META-INF/python-core-common.xml