Merge branch 'db/javac-ast'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 17 Oct 2016 16:05:41 +0000 (19:05 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 17 Oct 2016 16:05:41 +0000 (19:05 +0300)
# Conflicts:
# platform/util/resources/misc/registry.properties

1  2 
build/scripts/layouts.gant
java/java-psi-impl/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java
platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/util/resources/misc/registry.properties
resources/src/META-INF/IdeaPlugin.xml
resources/src/idea/RichPlatformPlugin.xml

Simple merge
index a21ae20afa6bde8ecb1aa848e660123fef7fbb0c,d23dd8fd51ceb3cf50ab1929e9822e891d48ab5a..b87428ba92a030252f3e8c1249d5b34b6e678c6d
@@@ -875,14 -863,6 +875,18 @@@ low.memory.watcher.sync.description=Whe
  typing.freeze.report.dumps=false
  typing.freeze.report.dumps.description=Automatically reports thread dumps to our statistics server
  
 +store.basedir.parent.detection=true
 +ide.ui.composite.editor.for.combobox.description=Allows to use composite components based on JPanel as a ComboBox editor
 +ide.ui.composite.editor.for.combobox=true
 +
 +debugger.show.values.inplace=false
 +debugger.show.values.inplace.description=Show primitive values near variables inside current execution line
 +show.configurables.ids.in.settings=false
 +show.configurables.ids.in.settings.description=Show configurables ids in settings when user holds Shift. Works in Keymap and Settings trees
 +
 +ide.projectView.globalOptions=true
 +ide.projectView.globalOptions.description=Make Project View options such as autoscroll to/from source, etc global per panes and per projects. For details see https://youtrack.jetbrains.com/issue/IDEA-85255
++
+ bytecode.ref.index=false
+ bytecode.ref.index.description=Enables find usages using references from bytecode
+ bytecode.ref.index.restartRequired=true
index 21853176ce56f5a1c52a5a230945dae2394d0248,d0b992ca5e6da8a24147c59fa3d402025ef9c55f..580077864f1d2b0d23d5a669603d736263709127
        <implementation-class>com.intellij.execution.scratch.JavaScratchCompilationSupport</implementation-class>
      </component>
      <component>
 -      <implementation-class>com.intellij.codeInsight.daemon.impl.ParameterHintsPassFactory</implementation-class>
 +      <implementation-class>com.intellij.codeInsight.hints.ParameterHintsPassFactory</implementation-class>
        <skipForDefaultProject/>
      </component>
+     <component>
+       <interface-class>com.intellij.compiler.CompilerReferenceService</interface-class>
+       <implementation-class>com.intellij.compiler.backwardRefs.CompilerReferenceServiceImpl</implementation-class>
+     </component>
    </project-components>
  
    <extensionPoints>