From 73d8824983a091ea6a22e15510cdc21a590d24bb Mon Sep 17 00:00:00 2001 From: Dmitry Kozhevnikov Date: Fri, 28 Mar 2025 20:34:38 +0200 Subject: [PATCH] [idea] Add Kotlin as primary language for IDEA This makes it appear next to Java in various settings like code style. Popped up when fixing CPP-39708 GitOrigin-RevId: 985316fc18a9d44d03e237850527bec8f679e797 --- .../intellij/ide/java/JavaIdeLanguageCustomization.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/ide/java/JavaIdeLanguageCustomization.java b/java/java-impl/src/com/intellij/ide/java/JavaIdeLanguageCustomization.java index e450e09dbe96..838775043aa5 100644 --- a/java/java-impl/src/com/intellij/ide/java/JavaIdeLanguageCustomization.java +++ b/java/java-impl/src/com/intellij/ide/java/JavaIdeLanguageCustomization.java @@ -4,14 +4,19 @@ package com.intellij.ide.java; import com.intellij.lang.IdeLanguageCustomization; import com.intellij.lang.Language; import com.intellij.lang.java.JavaLanguage; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import java.util.Collections; +import java.util.ArrayList; import java.util.List; public final class JavaIdeLanguageCustomization extends IdeLanguageCustomization { @Override public @NotNull List getPrimaryIdeLanguages() { - return Collections.singletonList(JavaLanguage.INSTANCE); + return ContainerUtil.addAllNotNull( + new ArrayList<>(), + JavaLanguage.INSTANCE, + Language.findLanguageByID("kotlin") + ); } }