User: rednesto Date: 16 Dec 23 16:36 Revision: 2f32b1f09351c5991f0bec2d0b187c21c8f4868f Summary: Fix TranslationIndex#hasDefaultTranslations impl Also fixes ktlint complaints TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8901&personal=false Index: src/main/kotlin/translations/TranslationEditorNotificationProvider.kt =================================================================== --- src/main/kotlin/translations/TranslationEditorNotificationProvider.kt (revision 3e28b815c5e5ba5239440e2267da8104f749da14) +++ src/main/kotlin/translations/TranslationEditorNotificationProvider.kt (revision 2f32b1f09351c5991f0bec2d0b187c21c8f4868f) @@ -60,16 +60,14 @@ return null } - val hasDefaultTranslations = TranslationIndex.hasDefaultTranslations(project, file.mcDomain) val hasMcpModule = file.findPsiFile(project)?.findMcpModule() != null return Function { - createNotificationPanel(missingTranslations, hasDefaultTranslations, hasMcpModule, file, project) + createNotificationPanel(missingTranslations, hasMcpModule, file, project) } } private fun createNotificationPanel( missingTranslations: Sequence, - hasDefaultTranslations: Boolean, hasMcpModule: Boolean, file: VirtualFile, project: Project @@ -97,12 +95,7 @@ .ask(project) if (sort) { try { - TranslationSorter.query( - project, - psi, - hasDefaultTranslations, - Ordering.LIKE_DEFAULT - ) + TranslationSorter.query(project, psi, true, Ordering.LIKE_DEFAULT) } catch (e: Exception) { Notification( "Translations sorting error", Index: src/main/kotlin/translations/index/TranslationIndex.kt =================================================================== --- src/main/kotlin/translations/index/TranslationIndex.kt (revision 3e28b815c5e5ba5239440e2267da8104f749da14) +++ src/main/kotlin/translations/index/TranslationIndex.kt (revision 2f32b1f09351c5991f0bec2d0b187c21c8f4868f) @@ -64,9 +64,14 @@ getProjectDefaultEntries(project, domain).flatten() fun hasDefaultTranslations(project: Project, domain: String? = null): Boolean { - return !FileBasedIndex.getInstance().processValues(NAME, TranslationConstants.DEFAULT_LOCALE, null, { _, entry -> - return@processValues entry.sourceDomain == domain - }, GlobalSearchScope.projectScope(project)) + return !FileBasedIndex.getInstance() + .processValues( + NAME, + TranslationConstants.DEFAULT_LOCALE, + null, + { _, entry -> entry.sourceDomain != domain }, + GlobalSearchScope.projectScope(project) + ) } fun getTranslations(project: Project, file: VirtualFile): Sequence {