Add failing unit test to illustrate problem.

nojaf · nojaf · commit 97f3d0ab46d1 · 2023-03-30T13:54:27.000+02:00
diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
@@ -206,6 +206,7 @@
     <Content Include="TypeChecks\Graph\scrape.fsx" CopyToOutputDirectory="Never" />
     <Compile Include="TypeChecks\Graph\CompilationFromCmdlineArgsTests.fs" />
     <Compile Include="TypeChecks\Graph\TypedTreeGraph.fs" />
+    <Compile Include="TypeChecks\TyparNameTests.fs" />
     <Compile Include="CompilerOptions\fsc\checked\checked.fs" />
     <Compile Include="CompilerOptions\fsc\cliversion.fs" />
     <Compile Include="CompilerOptions\fsc\codepage\codepage.fs" />
diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/TyparNameTests.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/TyparNameTests.fs
@@ -0,0 +1,63 @@
+﻿module FSharp.Compiler.ComponentTests.TypeChecks.TyparNameTests
+
+open FSharp.Compiler.Symbols
+open Xunit
+open FSharp.Test
+open FSharp.Test.Compiler
+
+[<Fact>]
+let ``The call site of a generic function should have no influence on the name of the type parameters`` () =
+    let definitionFile =
+        Fs
+            """
+module A
+
+let someGenericFunction _ = ()
+"""
+        |> withFileName "A.fs"
+
+    let usageFile =
+        ("""
+module B
+
+let otherGenericFunction _ _ _ =
+    A.someGenericFunction 1
+"""
+         |> FsSource)
+            .WithFileName("B.fs")
+
+    let getGenericParametersNamesFor
+        (entityDisplayName: string)
+        (valueDisplayName: string)
+        (additionalFile: SourceCodeFileKind)
+        : string array =
+        let typeCheckResult =
+            definitionFile |> withAdditionalSourceFile additionalFile |> typecheckProject
+
+        typeCheckResult.AssemblySignature.Entities
+        |> Seq.tryPick (fun (entity: FSharpEntity) ->
+            if entity.DisplayName <> entityDisplayName then
+                None
+            else
+                entity.MembersFunctionsAndValues
+                |> Seq.tryFind (fun mfv -> mfv.DisplayName = valueDisplayName)
+                |> Option.map (fun (mfv: FSharpMemberOrFunctionOrValue) ->
+                    mfv.GenericParameters |> Seq.map (fun gp -> gp.DisplayName) |> Seq.toArray))
+        |> Option.defaultValue Array.empty
+
+    let namesForB = getGenericParametersNamesFor "A" "someGenericFunction" usageFile
+
+    let alternativeUsageFile =
+        ("""
+module C
+
+let alternateGenericFunction _ =
+    A.someGenericFunction 1
+"""
+         |> FsSource)
+            .WithFileName("C.fs")
+
+    let namesForC =
+        getGenericParametersNamesFor "A" "someGenericFunction" alternativeUsageFile
+
+    Assert.Equal<string array>(namesForB, namesForC)
diff --git a/tests/FSharp.Test.Utilities/Compiler.fs b/tests/FSharp.Test.Utilities/Compiler.fs
@@ -6,6 +6,7 @@ open FSharp.Compiler.Interactive.Shell
 open FSharp.Compiler.IO
 open FSharp.Compiler.Diagnostics
 open FSharp.Compiler.Symbols
+open FSharp.Compiler.Text
 open FSharp.Test.Assert
 open FSharp.Test.Utilities
 open FSharp.Test.ScriptHelpers
@@ -347,6 +348,12 @@ module rec Compiler =
         | CS src -> CS { src with Name = Some name }
         | IL _ -> failwith "IL Compilation cannot be named."
 
+    let withFileName (name: string) (cUnit: CompilationUnit) : CompilationUnit =
+        match cUnit with
+        | FS compilationSource -> FS { compilationSource with Source = compilationSource.Source.WithFileName(name) }
+        | CS cSharpCompilationSource -> CS { cSharpCompilationSource with Source = cSharpCompilationSource.Source.WithFileName(name) }
+        | IL _ -> failwith "IL Compilation cannot be named."
+    
     let withReferenceFSharpCompilerService (cUnit: CompilationUnit) : CompilationUnit =
         // Compute the location of the FSharp.Compiler.Service dll that matches the target framework used to build this test assembly
         let compilerServiceAssemblyLocation =
@@ -816,6 +823,26 @@ module rec Compiler =
             CompilerAssert.TypeCheck(options, fileName, source)
         | _ -> failwith "Typecheck only supports F#"
 
+    let typecheckProject (cUnit: CompilationUnit) : FSharp.Compiler.CodeAnalysis.FSharpCheckProjectResults =
+        match cUnit with
+        | FS fsSource ->
+            let options = fsSource.Options |> Array.ofList
+            let sourceFiles =
+                [| yield (fsSource.Source.GetSourceFileName, fsSource.Source.GetSourceText)
+                   yield!
+                    fsSource.AdditionalSources
+                    |> List.map (fun source -> source.GetSourceFileName, source.GetSourceText) |]
+            
+            let getSourceText =
+                let project = Map.ofArray sourceFiles
+                fun (name: string) ->
+                    Map.tryFind name project
+                    |> Option.bind (Option.map SourceText.ofString)
+
+            let sourceFiles = Array.map fst sourceFiles
+            CompilerAssert.TypeCheckProject(options, sourceFiles, getSourceText)
+        | _ -> failwith "Typecheck only supports F#"
+
     let run (result: CompilationResult) : CompilationResult =
         match result with
         | CompilationResult.Failure f -> failwith (sprintf "Compilation should be successful in order to run.\n Errors: %A" (f.Diagnostics))
diff --git a/tests/FSharp.Test.Utilities/CompilerAssert.fs b/tests/FSharp.Test.Utilities/CompilerAssert.fs
@@ -2,6 +2,8 @@
 
 namespace FSharp.Test
 
+#nowarn "57"
+
 open System
 open System.IO
 open System.Text
@@ -856,6 +858,14 @@ Updated automatically, please check diffs in your pull request, changes must be
     static member TypeCheckSingleError (source: string) (expectedSeverity: FSharpDiagnosticSeverity) (expectedErrorNumber: int) (expectedErrorRange: int * int * int * int) (expectedErrorMsg: string) =
         CompilerAssert.TypeCheckWithErrors source [| expectedSeverity, expectedErrorNumber, expectedErrorRange, expectedErrorMsg |]
 
+    static member TypeCheckProject(options: string array, sourceFiles: string array, getSourceText: string -> ISourceText option) : FSharpCheckProjectResults =
+        let checker = FSharpChecker.Create(documentSource = DocumentSource.Custom getSourceText)
+        let defaultOptions = defaultProjectOptions TargetFramework.Current
+        let projectOptions = { defaultOptions with OtherOptions = Array.append options defaultOptions.OtherOptions; SourceFiles = sourceFiles }
+
+        checker.ParseAndCheckProject(projectOptions)
+        |> Async.RunImmediate
+    
     static member CompileExeWithOptions(options, (source: SourceCodeFileKind)) =
         compile true options source (fun (errors, _, _) ->
             if errors.Length > 0 then
