From 691275c5d010c1598850088f6f452ffae331201d Mon Sep 17 00:00:00 2001 From: Adam Bieganski Date: Fri, 9 Aug 2024 17:58:01 +0100 Subject: [PATCH 01/14] made compatible with Rider 2024.1.5 --- .github/ISSUE_TEMPLATE/bug_report.md | 31 -- .../plugin-not-compatible-with-rider.md | 14 - .github/workflows/dotnet.yml | 33 -- .gitignore | 5 +- .../.idea/.gitignore | 4 +- .../.idea/runConfigurations/Rider__Unix_.xml | 4 +- .../runConfigurations/Rider__Windows_.xml | 6 +- .../.idea/runConfigurations/VisualStudio.xml | 7 +- .../.idea/runConfigurations/rdgen__Unix_.xml | 6 +- .../runConfigurations/rdgen__Windows_.xml | 4 +- .idea/runConfigurations/rdgen.xml | 9 +- CHANGELOG.md | 5 +- LICENSE | 21 - README.md | 4 +- ReSharperPlugin.SharpCoachPlugin.sln | 69 ++-- build.gradle | 214 ---------- build.gradle.kts | 228 +++++++++++ dependencies.json | 2 + docs/features/Mapping.md | 41 -- global.json | 7 - gradle.properties | 16 +- gradle/libs.versions.toml | 10 + gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 373 +++++++++++++----- gradlew.bat | 134 +++++-- photos/map internals of models menu.jpg | Bin 55111 -> 0 bytes .../.idea/.idea.Mapping/.idea/.gitignore | 13 - .../.idea/.idea.Mapping/.idea/encodings.xml | 4 - .../.idea/.idea.Mapping/.idea/indexLayout.xml | 10 - .../Mapping/.idea/.idea.Mapping/.idea/vcs.xml | 6 - .../mapping/Mapping/Mapping.sln | 16 - .../BLL/Models/Requests/UserRequest.cs | 22 -- .../BLL/Models/Responses/UserResponse.cs | 22 -- .../mapping/Mapping/Mapping/Mapping.csproj | 8 - .../mapping/Mapping/Mapping/Program.cs | 30 -- .../mapping/Mapping/global.json | 7 - protocol/build.gradle | 17 - protocol/build.gradle.kts | 52 +++ .../model/rider/SharpCoachPluginModel.kt | 32 -- publishPlugin.ps1 | 2 +- runVisualStudio.ps1 | 7 +- settings.gradle => settings.gradle.kts | 10 +- settings.ps1 | 2 +- src/dotnet/Directory.Build.props | 18 +- src/dotnet/Plugin.props | 4 +- .../Properties/AssemblyInfo.cs | 35 ++ .../Providers/CaretProvider.cs | 3 +- ...perPlugin.SharpCoachPlugin.Core - Copy.txt | 17 + ...SharperPlugin.SharpCoachPlugin.Core.csproj | 7 +- .../TypeHelpers/CollectionTypeHelper.cs | 2 +- ...harperPlugin.SharpCoachPlugin.Tests.csproj | 27 +- .../TestEnvironment.cs | 22 -- .../Class/MapClassToClassActionTest.cs | 30 -- .../Class/MapClassToClassActionTest.cs.gold | 33 -- .../MapCollectionOfClassesActionTest.cs | 30 -- .../MapCollectionOfClassesActionTest.cs.gold | 33 -- .../Enum/MapEnumToNumericActionTest.cs | 23 -- .../Enum/MapEnumToNumericActionTest.cs.gold | 26 -- .../Actions/Enum/MapEnumToStringActionTest.cs | 23 -- .../Enum/MapEnumToStringActionTest.cs.gold | 26 -- .../ExtensionMethod/ExtensionMethodTest.cs | 19 - .../ExtensionMethodTest.cs.gold | 22 -- .../FullInputModelNameTest.cs | 19 - .../FullInputModelNameTest.cs.gold | 22 -- .../FullOutputModelNameTest.cs | 19 - .../FullOutputModelNameTest.cs.gold | 22 -- .../LocalFunction/LocalFunctionLaunchTest.cs | 22 -- .../LocalFunctionLaunchTest.cs.gold | 25 -- .../Actions/NonEmptyMethod/NonEmptyMethod.cs | 24 -- .../NonEmptyMethod/NonEmptyMethod.cs.gold | 1 - .../NonMethodHeaderCaret.cs | 25 -- .../NonMethodHeaderCaret.cs.gold | 1 - .../Numeric/MapNumericToEnumActionTest.cs | 23 -- .../MapNumericToEnumActionTest.cs.gold | 26 -- .../Numeric/MapNumericToStringActionTest.cs | 16 - .../MapNumericToStringActionTest.cs.gold | 19 - .../Numeric/MapSameTypeAndNameProperties.cs | 28 -- .../MapSameTypeAndNameProperties.cs.gold | 31 -- .../String/MapStringToEnumActionTest.cs | 23 -- .../String/MapStringToEnumActionTest.cs.gold | 26 -- .../String/MapStringToNumericActionTest.cs | 16 - .../MapStringToNumericActionTest.cs.gold | 19 - .../test/data/nuget.config | 21 - .../test/src/Actions/ExtensionMethodTests.cs | 14 - .../test/src/Actions/FullModelNameTests.cs | 17 - .../test/src/Actions/LocalFunctionTest.cs | 17 - .../src/Actions/MapClassInternalsTests.cs | 17 - .../Actions/MapCollectionInternalsTests.cs | 17 - .../test/src/Actions/MapEnumInternalsTests.cs | 23 -- .../src/Actions/MapNumericInternalsTests.cs | 29 -- .../src/Actions/MapStringInternalsTests.cs | 23 -- .../test/src/Actions/NonEmptyMethodTests.cs | 19 - .../test/src/Actions/NonMethodHeaderCaret.cs | 19 - .../Properties/AssemblyInfo.cs | 35 ++ ...ReSharperPlugin.SharpCoachPlugin.Ui.csproj | 28 +- .../ToolWindows/MapModelsLogsToolWindowUI.cs | 4 +- .../Actions/MapModelsAction.cs | 131 +++--- .../IContextActionsZone.cs | 11 + .../ISharpCoachPluginZone.cs | 15 - ...harperPlugin.SharpCoachPlugin.Rider.csproj | 62 +-- .../ReSharperPlugin.SharpCoachPlugin.csproj | 71 +--- .../Resources.Designer.cs | 67 ++++ .../Resources.resx | 30 ++ .../Templates.DotSettings | 13 - .../ZoneMarker.cs | 7 + .../coachsharp/actions/MapModelsAction.kt | 8 - .../options/CoachSharpOptionsPage.kt | 9 - src/rider/main/resources/META-INF/plugin.xml | 25 +- tools/nuget.exe | Bin 6512008 -> 7088048 bytes 110 files changed, 1098 insertions(+), 1952 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 .github/ISSUE_TEMPLATE/plugin-not-compatible-with-rider.md delete mode 100644 .github/workflows/dotnet.yml delete mode 100644 LICENSE delete mode 100644 build.gradle create mode 100644 build.gradle.kts create mode 100644 dependencies.json delete mode 100644 docs/features/Mapping.md delete mode 100644 global.json create mode 100644 gradle/libs.versions.toml delete mode 100644 photos/map internals of models menu.jpg delete mode 100644 plugin_sample_projects/mapping/Mapping/.idea/.idea.Mapping/.idea/.gitignore delete mode 100644 plugin_sample_projects/mapping/Mapping/.idea/.idea.Mapping/.idea/encodings.xml delete mode 100644 plugin_sample_projects/mapping/Mapping/.idea/.idea.Mapping/.idea/indexLayout.xml delete mode 100644 plugin_sample_projects/mapping/Mapping/.idea/.idea.Mapping/.idea/vcs.xml delete mode 100644 plugin_sample_projects/mapping/Mapping/Mapping.sln delete mode 100644 plugin_sample_projects/mapping/Mapping/Mapping/BLL/Models/Requests/UserRequest.cs delete mode 100644 plugin_sample_projects/mapping/Mapping/Mapping/BLL/Models/Responses/UserResponse.cs delete mode 100644 plugin_sample_projects/mapping/Mapping/Mapping/Mapping.csproj delete mode 100644 plugin_sample_projects/mapping/Mapping/Mapping/Program.cs delete mode 100644 plugin_sample_projects/mapping/Mapping/global.json delete mode 100644 protocol/build.gradle create mode 100644 protocol/build.gradle.kts delete mode 100644 protocol/src/main/kotlin/model/rider/SharpCoachPluginModel.kt rename settings.gradle => settings.gradle.kts (62%) create mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Core/Properties/AssemblyInfo.cs create mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Core/ReSharperPlugin.SharpCoachPlugin.Core - Copy.txt delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/TestEnvironment.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Class/MapClassToClassActionTest.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Class/MapClassToClassActionTest.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Collection/MapCollectionOfClassesActionTest.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Collection/MapCollectionOfClassesActionTest.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Enum/MapEnumToNumericActionTest.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Enum/MapEnumToNumericActionTest.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Enum/MapEnumToStringActionTest.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Enum/MapEnumToStringActionTest.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/ExtensionMethod/ExtensionMethodTest.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/ExtensionMethod/ExtensionMethodTest.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/FullModelNameTests/FullInputModelNameTest.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/FullModelNameTests/FullInputModelNameTest.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/FullModelNameTests/FullOutputModelNameTest.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/FullModelNameTests/FullOutputModelNameTest.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/LocalFunction/LocalFunctionLaunchTest.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/LocalFunction/LocalFunctionLaunchTest.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/NonEmptyMethod/NonEmptyMethod.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/NonEmptyMethod/NonEmptyMethod.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/NonMethodHeaderCaret/NonMethodHeaderCaret.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/NonMethodHeaderCaret/NonMethodHeaderCaret.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Numeric/MapNumericToEnumActionTest.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Numeric/MapNumericToEnumActionTest.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Numeric/MapNumericToStringActionTest.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Numeric/MapNumericToStringActionTest.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Numeric/MapSameTypeAndNameProperties.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Numeric/MapSameTypeAndNameProperties.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/String/MapStringToEnumActionTest.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/String/MapStringToEnumActionTest.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/String/MapStringToNumericActionTest.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/String/MapStringToNumericActionTest.cs.gold delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/nuget.config delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/src/Actions/ExtensionMethodTests.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/src/Actions/FullModelNameTests.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/src/Actions/LocalFunctionTest.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/src/Actions/MapClassInternalsTests.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/src/Actions/MapCollectionInternalsTests.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/src/Actions/MapEnumInternalsTests.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/src/Actions/MapNumericInternalsTests.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/src/Actions/MapStringInternalsTests.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/src/Actions/NonEmptyMethodTests.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/src/Actions/NonMethodHeaderCaret.cs create mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin.Ui/Properties/AssemblyInfo.cs create mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin/IContextActionsZone.cs delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin/ISharpCoachPluginZone.cs create mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin/Resources.Designer.cs create mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin/Resources.resx delete mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin/Templates.DotSettings create mode 100644 src/dotnet/ReSharperPlugin.SharpCoachPlugin/ZoneMarker.cs delete mode 100644 src/rider/main/kotlin/com/jetbrains/rider/plugins/coachsharp/actions/MapModelsAction.kt delete mode 100644 src/rider/main/kotlin/com/jetbrains/rider/plugins/coachsharp/options/CoachSharpOptionsPage.kt diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 3254c70..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Desktop (please complete the following information):** - - OS: [e.g. OSx] - - Rider version and build number [e.g. #2021.1.1 #212.1111.111] - -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/plugin-not-compatible-with-rider.md b/.github/ISSUE_TEMPLATE/plugin-not-compatible-with-rider.md deleted file mode 100644 index 7dbc641..0000000 --- a/.github/ISSUE_TEMPLATE/plugin-not-compatible-with-rider.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: Plugin not compatible with Rider -about: Create a report to know, which version is not supported -title: 'Plugin not compatible with Rider ' -labels: 'rider-version-compatibility' -assignees: 'DeagleGross' - ---- -**Please complete the following information:** -- Rider version and build number [e.g. #2021.1.1 #212.1111.111] -You can find it by clicking "Help" -> "About" in Rider menu. - -**Do you want to help by submitting a PR?** -That's the fastest way to get your version of plugin in production. Follow README.md guidelines on building, launching and testing plugin. diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml deleted file mode 100644 index df05f6d..0000000 --- a/.github/workflows/dotnet.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: CI - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - # because of project specificity, we need to run net472, so choosing windows - runs-on: [windows-latest] - - steps: - # check out repository under $GITHUB_WORKSPACE, so job can access it - - uses: actions/checkout@v2 - - # helps set up MSBuild into PATH for later usage - - name: setup MsBuild - uses: microsoft/setup-msbuild@v1.0.3 - - # install nuget.exe - - name: Setup NuGet.exe - uses: NuGet/setup-nuget@v1.0.5 - - - name: Restore Nuget Packages - run: nuget restore ReSharperPlugin.SharpCoachPlugin.sln - - - name: Build the Solution - run: msbuild ReSharperPlugin.SharpCoachPlugin.sln - - - name: Run Tests - run: dotnet test ReSharperPlugin.SharpCoachPlugin.sln --no-restore --verbosity normal \ No newline at end of file diff --git a/.gitignore b/.gitignore index e05792a..98cd959 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,13 @@ # Build artifacts +/.intellijPlatform/ [Bb]in/ [Oo]bj/ build +packages output .gradle .tmp +NuGetLocks/ # User-specific files *.suo @@ -19,4 +22,4 @@ output /.idea/.idea.*/.idea/*.xml .vs _ReSharper* -_dotTrace* \ No newline at end of file +_dotTrace* diff --git a/.idea/.idea.ReSharperPlugin.SharpCoachPlugin/.idea/.gitignore b/.idea/.idea.ReSharperPlugin.SharpCoachPlugin/.idea/.gitignore index c54027e..333c45e 100644 --- a/.idea/.idea.ReSharperPlugin.SharpCoachPlugin/.idea/.gitignore +++ b/.idea/.idea.ReSharperPlugin.SharpCoachPlugin/.idea/.gitignore @@ -1,11 +1,11 @@ -# Default ignored files +# Default ignored files /shelf/ /workspace.xml # Rider ignored files /contentModel.xml /modules.xml /projectSettingsUpdater.xml -/.idea.ReSharperPlugin.SharpCoachPlugin.iml +/.idea.ReSharperPlugin.ContextActions.iml # Editor-based HTTP Client requests /httpRequests/ # Datasource local storage ignored files diff --git a/.idea/.idea.ReSharperPlugin.SharpCoachPlugin/.idea/runConfigurations/Rider__Unix_.xml b/.idea/.idea.ReSharperPlugin.SharpCoachPlugin/.idea/runConfigurations/Rider__Unix_.xml index 9a468a4..9e51371 100644 --- a/.idea/.idea.ReSharperPlugin.SharpCoachPlugin/.idea/runConfigurations/Rider__Unix_.xml +++ b/.idea/.idea.ReSharperPlugin.SharpCoachPlugin/.idea/runConfigurations/Rider__Unix_.xml @@ -10,8 +10,8 @@