Merge branch 'main' into cache-2

Author: majocha

docs/release-notes/.FSharp.Compiler.Service/10.0.100.md

@@ -28,6 +28,8 @@
 * TypeMismatchDiagnosticExtendedData: fix expected and actual types calculation. ([Issue ](https://github.com/dotnet/fsharp/pull/18851))
 * Format top-level generic types using a prefix style in inherit/interface declarations and flexible type annotations. ([PR #18897](https://github.com/dotnet/fsharp/pull/18897))
 * Parser: fix range for computed binding expressions ([PR #18903](https://github.com/dotnet/fsharp/pull/18903))
+* Tests: set test source for range debug printing ([PR #18879](https://github.com/dotnet/fsharp/pull/18879))
+* Checker: fix declaring type for abbreviated types extensions ([PR #18909](https://github.com/dotnet/fsharp/pull/18909))
 
 ### Changed
 * Use `errorR` instead of `error` in `CheckDeclarations.fs` when possible. ([PR #18645](https://github.com/dotnet/fsharp/pull/18645))

eng/Version.Details.props

@@ -20,11 +20,11 @@ This file should be imported by eng/Versions.props
     <!-- dotnet/arcade dependencies -->
     <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25426.3</MicrosoftDotNetArcadeSdkPackageVersion>
     <!-- _git/dotnet-optimization dependencies -->
-    <optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25458.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
-    <optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25458.1</optimizationlinuxx64MIBCRuntimePackageVersion>
-    <optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25458.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
-    <optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.25458.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
-    <optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.25458.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
+    <optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25467.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
+    <optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25467.1</optimizationlinuxx64MIBCRuntimePackageVersion>
+    <optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25467.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
+    <optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.25467.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
+    <optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.25467.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>

eng/Version.Details.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="8ea69c337be69385ff7eb44b2a54db78010110d8" BarId="282240" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="e533cfad385ba4f0ec96e35ad3d485dc13581906" BarId="283666" />
   <ProductDependencies>
     <Dependency Name="Microsoft.Build" Version="18.0.0-preview-25465-08">
       <Uri>https://github.com/dotnet/msbuild</Uri>
@@ -48,25 +48,25 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>5db998e02282e63bc375948a237bcdfef534a5c5</Sha>
     </Dependency>
-    <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25458.1">
+    <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25467.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>373ed5bf1a64c212e655063e58967eb62f9187ef</Sha>
+      <Sha>59dc6a9bf1b3e3ab71c73d94160c2049fb104cd1</Sha>
     </Dependency>
-    <Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25458.1">
+    <Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25467.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>373ed5bf1a64c212e655063e58967eb62f9187ef</Sha>
+      <Sha>59dc6a9bf1b3e3ab71c73d94160c2049fb104cd1</Sha>
     </Dependency>
-    <Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25458.1">
+    <Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25467.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>373ed5bf1a64c212e655063e58967eb62f9187ef</Sha>
+      <Sha>59dc6a9bf1b3e3ab71c73d94160c2049fb104cd1</Sha>
     </Dependency>
-    <Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25458.1">
+    <Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25467.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>373ed5bf1a64c212e655063e58967eb62f9187ef</Sha>
+      <Sha>59dc6a9bf1b3e3ab71c73d94160c2049fb104cd1</Sha>
     </Dependency>
-    <Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25458.1">
+    <Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25467.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>373ed5bf1a64c212e655063e58967eb62f9187ef</Sha>
+      <Sha>59dc6a9bf1b3e3ab71c73d94160c2049fb104cd1</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

src/Compiler/Checking/CheckDeclarations.fs

@@ -4250,11 +4250,9 @@ module TcDeclarations =
         // a) For interfaces, only if it is in the original defn.
         //    Augmentations to interfaces via partial type defns will always be extensions, e.g. extension members on interfaces.
         // b) For other types, if the type is isInSameModuleOrNamespace
-        let declKind, typars = 
-          if isAtOriginalTyconDefn then 
-              ModuleOrMemberBinding, reqTypars
-
-          else
+        if isAtOriginalTyconDefn then
+            ModuleOrMemberBinding, tcref, reqTypars
+        else
             let isInSameModuleOrNamespace = 
                  match envForDecls.eModuleOrNamespaceTypeAccumulator.Value.TypesByMangledName.TryGetValue tcref.LogicalName with 
                  | true, tycon -> tyconOrder.Compare(tcref.Deref, tycon) = 0
@@ -4270,25 +4268,24 @@ module TcDeclarations =
             let _tpenv = TcTyparConstraints cenv NoNewTypars CheckCxs ItemOccurrence.UseInType envForTycon emptyUnscopedTyparEnv synTyparCxs
             declaredTypars |> List.iter (SetTyparRigid envForDecls.DisplayEnv m)
 
-            if isInSameModuleOrNamespace && not isInterfaceOrDelegateOrEnum then 
+            if tcref.TypeAbbrev.IsSome then
+                ExtrinsicExtensionBinding, tcref, declaredTypars
+            elif isInSameModuleOrNamespace && not isInterfaceOrDelegateOrEnum then 
                 // For historical reasons we only give a warning for incorrect type parameters on intrinsic extensions
                 if nReqTypars <> synTypars.Length then 
                     errorR(Error(FSComp.SR.tcDeclaredTypeParametersForExtensionDoNotMatchOriginal(tcref.DisplayNameWithStaticParametersAndUnderscoreTypars), m))
                 if not (typarsAEquiv g (TypeEquivEnv.EmptyWithNullChecks g) reqTypars declaredTypars) then 
                     warning(Error(FSComp.SR.tcDeclaredTypeParametersForExtensionDoNotMatchOriginal(tcref.DisplayNameWithStaticParametersAndUnderscoreTypars), m))
                 // Note we return 'reqTypars' for intrinsic extensions since we may only have given warnings
-                IntrinsicExtensionBinding, reqTypars
+                IntrinsicExtensionBinding, tcref, reqTypars
             else 
                 if isInSameModuleOrNamespace && isDelegateOrEnum then 
                     errorR(Error(FSComp.SR.tcMembersThatExtendInterfaceMustBePlacedInSeparateModule(), tcref.Range))
                 if nReqTypars <> synTypars.Length then 
                     error(Error(FSComp.SR.tcDeclaredTypeParametersForExtensionDoNotMatchOriginal(tcref.DisplayNameWithStaticParametersAndUnderscoreTypars), m))
                 if not (typarsAEquiv g (TypeEquivEnv.EmptyWithNullChecks g) reqTypars declaredTypars) then 
                     errorR(Error(FSComp.SR.tcDeclaredTypeParametersForExtensionDoNotMatchOriginal(tcref.DisplayNameWithStaticParametersAndUnderscoreTypars), m))
-                ExtrinsicExtensionBinding, declaredTypars
-
-
-        declKind, tcref, typars
+                ExtrinsicExtensionBinding, tcref, declaredTypars
 
 
     let private isAugmentationTyconDefnRepr = function SynTypeDefnSimpleRepr.General(kind=SynTypeDefnKind.Augmentation _) -> true | _ -> false

src/Compiler/Utilities/range.fs

@@ -7,6 +7,7 @@ open System
 open System.IO
 open System.Collections.Concurrent
 open System.Collections.Generic
+open System.Text
 open Microsoft.FSharp.Core.Printf
 open Internal.Utilities.Library
 open Internal.Utilities.Library.Extras.Bits
@@ -261,6 +262,9 @@ module FileIndex =
     let startupFileName = "startup"
     let commandLineArgsFileName = "commandLineArgs"
 
+    let mutable testSources: ConcurrentDictionary<string, string> =
+        ConcurrentDictionary()
+
 [<RequireQualifiedAccess>]
 module internal LineDirectives =
 
@@ -329,6 +333,9 @@ type Range(code1: int64, code2: int64) =
 
     member m.FileName = fileOfFileIndex m.FileIndex
 
+    member internal m.ShortFileName =
+        Path.GetFileName(fileOfFileIndex m.FileIndex) |> nonNull
+
     member m.ApplyLineDirectives() =
         match LineDirectives.store.TryFind m.FileIndex with
         | None -> m
@@ -376,32 +383,42 @@ type Range(code1: int64, code2: int64) =
     member _.Code2 = code2
 
     member m.DebugCode =
-        let name = m.FileName
+        let getRangeSubstring (m: range) (stream: Stream) =
+            let endCol = m.EndColumn - 1
+            let startCol = m.StartColumn - 1
+
+            stream.ReadLines()
+            |> Seq.skip (m.StartLine - 1)
+            |> Seq.take (m.EndLine - m.StartLine + 1)
+            |> String.concat "\n"
+            |> fun s -> s.Substring(startCol + 1, s.LastIndexOf("\n", StringComparison.Ordinal) + 1 - startCol + endCol)
+
+        match testSources.TryGetValue(m.FileName) with
+        | true, source ->
+            use stream = new MemoryStream(Encoding.UTF8.GetBytes(source + "\n"))
+            getRangeSubstring m stream
+        | _ ->
 
-        if
-            name = unknownFileName
-            || name = startupFileName
-            || name = commandLineArgsFileName
-        then
-            name
-        else
+            let name = m.FileName
 
-            try
-                let endCol = m.EndColumn - 1
-                let startCol = m.StartColumn - 1
+            if
+                name = unknownFileName
+                || name = startupFileName
+                || name = commandLineArgsFileName
+            then
+                name
+            else
 
-                if FileSystem.IsInvalidPathShim m.FileName then
-                    "path invalid: " + m.FileName
-                elif not (FileSystem.FileExistsShim m.FileName) then
-                    "nonexistent file: " + m.FileName
-                else
-                    FileSystem.OpenFileForReadShim(m.FileName).ReadLines()
-                    |> Seq.skip (m.StartLine - 1)
-                    |> Seq.take (m.EndLine - m.StartLine + 1)
-                    |> String.concat "\n"
-                    |> fun s -> s.Substring(startCol + 1, s.LastIndexOf("\n", StringComparison.Ordinal) + 1 - startCol + endCol)
-            with e ->
-                e.ToString()
+                try
+                    if FileSystem.IsInvalidPathShim m.FileName then
+                        "path invalid: " + m.FileName
+                    elif not (FileSystem.FileExistsShim m.FileName) then
+                        "nonexistent file: " + m.FileName
+                    else
+                        use stream = FileSystem.OpenFileForReadShim(m.FileName)
+                        getRangeSubstring m stream
+                with e ->
+                    e.ToString()
 
     member _.Equals(m2: range) =
         let code2 = code2 &&& ~~~(debugPointKindMask ||| isSyntheticMask)
@@ -613,3 +630,6 @@ module Range =
                     | None -> mkRange file (mkPos 1 0) (mkPos 1 80)
         with _ ->
             mkRange file (mkPos 1 0) (mkPos 1 80)
+
+    let internal setTestSource path (source: string) =
+        testSources.GetOrAdd(path, source) |> ignore

src/Compiler/Utilities/range.fsi

@@ -100,9 +100,13 @@ type Range =
     /// The file index for the range
     member internal FileIndex: int
 
+    member internal DebugCode: string
+
     /// The file name for the file of the range
     member FileName: string
-    
+
+    member internal ShortFileName: string
+
     /// Apply the line directives to the range.
     member ApplyLineDirectives: unit -> range
 
@@ -272,6 +276,8 @@ module Range =
     /// Equality comparer for range.
     val comparer: IEqualityComparer<range>
 
+    val internal setTestSource: path: string -> source: string -> unit
+
 /// Functions related to converting between lines indexed at 0 and 1
 module Line =
 

tests/AheadOfTime/Trimming/check.ps1

@@ -58,5 +58,5 @@ CheckTrim -root "SelfContained_Trimming_Test" -tfm "net9.0" -outputfile "FSharp.
 CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net9.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 9154048
 
 # Check net9.0 trimmed assemblies with F# metadata resources removed
-CheckTrim -root "FSharpMetadataResource_Trimming_Test" -tfm "net9.0" -outputfile "FSharpMetadataResource_Trimming_Test.dll" -expected_len 7607296 
+CheckTrim -root "FSharpMetadataResource_Trimming_Test" -tfm "net9.0" -outputfile "FSharpMetadataResource_Trimming_Test.dll" -expected_len 7607296
 

tests/FSharp.Compiler.ComponentTests/ErrorMessages/AbbreviationTests.fs

@@ -54,6 +54,23 @@ type FloatAlias with
             (Error 909, Line 6, Col 15, Line 6, Col 34, "All implemented interfaces should be declared on the initial declaration of the type")
         ]
 
+[<Fact>]
+let ``Members 04 - Error in expr`` () =
+    Fsx """
+type StringAlias = string
+
+type StringAlias with
+    member x.Length = x.Length + ""
+        """
+        |> typecheck
+        |> shouldFail
+        |> withDiagnostics [
+            (Error 964, Line 4, Col 6, Line 4, Col 17, "Type abbreviations cannot have augmentations")
+            (Error 895, Line 5, Col 5, Line 5, Col 36, "Type abbreviations cannot have members")
+            (Error 1, Line 5, Col 34, Line 5, Col 36, "The type 'string' does not match the type 'int'")
+            (Error 43, Line 5, Col 32, Line 5, Col 33, "The type 'string' does not match the type 'int'")
+        ]
+
 [<Fact>]
 let ``Multiple types 01`` () =
     Fsx """

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

@@ -141,11 +141,14 @@ let mkTestFileAndOptions additionalArgs =
     fileName, options
 
 let parseAndCheckFile fileName source options =
+    Range.setTestSource fileName source
+
     match checker.ParseAndCheckFileInProject(fileName, 0, SourceText.ofString source, options) |> Async.RunImmediate with
     | parseResults, FSharpCheckFileAnswer.Succeeded(checkResults) -> parseResults, checkResults
     | _ -> failwithf "Parsing aborted unexpectedly..."
 
 let parseAndCheckScriptWithOptions (file:string, input, opts) =
+    Range.setTestSource file input
 
 #if NETCOREAPP
     let projectOptions =
@@ -194,6 +197,7 @@ let parseSourceCode (name: string, code: string) =
     let args = mkProjectCommandLineArgs(dllPath, [filePath])
     let options, _errors = checker.GetParsingOptionsFromCommandLineArgs(List.ofArray args)
     let parseResults = checker.ParseFile(filePath, SourceText.ofString code, options) |> Async.RunImmediate
+    Range.setTestSource filePath code
     parseResults.ParseTree
 
 let matchBraces (name: string, code: string) =

tests/FSharp.Test.Utilities/Compiler.fs

@@ -368,6 +368,8 @@ module rec Compiler =
     let loadSourceFromFile path = getSource(TestType.Path path)
 
     let fsFromString (source: SourceCodeFileKind): FSharpCompilationSource =
+        source.GetSourceText |> Option.iter (Range.setTestSource source.GetSourceFileName)
+
         {
             Source            = source
             AdditionalSources = []
@@ -1308,7 +1310,7 @@ Actual:
     /// After compile, rebuild and print FSharpDiagnostic[] exactly as before,
     /// then diff against your existing .err.bsl files (few lines will shift).
     let verifyBaseline (cResult: CompilationResult) : CompilationResult =
-        // 1) Grab the ErrorInfo list from the compile result…
+        // 1) Grab the ErrorInfo list from the compilation result
         let errorInfos =
             match cResult with
             | CompilationResult.Success o