Completion: use short item return types

JetBrains · Feb 10, 2025 · da03f82 · da03f82
1 parent c46102f
commit da03f82
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/CodeCompletion/FcsLookupItem.fs b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/CodeCompletion/FcsLookupItem.fs
@@ -111,7 +111,7 @@ type FcsLookupItem(items: RiderDeclarationListItems, context: FSharpCodeCompleti
     override x.DisplayTypeName =
         try
             match getReturnType x.FcsSymbol with
-            | Some t -> RichText(t.Format(x.FcsSymbolUse.DisplayContext))
+            | Some t -> RichText(t.Format(x.FcsSymbolUse.DisplayContext.WithShortTypeNames(true)))
             | _ -> null
         with _ -> null
 

diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/CodeCompletion/Rules/LocalValuesRule.fs b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/CodeCompletion/Rules/LocalValuesRule.fs
@@ -169,7 +169,7 @@ type LocalValuesRule() =
                 if isNull fcsSymbolUse then null else
 
                 match getReturnType fcsSymbolUse.Symbol with
-                | Some t -> RichText(t.Format(fcsSymbolUse.DisplayContext))
+                | Some t -> RichText(t.Format(fcsSymbolUse.DisplayContext.WithShortTypeNames(true)))
                 | _ -> null
 
             collector.Add(item)

diff --git a/...rp/src/FSharp/FSharp.Psi.Features/src/CodeCompletion/Rules/NamedUnionCaseFieldsPatRule.fs b/...rp/src/FSharp/FSharp.Psi.Features/src/CodeCompletion/Rules/NamedUnionCaseFieldsPatRule.fs
@@ -35,7 +35,7 @@ type NamedUnionCaseFieldsPatRule() =
         let fcsUnionCase = referenceName.Reference.GetFcsSymbol().As<FSharpUnionCase>()
         if isNull fcsUnionCase then None else
 
-        let displayContext = referenceName.Reference.GetSymbolUse().DisplayContext
+        let displayContext = referenceName.Reference.GetSymbolUse().DisplayContext.WithShortTypeNames(true)
         let fieldNames =
             fcsUnionCase.Fields
             |> Seq.choose (fun field -> if field.IsNameGenerated then None else Some (field.Name, field.FieldType.Format(displayContext)))

diff --git a/...er.FSharp/src/FSharp/FSharp.Psi.Features/src/CodeCompletion/Rules/UnionCasePatternRule.fs b/...er.FSharp/src/FSharp/FSharp.Psi.Features/src/CodeCompletion/Rules/UnionCasePatternRule.fs
@@ -255,7 +255,7 @@ type UnionCasePatternRule() =
                 if not (matchesType returnType || isFSharpList returnType) then
                     let text = fcsUnionCase.Name
                     let fcsEntityInstance = FcsEntityInstance.create returnType
-                    let displayContext = lookupItem.FcsSymbolUse.DisplayContext
+                    let displayContext = lookupItem.FcsSymbolUse.DisplayContext.WithShortTypeNames(true)
                     let item = createUnionCaseItem fcsEntityInstance returnType displayContext text fcsUnionCase false
                     unionCaseItems.Add(item)
 
@@ -285,6 +285,7 @@ type UnionCasePatternRule() =
             let typeName = expectedTypeElement.GetSourceName()
 
             if fcsEntity.IsFSharpUnion then
+                let displayContext = displayContext.WithShortTypeNames(true)
                 let requiresQualifiedName = expectedTypeElement.RequiresQualifiedAccess()
                 for fcsUnionCase in fcsEntity.UnionCases do
                     let text = if requiresQualifiedName then $"{typeName}.{fcsUnionCase.Name}" else fcsUnionCase.Name