diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/navigation/JavaLangInvokeHandleNavigationTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/navigation/JavaLangInvokeHandleNavigationTest.kt index 76501af26346..cbc5a427b648 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/navigation/JavaLangInvokeHandleNavigationTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/navigation/JavaLangInvokeHandleNavigationTest.kt @@ -118,7 +118,7 @@ class Main { TestCase.assertTrue("Is method", member is PsiMethod) val parameters = (member as PsiMethod).parameterList.parameters TestCase.assertEquals("Parameter count", expectedParameterTypes.size, parameters.size) - for (i in 0 until expectedParameterTypes.size) { + for (i in expectedParameterTypes.indices) { TestCase.assertEquals("Parameter $i", expectedParameterTypes[i], parameters[i].type.canonicalText) } } diff --git a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/dataframe/DataFrameCSVAdapter.kt b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/dataframe/DataFrameCSVAdapter.kt index 3720fe457c48..2d229d100dc9 100644 --- a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/dataframe/DataFrameCSVAdapter.kt +++ b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/dataframe/DataFrameCSVAdapter.kt @@ -48,7 +48,7 @@ class DataFrameCSVAdapter { val columnsInfo = ArrayList() var previous = 0 - for (i in 0 until data.length) { + for (i in data.indices) { if (data[i] != '\n' && data[i] != '\t') { continue } @@ -112,8 +112,8 @@ class DataFrameCSVAdapter { val columns = ArrayList>(columnsInfo.size) - for (i in 0 until columnsInfo.size) { - columns.add(columnsInfo[i].type!!.createDataArray()) + for (info in columnsInfo) { + columns.add(info.type!!.createDataArray()) } // Skip first line (header). @@ -144,7 +144,7 @@ class DataFrameCSVAdapter { } val realColumns = ArrayList>(columnsInfo.size) - for (i in 0 until columnsInfo.size) { + for (i in columnsInfo.indices) { realColumns.add(columnsInfo[i].type!!.createDataColumn(columnsInfo[i].name, columns[i])) } diff --git a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/dataframe/DataFrameImpl.kt b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/dataframe/DataFrameImpl.kt index 3744025a36e6..fe298fb35364 100644 --- a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/dataframe/DataFrameImpl.kt +++ b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/dataframe/DataFrameImpl.kt @@ -43,19 +43,19 @@ class DataFrameImpl(private val columns: ArrayList>) : DataFrame() { is IntType -> { val intColumn = columns[i] as IntColumn val data = ArrayList(intColumn.size) - (0 until sortedIndices.size).forEach { data.add(intColumn[sortedIndices[it]]) } + sortedIndices.forEach { data.add(intColumn[it]) } columns[i] = IntColumn(columns[i].name, data) } is DoubleType -> { val doubleColumn = columns[i] as DoubleColumn val data = ArrayList(doubleColumn.size) - (0 until sortedIndices.size).forEach { data.add(doubleColumn[sortedIndices[it]]) } + sortedIndices.forEach { data.add(doubleColumn[it]) } columns[i] = DoubleColumn(columns[i].name, data) } is StringType -> { val stringColumn = columns[i] as StringColumn val data = ArrayList(stringColumn.size) - (0 until sortedIndices.size).forEach { data.add(stringColumn[sortedIndices[it]]) } + sortedIndices.forEach { data.add(stringColumn[it]) } columns[i] = StringColumn(columns[i].name, data) } else -> throw Exception("Unsupported column type ${columns[i].type} in sorting.") diff --git a/platform/diff-impl/tests/testSrc/com/intellij/diff/DiffTestCase.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/DiffTestCase.kt index 86c71c5f0e27..c0c12e21cef3 100644 --- a/platform/diff-impl/tests/testSrc/com/intellij/diff/DiffTestCase.kt +++ b/platform/diff-impl/tests/testSrc/com/intellij/diff/DiffTestCase.kt @@ -280,7 +280,7 @@ abstract class DiffTestCase : TestCase() { val lines1 = matching.split('_', '*') val lines2 = text.split('\n') assertEquals(lines1.size, lines2.size) - for (i in 0..lines1.size - 1) { + for (i in lines1.indices) { assertEquals(lines1[i].length, lines2[i].length, "line $i") } diff --git a/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/ComparisonUtilAutoTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/ComparisonUtilAutoTest.kt index 89335beebf9a..031966d757c3 100644 --- a/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/ComparisonUtilAutoTest.kt +++ b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/ComparisonUtilAutoTest.kt @@ -668,7 +668,7 @@ class ComparisonUtilAutoTest : HeavyDiffTestCase() { } private fun countNonWhitespaceCharacters(line: CharSequence): Int { - return (0 until line.length).count { !StringUtil.isWhiteSpace(line[it]) } + return line.indices.count { !StringUtil.isWhiteSpace(line[it]) } } private fun getFirstLastLines(text: Document, start: Int, end: Int): Couple? { diff --git a/platform/diff-impl/tests/testSrc/com/intellij/diff/util/DiffUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/util/DiffUtilTest.kt index b8540c03c1ea..b7cac9c82780 100644 --- a/platform/diff-impl/tests/testSrc/com/intellij/diff/util/DiffUtilTest.kt +++ b/platform/diff-impl/tests/testSrc/com/intellij/diff/util/DiffUtilTest.kt @@ -47,7 +47,7 @@ class DiffUtilTest : DiffTestCase() { val sortedIndexes = DiffUtil.getSortedIndexes(list, comparator) val expected = ContainerUtil.sorted(list, comparator) - val actual = (0..values.size - 1).map { values[sortedIndexes[it]] } + val actual = values.indices.map { values[sortedIndexes[it]] } assertOrderedEquals(expected, actual) assertEquals(sortedIndexes.toSet().size, list.size) diff --git a/platform/platform-impl/src/com/intellij/diagnostic/hprof/visitors/CollectThreadInfoVisitor.kt b/platform/platform-impl/src/com/intellij/diagnostic/hprof/visitors/CollectThreadInfoVisitor.kt index 4de86ed93350..64526f8c3761 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/hprof/visitors/CollectThreadInfoVisitor.kt +++ b/platform/platform-impl/src/com/intellij/diagnostic/hprof/visitors/CollectThreadInfoVisitor.kt @@ -80,8 +80,8 @@ class CollectThreadInfoVisitor(private val threadsMap: Long2ObjectMap(stackFrameIds.size) - for (i in 0 until stackFrameIds.size) { - frames.add(stackFrameIdToStringMap[stackFrameIds[i]]) + for (id in stackFrameIds) { + frames.add(stackFrameIdToStringMap[id]) } threadsMap.put(threadSerialNumber, ThreadInfo(frames)) } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt index 19ea57244d2e..1860230ac520 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt +++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt @@ -754,8 +754,7 @@ object Switcher : BaseSwitcherAction(null) { private fun addSmartShortcut(window: SwitcherToolWindow, keymap: MutableMap): Boolean { val title = window.mainText if (StringUtil.isEmpty(title)) return false - for (i in 0 until title.length) { - val c = title[i] + for (c in title) { if (Character.isUpperCase(c) && addShortcut(keymap, window, c.toString())) { return true } diff --git a/platform/platform-tests/testSrc/com/intellij/internal/statistics/logger/FeatureUsageEventLoggerTest.kt b/platform/platform-tests/testSrc/com/intellij/internal/statistics/logger/FeatureUsageEventLoggerTest.kt index bb9956b7735d..5f5d1b6732a9 100644 --- a/platform/platform-tests/testSrc/com/intellij/internal/statistics/logger/FeatureUsageEventLoggerTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/internal/statistics/logger/FeatureUsageEventLoggerTest.kt @@ -614,7 +614,7 @@ class FeatureUsageEventLoggerTest : HeavyPlatformTestCase() { val actual = logger.testWriter.logged assertEquals(expected.size, actual.size) - for (i in 0 until expected.size) { + for (i in expected.indices) { assertEvent(actual[i], expected[i]) } } diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/MoveToCaretStopTest.kt b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/MoveToCaretStopTest.kt index 99d688b6bbe2..8e1ec51d13c5 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/MoveToCaretStopTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/MoveToCaretStopTest.kt @@ -445,7 +445,7 @@ my_list^ =^ [^"^one^"^,^ "^two^"^,^ "^three^"^,^ private fun CharSequence.offsets(direction: Direction): IntProgression = when (direction) { - FORWARD -> 0 until length + FORWARD -> indices BACKWARD -> length downTo 1 } diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/InputClassScope.kt b/platform/script-debugger/protocol/protocol-model-generator/src/InputClassScope.kt index a8bf4470dc94..b13fe59368b8 100644 --- a/platform/script-debugger/protocol/protocol-model-generator/src/InputClassScope.kt +++ b/platform/script-debugger/protocol/protocol-model-generator/src/InputClassScope.kt @@ -8,7 +8,7 @@ internal class InputClassScope(generator: DomainGenerator, namePath: NamePath) : override val typeDirection = TypeData.Direction.INPUT fun generateDeclarationBody(out: TextOutput, list: List) { - for (i in 0 until list.size) { + for (i in list.indices) { val named = list[i] if (named.description != null) { out.doc(named.description) diff --git a/platform/script-debugger/protocol/protocol-reader/src/MethodHandler.kt b/platform/script-debugger/protocol/protocol-reader/src/MethodHandler.kt index 70f06093df76..08bcd9fdbc01 100644 --- a/platform/script-debugger/protocol/protocol-reader/src/MethodHandler.kt +++ b/platform/script-debugger/protocol/protocol-reader/src/MethodHandler.kt @@ -6,7 +6,7 @@ internal fun appendMethodSignatureJava(method: Method, paramNames: List, out.append(method.name).append('(') var firstArg = true val types = method.genericParameterTypes - for (i in 0..types.size - 1) { + for (i in types.indices) { val arg = types[i] if (firstArg) { firstArg = false diff --git a/plugins/settings-repository/src/git/dirCacheEditor.kt b/plugins/settings-repository/src/git/dirCacheEditor.kt index e0213fee3f58..8bfefadbd5a4 100644 --- a/plugins/settings-repository/src/git/dirCacheEditor.kt +++ b/plugins/settings-repository/src/git/dirCacheEditor.kt @@ -122,7 +122,7 @@ abstract class PathEditBase(final override val path: ByteArray) : PathEdit private fun encodePath(path: String): ByteArray { val bytes = Charsets.UTF_8.encode(path).toByteArray() if (SystemInfo.isWindows) { - for (i in 0 until bytes.size) { + for (i in bytes.indices) { if (bytes[i].toChar() == '\\') { bytes[i] = '/'.toByte() } diff --git a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLBlockScalarImpl.kt b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLBlockScalarImpl.kt index 076e287d1fb1..c915f361fc3c 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLBlockScalarImpl.kt +++ b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLBlockScalarImpl.kt @@ -138,7 +138,7 @@ abstract class YAMLBlockScalarImpl(node: ASTNode) : YAMLScalarImpl(node) { if (includeFirstLineInContent) return IMPLICIT_INDENT val headerNode = getNthContentTypeChild(0) ?: return IMPLICIT_INDENT val header = headerNode.text - for (i in 0 until header.length) { + for (i in header.indices) { if (Character.isDigit(header[i])) { val k = i + 1 // YAML 1.2 standard does not allow more then 1 symbol in indentation number