From 53f440505342849c188209ea0470ba43bfeb5f96 Mon Sep 17 00:00:00 2001 From: Rival Abdrakhmanov Date: Wed, 6 Dec 2023 21:49:09 +0100 Subject: [PATCH] Fix verifier --- README.md | 8 ++++---- build.gradle.kts | 2 +- gradle.properties | 2 +- .../kotlin/model/sessionHost/AspireSessionHostModel.kt | 2 +- .../{com/intellij => me/rafaelldi}/aspire/AspireBundle.kt | 2 +- .../aspire/generated/AspireSessionHostModel.Generated.kt | 2 +- .../aspire/generated/AspireSessionHostRoot.Generated.kt | 2 +- .../rafaelldi}/aspire/run/AspireHostConfiguration.kt | 2 +- .../aspire/run/AspireHostConfigurationFactory.kt | 2 +- .../aspire/run/AspireHostConfigurationParameters.kt | 2 +- .../rafaelldi}/aspire/run/AspireHostConfigurationType.kt | 2 +- .../aspire/run/AspireHostConfigurationViewModel.kt | 2 +- .../rafaelldi}/aspire/run/AspireHostExecutorFactory.kt | 4 ++-- .../rafaelldi}/aspire/run/AspireHostProgramRunner.kt | 2 +- .../rafaelldi}/aspire/run/AspireHostSettingsEditor.kt | 2 +- .../rafaelldi}/aspire/run/AspireRunnableProjectKinds.kt | 2 +- .../aspire/sessionHost/AspireSessionHostService.kt | 6 +++--- .../rafaelldi}/aspire/sessionHost/AspireSessionRunner.kt | 4 ++-- src/main/resources/META-INF/plugin.xml | 6 +++--- 19 files changed, 28 insertions(+), 28 deletions(-) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/AspireBundle.kt (95%) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/generated/AspireSessionHostModel.Generated.kt (99%) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/generated/AspireSessionHostRoot.Generated.kt (97%) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/run/AspireHostConfiguration.kt (96%) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/run/AspireHostConfigurationFactory.kt (95%) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/run/AspireHostConfigurationParameters.kt (99%) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/run/AspireHostConfigurationType.kt (98%) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/run/AspireHostConfigurationViewModel.kt (99%) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/run/AspireHostExecutorFactory.kt (97%) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/run/AspireHostProgramRunner.kt (90%) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/run/AspireHostSettingsEditor.kt (98%) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/run/AspireRunnableProjectKinds.kt (82%) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/sessionHost/AspireSessionHostService.kt (96%) rename src/main/kotlin/{com/intellij => me/rafaelldi}/aspire/sessionHost/AspireSessionRunner.kt (99%) diff --git a/README.md b/README.md index abc08929..b9cbe99b 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ -# aspire-plugin +# Aspire Plugin for JetBrains Rider ![Build](https://github.com/rafaelldi/aspire-plugin/workflows/Build/badge.svg) -[![Version](https://img.shields.io/jetbrains/plugin/v/PLUGIN_ID.svg)](https://plugins.jetbrains.com/plugin/PLUGIN_ID) +[![Version](https://img.shields.io/jetbrains/plugin/v/PLUGIN_ID.svg?label=plugin&logo=rider)](https://plugins.jetbrains.com/plugin/PLUGIN_ID) [![Downloads](https://img.shields.io/jetbrains/plugin/d/PLUGIN_ID.svg)](https://plugins.jetbrains.com/plugin/PLUGIN_ID) -Experiments with Aspire +The plugin provides support for .NET Aspire projects in JetBrains Rider. + ## Installation @@ -25,4 +26,3 @@ Experiments with Aspire Plugin based on the [IntelliJ Platform Plugin Template][template]. [template]: https://github.com/JetBrains/intellij-platform-plugin-template -[docs:plugin-description]: https://plugins.jetbrains.com/docs/intellij/plugin-user-experience.html#plugin-description-and-presentation diff --git a/build.gradle.kts b/build.gradle.kts index 623b8125..bb6d64c3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -70,7 +70,7 @@ tasks { configure { val modelDir = projectDir.resolve("protocol/src/main/kotlin/model/sessionHost") val pluginSourcePath = projectDir.resolve("src") - val ktOutput = pluginSourcePath.resolve("main/kotlin/com/intellij/aspire/generated") + val ktOutput = pluginSourcePath.resolve("main/kotlin/me/rafaelldi/aspire/generated") val csOutput = pluginSourcePath.resolve("dotnet/aspire-session-host/Generated") verbose = true diff --git a/gradle.properties b/gradle.properties index 1464eaf2..4536032a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html -pluginGroup = com.intellij.aspire +pluginGroup = me.rafaelldi.aspire pluginName = aspire-plugin pluginRepositoryUrl = https://github.com/rafaelldi/aspire-plugin # SemVer format -> https://semver.org diff --git a/protocol/src/main/kotlin/model/sessionHost/AspireSessionHostModel.kt b/protocol/src/main/kotlin/model/sessionHost/AspireSessionHostModel.kt index 80b986c2..627339b0 100644 --- a/protocol/src/main/kotlin/model/sessionHost/AspireSessionHostModel.kt +++ b/protocol/src/main/kotlin/model/sessionHost/AspireSessionHostModel.kt @@ -7,7 +7,7 @@ import com.jetbrains.rd.generator.nova.kotlin.Kotlin11Generator object AspireSessionHostRoot : Root() { init { - setting(Kotlin11Generator.Namespace, "com.intellij.aspire.generated") + setting(Kotlin11Generator.Namespace, "me.rafaelldi.aspire.generated") setting(CSharp50Generator.Namespace, "AspireSessionHost.Generated") } } diff --git a/src/main/kotlin/com/intellij/aspire/AspireBundle.kt b/src/main/kotlin/me/rafaelldi/aspire/AspireBundle.kt similarity index 95% rename from src/main/kotlin/com/intellij/aspire/AspireBundle.kt rename to src/main/kotlin/me/rafaelldi/aspire/AspireBundle.kt index b2d2bc29..43471bd0 100644 --- a/src/main/kotlin/com/intellij/aspire/AspireBundle.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/AspireBundle.kt @@ -1,4 +1,4 @@ -package com.intellij.aspire +package me.rafaelldi.aspire import com.intellij.DynamicBundle import org.jetbrains.annotations.NonNls diff --git a/src/main/kotlin/com/intellij/aspire/generated/AspireSessionHostModel.Generated.kt b/src/main/kotlin/me/rafaelldi/aspire/generated/AspireSessionHostModel.Generated.kt similarity index 99% rename from src/main/kotlin/com/intellij/aspire/generated/AspireSessionHostModel.Generated.kt rename to src/main/kotlin/me/rafaelldi/aspire/generated/AspireSessionHostModel.Generated.kt index c1e996e2..437a6bb0 100644 --- a/src/main/kotlin/com/intellij/aspire/generated/AspireSessionHostModel.Generated.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/generated/AspireSessionHostModel.Generated.kt @@ -1,5 +1,5 @@ @file:Suppress("EXPERIMENTAL_API_USAGE","EXPERIMENTAL_UNSIGNED_LITERALS","PackageDirectoryMismatch","UnusedImport","unused","LocalVariableName","CanBeVal","PropertyName","EnumEntryName","ClassName","ObjectPropertyName","UnnecessaryVariable","SpellCheckingInspection") -package com.intellij.aspire.generated +package me.rafaelldi.aspire.generated import com.jetbrains.rd.framework.* import com.jetbrains.rd.framework.base.* diff --git a/src/main/kotlin/com/intellij/aspire/generated/AspireSessionHostRoot.Generated.kt b/src/main/kotlin/me/rafaelldi/aspire/generated/AspireSessionHostRoot.Generated.kt similarity index 97% rename from src/main/kotlin/com/intellij/aspire/generated/AspireSessionHostRoot.Generated.kt rename to src/main/kotlin/me/rafaelldi/aspire/generated/AspireSessionHostRoot.Generated.kt index 641366a3..0c4d4a17 100644 --- a/src/main/kotlin/com/intellij/aspire/generated/AspireSessionHostRoot.Generated.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/generated/AspireSessionHostRoot.Generated.kt @@ -1,5 +1,5 @@ @file:Suppress("EXPERIMENTAL_API_USAGE","EXPERIMENTAL_UNSIGNED_LITERALS","PackageDirectoryMismatch","UnusedImport","unused","LocalVariableName","CanBeVal","PropertyName","EnumEntryName","ClassName","ObjectPropertyName","UnnecessaryVariable","SpellCheckingInspection") -package com.intellij.aspire.generated +package me.rafaelldi.aspire.generated import com.jetbrains.rd.framework.* import com.jetbrains.rd.framework.base.* diff --git a/src/main/kotlin/com/intellij/aspire/run/AspireHostConfiguration.kt b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfiguration.kt similarity index 96% rename from src/main/kotlin/com/intellij/aspire/run/AspireHostConfiguration.kt rename to src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfiguration.kt index add57d31..3e3198ab 100644 --- a/src/main/kotlin/com/intellij/aspire/run/AspireHostConfiguration.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfiguration.kt @@ -1,4 +1,4 @@ -package com.intellij.aspire.run +package me.rafaelldi.aspire.run import com.intellij.execution.configurations.ConfigurationFactory import com.intellij.openapi.project.Project diff --git a/src/main/kotlin/com/intellij/aspire/run/AspireHostConfigurationFactory.kt b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfigurationFactory.kt similarity index 95% rename from src/main/kotlin/com/intellij/aspire/run/AspireHostConfigurationFactory.kt rename to src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfigurationFactory.kt index 1f88069b..c562389e 100644 --- a/src/main/kotlin/com/intellij/aspire/run/AspireHostConfigurationFactory.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfigurationFactory.kt @@ -1,4 +1,4 @@ -package com.intellij.aspire.run +package me.rafaelldi.aspire.run import com.intellij.openapi.project.Project import com.jetbrains.rider.run.configurations.DotNetConfigurationFactoryBase diff --git a/src/main/kotlin/com/intellij/aspire/run/AspireHostConfigurationParameters.kt b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfigurationParameters.kt similarity index 99% rename from src/main/kotlin/com/intellij/aspire/run/AspireHostConfigurationParameters.kt rename to src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfigurationParameters.kt index f22ea62b..71892ed4 100644 --- a/src/main/kotlin/com/intellij/aspire/run/AspireHostConfigurationParameters.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfigurationParameters.kt @@ -1,4 +1,4 @@ -package com.intellij.aspire.run +package me.rafaelldi.aspire.run import com.intellij.execution.configurations.RunConfiguration import com.intellij.execution.configurations.RunProfile diff --git a/src/main/kotlin/com/intellij/aspire/run/AspireHostConfigurationType.kt b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfigurationType.kt similarity index 98% rename from src/main/kotlin/com/intellij/aspire/run/AspireHostConfigurationType.kt rename to src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfigurationType.kt index 332e5bd4..4720676c 100644 --- a/src/main/kotlin/com/intellij/aspire/run/AspireHostConfigurationType.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfigurationType.kt @@ -1,4 +1,4 @@ -package com.intellij.aspire.run +package me.rafaelldi.aspire.run import com.intellij.execution.RunManager import com.intellij.execution.RunnerAndConfigurationSettings diff --git a/src/main/kotlin/com/intellij/aspire/run/AspireHostConfigurationViewModel.kt b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfigurationViewModel.kt similarity index 99% rename from src/main/kotlin/com/intellij/aspire/run/AspireHostConfigurationViewModel.kt rename to src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfigurationViewModel.kt index a7e26b75..cb6eea4c 100644 --- a/src/main/kotlin/com/intellij/aspire/run/AspireHostConfigurationViewModel.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostConfigurationViewModel.kt @@ -1,4 +1,4 @@ -package com.intellij.aspire.run +package me.rafaelldi.aspire.run import com.jetbrains.rd.util.lifetime.Lifetime import com.jetbrains.rd.util.reactive.adviseOnce diff --git a/src/main/kotlin/com/intellij/aspire/run/AspireHostExecutorFactory.kt b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostExecutorFactory.kt similarity index 97% rename from src/main/kotlin/com/intellij/aspire/run/AspireHostExecutorFactory.kt rename to src/main/kotlin/me/rafaelldi/aspire/run/AspireHostExecutorFactory.kt index bf5d59f3..a0141c18 100644 --- a/src/main/kotlin/com/intellij/aspire/run/AspireHostExecutorFactory.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostExecutorFactory.kt @@ -1,6 +1,6 @@ -package com.intellij.aspire.run +package me.rafaelldi.aspire.run -import com.intellij.aspire.sessionHost.AspireSessionHostService +import me.rafaelldi.aspire.sessionHost.AspireSessionHostService import com.intellij.execution.CantRunException import com.intellij.execution.configurations.RunProfileState import com.intellij.execution.executors.DefaultDebugExecutor diff --git a/src/main/kotlin/com/intellij/aspire/run/AspireHostProgramRunner.kt b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostProgramRunner.kt similarity index 90% rename from src/main/kotlin/com/intellij/aspire/run/AspireHostProgramRunner.kt rename to src/main/kotlin/me/rafaelldi/aspire/run/AspireHostProgramRunner.kt index 7c21f6c1..5065a194 100644 --- a/src/main/kotlin/com/intellij/aspire/run/AspireHostProgramRunner.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostProgramRunner.kt @@ -1,4 +1,4 @@ -package com.intellij.aspire.run +package me.rafaelldi.aspire.run import com.intellij.execution.configurations.RunProfile import com.jetbrains.rider.debugger.DotNetProgramRunner diff --git a/src/main/kotlin/com/intellij/aspire/run/AspireHostSettingsEditor.kt b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostSettingsEditor.kt similarity index 98% rename from src/main/kotlin/com/intellij/aspire/run/AspireHostSettingsEditor.kt rename to src/main/kotlin/me/rafaelldi/aspire/run/AspireHostSettingsEditor.kt index f09fd651..930efc98 100644 --- a/src/main/kotlin/com/intellij/aspire/run/AspireHostSettingsEditor.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/run/AspireHostSettingsEditor.kt @@ -1,4 +1,4 @@ -package com.intellij.aspire.run +package me.rafaelldi.aspire.run import com.intellij.openapi.project.Project import com.jetbrains.rd.util.lifetime.Lifetime diff --git a/src/main/kotlin/com/intellij/aspire/run/AspireRunnableProjectKinds.kt b/src/main/kotlin/me/rafaelldi/aspire/run/AspireRunnableProjectKinds.kt similarity index 82% rename from src/main/kotlin/com/intellij/aspire/run/AspireRunnableProjectKinds.kt rename to src/main/kotlin/me/rafaelldi/aspire/run/AspireRunnableProjectKinds.kt index f6e5902a..af6be3f8 100644 --- a/src/main/kotlin/com/intellij/aspire/run/AspireRunnableProjectKinds.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/run/AspireRunnableProjectKinds.kt @@ -1,4 +1,4 @@ -package com.intellij.aspire.run +package me.rafaelldi.aspire.run import com.jetbrains.rider.model.RunnableProjectKind diff --git a/src/main/kotlin/com/intellij/aspire/sessionHost/AspireSessionHostService.kt b/src/main/kotlin/me/rafaelldi/aspire/sessionHost/AspireSessionHostService.kt similarity index 96% rename from src/main/kotlin/com/intellij/aspire/sessionHost/AspireSessionHostService.kt rename to src/main/kotlin/me/rafaelldi/aspire/sessionHost/AspireSessionHostService.kt index 86f12908..7e63c7e4 100644 --- a/src/main/kotlin/com/intellij/aspire/sessionHost/AspireSessionHostService.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/sessionHost/AspireSessionHostService.kt @@ -1,7 +1,7 @@ -package com.intellij.aspire.sessionHost +package me.rafaelldi.aspire.sessionHost -import com.intellij.aspire.generated.AspireSessionHostModel -import com.intellij.aspire.generated.aspireSessionHostModel +import me.rafaelldi.aspire.generated.AspireSessionHostModel +import me.rafaelldi.aspire.generated.aspireSessionHostModel import com.intellij.execution.CantRunException import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.execution.process.KillableColoredProcessHandler diff --git a/src/main/kotlin/com/intellij/aspire/sessionHost/AspireSessionRunner.kt b/src/main/kotlin/me/rafaelldi/aspire/sessionHost/AspireSessionRunner.kt similarity index 99% rename from src/main/kotlin/com/intellij/aspire/sessionHost/AspireSessionRunner.kt rename to src/main/kotlin/me/rafaelldi/aspire/sessionHost/AspireSessionRunner.kt index 627a0f7e..0394192f 100644 --- a/src/main/kotlin/com/intellij/aspire/sessionHost/AspireSessionRunner.kt +++ b/src/main/kotlin/me/rafaelldi/aspire/sessionHost/AspireSessionRunner.kt @@ -1,6 +1,5 @@ -package com.intellij.aspire.sessionHost +package me.rafaelldi.aspire.sessionHost -import com.intellij.aspire.generated.* import com.intellij.execution.ProgramRunnerUtil import com.intellij.execution.RunManager import com.intellij.execution.RunnerAndConfigurationSettings @@ -36,6 +35,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.consumeAsFlow import kotlinx.coroutines.launch +import me.rafaelldi.aspire.generated.* import kotlin.io.path.Path @Service(Service.Level.PROJECT) diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 9f8513ad..7519531c 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,6 +1,6 @@ - com.intellij.aspire + me.rafaelldi.aspire Aspire Rival Abdrakhmanov @@ -10,8 +10,8 @@ messages.AspireBundle - - + +