wip

Author: DedSec256

src/Compiler/TypedTree/TcGlobals.fs

@@ -966,27 +966,28 @@ type TcGlobals(
   let mkDebuggerTypeProxyAttribute (ty : ILType) = mkILCustomAttribute (findSysILTypeRef tname_DebuggerTypeProxyAttribute,  [ilg.typ_Type], [ILAttribElem.TypeRef (Some ty.TypeRef)], [])
 
   let betterTyconEntries =
-     [| "Int32"    , v_int_tcr
-        "IntPtr"   , v_nativeint_tcr
-        "UIntPtr"  , v_unativeint_tcr
-        "Int16"    , v_int16_tcr
-        "Int64"    , v_int64_tcr
-        "UInt16"   , v_uint16_tcr
-        "UInt32"   , v_uint32_tcr
-        "UInt64"   , v_uint64_tcr
-        "SByte"    , v_sbyte_tcr
-        "Decimal"  , v_decimal_tcr
-        "Byte"     , v_byte_tcr
-        "Boolean"  , v_bool_tcr
-        "String"   , v_string_tcr
-        "Object"   , v_obj_tcr
-        "Exception", v_exn_tcr
-        "Char"     , v_char_tcr
-        "Double"   , v_float_tcr
-        "Single"   , v_float32_tcr |]
-            |> Array.map (fun (nm, tcr) ->
+     [| sys,         "Int32"        , v_int_tcr
+        sys,         "IntPtr"       , v_nativeint_tcr
+        sys,         "UIntPtr"      , v_unativeint_tcr
+        sys,         "Int16"        , v_int16_tcr
+        sys,         "Int64"        , v_int64_tcr
+        sys,         "UInt16"       , v_uint16_tcr
+        sys,         "UInt32"       , v_uint32_tcr
+        sys,         "UInt64"       , v_uint64_tcr
+        sys,         "SByte"        , v_sbyte_tcr
+        sys,         "Decimal"      , v_decimal_tcr
+        sys,         "Byte"         , v_byte_tcr
+        sys,         "Boolean"      , v_bool_tcr
+        sys,         "String"       , v_string_tcr
+        sys,         "Object"       , v_obj_tcr
+        sys,         "Exception"    , v_exn_tcr
+        sys,         "Char"         , v_char_tcr
+        sys,         "Double"       , v_float_tcr
+        sys,         "Single"       , v_float32_tcr
+        sysGenerics, "IEnumerable`1", v_seq_tcr |]
+            |> Array.map (fun (sysLib, nm, tcr) ->
                 let ty = mkNonGenericTy tcr
-                nm, findSysTyconRef sys nm, (fun _ nullness ->
+                nm, findSysTyconRef sysLib nm, (fun _ nullness ->
                     match nullness with
                     | Nullness.Known NullnessInfo.WithoutNull -> ty
                     | _ -> mkNonGenericTyWithNullness tcr nullness))

tests/FSharp.Compiler.Service.Tests/EditorTests.fs

@@ -130,15 +130,15 @@ let ``GetMethodsAsSymbols should return all overloads of a method as FSharpSymbo
                 yield ms.Symbol.DisplayName, extractCurriedParams ms ]
             |> List.sortBy (fun (_name, parameters) -> parameters.Length, (parameters |> List.map snd ))
         let expected =
-            [("Concat", [("values", "Collections.Generic.IEnumerable<'T>")]);
-             ("Concat", [("values", "Collections.Generic.IEnumerable<string>")]);
+            [("Concat", [("values", "'T seq")]);
 #if NETCOREAPP
              ("Concat", [("args", "ReadOnlySpan<obj>")]);
              ("Concat", [("values", "ReadOnlySpan<string>")]);
 #endif
              ("Concat", [("arg0", "obj")]);
              ("Concat", [("args", "obj array")]);
-             ("Concat", [("values", "string array")]);
+             ("Concat", [("values", "string array")])
+             ("Concat", [("values", "string seq")])
 #if NETCOREAPP
              ("Concat", [("str0", "ReadOnlySpan<char>");("str1", "ReadOnlySpan<char>")]);
 #endif

tests/FSharp.Compiler.Service.Tests/Symbols.fs

@@ -521,6 +521,18 @@ let f2 b1 b2 b3 b4 b5 =
     let ``Nullable types`` declaredType formattedType =
         let _, checkResults = getParseAndCheckResults $"""
 let f (x: {declaredType}) = ()
+"""
+        let symbolUse = findSymbolUseByName "x" checkResults
+        let symbol = symbolUse.Symbol :?> FSharpMemberOrFunctionOrValue
+        let typeArg = symbol.FullType
+        typeArg.Format(symbolUse.DisplayContext) |> shouldEqual formattedType
+
+    [<Theory>]
+    [<InlineData("IEnumerable<int>", "int seq")>]
+    let ``Format IEnumerable as seq`` declaredType formattedType =
+        let _, checkResults = getParseAndCheckResults $"""
+open System.Collections.Generic
+let f (x: {declaredType}) = ()
 """
         let symbolUse = findSymbolUseByName "x" checkResults
         let symbol = symbolUse.Symbol :?> FSharpMemberOrFunctionOrValue