From c994f837379194511ebf5b5aae0865487a51a182 Mon Sep 17 00:00:00 2001 From: Him188 Date: Sun, 13 Sep 2020 22:55:03 +0800 Subject: [PATCH] Add missing copyright, cleanup --- .../console/intellij/IDEContainerContributor.kt | 9 +++++++++ .../net/mamoe/mirai/console/intellij/Mirai.kt | 14 -------------- .../marker/CommandDeclarationLineMarkerProvider.kt | 9 +++++++++ .../line/marker/PluginMainLineMarkerProvider.kt | 11 ++++++++++- .../mirai/console/intellij/line/marker/util.kt | 1 + .../mirai/console/intellij/resolve/psiResolve.kt | 2 ++ 6 files changed, 31 insertions(+), 15 deletions(-) delete mode 100644 intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/Mirai.kt diff --git a/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/IDEContainerContributor.kt b/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/IDEContainerContributor.kt index cff72d5a9..ef7231786 100644 --- a/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/IDEContainerContributor.kt +++ b/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/IDEContainerContributor.kt @@ -1,3 +1,12 @@ +/* + * Copyright 2020 Mamoe Technologies and contributors. + * + * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. + * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. + * + * https://github.com/mamoe/mirai/blob/master/LICENSE + */ + package net.mamoe.mirai.console.intellij import org.jetbrains.kotlin.container.StorageComponentContainer diff --git a/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/Mirai.kt b/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/Mirai.kt deleted file mode 100644 index 595f0f2e7..000000000 --- a/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/Mirai.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2020 Mamoe Technologies and contributors. - * - * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. - * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. - * - * https://github.com/mamoe/mirai/blob/master/LICENSE - */ - -package net.mamoe.mirai.console.intellij - -import org.jetbrains.kotlin.name.FqName - -val Plugin_FQ_NAME = FqName("net.mamoe.mirai.console.plugin.Plugin") \ No newline at end of file diff --git a/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/line/marker/CommandDeclarationLineMarkerProvider.kt b/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/line/marker/CommandDeclarationLineMarkerProvider.kt index b05df3175..144ea41f9 100644 --- a/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/line/marker/CommandDeclarationLineMarkerProvider.kt +++ b/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/line/marker/CommandDeclarationLineMarkerProvider.kt @@ -1,3 +1,12 @@ +/* + * Copyright 2020 Mamoe Technologies and contributors. + * + * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. + * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. + * + * https://github.com/mamoe/mirai/blob/master/LICENSE + */ + package net.mamoe.mirai.console.intellij.line.marker import com.intellij.codeHighlighting.Pass diff --git a/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/line/marker/PluginMainLineMarkerProvider.kt b/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/line/marker/PluginMainLineMarkerProvider.kt index 22d8407f4..866d22378 100644 --- a/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/line/marker/PluginMainLineMarkerProvider.kt +++ b/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/line/marker/PluginMainLineMarkerProvider.kt @@ -1,3 +1,12 @@ +/* + * Copyright 2020 Mamoe Technologies and contributors. + * + * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. + * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. + * + * https://github.com/mamoe/mirai/blob/master/LICENSE + */ + package net.mamoe.mirai.console.intellij.line.marker import com.intellij.codeHighlighting.Pass @@ -8,7 +17,7 @@ import com.intellij.openapi.editor.markup.GutterIconRenderer import com.intellij.psi.PsiElement import com.intellij.util.castSafelyTo import net.mamoe.mirai.console.intellij.Icons -import net.mamoe.mirai.console.intellij.Plugin_FQ_NAME +import net.mamoe.mirai.console.intellij.resolve.Plugin_FQ_NAME import org.jetbrains.kotlin.nj2k.postProcessing.resolve import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtConstructor diff --git a/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/line/marker/util.kt b/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/line/marker/util.kt index 4e93675e5..d75f2e05b 100644 --- a/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/line/marker/util.kt +++ b/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/line/marker/util.kt @@ -6,6 +6,7 @@ * * https://github.com/mamoe/mirai/blob/master/LICENSE */ + package net.mamoe.mirai.console.intellij.line.marker import com.intellij.psi.PsiElement diff --git a/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/resolve/psiResolve.kt b/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/resolve/psiResolve.kt index 0504c573f..c72204ade 100644 --- a/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/resolve/psiResolve.kt +++ b/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/resolve/psiResolve.kt @@ -16,6 +16,8 @@ import org.jetbrains.kotlin.psi.KtNamedFunction val COMPOSITE_COMMAND_SUB_COMMAND_FQ_NAME = FqName("net.mamoe.mirai.console.command.CompositeCommand.SubCommand") val SIMPLE_COMMAND_HANDLER_COMMAND_FQ_NAME = FqName("net.mamoe.mirai.console.command.SimpleCommand.Handler") +val Plugin_FQ_NAME = FqName("net.mamoe.mirai.console.plugin.Plugin") + /** * For CompositeCommand.SubCommand */