projects / idea / community.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2aebcfd a48371d)
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
tree74e0dac4c0aa96e9f191dab83b7c914e48d4d4batree
parent2aebcfd15b3eab2b84981cfc8933fab52996a85fcommit | diff
parenta48371d8fc6e4241f269cec75767f819e38787decommit | diff
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 diff1 | diff2 | blob | history
java/compiler/impl/src/com/intellij/compiler/backwardRefs/JavaLightUsageAdapter.java diff1 | diff2 | blob | history
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java diff1 | diff2 | blob | history
jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexUtil.java diff1 | diff2 | blob | history
jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java diff1 | diff2 | blob | history
jps/jps-builders/src/org/jetbrains/jps/backwardRefs/CompilerBackwardReferenceIndex.java diff1 | diff2 | blob | history
jps/jps-builders/src/org/jetbrains/jps/incremental/JavaBuilderService.java diff1 | diff2 | blob | history
jps/jps-builders/testSrc/org/jetbrains/references/ReferenceIndexTestBase.kt diff1 | diff2 | blob | history
platform/util/resources/misc/registry.properties diff1 | diff2 | blob | history
resources/src/META-INF/IdeaPlugin.xml diff1 | diff2 | blob | history
resources/src/idea/RichPlatformPlugin.xml diff1 | diff2 | blob | history
IntelliJ IDEA Community Edition and IntelliJ Platform.