From b27334d2a00a002a3dcb0568089ab1e254205623 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Tue, 24 Oct 2017 19:44:04 +0300 Subject: [PATCH] Remove GradleProjectImportProvider and GradleProjectOpenProcessor --- .../kdsl/GradleProjectImportProvider.kt | 31 ----------------- .../gradle/kdsl/GradleProjectOpenProcessor.kt | 33 ------------------- idea/src/META-INF/plugin.xml | 2 -- 3 files changed, 66 deletions(-) delete mode 100644 idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleProjectImportProvider.kt delete mode 100644 idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleProjectOpenProcessor.kt diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleProjectImportProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleProjectImportProvider.kt deleted file mode 100644 index 7566ed5b324..00000000000 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleProjectImportProvider.kt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jetbrains.kotlin.gradle.kdsl - -import com.intellij.openapi.externalSystem.service.project.wizard.AbstractExternalProjectImportProvider -import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.plugins.gradle.service.project.wizard.GradleProjectImportBuilder -import org.jetbrains.plugins.gradle.util.GradleConstants - -class GradleProjectImportProvider(builder: GradleProjectImportBuilder) - : AbstractExternalProjectImportProvider(builder, GradleConstants.SYSTEM_ID) { - - override fun canImportFromFile(file: VirtualFile): Boolean = file.name.endsWith(".${GradleConstants.EXTENSION}.kts") - - override fun getFileSample(): String? = "Gradle (Kotlin DSL) build script (*.gradle.kts)" - - override fun getName(): String = "Gradle (Kotlin DSL)" -} diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleProjectOpenProcessor.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleProjectOpenProcessor.kt deleted file mode 100644 index 36d21acef73..00000000000 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleProjectOpenProcessor.kt +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.gradle.kdsl - -import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.plugins.gradle.service.project.wizard.GradleProjectImportBuilder -import org.jetbrains.plugins.gradle.service.project.wizard.GradleProjectOpenProcessor -import org.jetbrains.plugins.gradle.util.GradleConstants - -class GradleProjectOpenProcessor(builder: GradleProjectImportBuilder) : GradleProjectOpenProcessor(builder) { - override fun canOpenProject(file: VirtualFile): Boolean = when { - !file.isDirectory -> file.name.endsWith(".gradle.kts") - supportedExtensions.any { file.findChild(it) != null } -> true - else -> super.canOpenProject(file) - } - - override fun getSupportedExtensions(): Array = - arrayOf("${GradleConstants.DEFAULT_SCRIPT_NAME}.kts", GradleConstants.SETTINGS_FILE_NAME) -} \ No newline at end of file diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 393421522cc..809cf126e0c 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -2646,8 +2646,6 @@ - -