wip

Author: DedSec256

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

@@ -78,16 +78,7 @@ type private FileSummarizerVisitor() =
     let addMember (memberDecl: IOverridableMemberDeclaration) (context: SummarizerContext) =
         let typeRepr = memberDecl.GetFcsSymbol() |> formatFcsSymbolType
         let accessorNames =
-            match memberDecl with
-            | :? IAccessorsNamesClauseOwner as prop ->
-                match prop.AccessorsClause with
-                | null -> Seq.empty
-                | clause -> clause.AccessorsNamesEnumerable |> Seq.map _.Name
-
-            | :? IMemberSignatureOrDeclaration as memberDecl ->
-                memberDecl.AccessorDeclarationsEnumerable |> Seq.map _.NameIdentifier.Name
-
-            | _ -> Seq.empty
+            memberDecl.AccessorDeclarations |> Seq.map _.NameIdentifier.Name
 
         let accessors =
             if Seq.isEmpty accessorNames then "" else

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/LanguageService/FSharpElementFactory.fs

@@ -403,14 +403,14 @@ type FSharpElementFactory(languageService: IFSharpLanguageService, [<NotNull>] c
 
             typeDeclaration.TypeParameterDeclarationList
 
-        member this.CreateAccessorsNamesClause(withGetter, withSetter) =
+        member this.CreateAutoPropertyDeclaration(withGetter, withSetter) =
             let accessors = [|
                 if withGetter then "get"
                 if withSetter then "set" |] |> String.concat ", "
 
             let source = $"member val P = 3 with {accessors}"
             let t = getTypeDecl source
-            t.MemberDeclarations[0].As<IAutoPropertyDeclaration>().AccessorsClause
+            t.MemberDeclarations[0].As<IAutoPropertyDeclaration>()
 
         member this.CreateEmptyFile() = createFile ""
 

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

@@ -255,13 +255,13 @@ type FSharpImplTreeBuilder(lexer, document, decls, warnDirectives, lifetime, pat
             | SynMemberDefn.Member(binding, range) ->
                 x.ProcessMemberBinding(mark, binding, range, None)
 
-            | SynMemberDefn.AbstractSlot(SynValSig(explicitTypeParams = typeParams; synType = synType; arity = arity; trivia = trivia), _, range, _) ->
+            | SynMemberDefn.AbstractSlot(SynValSig(explicitTypeParams = typeParams; synType = synType; arity = arity; trivia = trivia), _, range, memberTrivia) ->
                 match typeParams with
                 | SynValTyparDecls(Some(typeParams), _) ->
                     x.ProcessTypeParameters(typeParams, false)
                 | _ -> ()
                 x.ProcessReturnTypeInfo(arity, synType)
-                x.ProcessAccessorsNamesClause(trivia, range)
+                x.ProcessAccessorsNamesClause(trivia.WithKeyword, memberTrivia.GetSetKeywords)
                 ElementType.ABSTRACT_MEMBER_DECLARATION
 
             | SynMemberDefn.ValField(SynField(fieldType = synType), _) ->
@@ -272,16 +272,9 @@ type FSharpImplTreeBuilder(lexer, document, decls, warnDirectives, lifetime, pat
                 match synTypeOpt with
                 | Some synType -> x.ProcessType(synType)
                 | _ -> ()
-                x.MarkChameleonExpression(expr)
-
-                match accessorClause.WithKeyword, accessorClause.GetSetKeywords with
-                | Some withKeyword, None ->
-                    x.MarkAndDone(withKeyword, ElementType.ACCESSORS_NAMES_CLAUSE)
-                | Some withKeyword, Some getSetKeywords ->
-                    let range = Range.unionRanges withKeyword getSetKeywords.Range
-                    x.MarkAndDone(range, ElementType.ACCESSORS_NAMES_CLAUSE)
-                | _ -> ()
 
+                x.MarkChameleonExpression(expr)
+                x.ProcessAccessorsNamesClause(accessorClause.WithKeyword, accessorClause.GetSetKeywords)
                 ElementType.AUTO_PROPERTY_DECLARATION
 
             | _ -> failwithf "Unexpected type member: %A" typeMember

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

@@ -147,6 +147,11 @@ type FSharpTreeBuilderBase(lexer: ILexer, document: IDocument, warnDirectives: W
         while x.CurrentOffset < maxOffset && x.TokenType != tokenType && not x.Eof do
             x.AdvanceLexer()
 
+    member x.AdvanceToAnyInTokenSetOrPos(tokenTypes: NodeTypeSet, pos: pos) =
+        let maxOffset = x.GetOffset(pos)
+        while x.CurrentOffset < maxOffset && not (tokenTypes.Contains(x.TokenType)) && not x.Eof do
+            x.AdvanceLexer()
+
     member x.MarkXmlDocOwner(xmlDoc: XmlDoc, expectedType: TokenNodeType, declarationRange: range) =
         let mark = x.MarkTokenOrRange(expectedType, declarationRange)
         if xmlDoc.HasDeclaration then
@@ -941,22 +946,34 @@ type FSharpTreeBuilderBase(lexer: ILexer, document: IDocument, warnDirectives: W
         x.MarkAndDone(range, ElementType.TYPE_PARAMETER_ID)
         x.Done(range, mark, ElementType.TYPE_REFERENCE_NAME)
 
-    member x.ProcessAccessorsNamesClause(trivia: SynValSigTrivia, memberRange) =
-        match trivia.WithKeyword with
-        | None -> ()
-        | Some withRange ->
+    member x.ProcessAccessorNameWithModifiers(accessorNameRange: range) =
+        x.AdvanceToAnyInTokenSetOrPos(FSharpTokenType.AccessModifiers, accessorNameRange.Start)
+        let mark = x.Mark()
+        x.Done(accessorNameRange, mark, ElementType.ACCESSOR_DECLARATION)
 
-        let accessorsMark = x.Mark(withRange)
-        x.Done(memberRange, accessorsMark, ElementType.ACCESSORS_NAMES_CLAUSE)
+    member x.ProcessAccessorsNamesClause(withKeyword, getSetKeywords) =
+        match withKeyword, getSetKeywords with
+        | Some _, Some getSetKeywords ->
+            match getSetKeywords with
+            | GetSetKeywords.GetSet(getKeywordRange, setKeywordRange) ->
+                x.ProcessAccessorNameWithModifiers(getKeywordRange)
+                x.AdvanceToTokenOrRangeEnd(FSharpTokenType.COMMA, setKeywordRange)
+                x.ProcessAccessorNameWithModifiers(setKeywordRange)
+
+            | GetSetKeywords.Get(accessorsKeywordRange)
+            | GetSetKeywords.Set(accessorsKeywordRange) ->
+                x.ProcessAccessorNameWithModifiers(accessorsKeywordRange)
+
+        | _ -> ()
 
     member x.ProcessTypeMemberSignature(memberSig) =
         match memberSig with
-        | SynMemberSig.Member(SynValSig(attrs, _, _, synType, arity, _, _, XmlDoc xmlDoc, _, _, _, trivia), flags, range, _) ->
+        | SynMemberSig.Member(SynValSig(attrs, _, _, synType, arity, _, _, XmlDoc xmlDoc, _, _, _, trivia), flags, range, memberTrivia) ->
             let mark = x.MarkAndProcessIntro(attrs, xmlDoc, null, range)
             x.ProcessReturnTypeInfo(arity, synType)
             let elementType =
                 if flags.IsDispatchSlot then
-                    x.ProcessAccessorsNamesClause(trivia, range)
+                    x.ProcessAccessorsNamesClause(trivia.WithKeyword, memberTrivia.GetSetKeywords)
                     ElementType.ABSTRACT_MEMBER_DECLARATION
                 else
                     match flags.MemberKind with

ReSharper.FSharp/src/FSharp/FSharp.Psi.Intentions/src/QuickFixes/AddSetterFix.fs

@@ -2,16 +2,16 @@ namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.QuickFixes
 
 open JetBrains.ReSharper.Plugins.FSharp.Psi
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.Highlightings
-open JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Tree
+open JetBrains.ReSharper.Plugins.FSharp.Psi.Parsing
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
-open JetBrains.ReSharper.Psi.ExtensionsAPI
+open JetBrains.ReSharper.Psi.ExtensionsAPI.Tree
 open JetBrains.ReSharper.Resources.Shell
 
 type AddSetterFix(error: PropertyCannotBeSetError) =
     inherit FSharpQuickFixBase()
 
     let refExpr = error.RefExpr
-    let mutable declaration: IAccessorsNamesClauseOwner = null
+    let mutable declaration: IOverridableMemberDeclaration = null
 
     override this.IsAvailable _ =
         isValid refExpr &&
@@ -26,20 +26,35 @@ type AddSetterFix(error: PropertyCannotBeSetError) =
 
         declaration <-
             match decl with
-            | :? IAbstractMemberDeclaration as decl -> decl :> IAccessorsNamesClauseOwner
+            | :? IAbstractMemberDeclaration as decl -> decl :> IOverridableMemberDeclaration
             | :? IAutoPropertyDeclaration as decl when not decl.IsVirtual -> decl
             | _ -> null
 
-        isNotNull declaration
+        isNotNull declaration &&
+
+        let accessors = declaration.AccessorDeclarations
+        accessors.All _.IsAutoPropertyAccessor
 
     override this.Text = $"Add setter to '{refExpr.ShortName}'"
 
     override this.ExecutePsiTransaction _ =
         use writeCookie = WriteLockCookie.Create(refExpr.IsPhysical())
 
         let factory = refExpr.CreateElementFactory()
-        let accessors = factory.CreateAccessorsNamesClause(true, true)
-
-        declaration.SetAccessorsClause(accessors) |> ignore
-        if not (declaration.AccessorsClause.PrevSibling :? Whitespace) then
-            addNodeBefore declaration.AccessorsClause (Whitespace(1))
+        let autoProperty = factory.CreateAutoPropertyDeclaration(isNull (declaration.Getter()), true)
+        let accessors = autoProperty.AccessorDeclarationsEnumerable |> Seq.toList
+
+        addNodesAfter declaration.LastChild
+            [ match accessors with
+              | [getter; setter] ->
+                  FSharpTokenType.WITH.CreateLeafElement()
+                  getter
+                  FSharpTokenType.COMMA.CreateLeafElement()
+                  setter
+
+              | [setter] ->
+                  FSharpTokenType.COMMA.CreateLeafElement()
+                  setter
+
+              | _ -> () ]
+        |> ignore

ReSharper.FSharp/src/FSharp/FSharp.Psi/src/FSharp.psi

@@ -1446,7 +1446,7 @@ abstractMemberDeclaration options { stubBase="FSharpProperTypeMemberDeclarationB
   identOrOpName{IDENTIFIER, Identifier}
   postfixTypeParameterDeclarationList<TYPE_PARAMETER_LIST, TypeParameterList>?
   returnTypeInfo<RETURN_INFO, ReturnTypeInfo>
-  accessorsNamesClause<ACESSORS_CLAUSE, AccessorsClause>?;
+  accessorDecls?;
 
 valFieldDeclaration options { stubBase="FSharpProperTypeMemberDeclarationBase"; } extras {
   get { methodName="Attributes" path=<valFieldDeclaration:ATTRIBUTE_LIST/attributeList:ATTRIBUTE> };
@@ -1475,17 +1475,7 @@ autoPropertyDeclaration options { stubBase="FSharpProperTypeMemberDeclarationBas
   )?
   EQUALS<FSHARP_EQUALS, EqualsToken>
   chameleonExpression<CHAMELEON_EXPR, InitExpression>
-  accessorsNamesClause<ACESSORS_CLAUSE, AccessorsClause>?;
-
-accessorsNamesClause:
-  WITH
-  (
-    fSharpIdentifier<ACESSOR, AccessorsNames>
-  |
-    fSharpIdentifier<ACESSOR, AccessorsNames>
-    COMMA<FSHARP_COMMA, Comma>
-    fSharpIdentifier<ACESSOR, AccessorsNames>
-  );
+  accessorDecls?;
 
 accessorDeclaration options { stubBase="FSharpProperTypeMemberDeclarationBase"; } extras {
   get { methodName="Expression" path=<accessorDeclaration:CHAMELEON_EXPR/chameleonExpression:EXPR> };

ReSharper.FSharp/src/FSharp/FSharp.Psi/src/IFSharpElementFactory.cs

@@ -65,7 +65,7 @@ public interface IFSharpElementFactory
 
     ITypeParameterDeclarationList CreateTypeParameterOfTypeList(FSharpList<string> names);
 
-    IAccessorsNamesClause CreateAccessorsNamesClause(bool withGetter, bool withSetter);
+    IAutoPropertyDeclaration CreateAutoPropertyDeclaration(bool withGetter, bool withSetter);
 
     IFSharpFile CreateEmptyFile();
     INamedModuleDeclaration CreateModule(string name);

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

@@ -9,7 +9,7 @@
 namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.DeclaredElement
 {
   internal class FSharpProperty<TDeclaration> : FSharpPropertyMemberBase<TDeclaration>, IFSharpProperty
-    where TDeclaration : IFSharpDeclaration, IModifiersOwnerDeclaration, ITypeMemberDeclaration
+    where TDeclaration : IFSharpDeclaration, IModifiersOwnerDeclaration, ITypeMemberDeclaration, IAccessorOwnerDeclaration
   {
     public FSharpProperty([NotNull] ITypeMemberDeclaration declaration,
       [NotNull] FSharpMemberOrFunctionOrValue mfv) : base(declaration, mfv)

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

@@ -6,14 +6,13 @@
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Tree;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Util;
 using JetBrains.ReSharper.Psi;
-using JetBrains.ReSharper.Psi.Impl.Special;
 using JetBrains.ReSharper.Psi.Resolve;
 using JetBrains.ReSharper.Psi.Tree;
 
 namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.DeclaredElement
 {
   internal abstract class FSharpPropertyMemberBase<TDeclaration> : FSharpPropertyBase<TDeclaration>
-    where TDeclaration : IFSharpDeclaration, IModifiersOwnerDeclaration, ITypeMemberDeclaration
+    where TDeclaration : IFSharpDeclaration, IModifiersOwnerDeclaration, ITypeMemberDeclaration, IAccessorOwnerDeclaration
   {
     protected FSharpPropertyMemberBase([NotNull] ITypeMemberDeclaration declaration,
       [NotNull] FSharpMemberOrFunctionOrValue mfv) : base(declaration)
@@ -82,7 +81,7 @@ bool IsReadable(FSharpMemberOrFunctionOrValue mfv) =>
 
   internal abstract class FSharpPropertyBase<TDeclaration>([NotNull] ITypeMemberDeclaration declaration)
     : FSharpMemberBase<TDeclaration>(declaration), IFSharpParameterOwnerMember, IProperty
-    where TDeclaration : IFSharpDeclaration, IModifiersOwnerDeclaration, ITypeMemberDeclaration
+    where TDeclaration : IFSharpDeclaration, IModifiersOwnerDeclaration, ITypeMemberDeclaration, IAccessorOwnerDeclaration
   {
     protected override FSharpSymbol GetActualSymbol(FSharpSymbol symbol)
     {
@@ -124,13 +123,19 @@ public override DeclaredElementType GetElementType() =>
 
     public string GetDefaultPropertyMetadataName() => ShortName;
 
-    public IAccessor Getter => IsReadable ? new ImplicitAccessor(this, AccessorKind.GETTER) : null;
-    public IAccessor Setter => IsWritable ? new ImplicitAccessor(this, AccessorKind.SETTER) : null;
+    private IAccessor GetAccessor(AccessorKind kind) =>
+      GetDeclaration() is { } accessorOwner &&
+      accessorOwner.AccessorDeclarationsEnumerable.FirstOrDefault(x => x.Kind == kind) is var accessor
+        ? new FSharpPropertyImplicitAccessor(this, kind, FSharpModifiersUtil.GetAccessRights(accessor?.AccessModifier))
+        : null;
+
+    public IAccessor Getter => IsReadable ? GetAccessor(AccessorKind.GETTER) : null;
+    public IAccessor Setter => IsWritable ? GetAccessor(AccessorKind.SETTER) : null;
 
     public abstract bool IsReadable { get; }
     public abstract bool IsWritable { get; }
     public bool IsRequired => false;
-    public bool IsAuto => false;
+    public bool IsAuto => GetDeclaration() is IAutoPropertyDeclaration;
     public virtual bool IsDefault => false;
 
     public override bool Equals(object obj) =>

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

@@ -0,0 +1,11 @@
+using JetBrains.Annotations;
+using JetBrains.ReSharper.Psi;
+using JetBrains.ReSharper.Psi.Impl.Special;
+
+namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.DeclaredElement;
+
+public class FSharpPropertyImplicitAccessor([NotNull] IOverridableMember owner, AccessorKind kind, AccessRights accessRights)
+  : ImplicitAccessor(owner, kind)
+{
+  public override AccessRights GetAccessRights() => accessRights;
+}