Merge branch 'db/implicit-to-string'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 24 Apr 2018 13:08:53 +0000 (16:08 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 24 Apr 2018 13:08:53 +0000 (16:08 +0300)
commit1b165aecfe8dd8e6d61dc9ecbd8c6c82dd46af12
tree7630a1766fba76033a75496dcc002d043b178e95
parentb000ca362406a1c7abe542e9bc08b2a49a039d38
parent8107bf4226970e51420755ad49f79c30bc8f4272
Merge branch 'db/implicit-to-string'

# Conflicts:
# java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java
# java/java-indexing-impl/src/com/intellij/compiler/CompilerReferenceService.java
# jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/JavacTreeRefScanner.java
# jps/jps-builders/testSrc/org/jetbrains/references/ReferenceIndexTest.kt
java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java
java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java
java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesHelper.java
java/java-indexing-impl/src/com/intellij/compiler/CompilerReferenceService.java
java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesTest.java
jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/JavacTreeRefScanner.java
jps/jps-builders/src/org/jetbrains/jps/javac/ast/InProcessRefCollectorCompilerToolExtension.java
jps/jps-builders/testSrc/org/jetbrains/references/ReferenceIndexTest.kt
platform/platform-resources-en/src/messages/FindBundle.properties