Psi: Support auto property get set access modifiers #1007

DedSec256 · 2025-11-12T13:53:50Z

No description provided.

auduchinok

Great work! I've left some comments, could you take a look?

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/AICore/FSharpFileSummarizer.fs

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/Parsing/FSharpTreeBuilderBase.fs

auduchinok · 2025-11-14T13:38:15Z

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/Parsing/FSharpTreeBuilderBase.fs

-        x.Done(memberRange, accessorsMark, ElementType.ACCESSORS_NAMES_CLAUSE)
+    member x.ProcessAccessorsNamesClause(getSetKeywords) =
+        match getSetKeywords with
+        | Some getSetKeywords ->


Would be really cool to add some recovery to the compiler here and to allow having other names (e.g. coming from an error), instead of allowing parsing with the expected names only.

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/Parsing/FSharpTreeBuilderBase.fs

ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Impl/DeclaredElement/FSharpPropertyBase.cs

ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Impl/DeclaredElement/ModuleValue.cs

...est/data/cache/csharpResolve/Properties 22 - Accessor modifiers - Private getter - Auto.gold

.../test/data/cache/csharpResolve/Properties 22 - Accessor modifiers - Private getter - Auto.cs

...est/data/cache/csharpResolve/Properties 22 - Accessor modifiers - Private getter - Auto.gold

auduchinok · 2025-11-19T09:48:49Z

ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Impl/Tree/AccessorDeclaration.cs

+    public bool IsAutoPropertyAccessor => 
+      ParametersDeclarationsEnumerable.IsEmpty() && EqualsToken == null;


Would it also be true for non-auto properties in interfaces and signatures?

Possibly it requires a better name. The idea is to designate accessors consisting of 'simple' names syntactically. So it should be true for properties in interfaces and signatures

Maybe try something along HasParameters, IsParameterless, IsImplicit?

^ Conflicts: ^ ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Impl/DeclaredElement/FSharpProperty.cs ^ ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Tree/IAccessorDeclaration.cs

auduchinok

@DedSec256 This is a very nice refactoring! Thanks a lot for it 🙂

auduchinok · 2025-12-11T11:48:28Z

ReSharper.FSharp/test/src/FSharp.Intentions.Tests/src/QuickFixes/AddSetterFixTest.fs

    [<Test>] member x.``Auto property 04 - Abstract``() = x.DoNamedTest()
+    [<Test>] member x.``Auto property 05 - With getter - Access modifier``() = x.DoNamedTest()
+
+    // TODO: fix in the formatter


Thanks for adding this todo here! I was going to suggest it while looking at the test data :)

auduchinok · 2025-12-11T11:50:13Z

ReSharper.FSharp/test/data/parsing/Type member - Abstract 06 - Accessors.fs.gold

-          IAccessorsNamesClause
-            FSharpTokenType+WithTokenElement(type:WITH, text:with)
-            Whitespace(type:WHITE_SPACE, text: ) spaces:" "
+          FSharpTokenType+WithTokenElement(type:WITH, text:with)
+          Whitespace(type:WHITE_SPACE, text: ) spaces:" "
+          IAccessorDeclaration
            FSharpIdentifierToken(type:IDENTIFIER, text:get)
-            FSharpTokenType+CommaTokenElement(type:COMMA, text:,)
-            Whitespace(type:WHITE_SPACE, text: ) spaces:" "
+          FSharpTokenType+CommaTokenElement(type:COMMA, text:,)
+          Whitespace(type:WHITE_SPACE, text: ) spaces:" "
+          IAccessorDeclaration


One small downside of this change is 'Extend Selection' would not select the accessors clause anymore. I'd suggest adding a separate rule there to prevent it.

What do you think about doing this in the next PR?

That would be fine.

DedSec256 force-pushed the ber.a/autoPropertyModifiers branch 3 times, most recently from 4f87705 to 802ba94 Compare November 14, 2025 01:58

DedSec256 changed the title ~~Psi: Support get set access modifiers~~ Psi: Support auto property get set access modifiers Nov 14, 2025

DedSec256 marked this pull request as ready for review November 14, 2025 03:51

auduchinok reviewed Nov 14, 2025

View reviewed changes

...est/data/cache/csharpResolve/Properties 22 - Accessor modifiers - Private getter - Auto.gold Outdated Show resolved Hide resolved

auduchinok reviewed Nov 19, 2025

View reviewed changes

DedSec256 added 11 commits December 9, 2025 15:32

wip

364f1d7

^ Conflicts: ^ ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Impl/DeclaredElement/FSharpProperty.cs ^ ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Tree/IAccessorDeclaration.cs

wip

f6b7f5d

wip

39f56cc

tests

2baf816

refactoring

6b5c6e9

refactoring

733084c

cleanup

55d2c61

fixes, part 1

aa0da82

newlines

678d326

fixes

8a3f589

cleanup

2a907e8

DedSec256 force-pushed the ber.a/autoPropertyModifiers branch from d338367 to 2a907e8 Compare December 9, 2025 12:33

auduchinok approved these changes Dec 11, 2025

View reviewed changes

DedSec256 merged commit 1053af3 into main Dec 12, 2025
1 check passed

DedSec256 deleted the ber.a/autoPropertyModifiers branch December 17, 2025 14:19

		public bool IsAutoPropertyAccessor =>
		ParametersDeclarationsEnumerable.IsEmpty() && EqualsToken == null;

Psi: Support auto property get set access modifiers #1007

Psi: Support auto property get set access modifiers #1007

Uh oh!

Conversation

DedSec256 commented Nov 12, 2025

Uh oh!

auduchinok left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

auduchinok Nov 14, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

auduchinok Nov 19, 2025

Choose a reason for hiding this comment

Uh oh!

DedSec256 Nov 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

auduchinok Nov 19, 2025

Choose a reason for hiding this comment

Uh oh!

auduchinok left a comment

Choose a reason for hiding this comment

Uh oh!

auduchinok Dec 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

auduchinok Dec 11, 2025

Choose a reason for hiding this comment

Uh oh!

DedSec256 Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

auduchinok Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

DedSec256 Nov 19, 2025 •

edited

Loading

auduchinok Dec 11, 2025 •

edited

Loading