Got rid of TObjectIntHashMap and TIntObjectHashMap usages

Author: hurricup

.idea/codeInsightSettings.xml

@@ -17,7 +17,7 @@
 package com.perl5.lang.perl.idea.codeInsight.typeInference.value;
 
 import com.intellij.psi.stubs.StubInputStream;
-import gnu.trove.TIntObjectHashMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -30,7 +30,7 @@
 public class PerlValueDeserializer {
 
   private final @NotNull StubInputStream myInputStream;
-  private final TIntObjectHashMap<PerlValue> myDryMap = new TIntObjectHashMap<>();
+  private final Int2ObjectOpenHashMap<PerlValue> myDryMap = new Int2ObjectOpenHashMap<>();
 
   public PerlValueDeserializer(@NotNull StubInputStream inputStream) {
     myInputStream = inputStream;

plugin/core/src/main/java/com/perl5/lang/perl/idea/codeInsight/typeInference/value/PerlValueDeserializer.java

@@ -17,7 +17,7 @@
 package com.perl5.lang.perl.idea.codeInsight.typeInference.value;
 
 import com.intellij.psi.stubs.StubOutputStream;
-import gnu.trove.TObjectIntHashMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -26,7 +26,7 @@
 
 final class PerlValueSerializer {
   private final @NotNull StubOutputStream myOutputStream;
-  private final TObjectIntHashMap<PerlValue> myDryMap = new TObjectIntHashMap<>();
+  private final Object2IntOpenHashMap<PerlValue> myDryMap = new Object2IntOpenHashMap<>();
 
   public PerlValueSerializer(@NotNull StubOutputStream outputStream) {
     myOutputStream = outputStream;
@@ -37,7 +37,7 @@ void writeValue(@NotNull PerlValue value) throws IOException {
       writeVarInt(value.getSerializationId());
       return;
     }
-    int duplicateId = myDryMap.get(value);
+    int duplicateId = myDryMap.getInt(value);
     if (duplicateId > 0) {
       writeVarInt(PerlValuesManager.DUPLICATE_ID);
       writeVarInt(duplicateId);

plugin/core/src/main/java/com/perl5/lang/perl/idea/codeInsight/typeInference/value/PerlValueSerializer.java

@@ -43,8 +43,8 @@
 import com.perl5.lang.perl.psi.PerlSignatureElement;
 import com.perl5.lang.perl.psi.PsiPerlStatementModifier;
 import com.perl5.lang.perl.psi.utils.PerlPsiUtil;
-import gnu.trove.TIntIntHashMap;
-import gnu.trove.TIntObjectHashMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -64,7 +64,7 @@ public class PurePerlFormattingContext extends PerlBaseFormattingContext {
   private static final Logger LOG = Logger.getInstance(PurePerlFormattingContext.class);
   private final Map<ASTNode, Wrap> myWrapMap = new HashMap<>();
   private final Map<Integer, Alignment> myAssignmentsAlignmentsMap = new HashMap<>();
-  private final TIntObjectHashMap<Alignment> myCommentsAlignmentMap = new TIntObjectHashMap<>();
+  private final Int2ObjectOpenHashMap<Alignment> myCommentsAlignmentMap = new Int2ObjectOpenHashMap<>();
   private final Map<ASTNode, Alignment> myRightwardCallsAlignmentMap = FactoryMap.create(sequence -> Alignment.createAlignment(true));
   private final Map<ASTNode, Alignment> myOperatorsAlignmentsMap = FactoryMap.create(sequence -> Alignment.createAlignment(true));
   private final Map<ASTNode, Alignment> myElementsALignmentsMap = FactoryMap.create(sequence -> Alignment.createAlignment(true));
@@ -99,7 +99,7 @@ else if (StringUtil.containsLineBreak(run.getChars())) {
     }
 
     int commentLine = getNodeLine(commentNode);
-    if (myCommentsAlignmentMap.contains(commentLine)) {
+    if (myCommentsAlignmentMap.containsKey(commentLine)) {
       return myCommentsAlignmentMap.get(commentLine);
     }
     if (LOG.isDebugEnabled()) {
@@ -140,7 +140,7 @@ else if (StringUtil.containsLineBreak(run.getChars())) {
   /**
    * Maps line numbers to the offset of first here-doc openers. Or {@link Integer.MAX_VALUE} if there is none
    */
-  private final TIntIntHashMap myHeredocForbiddenOffsets = new TIntIntHashMap();
+  private final Int2IntOpenHashMap myHeredocForbiddenOffsets = new Int2IntOpenHashMap();
 
   private static final MultiMap<IElementType, IElementType> OPERATOR_COLLISIONS_MAP = new MultiMap<>();
 
@@ -205,7 +205,7 @@ public boolean isNewLineForbiddenAt(@NotNull ASTNode node) {
       return true;
     }
     int nodeLine = getNodeLine(node);
-    if (myHeredocForbiddenOffsets.contains(nodeLine)) {
+    if (myHeredocForbiddenOffsets.containsKey(nodeLine)) {
       return node.getStartOffset() > myHeredocForbiddenOffsets.get(nodeLine);
     }
 

plugin/core/src/main/java/com/perl5/lang/perl/idea/formatter/PurePerlFormattingContext.java

@@ -17,14 +17,15 @@
 package com.perl5.lang.perl.psi.stubs;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.stubs.*;
 import com.intellij.util.containers.ContainerUtil;
 import com.perl5.lang.perl.PerlLanguage;
 import com.perl5.lang.perl.parser.elementTypes.PsiElementProvider;
 import com.perl5.lang.perl.psi.impl.PerlPolyNamedElement;
-import gnu.trove.TIntObjectHashMap;
-import gnu.trove.TObjectIntHashMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -36,8 +37,9 @@
 
 public abstract class PerlPolyNamedElementType<Stub extends PerlPolyNamedElementStub<Psi>, Psi extends PerlPolyNamedElement<Stub>>
   extends IStubElementType<Stub, Psi> implements PsiElementProvider {
-  private static final TObjectIntHashMap<IStubElementType<?, ?>> DIRECT_MAP = new TObjectIntHashMap<>();
-  private static final TIntObjectHashMap<IStubElementType<?, ?>> REVERSE_MAP = new TIntObjectHashMap<>();
+  private static final Logger LOG = Logger.getInstance(PerlPolyNamedElementType.class);
+  private static final Object2IntOpenHashMap<IStubElementType<?, ?>> DIRECT_MAP = new Object2IntOpenHashMap<>();
+  private static final Int2ObjectOpenHashMap<IStubElementType<?, ?>> REVERSE_MAP = new Int2ObjectOpenHashMap<>();
 
   static {
     // 0 is reserved for n/a
@@ -46,12 +48,9 @@ public abstract class PerlPolyNamedElementType<Stub extends PerlPolyNamedElement
     DIRECT_MAP.put(LIGHT_METHOD_DEFINITION, 3);
     DIRECT_MAP.put(CLASS_ACCESSOR_METHOD, 4);
     DIRECT_MAP.put(LIGHT_ATTRIBUTE_DEFINITION, 5);
-    assert DIRECT_MAP.size() == 5;
+    LOG.assertTrue(DIRECT_MAP.size() == 5);
 
-    DIRECT_MAP.forEachEntry((type, id) -> {
-      REVERSE_MAP.put(id, type);
-      return true;
-    });
+    DIRECT_MAP.forEach((type, id) -> REVERSE_MAP.put(id.intValue(), type));
   }
 
   public PerlPolyNamedElementType(@NotNull String debugName) {