From a926a1f53482a9ef2a405be8aac994942505d6a8 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 26 May 2021 15:44:42 +0200 Subject: [PATCH] FIR IDE: handle `.` after package name in completion tests --- .../idea/completion/test/ExpectedCompletionUtils.kt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt index 520fa8a5a58..b4cf212dac5 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt @@ -64,7 +64,18 @@ object ExpectedCompletionUtils { } } - fun matches(expectedProposal: CompletionProposal): Boolean = expectedProposal.map.entries.none { it.value != map[it.key] } + fun matches(expectedProposal: CompletionProposal): Boolean { + return expectedProposal.map.entries.none { expected -> + val actualValues = when (expected.key) { + "lookupString" -> { + // FIR IDE adds `.` after package names in completion + listOf(map[expected.key]?.removeSuffix("."), map[expected.key]) + } + else -> listOf(map[expected.key]) + } + expected.value !in actualValues + } + } override fun toString(): String { val jsonObject = JsonObject()