From 003b05e0caf23a9d5de84f3cb1cad384a1d96ddd Mon Sep 17 00:00:00 2001 From: DoctorKrolic Date: Fri, 14 Oct 2022 14:22:07 +0300 Subject: [PATCH] Fixed prop snippet caret position --- .../CSharpPropSnippetCompletionProviderTests.cs | 10 +++++----- .../Portable/Snippets/CSharpPropSnippetProvider.cs | 2 +- .../Core/Portable/Snippets/SnippetPlaceholder.cs | 3 --- .../SnippetProviders/AbstractPropSnippetProvider.cs | 3 --- .../SnippetProviders/AbstractSnippetProvider.cs | 1 - .../Snippets/SnippetProviders/ISnippetProvider.cs | 5 ----- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/Snippets/CSharpPropSnippetCompletionProviderTests.cs b/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/Snippets/CSharpPropSnippetCompletionProviderTests.cs index 3dc2b4250cd03..63110bcf0a40a 100644 --- a/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/Snippets/CSharpPropSnippetCompletionProviderTests.cs +++ b/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/Snippets/CSharpPropSnippetCompletionProviderTests.cs @@ -62,7 +62,7 @@ public async Task InsertPropSnippetInClassTest() var expectedCodeAfterCommit = @"class MyClass { - public int MyProperty {$$ get; set; } + public int MyProperty { get; set; }$$ }"; await VerifyCustomCommitProviderAsync(markupBeforeCommit, ItemToCommit, expectedCodeAfterCommit); } @@ -79,7 +79,7 @@ public async Task InsertPropSnippetInRecordTest() var expectedCodeAfterCommit = @"record MyRecord { - public int MyProperty {$$ get; set; } + public int MyProperty { get; set; }$$ }"; await VerifyCustomCommitProviderAsync(markupBeforeCommit, ItemToCommit, expectedCodeAfterCommit); } @@ -96,7 +96,7 @@ public async Task InsertPropSnippetInStructTest() var expectedCodeAfterCommit = @"struct MyStruct { - public int MyProperty {$$ get; set; } + public int MyProperty { get; set; }$$ }"; await VerifyCustomCommitProviderAsync(markupBeforeCommit, ItemToCommit, expectedCodeAfterCommit); } @@ -113,7 +113,7 @@ public async Task InsertPropSnippetInInterfaceTest() var expectedCodeAfterCommit = @"interface MyInterface { - public int MyProperty {$$ get; set; } + public int MyProperty { get; set; }$$ }"; await VerifyCustomCommitProviderAsync(markupBeforeCommit, ItemToCommit, expectedCodeAfterCommit); } @@ -132,7 +132,7 @@ public async Task InsertPropSnippetNamingTest() @"class MyClass { public int MyProperty { get; set; } - public int MyProperty1 {$$ get; set; } + public int MyProperty1 { get; set; }$$ }"; await VerifyCustomCommitProviderAsync(markupBeforeCommit, ItemToCommit, expectedCodeAfterCommit); } diff --git a/src/Features/CSharp/Portable/Snippets/CSharpPropSnippetProvider.cs b/src/Features/CSharp/Portable/Snippets/CSharpPropSnippetProvider.cs index 5e73eb0593084..a5d4987ed573f 100644 --- a/src/Features/CSharp/Portable/Snippets/CSharpPropSnippetProvider.cs +++ b/src/Features/CSharp/Portable/Snippets/CSharpPropSnippetProvider.cs @@ -62,7 +62,7 @@ protected override async Task GenerateSnippetSyntaxAsync(Document do protected override int GetTargetCaretPosition(ISyntaxFactsService syntaxFacts, SyntaxNode caretTarget, SourceText sourceText) { var propertyDeclaration = (PropertyDeclarationSyntax)caretTarget; - return propertyDeclaration.AccessorList!.OpenBraceToken.Span.End; + return propertyDeclaration.AccessorList!.CloseBraceToken.Span.End; } protected override ImmutableArray GetPlaceHolderLocationsList(SyntaxNode node, ISyntaxFacts syntaxFacts, CancellationToken cancellationToken) diff --git a/src/Features/Core/Portable/Snippets/SnippetPlaceholder.cs b/src/Features/Core/Portable/Snippets/SnippetPlaceholder.cs index 5932bdfeff17d..a60fd6401d9cc 100644 --- a/src/Features/Core/Portable/Snippets/SnippetPlaceholder.cs +++ b/src/Features/Core/Portable/Snippets/SnippetPlaceholder.cs @@ -3,10 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; using System.Collections.Immutable; -using System.Text; -using Microsoft.CodeAnalysis.Text; namespace Microsoft.CodeAnalysis.Snippets { diff --git a/src/Features/Core/Portable/Snippets/SnippetProviders/AbstractPropSnippetProvider.cs b/src/Features/Core/Portable/Snippets/SnippetProviders/AbstractPropSnippetProvider.cs index 0f7f010fb9e85..058409c7c67c3 100644 --- a/src/Features/Core/Portable/Snippets/SnippetProviders/AbstractPropSnippetProvider.cs +++ b/src/Features/Core/Portable/Snippets/SnippetProviders/AbstractPropSnippetProvider.cs @@ -3,12 +3,9 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; using System.Collections.Immutable; -using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Editing; using Microsoft.CodeAnalysis.LanguageService; using Microsoft.CodeAnalysis.Text; diff --git a/src/Features/Core/Portable/Snippets/SnippetProviders/AbstractSnippetProvider.cs b/src/Features/Core/Portable/Snippets/SnippetProviders/AbstractSnippetProvider.cs index f744d28ce15c8..a78a9ccd6b818 100644 --- a/src/Features/Core/Portable/Snippets/SnippetProviders/AbstractSnippetProvider.cs +++ b/src/Features/Core/Portable/Snippets/SnippetProviders/AbstractSnippetProvider.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; using System.Threading; diff --git a/src/Features/Core/Portable/Snippets/SnippetProviders/ISnippetProvider.cs b/src/Features/Core/Portable/Snippets/SnippetProviders/ISnippetProvider.cs index a4205fba2106c..bbf1858de9980 100644 --- a/src/Features/Core/Portable/Snippets/SnippetProviders/ISnippetProvider.cs +++ b/src/Features/Core/Portable/Snippets/SnippetProviders/ISnippetProvider.cs @@ -2,13 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Collections.Generic; -using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Host; -using Microsoft.CodeAnalysis.Text; namespace Microsoft.CodeAnalysis.Snippets.SnippetProviders {