support for type definitions

src/FsAutoComplete/CodeFixes/AddPrivateAccessModifier.fs

@@ -64,6 +64,11 @@ let private getRangesAndPlacement input pos =
     | Some a when a.Range.EndLine = posLine -> a.Range.WithStart a.Range.End
     | _ -> moduleKeywordRange.WithStart moduleKeywordRange.End
 
+  let longIdentContainsPos (longIdent: LongIdent) (pos: FSharp.Compiler.Text.pos) =
+    longIdent
+    |> List.tryFind (fun i -> rangeContainsPos i.idRange pos)
+    |> Option.isSome
+
   let tryGetDeclContainingRange (path: SyntaxVisitorPath) pos =
     path
     |> Seq.skip 1
@@ -80,11 +85,7 @@ let private getRangesAndPlacement input pos =
       match d with
       | SynModuleDecl.NestedModule(
           moduleInfo = SynComponentInfo(attributes = attributes; longId = longId; accessibility = None)
-          trivia = { ModuleKeyword = Some r }) as m when
-        longId
-        |> List.tryFind (fun i -> rangeContainsPos i.idRange pos)
-        |> Option.isSome
-        ->
+          trivia = { ModuleKeyword = Some r }) as m when longIdentContainsPos longId pos ->
         let editRange = getEditRangeForModule attributes r pos.Line
         let path = (SyntaxNode.SynModule m) :: path
 
@@ -102,6 +103,15 @@ let private getRangesAndPlacement input pos =
         typeDefns
         |> List.tryPick (fun td ->
           match td with
+          | SynTypeDefn(typeInfo = SynComponentInfo(longId = longId; accessibility = None; range = r)) as t when
+            longIdentContainsPos longId pos
+            ->
+            let editRange = r.WithEnd r.Start
+            let path = SyntaxNode.SynTypeDefn t :: path
+
+            match tryGetDeclContainingRange path pos with
+            | Some r -> Some(editRange, r, Before)
+            | _ -> None
           | SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(_, members, _)) as d ->
             let path = SyntaxNode.SynTypeDefn d :: path
 
@@ -163,9 +173,7 @@ let private getRangesAndPlacement input pos =
               attribs = attribs
               accessibility = None
               trivia = { LeadingKeyword = SynModuleOrNamespaceLeadingKeyword.Module r }) as mOrN when
-            longId
-            |> List.tryFind (fun i -> rangeContainsPos i.idRange pos)
-            |> Option.isSome
+            longIdentContainsPos longId pos
             ->
             let editRange = getEditRangeForModule attribs r pos.Line
 

test/FsAutoComplete.Tests.Lsp/CodeFixTests/Tests.fs

@@ -727,6 +727,20 @@ let private addPrivateAccessModifierTests state =
         Diagnostics.acceptAll
         selectCodeFix
 
+      testCaseAsync "add private works for class type definition"
+      <| CodeFix.check
+        server
+        """
+        type [<System.Obsolete>] MyCla$0ss() =
+          member _.X = 10
+        """
+        Diagnostics.acceptAll
+        selectCodeFix
+        """
+        type [<System.Obsolete>] private MyClass() =
+          member _.X = 10
+        """
+
       testCaseAsync "add private is not offered for member with reference outside its declaring class"
       <| CodeFix.checkNotApplicable
         server
@@ -814,6 +828,22 @@ let private addPrivateAccessModifierTests state =
         Diagnostics.acceptAll
         selectCodeFix
 
+      testCaseAsync "add private works for DU type definition"
+      <| CodeFix.check
+        server
+        """
+        type [<System.Obsolete>] MyDi$0scUnion =
+        | Case1
+        | Case2
+        """
+        Diagnostics.acceptAll
+        selectCodeFix
+        """
+        type [<System.Obsolete>] private MyDiscUnion =
+        | Case1
+        | Case2
+        """
+
       testCaseAsync "add private is not offered for member with reference outside its declaring DU"
       <| CodeFix.checkNotApplicable
         server
@@ -879,6 +909,22 @@ let private addPrivateAccessModifierTests state =
           member private _.Foo x = x
         """
 
+      testCaseAsync "add private works for Record definition"
+      <| CodeFix.check
+        server
+        """
+        type [<System.Obsolete>] My$0Record =
+          { Field1: int
+            Field2: string }
+        """
+        Diagnostics.acceptAll
+        selectCodeFix
+        """
+        type [<System.Obsolete>] private MyRecord =
+          { Field1: int
+            Field2: string }
+        """
+
       testCaseAsync "add private is not offered for member with reference outside its declaring Record"
       <| CodeFix.checkNotApplicable
         server