Skip to content

Update Fantomas to the latest beta. #13622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vzarytovskii merged 1 commit into from
Aug 8, 2022
Merged

Update Fantomas to the latest beta. #13622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"fantomas": {
"version": "5.0.0-alpha-011",
"version": "5.0.0-beta-005",
"commands": [
"fantomas"
]
Expand Down
2 changes: 1 addition & 1 deletion src/Compiler/AbstractIL/ilread.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

[<RequireQualifiedAccess>]
type MetadataOnlyFlag =
Expand Down
2 changes: 2 additions & 0 deletions src/Compiler/AbstractIL/ilreflect.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) =
Expand Down Expand Up @@ -2546,6 +2547,7 @@ let mkDynamicAssemblyAndModule (assemblyName, optimize, collectible) =
AssemblyBuilderAccess.RunAndCollect
else
AssemblyBuilderAccess.Run

let asmB = defineDynamicAssemblyAndLog (asmName, asmAccess, asmDir)

if not optimize then
Expand Down
2 changes: 1 addition & 1 deletion src/Compiler/Service/ServiceParsedInputOps.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/Compiler/Service/service.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ type public FSharpChecker =
/// <param name="userOpName">An optional string used for tracing compiler operations associated with this request.</param>
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
Expand Down