From ffe20a1110095ceb4d226aedb73f85acfb55c803 Mon Sep 17 00:00:00 2001 From: nojaf Date: Wed, 3 Aug 2022 11:23:12 +0200 Subject: [PATCH] Update Fantomas to the latest beta. --- .config/dotnet-tools.json | 2 +- src/Compiler/AbstractIL/ilread.fs | 2 +- src/Compiler/AbstractIL/ilreflect.fs | 2 ++ src/Compiler/Service/ServiceParsedInputOps.fsi | 2 +- src/Compiler/Service/service.fsi | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9a25558c924..0fdcde7e13a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "fantomas": { - "version": "5.0.0-alpha-011", + "version": "5.0.0-beta-005", "commands": [ "fantomas" ] diff --git a/src/Compiler/AbstractIL/ilread.fs b/src/Compiler/AbstractIL/ilread.fs index 964d4d2b779..22c65d5f1c3 100644 --- a/src/Compiler/AbstractIL/ilread.fs +++ b/src/Compiler/AbstractIL/ilread.fs @@ -4843,7 +4843,7 @@ let openPEMetadataOnly (fileName, peinfo, pectxtEager, pevEager, mdfile: BinaryF openMetadataReader (fileName, mdfile, 0, peinfo, pectxtEager, pevEager, None, reduceMemoryUsage) type ILReaderMetadataSnapshot = obj * nativeint * int -type ILReaderTryGetMetadataSnapshot = (* path: *) string (* snapshotTimeStamp: *) * DateTime -> ILReaderMetadataSnapshot option +type ILReaderTryGetMetadataSnapshot = (* path: *) string (* snapshotTimeStamp: *) * DateTime -> ILReaderMetadataSnapshot option [] type MetadataOnlyFlag = diff --git a/src/Compiler/AbstractIL/ilreflect.fs b/src/Compiler/AbstractIL/ilreflect.fs index e7e1e548e1a..e72f18d81bb 100644 --- a/src/Compiler/AbstractIL/ilreflect.fs +++ b/src/Compiler/AbstractIL/ilreflect.fs @@ -162,6 +162,7 @@ type TypeBuilder with member typB.CreateTypeAndLog() = if logRefEmitCalls then printfn "typeBuilder%d.CreateType()" (abs <| hash typB) + typB.CreateTypeInfo().AsType() member typB.DefineNestedTypeAndLog(name, attrs) = @@ -2546,6 +2547,7 @@ let mkDynamicAssemblyAndModule (assemblyName, optimize, collectible) = AssemblyBuilderAccess.RunAndCollect else AssemblyBuilderAccess.Run + let asmB = defineDynamicAssemblyAndLog (asmName, asmAccess, asmDir) if not optimize then diff --git a/src/Compiler/Service/ServiceParsedInputOps.fsi b/src/Compiler/Service/ServiceParsedInputOps.fsi index 07a1ac56fe6..2c7a0e20d83 100644 --- a/src/Compiler/Service/ServiceParsedInputOps.fsi +++ b/src/Compiler/Service/ServiceParsedInputOps.fsi @@ -138,7 +138,7 @@ module public ParsedInput = parsedInput: ParsedInput -> partiallyQualifiedName: MaybeUnresolvedIdent[] -> insertionPoint: OpenStatementInsertionPoint -> - (( (* requiresQualifiedAccessParent: *) ShortIdents option (* autoOpenParent: *) * ShortIdents option (* entityNamespace *) * ShortIdents option (* entity: *) * ShortIdents) -> (InsertionContextEntity * InsertionContext)[]) + (( (* requiresQualifiedAccessParent: *) ShortIdents option (* autoOpenParent: *) * ShortIdents option (* entityNamespace *) * ShortIdents option (* entity: *) * ShortIdents) -> (InsertionContextEntity * InsertionContext)[]) /// Returns `InsertContext` based on current position and symbol idents. val FindNearestPointToInsertOpenDeclaration: diff --git a/src/Compiler/Service/service.fsi b/src/Compiler/Service/service.fsi index f9da3677f34..25a5a2b412e 100644 --- a/src/Compiler/Service/service.fsi +++ b/src/Compiler/Service/service.fsi @@ -404,7 +404,7 @@ type public FSharpChecker = /// An optional string used for tracing compiler operations associated with this request. member TryGetRecentCheckResultsForFile: fileName: string * options: FSharpProjectOptions * ?sourceText: ISourceText * ?userOpName: string -> - (FSharpParseFileResults * FSharpCheckFileResults (* hash *) * int64) option + (FSharpParseFileResults * FSharpCheckFileResults (* hash *) * int64) option /// This function is called when the entire environment is known to have changed for reasons not encoded in the ProjectOptions of any project/compilation. member InvalidateAll: unit -> unit