From 3e4c375a8054cade193568016d608f404b01b8e3 Mon Sep 17 00:00:00 2001 From: Vasileios Naskos Date: Wed, 2 Oct 2024 14:53:11 +0200 Subject: [PATCH] Change idePath from FileUri to string --- .../Implementation/ShowFixSuggestionListenerTests.cs | 3 +-- .../Listener/FixSuggestion/ShowFixSuggestionParamsTests.cs | 5 ++--- src/SLCore/Listener/FixSuggestion/Models/FileEditDto.cs | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/SLCore.Listeners.UnitTests/Implementation/ShowFixSuggestionListenerTests.cs b/src/SLCore.Listeners.UnitTests/Implementation/ShowFixSuggestionListenerTests.cs index 670da1dab..d730ffb6f 100644 --- a/src/SLCore.Listeners.UnitTests/Implementation/ShowFixSuggestionListenerTests.cs +++ b/src/SLCore.Listeners.UnitTests/Implementation/ShowFixSuggestionListenerTests.cs @@ -19,7 +19,6 @@ */ using SonarLint.VisualStudio.IssueVisualization.FixSuggestion; -using SonarLint.VisualStudio.SLCore.Common.Models; using SonarLint.VisualStudio.SLCore.Core; using SonarLint.VisualStudio.SLCore.Listener.FixSuggestion; using SonarLint.VisualStudio.SLCore.Listener.FixSuggestion.Models; @@ -60,7 +59,7 @@ public void ShowFixSuggestion_CallsHandler() { new(new LineRangeDto(10, 10), "public void test()", "private void test()") }; - var fileEditDto = new FileEditDto(new FileUri(@"C:\Users\test\TestProject\AFile.cs"), listOfChanges); + var fileEditDto = new FileEditDto(@"C:\Users\test\TestProject\AFile.cs", listOfChanges); var fixSuggestionDto = new FixSuggestionDto("SUGGESTION_ID", "AN EXPLANATION", fileEditDto); var parameters = new ShowFixSuggestionParams("CONFIG_SCOPE_ID", "S1234", fixSuggestionDto); diff --git a/src/SLCore.UnitTests/Listener/FixSuggestion/ShowFixSuggestionParamsTests.cs b/src/SLCore.UnitTests/Listener/FixSuggestion/ShowFixSuggestionParamsTests.cs index a56ff28e1..e8aff94c8 100644 --- a/src/SLCore.UnitTests/Listener/FixSuggestion/ShowFixSuggestionParamsTests.cs +++ b/src/SLCore.UnitTests/Listener/FixSuggestion/ShowFixSuggestionParamsTests.cs @@ -19,7 +19,6 @@ */ using Newtonsoft.Json; -using SonarLint.VisualStudio.SLCore.Common.Models; using SonarLint.VisualStudio.SLCore.Listener.FixSuggestion; using SonarLint.VisualStudio.SLCore.Listener.FixSuggestion.Models; using FileEditDto = SonarLint.VisualStudio.SLCore.Listener.FixSuggestion.Models.FileEditDto; @@ -36,7 +35,7 @@ public void Serialize_AsExpected() { new(new LineRangeDto(10, 10), "public void test()", "private void test()") }; - var fileEditDto = new FileEditDto(new FileUri(@"C:\Users\test\TestProject\AFile.cs"), listOfChanges); + var fileEditDto = new FileEditDto(@"C:\Users\test\TestProject\AFile.cs", listOfChanges); var fixSuggestionDto = new FixSuggestionDto("SUGGESTION_ID", "AN EXPLANATION", fileEditDto); var testSubject = new ShowFixSuggestionParams("CONFIG_SCOPE_ID", "S1234", fixSuggestionDto); @@ -48,7 +47,7 @@ public void Serialize_AsExpected() "suggestionId": "SUGGESTION_ID", "explanation": "AN EXPLANATION", "fileEdit": { - "idePath": "file:///C:/Users/test/TestProject/AFile.cs", + "idePath": "C:\\Users\\test\\TestProject\\AFile.cs", "changes": [ { "beforeLineRange": { diff --git a/src/SLCore/Listener/FixSuggestion/Models/FileEditDto.cs b/src/SLCore/Listener/FixSuggestion/Models/FileEditDto.cs index fe1b79c2a..ba666ff98 100644 --- a/src/SLCore/Listener/FixSuggestion/Models/FileEditDto.cs +++ b/src/SLCore/Listener/FixSuggestion/Models/FileEditDto.cs @@ -18,8 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using SonarLint.VisualStudio.SLCore.Common.Models; - namespace SonarLint.VisualStudio.SLCore.Listener.FixSuggestion.Models; -public record FileEditDto(FileUri idePath, List changes); +public record FileEditDto(string idePath, List changes);