Merge branch 'db/method-chains-with-casts'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 25 Sep 2017 09:40:26 +0000 (12:40 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 25 Sep 2017 09:40:26 +0000 (12:40 +0300)
commit07a432405372b555b493e5b3fbdf103316052e97
treebfdf8366e8bda87518439ca968ffa62a3f87ba16
parentf0077e5242ba0a30aa7641ccc6a6ab066c3478f6
parent614810f8cd65710598dec6c5ffe8189a3ee1fb6b
Merge branch 'db/method-chains-with-casts'

# Conflicts:
# java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java
java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java
jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexUtil.java