Merge pull request #64732 from DoctorKrolic/fix-prop-caret-position

Fixed prop snippet caret position
dotnet · Oct 17, 2022 · 048f695 · 048f695
2 parents a1c6606 + 003b05e
commit 048f695
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 18 deletions.
diff --git a/...pTest/Completion/CompletionProviders/Snippets/CSharpPropSnippetCompletionProviderTests.cs b/...pTest/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
@@ -62,7 +62,7 @@ protected override async Task<SyntaxNode> 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<SnippetPlaceholder> 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
@@ -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
@@ -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
@@ -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
@@ -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
 {