do not export trove from util module

GitOrigin-RevId: 666bf5e1fc45045bb9b1c391b7ec5a2ac4b65dde
2025-12-16 14:23:28 +07:00 · 2020-05-16 16:28:02 +02:00
parent 3ffbaa92d3
commit f2a72b34fa
146 changed files with 211 additions and 22 deletions
--- a/.idea/libraries/fastutil_min.xml
+++ b/.idea/libraries/fastutil_min.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
  <library name="fastutil-min" type="repository">
-    <properties maven-id="com.github.develar:fastutil-min-builder:8.3.1-10" />
+    <properties maven-id="com.github.develar:fastutil-min-builder:8.3.1-23" />
    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/develar/fastutil-min-builder/8.3.1-10/fastutil-min-builder-8.3.1-10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/develar/fastutil-min-builder/8.3.1-23/fastutil-min-builder-8.3.1-23.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
--- a/java/compiler/intellij.java.compiler.tests.iml
+++ b/java/compiler/intellij.java.compiler.tests.iml
@@ -20,6 +20,8 @@
    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" scope="TEST" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" scope="TEST" name="Trove4j" level="project" />
  </component>
  <component name="copyright">
    <Base>
--- a/java/compiler/openapi/intellij.java.compiler.iml
+++ b/java/compiler/openapi/intellij.java.compiler.iml
@@ -13,6 +13,7 @@
    <orderEntry type="library" name="JDOM" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
    <orderEntry type="module" module-name="intellij.platform.externalSystem" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="copyright">
    <Base>
--- a/java/debugger/impl/intellij.java.debugger.impl.iml
+++ b/java/debugger/impl/intellij.java.debugger.impl.iml
@@ -38,6 +38,7 @@
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="module" module-name="intellij.platform.images" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="copyright">
    <Base>
--- a/java/execution/impl/intellij.java.execution.impl.iml
+++ b/java/execution/impl/intellij.java.execution.impl.iml
@@ -31,6 +31,7 @@
    <orderEntry type="library" name="jackson-databind" level="project" />
    <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="copyright">
    <Base>
--- a/java/execution/openapi/intellij.java.execution.iml
+++ b/java/execution/openapi/intellij.java.execution.iml
@@ -10,6 +10,7 @@
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="intellij.java.resources" />
    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="copyright">
    <Base>
--- a/java/idea-ui/intellij.java.ui.iml
+++ b/java/idea-ui/intellij.java.ui.iml
@@ -27,5 +27,6 @@
    <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/java/java-analysis-api/intellij.java.analysis.iml
+++ b/java/java-analysis-api/intellij.java.analysis.iml
@@ -13,5 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.projectModel" />
    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
    <orderEntry type="module" module-name="intellij.platform.uast" exported="" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/java/java-analysis-impl/intellij.java.analysis.impl.iml
+++ b/java/java-analysis-impl/intellij.java.analysis.impl.iml
@@ -27,5 +27,6 @@
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/java/java-indexing-api/intellij.java.indexing.iml
+++ b/java/java-indexing-api/intellij.java.indexing.iml
@@ -12,5 +12,6 @@
    <orderEntry type="module" module-name="intellij.java.psi" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
    <orderEntry type="module" module-name="intellij.platform.concurrency" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/java/java-indexing-impl/intellij.java.indexing.impl.iml
+++ b/java/java-indexing-impl/intellij.java.indexing.impl.iml
@@ -17,5 +17,6 @@
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/java/java-psi-api/intellij.java.psi.iml
+++ b/java/java-psi-api/intellij.java.psi.iml
@@ -11,5 +11,7 @@
    <orderEntry type="module" module-name="intellij.platform.core" exported="" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="library" name="Trove4j" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
  </component>
 </module>
--- a/java/java-psi-impl/intellij.java.psi.impl.iml
+++ b/java/java-psi-impl/intellij.java.psi.impl.iml
@@ -16,5 +16,6 @@
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/java/java-structure-view/intellij.java.structureView.iml
+++ b/java/java-structure-view/intellij.java.structureView.iml
@@ -11,5 +11,7 @@
    <orderEntry type="module" module-name="intellij.platform.structureView.impl" exported="" />
    <orderEntry type="module" module-name="intellij.java.psi.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/java/manifest/intellij.java.manifest.iml
+++ b/java/manifest/intellij.java.manifest.iml
@@ -19,5 +19,6 @@
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.spellchecker" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/java/structuralsearch-java/intellij.java.structuralSearch.iml
+++ b/java/structuralsearch-java/intellij.java.structuralSearch.iml
@@ -12,5 +12,6 @@
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.platform.duplicates.analysis" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/java/testFramework/intellij.java.testFramework.iml
+++ b/java/testFramework/intellij.java.testFramework.iml
@@ -28,6 +28,8 @@
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="library" name="StreamEx" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="copyright">
    <Base>
--- a/java/typeMigration/intellij.java.typeMigration.iml
+++ b/java/typeMigration/intellij.java.typeMigration.iml
@@ -17,5 +17,6 @@
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.structuralSearch" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/jps/jps-builders/intellij.platform.jps.build.iml
+++ b/jps/jps-builders/intellij.platform.jps.build.iml
@@ -36,5 +36,6 @@
    <orderEntry type="library" name="javax.annotation-api" level="project" />
    <orderEntry type="library" name="qdox-java-parser" level="project" />
    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/jps/model-impl/intellij.platform.jps.model.impl.iml
+++ b/jps/model-impl/intellij.platform.jps.model.impl.iml
@@ -9,5 +9,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/jps/model-impl/intellij.platform.jps.model.tests.iml
+++ b/jps/model-impl/intellij.platform.jps.model.tests.iml
@@ -11,5 +11,6 @@
    <orderEntry type="module" module-name="intellij.platform.testFramework" exported="" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/jps/model-serialization/intellij.platform.jps.model.serialization.iml
+++ b/jps/model-serialization/intellij.platform.jps.model.serialization.iml
@@ -10,5 +10,7 @@
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="library" exported="" name="JDOM" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/json/intellij.json.iml
+++ b/json/intellij.json.iml
@@ -18,5 +18,6 @@
    <orderEntry type="module" module-name="intellij.regexp" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/json/tests/intellij.json.tests.iml
+++ b/json/tests/intellij.json.tests.iml
@@ -12,5 +12,6 @@
    <orderEntry type="module" module-name="intellij.json" scope="TEST" />
    <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/analysis-api/intellij.platform.analysis.iml
+++ b/platform/analysis-api/intellij.platform.analysis.iml
@@ -15,5 +15,6 @@
    <orderEntry type="module" module-name="intellij.platform.projectModel" />
    <orderEntry type="module" module-name="intellij.platform.editor" exported="" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/analysis-impl/intellij.platform.analysis.impl.iml
+++ b/platform/analysis-impl/intellij.platform.analysis.impl.iml
@@ -23,5 +23,7 @@
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="library" name="XStream" level="project" />
    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
  </component>
 </module>
--- a/platform/built-in-server/intellij.platform.builtInServer.impl.iml
+++ b/platform/built-in-server/intellij.platform.builtInServer.impl.iml
@@ -24,5 +24,7 @@
    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
+++ b/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
@@ -24,5 +24,6 @@
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="library" name="fastutil-min" level="project" />
    <orderEntry type="module" module-name="intellij.platform.diff" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
+++ b/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
@@ -17,6 +17,7 @@
    <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" scope="TEST" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="TestModuleProperties" production-module="intellij.platform.configurationStore.impl" />
 </module>
--- a/platform/core-api/intellij.platform.core.iml
+++ b/platform/core-api/intellij.platform.core.iml
@@ -13,5 +13,6 @@
    <orderEntry type="library" name="automaton" level="project" />
    <orderEntry type="library" name="JDOM" level="project" />
    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/core-impl/intellij.platform.core.impl.iml
+++ b/platform/core-impl/intellij.platform.core.impl.iml
@@ -15,5 +15,6 @@
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/credential-store/intellij.platform.credentialStore.iml
+++ b/platform/credential-store/intellij.platform.credentialStore.iml
@@ -38,5 +38,7 @@
        </SOURCES>
      </library>
    </orderEntry>
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/diagnostic/intellij.platform.diagnostic.iml
+++ b/platform/diagnostic/intellij.platform.diagnostic.iml
@@ -16,5 +16,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
    <orderEntry type="module" module-name="intellij.platform.concurrency" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/diff-impl/intellij.platform.diff.impl.iml
+++ b/platform/diff-impl/intellij.platform.diff.impl.iml
@@ -16,5 +16,6 @@
    <orderEntry type="library" name="miglayout-swing" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="module" module-name="intellij.platform.boot" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/duplicates-analysis/intellij.platform.duplicates.analysis.iml
+++ b/platform/duplicates-analysis/intellij.platform.duplicates.analysis.iml
@@ -16,5 +16,6 @@
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" exported="" />
    <orderEntry type="library" name="XStream" level="project" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
+++ b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
@@ -22,5 +22,6 @@
    <orderEntry type="module" module-name="intellij.platform.vcs.testFramework" scope="TEST" />
    <orderEntry type="library" name="miglayout-swing" level="project" />
    <orderEntry type="library" name="StreamEx" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/editor-ui-ex/intellij.platform.editor.ex.iml
+++ b/platform/editor-ui-ex/intellij.platform.editor.ex.iml
@@ -16,5 +16,6 @@
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/execution-impl/intellij.platform.execution.impl.iml
+++ b/platform/execution-impl/intellij.platform.execution.impl.iml
@@ -16,5 +16,6 @@
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/extensions/intellij.platform.extensions.iml
+++ b/platform/extensions/intellij.platform.extensions.iml
@@ -12,6 +12,8 @@
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="copyright">
    <Base>
--- a/platform/external-system-api/intellij.platform.externalSystem.iml
+++ b/platform/external-system-api/intellij.platform.externalSystem.iml
@@ -19,5 +19,7 @@
    <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
    <orderEntry type="library" name="lz4-java" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
+++ b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
@@ -22,5 +22,7 @@
    <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
    <orderEntry type="module" module-name="intellij.platform.debugger" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/external-system-impl/intellij.platform.externalSystem.tests.iml
+++ b/platform/external-system-impl/intellij.platform.externalSystem.tests.iml
@@ -24,5 +24,6 @@
    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
    <orderEntry type="module" module-name="intellij.platform.lang.tests" exported="" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-jdk8" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/indexing-api/intellij.platform.indexing.iml
+++ b/platform/indexing-api/intellij.platform.indexing.iml
@@ -14,5 +14,7 @@
    <orderEntry type="library" name="JDOM" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
    <orderEntry type="module" module-name="intellij.platform.concurrency" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/indexing-impl/intellij.platform.indexing.impl.iml
+++ b/platform/indexing-impl/intellij.platform.indexing.impl.iml
@@ -14,5 +14,6 @@
    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="library" name="StreamEx" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/lang-api/intellij.platform.lang.iml
+++ b/platform/lang-api/intellij.platform.lang.iml
@@ -22,5 +22,6 @@
    <orderEntry type="module" module-name="intellij.platform.util.ex" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -47,5 +47,6 @@
    <orderEntry type="module" module-name="intellij.platform.inspect" scope="RUNTIME" />
    <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/lang-impl/intellij.platform.lang.tests.iml
+++ b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -38,5 +38,6 @@
    <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="fastutil-min" level="project" />
+    <orderEntry type="library" scope="TEST" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/lvcs-impl/intellij.platform.lvcs.impl.iml
+++ b/platform/lvcs-impl/intellij.platform.lvcs.impl.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.platform.diff" />
    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="copyright">
    <Base>
--- a/platform/object-serializer/intellij.platform.objectSerializer.iml
+++ b/platform/object-serializer/intellij.platform.objectSerializer.iml
@@ -22,5 +22,6 @@
    <orderEntry type="library" name="lz4-java" level="project" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/object-serializer/intellij.platform.objectSerializer.tests.iml
+++ b/platform/object-serializer/intellij.platform.objectSerializer.tests.iml
@@ -15,5 +15,7 @@
    <orderEntry type="module" module-name="intellij.platform.objectSerializer" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" scope="TEST" />
    <orderEntry type="library" name="ion" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/platform-api/intellij.platform.ide.iml
+++ b/platform/platform-api/intellij.platform.ide.iml
@@ -46,5 +46,6 @@
    <orderEntry type="library" name="rd-framework" level="project" />
    <orderEntry type="library" name="rd-swing" level="project" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -85,5 +85,6 @@
    <orderEntry type="library" scope="RUNTIME" name="org.codehaus.groovy:groovy-jsr223" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="org.codehaus.groovy:groovy-json" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="org.codehaus.groovy:groovy-xml" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -45,5 +45,7 @@
    <orderEntry type="library" scope="TEST" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-jdk8" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/platform-util-io/intellij.platform.ide.util.io.iml
+++ b/platform/platform-util-io/intellij.platform.ide.util.io.iml
@@ -18,5 +18,7 @@
    <orderEntry type="library" name="pty4j" level="project" />
    <orderEntry type="library" name="winp" level="project" />
    <orderEntry type="library" name="jackson" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/projectModel-impl/intellij.platform.projectModel.impl.iml
+++ b/platform/projectModel-impl/intellij.platform.projectModel.impl.iml
@@ -17,5 +17,7 @@
    <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.ex" exported="" />
    <orderEntry type="module" module-name="intellij.platform.concurrency" exported="" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml
+++ b/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml
@@ -16,5 +16,7 @@
    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.debugger" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml
+++ b/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml
@@ -12,5 +12,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
+++ b/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
@@ -16,5 +16,7 @@
    <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
    <orderEntry type="library" name="netty-codec-http" level="project" />
    <orderEntry type="module" module-name="intellij.platform.debugger.testFramework" scope="TEST" />
+    <orderEntry type="library" name="Trove4j" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
  </component>
 </module>
--- a/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml
+++ b/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml
@@ -11,5 +11,7 @@
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/service-container/intellij.platform.serviceContainer.iml
+++ b/platform/service-container/intellij.platform.serviceContainer.iml
@@ -16,5 +16,7 @@
    <orderEntry type="module" module-name="intellij.platform.bootstrap" />
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/smRunner/intellij.platform.smRunner.iml
+++ b/platform/smRunner/intellij.platform.smRunner.iml
@@ -19,5 +19,7 @@
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.java.rt" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" scope="TEST" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/structure-view-impl/intellij.platform.structureView.impl.iml
+++ b/platform/structure-view-impl/intellij.platform.structureView.impl.iml
@@ -20,5 +20,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/testFramework/core/intellij.platform.testFramework.core.iml
+++ b/platform/testFramework/core/intellij.platform.testFramework.core.iml
@@ -9,5 +9,6 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/testFramework/extensions/intellij.platform.testExtensions.iml
+++ b/platform/testFramework/extensions/intellij.platform.testExtensions.iml
@@ -14,5 +14,7 @@
    <orderEntry type="library" exported="" name="assertJ" level="project" />
    <orderEntry type="library" exported="" name="memoryfilesystem" level="project" />
    <orderEntry type="library" name="snakeyaml" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/testFramework/intellij.platform.testFramework.iml
+++ b/platform/testFramework/intellij.platform.testFramework.iml
@@ -34,5 +34,7 @@
    <orderEntry type="module" module-name="intellij.platform.workspaceModel.core" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java
@@ -37,7 +37,6 @@ import com.intellij.util.indexing.FileBasedIndex;
 import com.intellij.util.indexing.FileBasedIndexImpl;
 import com.intellij.util.lang.CompoundRuntimeException;
 import com.intellij.util.ui.UIUtil;
-import gnu.trove.Equality;
 import gnu.trove.THashSet;
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
@@ -60,6 +59,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.function.BiPredicate;
 import java.util.function.Supplier;

 /**
@@ -524,15 +524,14 @@ public abstract class UsefulTestCase extends TestCase {
  public static <T> void assertOrderedEquals(@NotNull String errorMsg,
                                             @NotNull Iterable<? extends T> actual,
                                             @NotNull Iterable<? extends T> expected) {
-    //noinspection unchecked
-    assertOrderedEquals(errorMsg, actual, expected, Equality.CANONICAL);
+    assertOrderedEquals(errorMsg, actual, expected, Objects::equals);
  }

  public static <T> void assertOrderedEquals(@NotNull String errorMsg,
                                             @NotNull Iterable<? extends T> actual,
                                             @NotNull Iterable<? extends T> expected,
-                                             @NotNull Equality<? super T> comparator) {
-    if (!equals(actual, expected, comparator)) {
+                                             @NotNull BiPredicate<? super T, ? super T> predicate) {
+    if (!equals(actual, expected, predicate)) {
      String expectedString = toString(expected);
      String actualString = toString(actual);
      Assert.assertEquals(errorMsg, expectedString, actualString);
@@ -542,12 +541,13 @@ public abstract class UsefulTestCase extends TestCase {

  private static <T> boolean equals(@NotNull Iterable<? extends T> a1,
                                    @NotNull Iterable<? extends T> a2,
-                                    @NotNull Equality<? super T> comparator) {
+                                    @NotNull BiPredicate<? super T, ? super T> predicate) {
    Iterator<? extends T> it1 = a1.iterator();
    Iterator<? extends T> it2 = a2.iterator();
    while (it1.hasNext() || it2.hasNext()) {
-      if (!it1.hasNext() || !it2.hasNext()) return false;
-      if (!comparator.equals(it1.next(), it2.next())) return false;
+      if (!it1.hasNext() || !it2.hasNext() || !predicate.test(it1.next(), it2.next())) {
+        return false;
+      }
    }
    return true;
  }
--- a/platform/testRunner/intellij.platform.testRunner.iml
+++ b/platform/testRunner/intellij.platform.testRunner.iml
@@ -14,5 +14,6 @@
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.debugger" />
    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/usageView/intellij.platform.usageView.iml
+++ b/platform/usageView/intellij.platform.usageView.iml
@@ -10,5 +10,6 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/util-ex/intellij.platform.util.ex.iml
+++ b/platform/util-ex/intellij.platform.util.ex.iml
@@ -13,5 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="library" name="JDOM" level="project" />
    <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/util/intellij.platform.concurrency.iml
+++ b/platform/util/intellij.platform.concurrency.iml
@@ -11,5 +11,7 @@
    <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/util/intellij.platform.util.iml
+++ b/platform/util/intellij.platform.util.iml
@@ -13,7 +13,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="JDOM" level="project" />
    <orderEntry type="library" name="Log4J" level="project" />
-    <orderEntry type="library" exported="" name="Trove4j" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
    <orderEntry type="library" exported="" name="jetbrains-annotations" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.rt" exported="" />
    <orderEntry type="module" module-name="intellij.platform.util.classLoader" exported="" />
--- a/platform/util/intellij.platform.util.ui.iml
+++ b/platform/util/intellij.platform.util.ui.iml
@@ -17,5 +17,7 @@
    <orderEntry type="library" name="Java Compatibility" level="project" />
    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
    <orderEntry type="library" name="batik-codec" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/util/src/com/intellij/openapi/util/ObjectTree.java
+++ b/platform/util/src/com/intellij/openapi/util/ObjectTree.java
@@ -176,7 +176,9 @@ final class ObjectTree {
  static <T> void executeActionWithRecursiveGuard(@NotNull T object, @NotNull List<T> recursiveGuard, @NotNull Consumer<? super T> action) {
    //noinspection SynchronizationOnLocalVariableOrMethodParameter
    synchronized (recursiveGuard) {
-      if (ArrayUtil.indexOf(recursiveGuard, object, ContainerUtil.identityStrategy()) != -1) return;
+      if (ArrayUtil.indexOf(recursiveGuard, object, (t, t2) -> t == t2) != -1) {
+        return;
+      }
      recursiveGuard.add(object);
    }

--- a/platform/util/src/com/intellij/util/ArrayUtil.java
+++ b/platform/util/src/com/intellij/util/ArrayUtil.java
@@ -14,6 +14,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
+import java.util.function.BiPredicate;

@SuppressWarnings("MethodOverridesStaticMethodOfSuperclass")
 public final class ArrayUtil {
@@ -641,17 +642,11 @@ public final class ArrayUtil {
  }

  @Contract(pure=true)
-  public static <T> int indexOf(@NotNull List<? extends T> objects, T object, @NotNull Equality<? super T> comparator) {
+  public static <T> int indexOf(@NotNull List<? extends T> objects, T object, @NotNull BiPredicate<? super T, ? super T> predicate) {
    for (int i = 0; i < objects.size(); i++) {
-      if (comparator.equals(objects.get(i), object)) return i;
-    }
-    return -1;
-  }
-
-  @Contract(pure=true)
-  public static <T> int indexOf(@NotNull List<? extends T> objects, T object, @NotNull Comparator<? super T> comparator) {
-    for (int i = 0; i < objects.size(); i++) {
-      if (comparator.compare(objects.get(i), object) == 0) return i;
+      if (predicate.test(objects.get(i), object)) {
+        return i;
+      }
    }
    return -1;
  }
--- a/platform/util/testSrc/intellij.platform.util.tests.iml
+++ b/platform/util/testSrc/intellij.platform.util.tests.iml
@@ -23,5 +23,6 @@
    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="bouncy-castle-provider" level="project" />
    <orderEntry type="library" scope="TEST" name="memoryfilesystem" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/vcs-api/intellij.platform.vcs.iml
+++ b/platform/vcs-api/intellij.platform.vcs.iml
@@ -18,5 +18,6 @@
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/vcs-impl/intellij.platform.vcs.impl.iml
+++ b/platform/vcs-impl/intellij.platform.vcs.impl.iml
@@ -29,5 +29,6 @@
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.iml
+++ b/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.iml
@@ -14,6 +14,9 @@
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
    <orderEntry type="library" name="Guava" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
  </component>
 </module>
--- a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
+++ b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
@@ -30,5 +30,7 @@
    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="library" name="Trove4j" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
  </component>
 </module>
--- a/platform/vcs-tests/intellij.platform.vcs.tests.iml
+++ b/platform/vcs-tests/intellij.platform.vcs.tests.iml
@@ -19,5 +19,6 @@
    <orderEntry type="module" module-name="intellij.platform.util.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/workspaceModel-core/intellij.platform.workspaceModel.core.iml
+++ b/platform/workspaceModel-core/intellij.platform.workspaceModel.core.iml
@@ -18,5 +18,6 @@
    <orderEntry type="library" name="Objenesis" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.ex" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/workspaceModel-ide-tests/intellij.platform.workspaceModel.ide.tests.iml
+++ b/platform/workspaceModel-ide-tests/intellij.platform.workspaceModel.ide.tests.iml
@@ -12,6 +12,8 @@
    <orderEntry type="module" module-name="intellij.platform.workspaceModel.ide" />
    <orderEntry type="module" module-name="intellij.platform.smRunner" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="TestModuleProperties" production-module="intellij.platform.workspaceModel.ide" />
 </module>
--- a/platform/workspaceModel-ide/intellij.platform.workspaceModel.ide.iml
+++ b/platform/workspaceModel-ide/intellij.platform.workspaceModel.ide.iml
@@ -22,5 +22,7 @@
    <orderEntry type="module" module-name="intellij.platform.serviceContainer" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.externalSystem" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
+++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
@@ -19,5 +19,7 @@
    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml
+++ b/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml
@@ -12,5 +12,6 @@
    <orderEntry type="module" module-name="intellij.platform.debugger" />
    <orderEntry type="module" module-name="intellij.platform.testExtensions" />
    <orderEntry type="library" name="StreamEx" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/plugins/IntelliLang/intellij.java.langInjection.iml
+++ b/plugins/IntelliLang/intellij.java.langInjection.iml
@@ -17,6 +17,7 @@
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.platform.langInjection" />
    <orderEntry type="module" module-name="intellij.java.langInjection.jps" scope="RUNTIME" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="copyright">
    <Base>
--- a/plugins/IntelliLang/intellij.platform.langInjection.iml
+++ b/plugins/IntelliLang/intellij.platform.langInjection.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="library" name="Jaxen" level="project" />
    <orderEntry type="library" name="StreamEx" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="copyright">
    <Base>
--- a/plugins/IntelliLang/intellij.xml.langInjection.iml
+++ b/plugins/IntelliLang/intellij.xml.langInjection.iml
@@ -16,6 +16,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="library" name="Jaxen" level="project" />
    <orderEntry type="module" module-name="intellij.platform.langInjection" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="copyright">
    <Base>
--- a/plugins/ant/intellij.ant.iml
+++ b/plugins/ant/intellij.ant.iml
@@ -32,6 +32,8 @@
    <orderEntry type="library" name="NanoXML" level="project" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="copyright">
    <Base>
--- a/plugins/ant/jps-plugin/intellij.ant.jps.iml
+++ b/plugins/ant/jps-plugin/intellij.ant.jps.iml
@@ -14,5 +14,6 @@
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
    <orderEntry type="module" module-name="intellij.java.rt" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization.tests" scope="TEST" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/plugins/changeReminder/intellij.vcs.changeReminder.iml
+++ b/plugins/changeReminder/intellij.vcs.changeReminder.iml
@@ -28,5 +28,6 @@
      </library>
    </orderEntry>
    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/plugins/configuration-script/intellij.configurationScript.iml
+++ b/plugins/configuration-script/intellij.configurationScript.iml
@@ -25,5 +25,7 @@
    <orderEntry type="library" scope="TEST" name="jackson" level="project" />
    <orderEntry type="module" module-name="intellij.platform.serviceContainer" />
    <orderEntry type="library" name="snakeyaml-engine" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/plugins/cvs/cvs-plugin/intellij.vcs.cvs.iml
+++ b/plugins/cvs/cvs-plugin/intellij.vcs.cvs.iml
@@ -15,5 +15,6 @@
    <orderEntry type="module" module-name="intellij.vcs.cvs.smartcvs" />
    <orderEntry type="library" name="microba" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/plugins/cvs/javacvs-src/intellij.vcs.cvs.javacvs.iml
+++ b/plugins/cvs/javacvs-src/intellij.vcs.cvs.javacvs.iml
@@ -8,6 +8,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
  <component name="copyright">
    <Base>
--- a/plugins/devkit/devkit-core/intellij.devkit.iml
+++ b/plugins/devkit/devkit-core/intellij.devkit.iml
@@ -52,5 +52,6 @@
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
    <orderEntry type="library" name="StreamEx" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/plugins/eclipse/intellij.eclipse.iml
+++ b/plugins/eclipse/intellij.eclipse.iml
@@ -22,5 +22,6 @@
    <orderEntry type="module" module-name="intellij.eclipse.jps" />
    <orderEntry type="module" module-name="intellij.eclipse.common" />
    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/plugins/editorconfig/intellij.editorconfig.iml
+++ b/plugins/editorconfig/intellij.editorconfig.iml
@@ -33,5 +33,6 @@
    <orderEntry type="library" name="gson" level="project" />
    <orderEntry type="module" module-name="intellij.spellchecker" />
    <orderEntry type="library" name="automaton" level="project" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/plugins/filePrediction/intellij.filePrediction.iml
+++ b/plugins/filePrediction/intellij.filePrediction.iml
@@ -22,5 +22,6 @@
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/plugins/git4idea/intellij.vcs.git.iml
+++ b/plugins/git4idea/intellij.vcs.git.iml
@@ -48,5 +48,6 @@
    <orderEntry type="library" name="xz" level="project" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/plugins/github/intellij.vcs.github.iml
+++ b/plugins/github/intellij.vcs.github.iml
@@ -38,5 +38,6 @@
    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="library" name="Trove4j" level="project" />
  </component>
 </module>
--- a/Show More
+++ b/Show More