Merge branch 'db/method-chains-completion'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 3 Apr 2017 14:08:15 +0000 (17:08 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 3 Apr 2017 14:08:15 +0000 (17:08 +0300)
commita0cb4092b7243b6707281bd3086df4f661f7fb4c
tree74e0dac4c0aa96e9f191dab83b7c914e48d4d4ba
parent2aebcfd15b3eab2b84981cfc8933fab52996a85f
parenta48371d8fc6e4241f269cec75767f819e38787de
Merge branch 'db/method-chains-completion'

# Conflicts:
# jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexUtil.java
# jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java
# jps/jps-builders/src/org/jetbrains/jps/incremental/JavaBuilderService.java
java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java
java/compiler/impl/src/com/intellij/compiler/backwardRefs/JavaLightUsageAdapter.java
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java
jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexUtil.java
jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java
jps/jps-builders/src/org/jetbrains/jps/backwardRefs/CompilerBackwardReferenceIndex.java
jps/jps-builders/src/org/jetbrains/jps/incremental/JavaBuilderService.java
jps/jps-builders/testSrc/org/jetbrains/references/ReferenceIndexTestBase.kt
platform/util/resources/misc/registry.properties
resources/src/META-INF/IdeaPlugin.xml
resources/src/idea/RichPlatformPlugin.xml