diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpMatch.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpMatch.java index 90cf5fe06b78..5c66d6bead13 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpMatch.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpMatch.java @@ -2,13 +2,14 @@ package org.intellij.lang.regexp; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; /** * @author Bas Leijdekkers */ public class RegExpMatch { - private final IntArrayList groups = new IntArrayList(); + private final IntList groups = new IntArrayList(); public void add(int start, int end) { groups.add(start); diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java index b9eb7f56cf9c..1a7761a740a2 100644 --- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java @@ -80,6 +80,7 @@ import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; import io.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender; import io.netty.util.internal.ThreadLocalRandom; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -1846,7 +1847,7 @@ public final class BuildManager implements Disposable { * @param path assuming system-independent path with forward slashes */ InternedPath(String path) { - final IntArrayList list = new IntArrayList(); + final IntList list = new IntArrayList(); final StringTokenizer tokenizer = new StringTokenizer(path, "/", false); while(tokenizer.hasMoreTokens()) { final String element = tokenizer.nextToken(); diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/indices/DiscoveredTestDataHolder.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/indices/DiscoveredTestDataHolder.java index 4401afb81ec7..50229b0c71af 100644 --- a/java/execution/impl/src/com/intellij/execution/testDiscovery/indices/DiscoveredTestDataHolder.java +++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/indices/DiscoveredTestDataHolder.java @@ -188,7 +188,7 @@ public final class DiscoveredTestDataHolder { final int testNameId = myTestEnumerator.enumerate(createTestId(testClassName, testMethodName, frameworkId)); Int2ObjectMap result = new Int2ObjectOpenHashMap<>(); for (Map.Entry> e : usedMethods.entrySet()) { - IntArrayList methodIds = new IntArrayList(e.getValue().size()); + IntList methodIds = new IntArrayList(e.getValue().size()); result.put(myClassEnumerator.enumerate(e.getKey()), methodIds); for (String methodName : e.getValue()) { methodIds.add(myMethodEnumerator.enumerate(methodName)); diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/indices/IntArrayExternalizer.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/indices/IntArrayExternalizer.java index 2a00f32d15e7..4ae031ba72fb 100644 --- a/java/execution/impl/src/com/intellij/execution/testDiscovery/indices/IntArrayExternalizer.java +++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/indices/IntArrayExternalizer.java @@ -23,9 +23,9 @@ final class IntArrayExternalizer implements DataExternalizer { } @Override - public IntArrayList read(@NotNull DataInput in) throws IOException { + public IntList read(@NotNull DataInput in) throws IOException { int size = DataInputOutputUtil.readINT(in); - IntArrayList array = new IntArrayList(size); + IntList array = new IntArrayList(size); for (int i = 0; i < size; i++) { array.add(DataInputOutputUtil.readINT(in)); } diff --git a/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java index c8c41bb15040..b776cea4b185 100644 --- a/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java +++ b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java @@ -19,6 +19,7 @@ import com.intellij.refactoring.util.RefactoringChangeUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -76,7 +77,7 @@ public final class DuplicatesFinder { } while (endOffset < 0 && j >= 0); - IntArrayList exitPoints = new IntArrayList(); + IntList exitPoints = new IntArrayList(); final Collection exitStatements = ControlFlowUtil .findExitPointsAndStatements(controlFlow, startOffset, endOffset, exitPoints, ControlFlowUtil.DEFAULT_EXIT_STATEMENTS_CLASSES); myMultipleExitPoints = exitPoints.size() > 1; @@ -263,7 +264,7 @@ public final class DuplicatesFinder { endOffset = controlFlow.getEndOffset(candidates.get(j--)); } while(endOffset < 0 && j >= 0); - final IntArrayList exitPoints = new IntArrayList(); + final IntList exitPoints = new IntArrayList(); ControlFlowUtil.findExitPointsAndStatements(controlFlow, startOffset, endOffset, exitPoints, ControlFlowUtil.DEFAULT_EXIT_STATEMENTS_CLASSES); final PsiVariable[] outVariables = ControlFlowUtil.getOutputVariables(controlFlow, startOffset, endOffset, exitPoints.toIntArray()); diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/ControlFlowWrapper.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ControlFlowWrapper.java index 970e7f79db6d..b3124c45b076 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ControlFlowWrapper.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ControlFlowWrapper.java @@ -12,6 +12,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.util.containers.ContainerUtil; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import java.util.*; @@ -26,7 +27,7 @@ public final class ControlFlowWrapper { private boolean myGenerateConditionalExit; private Collection myExitStatements; private PsiStatement myFirstExitStatementCopy; - private IntArrayList myExitPoints; + private IntList myExitPoints; public ControlFlowWrapper(PsiElement codeFragment, PsiElement[] elements) throws PrepareFailedException { try { diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java index e4dd090816d2..acc7246b4e84 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java @@ -14,6 +14,7 @@ import gnu.trove.THashMap; import gnu.trove.THashSet; import gnu.trove.TIntHashSet; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -357,7 +358,7 @@ public final class ControlFlowUtil { @SafeVarargs @NotNull public static Collection findExitPointsAndStatements(@NotNull ControlFlow flow, final int start, final int end, - @NotNull IntArrayList exitPoints, + @NotNull IntList exitPoints, Class @NotNull ... classesFilter) { if (end == start) { exitPoints.add(end); @@ -412,7 +413,7 @@ public final class ControlFlowUtil { @SafeVarargs private static void processGoto(@NotNull ControlFlow flow, int start, int end, - @NotNull IntArrayList exitPoints, + @NotNull IntList exitPoints, @NotNull Collection exitStatements, @NotNull BranchingInstruction instruction, final PsiStatement statement, Class @NotNull ... classesFilter) { @@ -513,14 +514,14 @@ public final class ControlFlowUtil { final List instructions = flow.getInstructions(); class Worker { @NotNull - private Map getWritesOffsets() { - final Map writeOffsets = new THashMap<>(); + private Map getWritesOffsets() { + final Map writeOffsets = new THashMap<>(); for (int i = flowStart; i < flowEnd; i++) { Instruction instruction = instructions.get(i); if (instruction instanceof WriteVariableInstruction) { final PsiVariable variable = ((WriteVariableInstruction)instruction).variable; if (variable instanceof PsiLocalVariable || variable instanceof PsiParameter) { - IntArrayList offsets = writeOffsets.get(variable); + IntList offsets = writeOffsets.get(variable); if (offsets == null) writeOffsets.put(variable, offsets = new IntArrayList()); offsets.add(i); } @@ -531,8 +532,8 @@ public final class ControlFlowUtil { } @NotNull - private Map getVisibleReadsOffsets(@NotNull Map writeOffsets, @NotNull PsiCodeBlock tryBlock) { - final Map visibleReadOffsets = new THashMap<>(); + private Map getVisibleReadsOffsets(@NotNull Map writeOffsets, @NotNull PsiCodeBlock tryBlock) { + final Map visibleReadOffsets = new THashMap<>(); for (PsiVariable variable : writeOffsets.keySet()) { if (!PsiTreeUtil.isAncestor(tryBlock, variable, true)) { visibleReadOffsets.put(variable, new IntArrayList()); @@ -544,7 +545,7 @@ public final class ControlFlowUtil { final Instruction instruction = instructions.get(i); if (instruction instanceof ReadVariableInstruction) { final PsiVariable variable = ((ReadVariableInstruction)instruction).variable; - final IntArrayList readOffsets = visibleReadOffsets.get(variable); + final IntList readOffsets = visibleReadOffsets.get(variable); if (readOffsets != null) { readOffsets.add(i); } @@ -555,8 +556,8 @@ public final class ControlFlowUtil { } @NotNull - private Map> getReachableAfterWrite(@NotNull Map writeOffsets, - @NotNull Map visibleReadOffsets) { + private Map> getReachableAfterWrite(@NotNull Map writeOffsets, + @NotNull Map visibleReadOffsets) { final Map> afterWrite = new THashMap<>(); for (PsiVariable variable : visibleReadOffsets.keySet()) { final Function calculator = getReachableInstructionsCalculator(); @@ -586,8 +587,8 @@ public final class ControlFlowUtil { } @NotNull - private IntArrayList getCatchOrFinallyOffsets(@NotNull List tryStatements, @NotNull List thrownExceptions) { - final IntArrayList catchOrFinallyOffsets = new IntArrayList(); + private IntList getCatchOrFinallyOffsets(@NotNull List tryStatements, @NotNull List thrownExceptions) { + final IntList catchOrFinallyOffsets = new IntArrayList(); for (PsiTryStatement tryStatement : tryStatements) { final PsiCodeBlock finallyBlock = tryStatement.getFinallyBlock(); if (finallyBlock != null) { @@ -614,7 +615,7 @@ public final class ControlFlowUtil { return catchOrFinallyOffsets; } - private boolean isAnyReadOffsetReachableFrom(@Nullable IntArrayList readOffsets, @NotNull IntArrayList fromOffsets) { + private boolean isAnyReadOffsetReachableFrom(@Nullable IntList readOffsets, @NotNull IntList fromOffsets) { if (readOffsets != null && !readOffsets.isEmpty()) { final int[] readOffsetsArray = readOffsets.toIntArray(); for (int j = 0; j < fromOffsets.size(); j++) { @@ -650,7 +651,7 @@ public final class ControlFlowUtil { } final Worker worker = new Worker(); - final Map writeOffsets = worker.getWritesOffsets(); + final Map writeOffsets = worker.getWritesOffsets(); if (writeOffsets.isEmpty()) return false; final PsiElement commonParent = elements.length != 1 ? PsiTreeUtil.findCommonParent(elements) : elements[0].getParent(); @@ -659,7 +660,7 @@ public final class ControlFlowUtil { final PsiCodeBlock tryBlock = tryStatements.get(0).getTryBlock(); if (tryBlock == null) return false; - final Map visibleReadOffsets = worker.getVisibleReadsOffsets(writeOffsets, tryBlock); + final Map visibleReadOffsets = worker.getVisibleReadsOffsets(writeOffsets, tryBlock); if (visibleReadOffsets.isEmpty()) return false; final Map> afterWrite = worker.getReachableAfterWrite(writeOffsets, visibleReadOffsets); @@ -671,7 +672,7 @@ public final class ControlFlowUtil { final List thrownExceptions = ExceptionUtil.getThrownExceptions(psiElements); if (!thrownExceptions.isEmpty()) { - final IntArrayList catchOrFinallyOffsets = worker.getCatchOrFinallyOffsets(tryStatements, thrownExceptions); + final IntList catchOrFinallyOffsets = worker.getCatchOrFinallyOffsets(tryStatements, thrownExceptions); if (worker.isAnyReadOffsetReachableFrom(visibleReadOffsets.get(variable), catchOrFinallyOffsets)) { return true; } @@ -2375,7 +2376,7 @@ public final class ControlFlowUtil { startOffset = Math.max(startOffset, 0); endOffset = Math.min(endOffset, instructions.size()); - IntArrayList locationOffsetList = new IntArrayList(); + IntList locationOffsetList = new IntArrayList(); for (PsiElement location : locations) { int offset = flow.getStartOffset(location); if (offset >= startOffset && offset < endOffset) { diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/DefUseUtil.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/DefUseUtil.java index be0a687b14a7..e48d5e70d905 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/DefUseUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/DefUseUtil.java @@ -10,6 +10,7 @@ import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.ExceptionUtil; import com.intellij.util.containers.Stack; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -259,7 +260,7 @@ public final class DefUseUtil { try { RefsDefs refsDefs = new RefsDefs(body) { final PsiManager psiManager = def.getManager(); - private final IntArrayList[] myBackwardTraces = getBackwardTraces(instructions); + private final IntList[] myBackwardTraces = getBackwardTraces(instructions); @Override protected int nNext(int index) { @@ -410,7 +411,7 @@ public final class DefUseUtil { // hack: ControlFlow doesn't contains parameters initialization int startIndex = elem; - IntArrayList workQueue = new IntArrayList(); + IntList workQueue = new IntArrayList(); workQueue.add(startIndex); PsiManager psiManager = body.getManager(); @@ -467,8 +468,8 @@ public final class DefUseUtil { } - private static IntArrayList @NotNull [] getBackwardTraces(@NotNull List instructions) { - final IntArrayList[] states = new IntArrayList[instructions.size()]; + private static IntList @NotNull [] getBackwardTraces(@NotNull List instructions) { + final IntList[] states = new IntList[instructions.size()]; for (int i = 0; i < states.length; i++) { states[i] = new IntArrayList(); } diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/psi/ControlFlowTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/psi/ControlFlowTest.java index c30f82ac9c85..e46e0481c67d 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/psi/ControlFlowTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/psi/ControlFlowTest.java @@ -10,6 +10,7 @@ import com.intellij.psi.controlFlow.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.LightJavaCodeInsightTestCase; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.intellij.lang.annotations.Language; import org.jetbrains.annotations.NonNls; @@ -74,7 +75,7 @@ public class ControlFlowTest extends LightJavaCodeInsightTestCase { configureFromFileText("a.java", text); final PsiCodeBlock body = ((PsiJavaFile)getFile()).getClasses()[0].getMethods()[0].getBody(); ControlFlow flow = ControlFlowFactory.getInstance(getProject()).getControlFlow(body, new LocalsControlFlowPolicy(body), false); - IntArrayList exitPoints = new IntArrayList(); + IntList exitPoints = new IntArrayList(); ControlFlowUtil.findExitPointsAndStatements(flow, 0, flow.getSize() -1 , exitPoints, ControlFlowUtil.DEFAULT_EXIT_STATEMENTS_CLASSES); assertEquals(1, exitPoints.size()); } diff --git a/java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesTest.java b/java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesTest.java index 283e7cf9b103..aea72b91c42c 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesTest.java @@ -40,6 +40,7 @@ import com.intellij.util.Processor; import com.intellij.util.TimeoutUtil; import com.intellij.util.ui.UIUtil; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import java.util.*; @@ -68,8 +69,8 @@ public class FindUsagesTest extends JavaPsiTestCase { int[] starts = {}; int[] ends = {}; final ArrayList filesList = new ArrayList<>(); - final IntArrayList startsList = new IntArrayList(); - final IntArrayList endsList = new IntArrayList(); + final IntList startsList = new IntArrayList(); + final IntList endsList = new IntArrayList(); PsiReference[] refs = MethodReferencesSearch.search((PsiMethod)superExpr.resolve(), GlobalSearchScope.projectScope(myProject), false).toArray(PsiReference.EMPTY_ARRAY); for (PsiReference ref : refs) { @@ -140,7 +141,7 @@ public class FindUsagesTest extends JavaPsiTestCase { assertEquals(0, ReferencesSearch.search(unusedCtr).findAll().size()); } - private static void addReference(@NotNull PsiReference ref, @NotNull List filesList, @NotNull IntArrayList startsList, @NotNull IntArrayList endsList) { + private static void addReference(@NotNull PsiReference ref, @NotNull List filesList, @NotNull IntList startsList, @NotNull IntList endsList) { PsiElement element = ref.getElement(); filesList.add(element.getContainingFile()); TextRange range = element.getTextRange(); @@ -228,8 +229,8 @@ public class FindUsagesTest extends JavaPsiTestCase { public static void doTest(PsiElement element, String[] fileNames, int[] starts, int[] ends) { final ArrayList filesList = new ArrayList<>(); - final IntArrayList startsList = new IntArrayList(); - final IntArrayList endsList = new IntArrayList(); + final IntList startsList = new IntArrayList(); + final IntList endsList = new IntArrayList(); ReferencesSearch.search(element, GlobalSearchScope.projectScope(element.getProject()), false).forEach(new PsiReferenceProcessorAdapter( ref -> { addReference(ref, filesList, startsList, endsList); @@ -280,7 +281,7 @@ public class FindUsagesTest extends JavaPsiTestCase { } } - private static void checkResult(String @NotNull [] fileNames, final List filesList, int[] starts, final IntArrayList startsList, int[] ends, final IntArrayList endsList) { + private static void checkResult(String @NotNull [] fileNames, final List filesList, int[] starts, final IntList startsList, int[] ends, final IntList endsList) { List expected = new ArrayList<>(); for (int i = 0; i < fileNames.length; i++) { String fileName = fileNames[i]; diff --git a/java/java-tests/testSrc/com/intellij/java/psi/search/PlainTextUsagesTest.java b/java/java-tests/testSrc/com/intellij/java/psi/search/PlainTextUsagesTest.java index 54de833e0f54..43d122e03b9e 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/search/PlainTextUsagesTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/search/PlainTextUsagesTest.java @@ -16,6 +16,7 @@ import com.intellij.testFramework.IdeaTestUtil; import com.intellij.testFramework.JavaPsiTestCase; import com.intellij.testFramework.PsiTestUtil; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import java.util.ArrayList; import java.util.List; @@ -57,8 +58,8 @@ public class PlainTextUsagesTest extends JavaPsiTestCase { int[] ends) { PsiSearchHelper helper = PsiSearchHelper.getInstance(myProject); final List filesList = new ArrayList<>(); - final IntArrayList startsList = new IntArrayList(); - final IntArrayList endsList = new IntArrayList(); + final IntList startsList = new IntArrayList(); + final IntList endsList = new IntArrayList(); helper.processUsagesInNonJavaFiles(originalElement, qNameToSearch, (file, startOffset, endOffset) -> { diff --git a/java/java-tests/testSrc/com/intellij/java/slicer/SliceTreeTest.java b/java/java-tests/testSrc/com/intellij/java/slicer/SliceTreeTest.java index 744c3f7fbb03..7b314f651b06 100644 --- a/java/java-tests/testSrc/com/intellij/java/slicer/SliceTreeTest.java +++ b/java/java-tests/testSrc/com/intellij/java/slicer/SliceTreeTest.java @@ -10,6 +10,7 @@ import com.intellij.psi.*; import com.intellij.slicer.*; import com.intellij.util.containers.ContainerUtil; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import one.util.streamex.EntryStream; import one.util.streamex.StreamEx; import org.jetbrains.annotations.NonNls; @@ -76,7 +77,7 @@ public class SliceTreeTest extends SliceTestCase { List nodes = new ArrayList<>(); expandNodesTo(root, nodes); - IntArrayList hasDups = new IntArrayList(); + IntList hasDups = new IntArrayList(); for (SliceNode node : nodes) { if (node.getDuplicate() != null) { PsiElement element = node.getValue().getElement(); diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java index 35c1e06dc059..3359da5ba72a 100644 --- a/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java @@ -48,6 +48,7 @@ import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; import com.intellij.util.containers.ContainerUtil; import com.intellij.xml.XmlSchemaProvider; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -278,7 +279,7 @@ public abstract class DaemonAnalyzerTestCase extends JavaCodeInsightTestCase { protected List doHighlighting() { PsiDocumentManager.getInstance(myProject).commitAllDocuments(); - IntArrayList toIgnore = new IntArrayList(); + IntList toIgnore = new IntArrayList(); if (!doTestLineMarkers()) { toIgnore.add(Pass.LINE_MARKERS); } diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java index 6bbab1171ef5..17ae2b11e3de 100644 --- a/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java @@ -19,6 +19,7 @@ import com.intellij.testFramework.LightJavaCodeInsightTestCase; import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; import com.intellij.util.ArrayUtilRt; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -127,7 +128,7 @@ public abstract class LightDaemonAnalyzerTestCase extends LightJavaCodeInsightTe protected List doHighlighting() { PsiDocumentManager.getInstance(getProject()).commitAllDocuments(); - IntArrayList toIgnoreList = new IntArrayList(); + IntList toIgnoreList = new IntArrayList(); if (!doFolding()) { toIgnoreList.add(Pass.UPDATE_FOLDING); } diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorHighlightingPassRegistrarImpl.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorHighlightingPassRegistrarImpl.java index 158769f1f01f..4a23f4e59f68 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorHighlightingPassRegistrarImpl.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorHighlightingPassRegistrarImpl.java @@ -144,7 +144,7 @@ public final class TextEditorHighlightingPassRegistrarImpl extends TextEditorHig PsiUtilCore.getVirtualFile(psiFile); } List result = new ArrayList<>(myRegisteredPassFactories.size()); - IntArrayList passesRefusedToCreate = new IntArrayList(); + IntList passesRefusedToCreate = new IntArrayList(); boolean isDumb = DumbService.getInstance(myProject).isDumb(); for (IntIterator iterator = myRegisteredPassFactories.keySet().iterator(); iterator.hasNext(); ) { int passId = iterator.nextInt(); diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java b/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java index 05df88c86350..54f7a5f93766 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java @@ -45,6 +45,7 @@ import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.*; import com.intellij.util.containers.ContainerUtil; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -387,7 +388,7 @@ public final class TemplateState extends TemplateStateBase implements Disposable private void doReformat() { final Runnable action = () -> { - IntArrayList indices = initEmptyVariables(); + IntList indices = initEmptyVariables(); getSegments().setSegmentsGreedy(false); LOG.assertTrue(myTemplateRange.isValid(), "template key: " + getTemplate().getKey() + "; " + @@ -415,7 +416,7 @@ public final class TemplateState extends TemplateStateBase implements Disposable ApplicationManager.getApplication().runWriteAction(() -> { final PsiFile file = getPsiFile(); if (file != null) { - IntArrayList indices = initEmptyVariables(); + IntList indices = initEmptyVariables(); getSegments().setSegmentsGreedy(false); for (TemplateOptionalProcessor processor : TemplateOptionalProcessor.EP_NAME.getExtensionList()) { processor.processText(myProject, getTemplate(), getDocument(), myTemplateRange, getEditor()); @@ -733,7 +734,7 @@ public final class TemplateState extends TemplateStateBase implements Disposable replaceString(StringUtil.notNullize(result.toString()), start, end, segmentNumber); if (result instanceof RecalculatableResult) { - IntArrayList indices = initEmptyVariables(); + IntList indices = initEmptyVariables(); shortenReferences(); PsiDocumentManager.getInstance(myProject).commitDocument(getDocument()); ((RecalculatableResult)result) @@ -1038,11 +1039,11 @@ public final class TemplateState extends TemplateStateBase implements Disposable return items != null && items.length > 1; } - private IntArrayList initEmptyVariables() { + private IntList initEmptyVariables() { int endSegmentNumber = getTemplate().getEndSegmentNumber(); int selStart = getTemplate().getSelectionStartSegmentNumber(); int selEnd = getTemplate().getSelectionEndSegmentNumber(); - IntArrayList indices = new IntArrayList(); + IntList indices = new IntArrayList(); List changes = new ArrayList<>(); for (int i = 0; i < getTemplate().getSegmentsCount(); i++) { int length = getSegments().getSegmentEnd(i) - getSegments().getSegmentStart(i); diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/TemplateStateBase.java b/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/TemplateStateBase.java index 18ef204947e1..de88ae87c76a 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/TemplateStateBase.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/TemplateStateBase.java @@ -9,7 +9,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.DocumentUtil; -import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -100,7 +100,7 @@ public class TemplateStateBase { return myDocument == null; } - protected void restoreEmptyVariables(IntArrayList indices) { + protected void restoreEmptyVariables(IntList indices) { List rangesToRemove = new ArrayList<>(); for (int i = 0; i < indices.size(); i++) { int index = indices.getInt(i); diff --git a/platform/built-in-server/src/org/jetbrains/io/jsonRpc/JsonRpcServer.kt b/platform/built-in-server/src/org/jetbrains/io/jsonRpc/JsonRpcServer.kt index bc3379407bd9..768bf822f14d 100644 --- a/platform/built-in-server/src/org/jetbrains/io/jsonRpc/JsonRpcServer.kt +++ b/platform/built-in-server/src/org/jetbrains/io/jsonRpc/JsonRpcServer.kt @@ -19,6 +19,7 @@ import com.intellij.util.io.releaseIfError import com.intellij.util.io.writeUtf8 import io.netty.buffer.* import it.unimi.dsi.fastutil.ints.IntArrayList +import it.unimi.dsi.fastutil.ints.IntList import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.TestOnly import org.jetbrains.concurrency.Promise @@ -331,7 +332,7 @@ private class IntArrayListTypeAdapter : TypeAdapter() { override fun write(out: JsonWriter, value: T) { var error: IOException? = null out.beginArray() - val iterator = (value as IntArrayList).iterator() + val iterator = (value as IntList).iterator() while (iterator.hasNext()) { try { out.value(iterator.nextInt().toLong()) diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java index 4df8b39ee2e3..eae64ec8a917 100644 --- a/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java +++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java @@ -27,6 +27,7 @@ import com.intellij.util.text.CharArrayUtil; import com.intellij.util.text.ImmutableCharSequence; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.*; import java.beans.PropertyChangeListener; @@ -755,7 +756,7 @@ public final class DocumentImpl extends UserDataHolderBase implements DocumentEx } void clearLineModificationFlagsExcept(int @NotNull [] caretLines) { - IntArrayList modifiedLines = new IntArrayList(caretLines.length); + IntList modifiedLines = new IntArrayList(caretLines.length); LineSet lineSet = getLineSet(); for (int line : caretLines) { if (line >= 0 && line < lineSet.getLineCount() && lineSet.isModified(line)) { diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/LineSet.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/LineSet.java index 8ff8c124630f..a54acb01a27d 100644 --- a/platform/core-impl/src/com/intellij/openapi/editor/impl/LineSet.java +++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/LineSet.java @@ -9,6 +9,7 @@ import com.intellij.util.text.CharArrayUtil; import com.intellij.util.text.MergingCharSequence; import it.unimi.dsi.fastutil.bytes.ByteArrayList; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import java.util.Arrays; @@ -39,7 +40,7 @@ public final class LineSet { @NotNull private static LineSet createLineSet(@NotNull CharSequence text, boolean markModified) { - IntArrayList starts = new IntArrayList(); + IntList starts = new IntArrayList(); ByteArrayList flags = new ByteArrayList(); LineTokenizer lineTokenizer = new LineTokenizer(text); @@ -204,7 +205,7 @@ public final class LineSet { } @NotNull - final LineSet setModified(@NotNull IntArrayList indices) { + final LineSet setModified(@NotNull IntList indices) { if (indices.isEmpty()) { return this; } diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java index 2747a6d7b4db..bdb8c8f86667 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java @@ -32,10 +32,7 @@ import com.intellij.util.io.DataExternalizer; import com.intellij.util.io.DataInputOutputUtil; import com.intellij.util.io.EnumeratorIntegerDescriptor; import com.intellij.util.io.KeyDescriptor; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectMaps; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.*; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -48,13 +45,13 @@ import java.io.IOException; /** * @author Maxim.Mossienko on 12/11/13. */ -public class DuplicatesIndex extends FileBasedIndexExtension { +public class DuplicatesIndex extends FileBasedIndexExtension { static boolean ourEnabled = SystemProperties.getBooleanProperty("idea.enable.duplicates.online.calculation", true); static final boolean ourEnabledLightProfiles = true; private static boolean ourEnabledOldProfiles = false; - @NonNls public static final ID NAME = ID.create("DuplicatesIndex"); + @NonNls public static final ID NAME = ID.create("DuplicatesIndex"); private static final int myBaseVersion = 25; private final FileBasedIndex.InputFilter myInputFilter = file -> { @@ -70,9 +67,9 @@ public class DuplicatesIndex extends FileBasedIndexExtension myValueExternalizer = new DataExternalizer() { + private final DataExternalizer myValueExternalizer = new DataExternalizer() { @Override - public void save(@NotNull DataOutput out, IntArrayList list) throws IOException { + public void save(@NotNull DataOutput out, IntList list) throws IOException { if (list.size() == 2) { DataInputOutputUtil.writeINT(out, list.getInt(0)); DataInputOutputUtil.writeINT(out, list.getInt(1)); @@ -90,16 +87,16 @@ public class DuplicatesIndex extends FileBasedIndexExtension= 0) { - IntArrayList list = new IntArrayList(2); + IntList list = new IntArrayList(2); list.add(capacityOrValue); list.add(DataInputOutputUtil.readINT(in)); return list; } capacityOrValue = -capacityOrValue; - IntArrayList list = new IntArrayList(capacityOrValue); + IntList list = new IntArrayList(capacityOrValue); int prev = 0; while(capacityOrValue > 0) { int value = DataInputOutputUtil.readINT(in) + prev; @@ -112,10 +109,10 @@ public class DuplicatesIndex extends FileBasedIndexExtension myIndexer = new DataIndexer() { + private final DataIndexer myIndexer = new DataIndexer() { @Override @NotNull - public Int2ObjectMap map(@NotNull final FileContent inputData) { + public Int2ObjectMap map(@NotNull final FileContent inputData) { FileType type = inputData.getFileType(); DuplicatesProfile profile = findDuplicatesProfile(type); @@ -127,13 +124,13 @@ public class DuplicatesIndex extends FileBasedIndexExtension result = new Int2ObjectOpenHashMap<>(); + final Int2ObjectOpenHashMap result = new Int2ObjectOpenHashMap<>(); LighterAST ast = fileContent.getLighterAST(); ((LightDuplicateProfile)profile).process(ast, new LightDuplicateProfile.Callback() { @Override public void process(int hash, int hash2, @NotNull LighterAST ast, LighterASTNode @NotNull ... nodes) { - IntArrayList list = result.get(hash); + IntList list = result.get(hash); if (list == null) { result.put(hash, list = new IntArrayList(2)); } @@ -178,19 +175,19 @@ public class DuplicatesIndex extends FileBasedIndexExtension getName() { + public ID getName() { return NAME; } @NotNull @Override - public DataIndexer getIndexer() { + public DataIndexer getIndexer() { return myIndexer; } @NotNull @Override - public DataExternalizer getValueExternalizer() { + public DataExternalizer getValueExternalizer() { return myValueExternalizer; } @@ -210,7 +207,7 @@ public class DuplicatesIndex extends FileBasedIndexExtension myMap = new Int2ObjectOpenHashMap<>(); + private final Int2ObjectOpenHashMap myMap = new Int2ObjectOpenHashMap<>(); private final DuplicatesProfile myProfile; private final DuplocatorState myDuplocatorState; @@ -227,13 +224,13 @@ public class DuplicatesIndex extends FileBasedIndexExtension getMap() { + public Int2ObjectOpenHashMap getMap() { return myMap; } } diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesInspectionBase.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesInspectionBase.java index 7771425a76a7..f7291abeba96 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesInspectionBase.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesInspectionBase.java @@ -247,7 +247,7 @@ public class DuplicatesInspectionBase extends LocalInspectionTool { } } - abstract static class DuplicatedCodeProcessor implements FileBasedIndex.ValueProcessor { + abstract static class DuplicatedCodeProcessor implements FileBasedIndex.ValueProcessor { final Int2ObjectRBTreeMap reportedRanges = new Int2ObjectRBTreeMap<>(); final Int2ObjectOpenHashMap reportedFiles = new Int2ObjectOpenHashMap<>(); final Int2ObjectOpenHashMap reportedPsi = new Int2ObjectOpenHashMap<>(); @@ -280,7 +280,7 @@ public class DuplicatesInspectionBase extends LocalInspectionTool { } @Override - public boolean process(@NotNull VirtualFile file, IntArrayList list) { + public boolean process(@NotNull VirtualFile file, IntList list) { for(int i = 0, len = list.size(); i < len; i+=2) { ProgressManager.checkCanceled(); diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/TracingData.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/TracingData.java index b287854c99d7..79ef98d34dc9 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/TracingData.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/TracingData.java @@ -8,6 +8,7 @@ import com.intellij.util.io.EnumeratorIntegerDescriptor; import com.intellij.util.io.PersistentHashMap; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntListIterator; import java.io.IOException; @@ -77,7 +78,7 @@ public final class TracingData { public static void main(String[] args) throws IOException { PersistentHashMap lKeys = createOrOpenMap(); - IntArrayList mapping = new IntArrayList(); + IntList mapping = new IntArrayList(); lKeys.processKeysWithExistingMapping(new CommonProcessors.CollectProcessor<>(mapping)); System.out.println(mapping.size()); Int2IntOpenHashMap map = new Int2IntOpenHashMap(mapping.size()); diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java index 0b3435062eb1..4f9a80f7c871 100644 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java +++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java @@ -25,6 +25,7 @@ import com.intellij.util.containers.FactoryMap; import com.intellij.util.text.MergingCharSequence; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -67,7 +68,7 @@ public class LayeredLexerEditorHighlighter extends LexerEditorHighlighter { private final class LightMapper { final Mapper mapper; final StringBuilder text = new StringBuilder(); - final IntArrayList lengths = new IntArrayList(); + final IntList lengths = new IntArrayList(); final List tokenTypes = new ArrayList<>(); final Int2IntOpenHashMap index2Global = new Int2IntOpenHashMap(); private final String mySeparator; diff --git a/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternSearcher.java b/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternSearcher.java index 04e8f5b61163..17c9c181b29d 100644 --- a/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternSearcher.java +++ b/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternSearcher.java @@ -28,6 +28,7 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.text.CharArrayUtil; import com.intellij.util.text.CharSequenceSubSequence; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import java.util.*; @@ -69,7 +70,7 @@ public class IndexPatternSearcher extends QueryExecutorBase commentRanges = findCommentTokenRanges(file, chars, queryParameters.getRange(), multiLine); - IntArrayList occurrences = new IntArrayList(1); + IntList occurrences = new IntArrayList(1); IndexPattern[] patterns = patternProvider != null ? patternProvider.getIndexPatterns() : new IndexPattern[] {queryParameters.getPattern()}; @@ -202,7 +203,7 @@ public class IndexPatternSearcher extends QueryExecutorBase consumer, - IntArrayList matches, + IntList matches, boolean multiLine ) { CommentRange commentRange = commentRanges.get(commentNum); diff --git a/platform/indexing-impl/src/com/intellij/psi/stubs/IntEnumerator.java b/platform/indexing-impl/src/com/intellij/psi/stubs/IntEnumerator.java index d9bc0a7784de..ae96fbce23ba 100644 --- a/platform/indexing-impl/src/com/intellij/psi/stubs/IntEnumerator.java +++ b/platform/indexing-impl/src/com/intellij/psi/stubs/IntEnumerator.java @@ -4,6 +4,7 @@ package com.intellij.psi.stubs; import com.intellij.openapi.util.io.DataInputOutputUtilRt; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -15,7 +16,7 @@ import java.util.function.IntUnaryOperator; @ApiStatus.Internal final class IntEnumerator { private final Int2IntOpenHashMap myEnumerates; - private final IntArrayList myIds; + private final IntList myIds; private int myNext; IntEnumerator() { @@ -48,9 +49,9 @@ final class IntEnumerator { void dump(@NotNull DataOutput stream, @NotNull IntUnaryOperator idRemapping) throws IOException { DataInputOutputUtilRt.writeINT(stream, myIds.size()); - int[] elements = myIds.elements(); - for (int i = 0, n = myIds.size(); i < n; i++) { - int id = elements[i]; + int[] elements = new int[myIds.size()]; + myIds.getElements(0, elements, 0, elements.length); + for (int id : elements) { int remapped = idRemapping.applyAsInt(id); if (remapped == 0) { throw new IOException("remapping is not found for " + id); @@ -62,7 +63,7 @@ final class IntEnumerator { static IntEnumerator read(@NotNull DataInput stream) throws IOException { int size = DataInputOutputUtilRt.readINT(stream); IntEnumerator enumerator = new IntEnumerator(false); - for (int i = 1; i < size + 1; i++) { + for (int i = 0; i < size; i++) { enumerator.myIds.add(DataInputOutputUtilRt.readINT(stream)); } return enumerator; diff --git a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/MagicIntegerConstAccessor.java b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/MagicIntegerConstAccessor.java index 48eacf980ed8..e5e8f55a65b8 100644 --- a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/MagicIntegerConstAccessor.java +++ b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/MagicIntegerConstAccessor.java @@ -4,6 +4,7 @@ package com.intellij.application.options.codeStyle.properties; import com.intellij.util.containers.CollectionFactory; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -14,7 +15,7 @@ import java.util.Map; public class MagicIntegerConstAccessor extends ExternalStringAccessor implements CodeStyleChoiceList { private final Int2ObjectOpenHashMap myValueMap = new Int2ObjectOpenHashMap<>(); - private final Map myValueToKeysMap = CollectionFactory.createSmallMemoryFootprintMap(); + private final Map myValueToKeysMap = CollectionFactory.createSmallMemoryFootprintMap(); public MagicIntegerConstAccessor(@NotNull Object object, @NotNull Field field, @@ -31,7 +32,7 @@ public class MagicIntegerConstAccessor extends ExternalStringAccessor i @Override protected final @Nullable Integer fromExternal(@NotNull String str) { - IntArrayList keys = myValueToKeysMap.get(str); + IntList keys = myValueToKeysMap.get(str); return keys != null && keys.size() > 0 ? keys.getInt(0) : null; } diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/LineWrapper.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/LineWrapper.java index 650fb73a61bc..c66b00830bff 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/LineWrapper.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/LineWrapper.java @@ -2,11 +2,12 @@ package com.intellij.codeEditor.printing; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; public final class LineWrapper { - public static IntArrayList calcBreakOffsets(char[] text, int startOffset, int endOffset, boolean lineStart, double x, double clipX, - WidthProvider widthProvider) { - IntArrayList breakOffsets = new IntArrayList(); + public static IntList calcBreakOffsets(char[] text, int startOffset, int endOffset, boolean lineStart, double x, double clipX, + WidthProvider widthProvider) { + IntList breakOffsets = new IntArrayList(); int nextOffset = startOffset; while (true) { int prevOffset = nextOffset; diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/TextPainter.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/TextPainter.java index ec56dbfb9306..b93ba0e666ce 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/TextPainter.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/TextPainter.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.ui.paint.LinePainter2D; -import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -628,8 +628,8 @@ final class TextPainter extends BasePainter { if (myPrintSettings.WRAP) { double w = getTextSegmentWidth(text, myOffset, end - myOffset, position.getX(), g); if (position.getX() + w > clip.getWidth()) { - IntArrayList breakOffsets = LineWrapper.calcBreakOffsets(text, myOffset, end, lineStart, position.getX(), clip.getWidth(), - (t, start, count, x) -> getTextSegmentWidth(t, start, count, x, g)); + IntList breakOffsets = LineWrapper.calcBreakOffsets(text, myOffset, end, lineStart, position.getX(), clip.getWidth(), + (t, start, count, x) -> getTextSegmentWidth(t, start, count, x, g)); for (int i = 0; i < breakOffsets.size(); i++) { int breakOffset = breakOffsets.getInt(i); drawTabbedString(g, text, breakOffset - myOffset, position, backColor, underscoredColor); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java index b4a11260ecd5..8abe7d38c03b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java @@ -35,6 +35,7 @@ import com.intellij.psi.util.PsiUtilBase; import com.intellij.ui.LightweightHint; import com.intellij.util.text.CharArrayUtil; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -517,8 +518,8 @@ public final class CommentByBlockCommentHandler extends MultiCaretCodeInsightAct String normalizedPrefix = commentPrefix.trim(); String normalizedSuffix = commentSuffix.trim(); - IntArrayList nestedCommentPrefixes = new IntArrayList(); - IntArrayList nestedCommentSuffixes = new IntArrayList(); + IntList nestedCommentPrefixes = new IntArrayList(); + IntList nestedCommentSuffixes = new IntArrayList(); String commentedPrefix = commenter.getCommentedBlockCommentPrefix(); String commentedSuffix = commenter.getCommentedBlockCommentSuffix(); CharSequence chars = myDocument.getCharsSequence(); @@ -621,8 +622,8 @@ public final class CommentByBlockCommentHandler extends MultiCaretCodeInsightAct static void commentNestedComments(@NotNull Document document, TextRange range, Commenter commenter) { final int offset = range.getStartOffset(); - final IntArrayList toReplaceWithComments = new IntArrayList(); - final IntArrayList prefixes = new IntArrayList(); + final IntList toReplaceWithComments = new IntArrayList(); + final IntList prefixes = new IntArrayList(); final String text = document.getCharsSequence().subSequence(range.getStartOffset(), range.getEndOffset()).toString(); final String commentedPrefix = commenter.getCommentedBlockCommentPrefix(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java index 32684d97b343..0022d8dc2656 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java @@ -33,6 +33,7 @@ import com.intellij.util.DocumentUtil; import com.intellij.util.text.CharArrayUtil; import gnu.trove.THashMap; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -571,8 +572,8 @@ public final class CommentByLineCommentHandler extends MultiCaretCodeInsightActi return true; } - IntArrayList prefixes = new IntArrayList(); - IntArrayList suffixes = new IntArrayList(); + IntList prefixes = new IntArrayList(); + IntList suffixes = new IntArrayList(); for (int position = 0; position < text.length(); ) { int prefixPos = text.indexOf(prefix, position); if (prefixPos == -1) { @@ -671,8 +672,8 @@ public final class CommentByLineCommentHandler extends MultiCaretCodeInsightActi return true; } final String text = chars.subSequence(offset, endOffset).toString(); - final IntArrayList prefixes = new IntArrayList(); - final IntArrayList suffixes = new IntArrayList(); + final IntList prefixes = new IntArrayList(); + final IntList suffixes = new IntArrayList(); final String commentedSuffix = commenter.getCommentedBlockCommentSuffix(); final String commentedPrefix = commenter.getCommentedBlockCommentPrefix(); for (int position = 0; position < text.length(); ) { diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexEx.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexEx.java index 610182b40941..2c28d27400e6 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexEx.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexEx.java @@ -472,7 +472,7 @@ public abstract class FileBasedIndexEx extends FileBasedIndex { @NotNull VirtualFileFilter filter, @NotNull Processor processor) { // ensure predictable order because result might be cached by consumer - IntArrayList sortedIds = new IntArrayList(ids); + IntList sortedIds = new IntArrayList(ids); sortedIds.sort(null); PersistentFS fs = PersistentFS.getInstance(); diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java index f3c74dce0633..322617c20eb0 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java @@ -63,6 +63,7 @@ import com.intellij.util.indexing.snapshot.SnapshotSingleValueIndexStorage; import com.intellij.util.io.storage.HeavyProcessLatch; import com.intellij.util.messages.SimpleMessageBusConnection; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -802,7 +803,7 @@ public final class FileBasedIndexImpl extends FileBasedIndexEx { long start = System.currentTimeMillis(); - IntArrayList fileSet = new IntArrayList(); + IntList fileSet = new IntArrayList(); iterateIndexableFiles(fileOrDir -> { if (fileOrDir instanceof VirtualFileWithId) { fileSet.add(((VirtualFileWithId)fileOrDir).getId()); diff --git a/platform/lang-impl/src/com/intellij/util/indexing/ProjectIndexableFilesFilter.java b/platform/lang-impl/src/com/intellij/util/indexing/ProjectIndexableFilesFilter.java index 43b14559eae5..8df054c79693 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/ProjectIndexableFilesFilter.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/ProjectIndexableFilesFilter.java @@ -1,9 +1,8 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.util.indexing; -import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; public final class ProjectIndexableFilesFilter extends IdFilter { private static final int SHIFT = 6; @@ -13,16 +12,15 @@ public final class ProjectIndexableFilesFilter extends IdFilter { private final int myMinId; private final int myMaxId; - ProjectIndexableFilesFilter(@NotNull IntArrayList set, int modificationCount) { + ProjectIndexableFilesFilter(@NotNull IntList set, int modificationCount) { myModificationCount = modificationCount; final int[] minMax = new int[2]; if (!set.isEmpty()) { minMax[0] = minMax[1] = set.getInt(0); } - int[] elements = set.elements(); for (int i = 0, n = set.size(); i < n; i++) { - int value = elements[i]; + int value = set.getInt(i); minMax[0] = Math.min(minMax[0], value); minMax[1] = Math.max(minMax[1], value); } @@ -30,7 +28,7 @@ public final class ProjectIndexableFilesFilter extends IdFilter { myMinId = minMax[0]; myBitMask = new long[((myMaxId - myMinId) >> SHIFT) + 1]; for (int i = 0, n = set.size(); i < n; i++) { - int value = elements[i] - myMinId; + int value = set.getInt(i) - myMinId; myBitMask[value >> SHIFT] |= (1L << (value & MASK)); } } diff --git a/platform/lang-impl/testSources/com/intellij/codeEditor/printing/LineWrapperTest.java b/platform/lang-impl/testSources/com/intellij/codeEditor/printing/LineWrapperTest.java index a70cf119c35a..dda08ec24733 100644 --- a/platform/lang-impl/testSources/com/intellij/codeEditor/printing/LineWrapperTest.java +++ b/platform/lang-impl/testSources/com/intellij/codeEditor/printing/LineWrapperTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.codeEditor.printing; -import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.junit.Test; import static org.junit.Assert.assertArrayEquals; @@ -54,7 +54,7 @@ public class LineWrapperTest { } private void doTest(String text, boolean atLineStart, double clipWidth, int... expectedBreaks) { - IntArrayList actualBreaks = LineWrapper.calcBreakOffsets(text.toCharArray(), 0, text.length(), atLineStart, 0, clipWidth, myWidthProvider); + IntList actualBreaks = LineWrapper.calcBreakOffsets(text.toCharArray(), 0, text.length(), atLineStart, 0, clipWidth, myWidthProvider); assertArrayEquals(expectedBreaks, actualBreaks.toIntArray()); } } diff --git a/platform/object-serializer/src/xml/KotlinAwareBeanBinding.kt b/platform/object-serializer/src/xml/KotlinAwareBeanBinding.kt index 347610829f6a..14eefc0e2fb7 100644 --- a/platform/object-serializer/src/xml/KotlinAwareBeanBinding.kt +++ b/platform/object-serializer/src/xml/KotlinAwareBeanBinding.kt @@ -9,6 +9,7 @@ import com.intellij.util.ObjectUtils import com.intellij.util.xmlb.BeanBinding import com.intellij.util.xmlb.SerializationFilter import it.unimi.dsi.fastutil.ints.IntArrayList +import it.unimi.dsi.fastutil.ints.IntList import org.jdom.Element internal class KotlinAwareBeanBinding(beanClass: Class<*>) : BeanBinding(beanClass) { @@ -42,7 +43,7 @@ internal class KotlinAwareBeanBinding(beanClass: Class<*>) : BeanBinding(beanCla fun serializeBaseStateInto(o: BaseState, _element: Element?, filter: SerializationFilter?, excludedPropertyNames: Collection? = null): Element? { var element = _element // order of bindings must be used, not order of properties - var bindingIndices: IntArrayList? = null + var bindingIndices: IntList? = null for (property in o.__getProperties()) { val propertyName = property.name!! diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java index 40cba310c7e3..b7777706112a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java @@ -149,7 +149,7 @@ final class EditorGutterComponentImpl extends EditorGutterComponentEx implements @NotNull private List myActiveFoldRegions = Collections.emptyList(); private int myTextAnnotationGuttersSize; private int myTextAnnotationExtraSize; - final IntArrayList myTextAnnotationGutterSizes = new IntArrayList(); + final IntList myTextAnnotationGutterSizes = new IntArrayList(); final ArrayList myTextAnnotationGutters = new ArrayList<>(); private boolean myGapAfterAnnotations; private final Map myProviderToListener = new HashMap<>(); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileOffsetsManager.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileOffsetsManager.java index 6ca15d02e68c..1453858dc040 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileOffsetsManager.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileOffsetsManager.java @@ -6,6 +6,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ArrayUtilRt; import com.intellij.util.text.CharArrayUtil; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import java.io.IOException; @@ -122,8 +123,8 @@ public final class FileOffsetsManager { char prev = ' '; int crlfCount = 0; - final IntArrayList originalLineOffsets = new IntArrayList(); - final IntArrayList convertedLineOffsets = new IntArrayList(); + final IntList originalLineOffsets = new IntArrayList(); + final IntList convertedLineOffsets = new IntArrayList(); // first line originalLineOffsets.add(0); convertedLineOffsets.add(0); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java index 840ebf9d5ee1..d2e11e182e35 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java @@ -27,6 +27,7 @@ import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.keyFMap.KeyFMap; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; import org.jetbrains.annotations.ApiStatus; @@ -549,7 +550,7 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry { synchronized (myData) { int[] oldIds = myData.myChildrenIds; - IntArrayList mergedIds = new IntArrayList(oldIds.length + added.size()); + IntList mergedIds = new IntArrayList(oldIds.length + added.size()); //noinspection ForLoopReplaceableByForEach for (int i = 0; i < added.size(); i++) { ChildInfo info = added.get(i); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java index 85c9ca07fa66..ef15d1a4f351 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java @@ -681,7 +681,7 @@ public final class FSRecords { static int @NotNull [] listRoots() { return readAndHandleErrors(() -> { if (ourStoreRootsSeparately) { - IntArrayList result = new IntArrayList(); + IntList result = new IntArrayList(); try (@SuppressWarnings("ImplicitDefaultCharsetUsage") LineNumberReader stream = new LineNumberReader(Files.newBufferedReader(DbConnection.myRootsFile))) { String str; @@ -1109,7 +1109,7 @@ public final class FSRecords { @Nullable static VirtualFileSystemEntry findFileById(int id, @NotNull ConcurrentIntObjectMap idToDirCache) { class ParentFinder implements ThrowableComputable { - @Nullable private IntArrayList path; + @Nullable private IntList path; private VirtualFileSystemEntry foundParent; @Override @@ -1846,8 +1846,8 @@ public final class FSRecords { return fileLength / RECORD_SIZE; }); - IntArrayList usedAttributeRecordIds = new IntArrayList(); - IntArrayList validAttributeIds = new IntArrayList(); + IntList usedAttributeRecordIds = new IntArrayList(); + IntList validAttributeIds = new IntArrayList(); for (int id = 2; id < recordCount; id++) { int flags = getFlags(id); LOG.assertTrue((flags & ~ALL_VALID_FLAGS) == 0, "Invalid flags: 0x" + Integer.toHexString(flags) + ", id: " + id); @@ -1866,8 +1866,8 @@ public final class FSRecords { LOG.info("Sanity check took " + t + " ms"); } - private static void checkRecordSanity(final int id, final int recordCount, final IntArrayList usedAttributeRecordIds, - final IntArrayList validAttributeIds) { + private static void checkRecordSanity(final int id, final int recordCount, final IntList usedAttributeRecordIds, + final IntList validAttributeIds) { int parentId = getParent(id); assert parentId >= 0 && parentId < recordCount; if (parentId > 0 && getParent(parentId) > 0) { @@ -1896,7 +1896,7 @@ public final class FSRecords { } } - private static void checkAttributesStorageSanity(int id, IntArrayList usedAttributeRecordIds, IntArrayList validAttributeIds) { + private static void checkAttributesStorageSanity(int id, IntList usedAttributeRecordIds, IntList validAttributeIds) { int attributeRecordId = getAttributeRecordId(id); assert attributeRecordId >= 0; @@ -1910,7 +1910,7 @@ public final class FSRecords { } } - private static void checkAttributesSanity(int attributeRecordId, IntArrayList usedAttributeRecordIds, IntArrayList validAttributeIds) throws IOException { + private static void checkAttributesSanity(int attributeRecordId, IntList usedAttributeRecordIds, IntList validAttributeIds) throws IOException { assert !usedAttributeRecordIds.contains(attributeRecordId); usedAttributeRecordIds.add(attributeRecordId); diff --git a/platform/platform-impl/src/com/intellij/ui/FilteringTree.java b/platform/platform-impl/src/com/intellij/ui/FilteringTree.java index 3f1efb159883..813b71cde8c9 100644 --- a/platform/platform-impl/src/com/intellij/ui/FilteringTree.java +++ b/platform/platform-impl/src/com/intellij/ui/FilteringTree.java @@ -20,6 +20,7 @@ import com.intellij.util.containers.JBTreeTraverser; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -432,7 +433,7 @@ public abstract class FilteringTree { private void mergeAcceptedNodes(@NotNull N node, Set accepted) { int k = 0; N cur = getChildSafe(node, 0); - IntArrayList newIds = new IntArrayList(); + IntList newIds = new IntArrayList(); for (U child : accepted) { U curUsrObject = getUserObject(cur); boolean isCur = cur != null && myUseIdentityHashing ? curUsrObject == child : (curUsrObject != null && curUsrObject.equals(child)); @@ -449,7 +450,7 @@ public abstract class FilteringTree { nodesWereInserted(node, newIds.toIntArray()); } if (node.getChildCount() > k) { - IntArrayList leftIds = new IntArrayList(); + IntList leftIds = new IntArrayList(); List leftNodes = new ArrayList<>(); for (int i = node.getChildCount() - 1; i >= k; --i) { leftNodes.add(getChild(node, i)); @@ -470,7 +471,7 @@ public abstract class FilteringTree { } private void removeNotAccepted(@NotNull N node, Set accepted) { - IntArrayList removedIds = new IntArrayList(); + IntList removedIds = new IntArrayList(); List removedNodes = new ArrayList<>(); for (int i = node.getChildCount() - 1; i >= 0; --i) { N child = getChild(node, i); diff --git a/platform/platform-impl/src/com/intellij/ui/ListSpeedSearch.java b/platform/platform-impl/src/com/intellij/ui/ListSpeedSearch.java index 1bd3e05db9e3..b14ec8b1a67e 100644 --- a/platform/platform-impl/src/com/intellij/ui/ListSpeedSearch.java +++ b/platform/platform-impl/src/com/intellij/ui/ListSpeedSearch.java @@ -79,7 +79,7 @@ public class ListSpeedSearch extends SpeedSearchBase> { @NotNull private IntList findAllFilteredElements(@NotNull String s) { - IntArrayList indices = new IntArrayList(); + IntList indices = new IntArrayList(); String _s = s.trim(); Object[] elements = getAllListElements(myComponent); diff --git a/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java b/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java index d4d12ae29de7..e308c49f41ac 100644 --- a/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java +++ b/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java @@ -151,7 +151,7 @@ public class TableSpeedSearch extends SpeedSearchBase { @NotNull private IntList findAllFilteredRows(String s) { - IntArrayList rows = new IntArrayList(); + IntList rows = new IntArrayList(); String _s = s.trim(); for (int row = 0; row < myComponent.getRowCount(); row++) { diff --git a/platform/platform-impl/src/com/intellij/util/ui/table/JBListTable.java b/platform/platform-impl/src/com/intellij/util/ui/table/JBListTable.java index 40254ad0505a..f9ea7a4a8768 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/table/JBListTable.java +++ b/platform/platform-impl/src/com/intellij/util/ui/table/JBListTable.java @@ -21,6 +21,7 @@ import com.intellij.util.ui.UIUtil; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.objects.ObjectIterator; import org.jetbrains.annotations.NotNull; @@ -252,7 +253,7 @@ public abstract class JBListTable { } private void doAnimationStep(long updateTime) { - IntArrayList completeRows = new IntArrayList(myRowAnimationStates.size()); + IntList completeRows = new IntArrayList(myRowAnimationStates.size()); for (ObjectIterator> iterator = myRowAnimationStates.int2ObjectEntrySet().fastIterator(); iterator.hasNext(); ) { Int2ObjectMap.Entry entry = iterator.next(); if (entry.getValue().doAnimationStep(updateTime)) { diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/CompactStoragePerformanceTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/CompactStoragePerformanceTest.java index 17d84600f1a5..64eeaaa1a00d 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/CompactStoragePerformanceTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/CompactStoragePerformanceTest.java @@ -4,6 +4,7 @@ package com.intellij.openapi.vfs.newvfs.persistent; import com.intellij.util.io.storage.Storage; import com.intellij.util.io.storage.StorageTestBase; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import org.junit.Test; @@ -21,7 +22,7 @@ public class CompactStoragePerformanceTest extends StorageTestBase { @Test public void testDeleteRemovesExtendedRecords() throws IOException { - IntArrayList recordsList = new IntArrayList(); + IntList recordsList = new IntArrayList(); // 60000 records of 40000 bytes each: exercise extra record creation int recordCount = 60000; for (int i = 0; i < recordCount; ++i) { diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/CompactStorageTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/CompactStorageTest.java index c27bb75fd8f2..1478c268b3bb 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/CompactStorageTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/CompactStorageTest.java @@ -8,6 +8,7 @@ import com.intellij.util.io.storage.RecordIdIterator; import com.intellij.util.io.storage.Storage; import com.intellij.util.io.storage.StorageTestBase; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import org.junit.Test; @@ -28,7 +29,7 @@ public class CompactStorageTest extends StorageTestBase { @Test public void testCompactAndIterators() throws IOException { - IntArrayList recordsList = new IntArrayList(); + IntList recordsList = new IntArrayList(); // 1000 records after deletion greater than 3M limit for init time compaction final int recordCount = 2000; for (int i = 0; i < recordCount; ++i) { diff --git a/platform/util-ex/src/org/jetbrains/mvstore/MVStore.java b/platform/util-ex/src/org/jetbrains/mvstore/MVStore.java index 3c636f106d73..dbc5ec725652 100644 --- a/platform/util-ex/src/org/jetbrains/mvstore/MVStore.java +++ b/platform/util-ex/src/org/jetbrains/mvstore/MVStore.java @@ -3009,7 +3009,7 @@ public final class MVStore implements AutoCloseable { // find out which chunks to remove, // and which is the newest chunk to keep // (the chunk list can have gaps) - IntArrayList remove = new IntArrayList(); + IntList remove = new IntArrayList(); Chunk keep = null; serializationLock.lock(); try { diff --git a/platform/util/src/com/intellij/util/containers/IntObjectCache.java b/platform/util/src/com/intellij/util/containers/IntObjectCache.java index 5ccda6a3b54f..f66ce24be463 100644 --- a/platform/util/src/com/intellij/util/containers/IntObjectCache.java +++ b/platform/util/src/com/intellij/util/containers/IntObjectCache.java @@ -2,6 +2,8 @@ package com.intellij.util.containers; +import it.unimi.dsi.fastutil.ints.IntList; + import java.util.EventListener; import java.util.Iterator; @@ -93,7 +95,7 @@ public final class IntObjectCache extends ObjectCacheBase implements Iterable } public void removeAll() { - final it.unimi.dsi.fastutil.ints.IntArrayList keys = new it.unimi.dsi.fastutil.ints.IntArrayList(count()); + final IntList keys = new it.unimi.dsi.fastutil.ints.IntArrayList(count()); int current = myTop; while (current > 0) { if (myCache[current].value != null) { diff --git a/platform/util/src/com/intellij/util/diff/Reindexer.java b/platform/util/src/com/intellij/util/diff/Reindexer.java index cfb5850b836a..f67d1cb1007c 100644 --- a/platform/util/src/com/intellij/util/diff/Reindexer.java +++ b/platform/util/src/com/intellij/util/diff/Reindexer.java @@ -2,6 +2,7 @@ package com.intellij.util.diff; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.TestOnly; import java.util.Arrays; @@ -40,8 +41,8 @@ final class Reindexer { private int[] discard(int[] needed, int[] toDiscard, int arrayIndex) { myOriginalLengths[arrayIndex] = toDiscard.length; int[] sorted1 = createSorted(needed); - IntArrayList discarded = new IntArrayList(toDiscard.length); - IntArrayList oldIndices = new IntArrayList(toDiscard.length); + IntList discarded = new IntArrayList(toDiscard.length); + IntList oldIndices = new IntArrayList(toDiscard.length); for (int i = 0; i < toDiscard.length; i++) { int index = toDiscard[i]; if (Arrays.binarySearch(sorted1, index) >= 0) { diff --git a/platform/util/src/com/intellij/util/graph/DFSTBuilder.java b/platform/util/src/com/intellij/util/graph/DFSTBuilder.java index 5c6bd242e21a..dc3028704c51 100644 --- a/platform/util/src/com/intellij/util/graph/DFSTBuilder.java +++ b/platform/util/src/com/intellij/util/graph/DFSTBuilder.java @@ -26,7 +26,7 @@ public final class DFSTBuilder { private Comparator myNComparator; private Comparator myTComparator; - private final IntArrayList mySCCs = new IntArrayList(); // strongly connected component sizes + private final IntList mySCCs = new IntArrayList(); // strongly connected component sizes private final Object2IntMap myNodeToTNumber = new Object2IntOpenHashMap<>(); // node -> number in scc topological order. Independent scc are in reversed loading order private final Node[] myInvT; // number in (enumerate all nodes scc by scc) order -> node @@ -174,11 +174,10 @@ public final class DFSTBuilder { } // have to place SCCs in topological order too - int[] ints = mySCCs.elements(); for (int i = 0, j = mySCCs.size() - 1; i < j; i++, j--) { - int tmp = ints[i]; - ints[i] = ints[j]; - ints[j] = tmp; + int tmp = mySCCs.getInt(i); + mySCCs.set(i, mySCCs.getInt(j)); + mySCCs.set(j, tmp); } } diff --git a/platform/util/src/com/intellij/util/io/URLUtil.java b/platform/util/src/com/intellij/util/io/URLUtil.java index 10d5b427d365..5ac74e89389e 100644 --- a/platform/util/src/com/intellij/util/io/URLUtil.java +++ b/platform/util/src/com/intellij/util/io/URLUtil.java @@ -6,6 +6,7 @@ import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ThreeState; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -185,7 +186,7 @@ public final class URLUtil { StringBuilder decoded = new StringBuilder(); decoded.append(s, from, i); - IntArrayList bytes = null; + IntList bytes = null; while (i < end) { char c = s.charAt(i); if (c == '%') { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/FilePathMapping.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/FilePathMapping.java index c8e9458a124d..6aa5bafb9f65 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/FilePathMapping.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/FilePathMapping.java @@ -5,6 +5,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.FilePath; import com.intellij.util.containers.CollectionFactory; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; import org.jetbrains.annotations.NotNull; @@ -48,7 +49,7 @@ public final class FilePathMapping { int index = 0; int prefixHash = 0; - IntArrayList matches = new IntArrayList(); + IntList matches = new IntArrayList(); // check empty string for FS root if (myPathHashSet.contains(prefixHash)) { diff --git a/platform/vcs-impl/src/com/intellij/unscramble/AnnotateStackTraceAction.java b/platform/vcs-impl/src/com/intellij/unscramble/AnnotateStackTraceAction.java index 2d4877d0638b..da42c808d82f 100644 --- a/platform/vcs-impl/src/com/intellij/unscramble/AnnotateStackTraceAction.java +++ b/platform/vcs-impl/src/com/intellij/unscramble/AnnotateStackTraceAction.java @@ -47,10 +47,7 @@ import com.intellij.util.ui.update.Update; import com.intellij.vcs.history.VcsHistoryProviderEx; import com.intellij.vcsUtil.VcsUtil; import com.intellij.xml.util.XmlStringUtil; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import it.unimi.dsi.fastutil.ints.IntArrayList; -import it.unimi.dsi.fastutil.ints.IntListIterator; +import it.unimi.dsi.fastutil.ints.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -98,7 +95,7 @@ public final class AnnotateStackTraceAction extends DumbAwareAction { @Override public void run(@NotNull ProgressIndicator indicator) { - Map files2lines = CollectionFactory.createSmallMemoryFootprintMap(); + Map files2lines = CollectionFactory.createSmallMemoryFootprintMap(); Int2ObjectMap revisions = new Int2ObjectOpenHashMap<>(); ApplicationManager.getApplication().runReadAction(() -> { @@ -111,9 +108,9 @@ public final class AnnotateStackTraceAction extends DumbAwareAction { } }); - for (Map.Entry entry : files2lines.entrySet()) { + for (Map.Entry entry : files2lines.entrySet()) { VirtualFile file = entry.getKey(); - IntArrayList value = entry.getValue(); + IntList value = entry.getValue(); indicator.checkCanceled(); LastRevision revision = getLastRevision(file); if (revision == null) { diff --git a/platform/workspaceModel/storage/src/com/intellij/workspaceModel/storage/impl/containers/NonNegativeIntIntMultiMap.kt b/platform/workspaceModel/storage/src/com/intellij/workspaceModel/storage/impl/containers/NonNegativeIntIntMultiMap.kt index 18727024c264..4979ee76365d 100644 --- a/platform/workspaceModel/storage/src/com/intellij/workspaceModel/storage/impl/containers/NonNegativeIntIntMultiMap.kt +++ b/platform/workspaceModel/storage/src/com/intellij/workspaceModel/storage/impl/containers/NonNegativeIntIntMultiMap.kt @@ -99,7 +99,7 @@ sealed class MutableNonNegativeIntIntMultiMap( protected var freezed: Boolean ) : NonNegativeIntIntMultiMap() { - internal val modifiableValues = HashMap() + internal val modifiableValues = HashMap() class ByList private constructor(values: IntArray, links: Int2IntMap, freezed: Boolean) : MutableNonNegativeIntIntMultiMap(values, links, freezed) { @@ -130,7 +130,7 @@ sealed class MutableNonNegativeIntIntMultiMap( }) modifiableValues.forEach { (key, value) -> - if (value.isEmpty) return@forEach + if (value.isEmpty()) return@forEach if (value.size == 1) { newLinks[key] = value.single() } @@ -198,7 +198,7 @@ sealed class MutableNonNegativeIntIntMultiMap( val index = values.indexOf(value) return if (index >= 0) { values.removeInt(index) - if (values.isEmpty) { + if (values.isEmpty()) { modifiableValues.remove(key) } true @@ -211,7 +211,7 @@ sealed class MutableNonNegativeIntIntMultiMap( it.addAll(modifiableValues.keys) } - private fun startModifyingKey(key: Int): IntArrayList { + private fun startModifyingKey(key: Int): IntList { if (key in modifiableValues) return modifiableValues.getValue(key) return if (links.containsKey(key)) { var valueOrLink = links.get(key) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/LambdaUnfriendlyMethodOverloadInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/LambdaUnfriendlyMethodOverloadInspection.java index d72a69a2d518..0f12f8675b27 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/LambdaUnfriendlyMethodOverloadInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/LambdaUnfriendlyMethodOverloadInspection.java @@ -11,6 +11,7 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.fixes.RenameFix; import com.siyeh.ig.psiutils.MethodUtils; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -60,7 +61,7 @@ public final class LambdaUnfriendlyMethodOverloadInspection extends BaseInspecti return; } final PsiParameter[] parameters = parameterList.getParameters(); - final IntArrayList functionalIndices = new IntArrayList(2); + final IntList functionalIndices = new IntArrayList(2); for (int i = 0; i < parameters.length; i++) { final PsiParameter parameter = parameters[i]; if (LambdaUtil.isFunctionalType(parameter.getType())) { @@ -129,7 +130,7 @@ public final class LambdaUnfriendlyMethodOverloadInspection extends BaseInspecti } private static boolean areOtherParameterTypesConvertible(PsiParameter[] parameters, PsiParameter[] otherParameters, - IntArrayList ignores) { + IntList ignores) { for (int i = 0; i < parameters.length; i++) { if (ignores.contains(i)) { continue; diff --git a/plugins/ant/src/com/intellij/lang/ant/segments/PushReader.java b/plugins/ant/src/com/intellij/lang/ant/segments/PushReader.java index 59d44e71ae22..069c7b4dc0fa 100644 --- a/plugins/ant/src/com/intellij/lang/ant/segments/PushReader.java +++ b/plugins/ant/src/com/intellij/lang/ant/segments/PushReader.java @@ -2,6 +2,7 @@ package com.intellij.lang.ant.segments; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NonNls; import java.io.IOException; @@ -9,7 +10,7 @@ import java.io.Reader; public final class PushReader { private final Reader mySource; - private final IntArrayList myReadAhead = new IntArrayList(); + private final IntList myReadAhead = new IntArrayList(); @NonNls private static final String INTERNAL_ERROR_UNEXPECTED_END_OF_PIPE = "Unexpected end of pipe"; diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertiesUpdateManager.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertiesUpdateManager.java index cf86e2b8d2b1..d9d2ada6e872 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertiesUpdateManager.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertiesUpdateManager.java @@ -19,6 +19,7 @@ import com.intellij.util.containers.FactoryMap; import com.intellij.util.graph.*; import gnu.trove.THashMap; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -213,7 +214,7 @@ public final class ResourceBundlePropertiesUpdateManager { private static class PropertiesOrder { List myKeys; - Map myKeyIndices; + Map myKeyIndices; PropertiesOrder(@NotNull PropertiesFile file) { final List properties = file.getProperties(); @@ -235,7 +236,7 @@ public final class ResourceBundlePropertiesUpdateManager { public List getNext(@NotNull String key) { List nextProperties = null; if (myKeyIndices.containsKey(key)) { - final IntArrayList indices = myKeyIndices.get(key); + final IntList indices = myKeyIndices.get(key); for (int i = 0; i < indices.size(); i++) { final int searchIdx = indices.getInt(i) + 1; if (searchIdx < myKeys.size()) { diff --git a/plugins/ui-designer-core/src/com/intellij/designer/designSurface/CaptionPanel.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/CaptionPanel.java index dba03e500678..c8fc7d2d5208 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/designSurface/CaptionPanel.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/CaptionPanel.java @@ -12,6 +12,7 @@ import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.SideBorder; import com.intellij.ui.components.JBLayeredPane; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -214,7 +215,7 @@ public class CaptionPanel extends JBLayeredPane implements DataProvider, DeleteP boolean update = !myRootChildren.isEmpty(); - IntArrayList oldSelection = null; + IntList oldSelection = null; if (myCaption != null) { oldSelection = new IntArrayList(); for (RadComponent component : myArea.getSelection()) { diff --git a/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java index a96c7206a1cf..86da9cc68de4 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java @@ -48,6 +48,7 @@ import com.intellij.util.ui.AsyncProcessIcon; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -576,7 +577,7 @@ public abstract class DesignerEditorPanel extends JPanel if (myRootComponent != null && myExpandedState == null && mySelectionState == null) { myExpandedState = new int[myExpandedComponents == null ? 0 : myExpandedComponents.size()][]; for (int i = 0; i < myExpandedState.length; i++) { - IntArrayList path = new IntArrayList(); + IntList path = new IntArrayList(); componentToPath((RadComponent)myExpandedComponents.get(i), path); myExpandedState[i] = path.toIntArray(); } @@ -608,7 +609,7 @@ public abstract class DesignerEditorPanel extends JPanel int[][] selectionState = new int[selection.size()][]; for (int i = 0; i < selectionState.length; i++) { - IntArrayList path = new IntArrayList(); + IntList path = new IntArrayList(); componentToPath(selection.get(i), path); selectionState[i] = path.toIntArray(); } @@ -616,7 +617,7 @@ public abstract class DesignerEditorPanel extends JPanel return selectionState; } - private static void componentToPath(RadComponent component, IntArrayList path) { + private static void componentToPath(RadComponent component, IntList path) { RadComponent parent = component.getParent(); if (parent != null) { diff --git a/plugins/yaml/src/org/jetbrains/yaml/navigation/YAMLKeysSearchEverywhereContributor.java b/plugins/yaml/src/org/jetbrains/yaml/navigation/YAMLKeysSearchEverywhereContributor.java index 9758e06b8750..f5bc1299be8e 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/navigation/YAMLKeysSearchEverywhereContributor.java +++ b/plugins/yaml/src/org/jetbrains/yaml/navigation/YAMLKeysSearchEverywhereContributor.java @@ -23,10 +23,7 @@ import com.intellij.util.CommonProcessors; import com.intellij.util.Processor; import com.intellij.util.SmartList; import com.intellij.util.indexing.FileBasedIndex; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import it.unimi.dsi.fastutil.ints.IntArrayList; -import it.unimi.dsi.fastutil.ints.IntListIterator; +import it.unimi.dsi.fastutil.ints.*; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.yaml.YAMLBundle; @@ -167,7 +164,7 @@ public class YAMLKeysSearchEverywhereContributor implements SearchEverywhereCont } progressIndicator.checkCanceled(); - IntArrayList listToSort = new IntArrayList(priority.keySet()); + IntList listToSort = new IntArrayList(priority.keySet()); listToSort.sort(null); List result = new ArrayList<>(); for (IntListIterator iterator = listToSort.iterator(); iterator.hasNext(); ) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/lexer/PythonIndentingProcessor.java b/python/python-psi-impl/src/com/jetbrains/python/lexer/PythonIndentingProcessor.java index d60322f47bcf..5b0ebf2d435d 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/lexer/PythonIndentingProcessor.java +++ b/python/python-psi-impl/src/com/jetbrains/python/lexer/PythonIndentingProcessor.java @@ -230,7 +230,7 @@ public class PythonIndentingProcessor extends MergingLexerAdapter { private void setStartState() { myIndentStack.clear(); - myIndentStack.add(0); + myIndentStack.push(0); myBraceLevel = 0; adjustBraceLevel(); myLineHasSignificantTokens = false; diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverriddenDefineSearcher.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverriddenDefineSearcher.java index 1f234d6a80ba..7f15af7017b8 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverriddenDefineSearcher.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverriddenDefineSearcher.java @@ -3,13 +3,14 @@ package org.intellij.plugins.relaxNG.model.annotation; import com.intellij.psi.xml.XmlFile; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.intellij.plugins.relaxNG.model.*; import java.util.List; final class OverriddenDefineSearcher extends CommonElement.Visitor { private final Define myDefine; - private final IntArrayList myIncludes = new IntArrayList(); + private final IntList myIncludes = new IntArrayList(); private final XmlFile myLocalFile; private final List> myResult; diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeDelegate.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeDelegate.java index 3556f579a403..c2fd7fe08dce 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeDelegate.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeDelegate.java @@ -27,6 +27,7 @@ import com.intellij.xml.XmlAttributeDescriptor; import com.intellij.xml.XmlElementDescriptor; import com.intellij.xml.util.XmlUtil; import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -152,8 +153,8 @@ public abstract class XmlAttributeDelegate { valueTextRange = new TextRange(child.getTextLength(), valueTextRange.getEndOffset()); child = child.getTreeNext(); } - final IntArrayList gapsStarts = new IntArrayList(); - final IntArrayList gapsShifts = new IntArrayList(); + final IntList gapsStarts = new IntArrayList(); + final IntList gapsShifts = new IntArrayList(); StringBuilder buffer = new StringBuilder(myAttribute.getTextLength()); while (child != null) { final int start = buffer.length();