From 1672f38e7f4738ff69d6507a85d385913e5b8810 Mon Sep 17 00:00:00 2001 From: Alexey Utkin Date: Wed, 13 Dec 2023 18:48:50 +0400 Subject: [PATCH] IDEA-340833 Copyright plugin: No Copyright generation for secondary file types GitOrigin-RevId: 750352dcb32a2a5c37d9392b341e05d4a46c6518 --- .../idea/copyright/CopyrightUpdaters.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightUpdaters.java b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightUpdaters.java index 7c7d537cef73d..1b96e0ef389a3 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightUpdaters.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightUpdaters.java @@ -34,12 +34,16 @@ public UpdateCopyrightsProvider forFileType(@NotNull FileType type) { public FileType getRegisteredFileTypeFromLanguageHierarchy(@NotNull FileType type) { if (super.forFileType(type) != null) return type; - while (type instanceof LanguageFileType) { - Language language = ((LanguageFileType)type).getLanguage(); - Language baseLanguage = language.getBaseLanguage(); - if (baseLanguage == null) break; - - FileType baseFileType = FileTypeRegistry.getInstance().findFileTypeByLanguage(baseLanguage); + while (type instanceof LanguageFileType lft) { + Language language = lft.getLanguage(); + if (!lft.isSecondary()) { + language = language.getBaseLanguage(); + } + if (language == null) { + break; + } + + FileType baseFileType = FileTypeRegistry.getInstance().findFileTypeByLanguage(language); if (baseFileType == null) break; if (super.forFileType(baseFileType) != null) return baseFileType;