From 9dbbe9c58dff8f936d065e955f44905dc84bcdbe Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Wed, 12 Dec 2018 18:02:32 +0300 Subject: [PATCH] Fix KT-28626, KT-27263, KT-27718 in Idea 191 Original commit: ffb277d978c6fcd5c2a88f43500b65d895f585b3 --- .../config/KotlinResourceRootType.kt.191 | 24 +++++++++++++++++ .../kotlin/config/KotlinRootType.kt.191 | 0 .../kotlin/config/KotlinSourceRootType.kt.191 | 27 +++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.191 create mode 100644 jps/jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt.191 create mode 100644 jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.191 diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.191 b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.191 new file mode 100644 index 00000000000..09884bf560a --- /dev/null +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.191 @@ -0,0 +1,24 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.config + +import org.jetbrains.jps.model.ex.JpsElementTypeBase +import org.jetbrains.jps.model.java.JavaResourceRootProperties +import org.jetbrains.jps.model.java.JavaResourceRootType +import org.jetbrains.jps.model.java.JpsJavaExtensionService +import org.jetbrains.jps.model.module.JpsModuleSourceRootType + +sealed class KotlinResourceRootType() : JpsElementTypeBase(), + JpsModuleSourceRootType { + object Resource : KotlinResourceRootType() + + object TestResource : KotlinResourceRootType() { + override fun isForTests() = true + } + + override fun createDefaultProperties() = + JpsJavaExtensionService.getInstance().createResourceRootProperties("", false) +} \ No newline at end of file diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt.191 b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt.191 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.191 b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.191 new file mode 100644 index 00000000000..551c8d26307 --- /dev/null +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.191 @@ -0,0 +1,27 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.config + +import org.jetbrains.jps.model.ex.JpsElementTypeBase +import org.jetbrains.jps.model.java.JavaSourceRootProperties +import org.jetbrains.jps.model.java.JavaSourceRootType +import org.jetbrains.jps.model.java.JpsJavaExtensionService +import org.jetbrains.jps.model.module.JpsModuleSourceRootType + +sealed class KotlinSourceRootType() : JpsElementTypeBase(), JpsModuleSourceRootType { + object Source : KotlinSourceRootType() + + object TestSource : KotlinSourceRootType() { + override fun isForTests() = true + } + + override fun createDefaultProperties() = JpsJavaExtensionService.getInstance().createSourceRootProperties("") + + companion object { + val ALL_SOURCES = setOf(Source, TestSource) + } +} +