Skip to content

Commit 55d736b

Browse files
T-GroT-Gro
authored
Remove a bunch of files from fantomas ignore (#18407)
* Remove a bunch of files from fantomas ignore * see what happens - bunch of IFDEFs related to nullness removed to enable more fantomas * nowarn specific nullness when proto builds f.c.s and fsharpbuild
1 parent e37ef75 commit 55d736b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+567
-995
lines changed

‎.fantomasignore

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,6 @@ src/Compiler/Checking/SignatureConformance.fs
4040
src/Compiler/Checking/TypeHierarchy.fs
4141
src/Compiler/Checking/TypeRelations.fs
4242

43-
# nullness-related problems
44-
src/Compiler/Utilities/lib.fsi
45-
src/Compiler/Utilities/Cancellable.fsi
46-
src/FSharp.Core/tasks.fsi
47-
src/FSharp.Core/tasks.fs
48-
src/FSharp.Core/resumable.fs
49-
src/Compiler/DependencyManager/DependencyProvider.fs
50-
src/FSharp.Core/fslib-extra-pervasives.fs
51-
src/FSharp.Core/fslib-extra-pervasives.fsi
52-
53-
# Incorrectly formatted: https://github.com/dotnet/fsharp/pull/14645/commits/49443a67ea8a17670c8a7c80c8bdf91f82231e91 or https://github.com/fsprojects/fantomas/issues/2733
54-
# This CompilerImports.fs behavior is not fixed yet, following up in https://github.com/fsprojects/fantomas/issues/2733
55-
src/Compiler/Driver/CompilerImports.fs
5643
# The following files were formatted, but the "format, --check" loop is not stable.
5744
# Fantomas formats them, but still thinks they need formatting
5845
src/Compiler/Optimize/DetupleArgs.fs
@@ -96,44 +83,6 @@ src/FSharp.Core/printf.fs
9683
src/FSharp.Core/Query.fs
9784
src/FSharp.Core/seqcore.fs
9885

99-
100-
# fsharp (to investigate)
101-
102-
**/TypeProviders.fsi
103-
**/tainted.fsi
104-
105-
# uses nullness features
106-
107-
**/DependencyProvider.fsi
108-
src/FSharp.Core/array.fs
109-
src/FSharp.Core/option.fsi
110-
src/FSharp.Core/option.fs
111-
src/fsi/console.fs
112-
src/FSharp.Build/FSharpCommandLineBuilder.fs
113-
114-
src/Compiler/Utilities/Activity.fs
115-
src/Compiler/Utilities/sformat.fs
116-
src/Compiler/Utilities/illib.fsi
117-
src/Compiler/Utilities/illib.fs
118-
119-
120-
src/Compiler/Utilities/NullnessShims.fs
121-
src/Compiler/Utilities/DependencyGraph.fs
122-
src/Compiler/Utilities/LruCache.fsi
123-
src/Compiler/Utilities/LruCache.fs
124-
src/Compiler/Utilities/HashMultiMap.fsi
125-
src/Compiler/Utilities/HashMultiMap.fs
126-
src/Compiler/Facilities/AsyncMemoize.fsi
127-
src/Compiler/Facilities/AsyncMemoize.fs
128-
src/Compiler/AbstractIL/il.fs
129-
src/Compiler/SyntaxTree/LexerStore.fs
130-
131-
src/Compiler/Driver/GraphChecking/Graph.fsi
132-
src/Compiler/Driver/GraphChecking/Graph.fs
133-
134-
src/Compiler/DependencyManager/NativeDllResolveHandler.fsi
135-
src/Compiler/DependencyManager/AssemblyResolveHandler.fsi
136-
13786
# Fantomas limitations on implementation files (to investigate)
13887

13988
src/Compiler/AbstractIL/ilwrite.fs

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
since it's a non-arcade and non-sourcebuild scenario -->
6363
<FsLexPath>$(ArtifactsDir)/bin/fslex/$(Configuration)/$(FSharpNetCoreProductDefaultTargetFramework)/$(RuntimeIdentifier)/fslex.dll</FsLexPath>
6464
<FsYaccPath>$(ArtifactsDir)/bin/fsyacc/$(Configuration)/$(FSharpNetCoreProductDefaultTargetFramework)/$(RuntimeIdentifier)/fsyacc.dll</FsYaccPath>
65-
<DefineConstants>NO_CHECKNULLS;BUILDING_WITH_LKG;NO_NULLCHECKING_LIB_SUPPORT;$(DefineConstants)</DefineConstants>
65+
<DefineConstants>BUILDING_WITH_LKG;$(DefineConstants)</DefineConstants>
6666
</PropertyGroup>
6767

6868
<Import Project="$(MSBuildThisFileDirectory)/eng/Versions.props" Condition="'$(DISABLE_ARCADE)' == 'true'" />

‎FSharp.Profiles.props

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -->
33
<Project>
4-
<PropertyGroup>
5-
<!-- This turns on/off the use of the feature within the codebase -->
6-
<!-- The default is off - it is selectively enabled -->
7-
<CheckNulls Condition="'$(CheckNulls)' == ''">false</CheckNulls>
8-
</PropertyGroup>
9-
10-
<PropertyGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">
11-
<!-- nullness checking isn't possible when using shipped FSharp.Core package until it's updated -->
12-
<CheckNulls>false</CheckNulls>
13-
</PropertyGroup>
144

155
<PropertyGroup Condition="'$(Configuration)' == 'Proto'">
16-
<CheckNulls>false</CheckNulls>
17-
<DefineConstants>NO_CHECKNULLS;BUILDING_WITH_LKG;NO_NULLCHECKING_LIB_SUPPORT;$(DefineConstants)</DefineConstants>
18-
<NullCheckingSupportInLibrary>false</NullCheckingSupportInLibrary>
6+
<DefineConstants>BUILDING_WITH_LKG;$(DefineConstants)</DefineConstants>
197
</PropertyGroup>
208

219
<PropertyGroup Condition="'$(Configuration)' != 'Proto' and '$(BUILDING_USING_DOTNET)' != 'true' and '$(MSBuildProjectExtension)' == '.fsproj'"> <!-- VB.NET does not understand "preview". It only knows "old","older" and "boomer" :-)) (jk)-->
2210
<LangVersion>preview</LangVersion>
2311
</PropertyGroup>
2412

25-
<PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
26-
<CheckNulls>false</CheckNulls>
27-
</PropertyGroup>
28-
29-
<PropertyGroup Condition="'$(CheckNulls)' == 'true'">
30-
<Nullable>enable</Nullable>
31-
</PropertyGroup>
32-
33-
<PropertyGroup Condition="'$(CheckNulls)' == 'false'">
34-
<!-- 3271: warning nullness annotations being ignored -->
35-
<NoWarn>$(NoWarn);3271</NoWarn>
36-
<DefineConstants>NO_CHECKNULLS;$(DefineConstants)</DefineConstants>
37-
</PropertyGroup>
38-
3913
<Choose>
4014
<When Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
4115
</When>

‎src/Compiler/AbstractIL/il.fs

Lines changed: 82 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,8 @@ let splitTypeNameRight nm =
170170
// --------------------------------------------------------------------
171171

172172
/// This is used to store event, property and field maps.
173-
type LazyOrderedMultiMap<'Key, 'Data when 'Key: equality
174-
#if !NO_CHECKNULLS
175-
and 'Key:not null
176-
#endif
177-
>(keyf: 'Data -> 'Key, lazyItems: InterruptibleLazy<'Data list>) =
173+
type LazyOrderedMultiMap<'Key, 'Data when 'Key: equality and 'Key: not null>(keyf: 'Data -> 'Key, lazyItems: InterruptibleLazy<'Data list>)
174+
=
178175

179176
let quickMap =
180177
lazyItems
@@ -519,7 +516,11 @@ type ILAssemblyRef(data) =
519516

520517
let retargetable = aname.Flags = AssemblyNameFlags.Retargetable
521518

522-
let name = match aname.Name with | null -> aname.FullName | name -> name
519+
let name =
520+
match aname.Name with
521+
| null -> aname.FullName
522+
| name -> name
523+
523524
ILAssemblyRef.Create(name, None, publicKey, retargetable, version, locale)
524525

525526
member aref.QualifiedName =
@@ -1862,7 +1863,7 @@ type ILGenericParameterDef =
18621863
Name: string
18631864
Constraints: ILTypes
18641865
Variance: ILGenericVariance
1865-
HasReferenceTypeConstraint: bool
1866+
HasReferenceTypeConstraint: bool
18661867
HasNotNullableValueTypeConstraint: bool
18671868
HasDefaultConstructorConstraint: bool
18681869
HasAllowsRefStruct: bool
@@ -1910,7 +1911,11 @@ let inline conditionalAdd condition flagToAdd source =
19101911
let NoMetadataIdx = -1
19111912

19121913
type InterfaceImpl =
1913-
{ Idx: int; Type: ILType; mutable CustomAttrsStored: ILAttributesStored }
1914+
{
1915+
Idx: int
1916+
Type: ILType
1917+
mutable CustomAttrsStored: ILAttributesStored
1918+
}
19141919

19151920
member x.CustomAttrs =
19161921
match x.CustomAttrsStored with
@@ -1919,12 +1924,16 @@ type InterfaceImpl =
19191924
x.CustomAttrsStored <- ILAttributesStored.Given res
19201925
res
19211926
| ILAttributesStored.Given attrs -> attrs
1922-
1923-
static member Create(ilType: ILType, customAttrsStored: ILAttributesStored) =
1924-
{ Idx = NoMetadataIdx; Type = ilType; CustomAttrsStored = customAttrsStored }
19251927

1926-
static member Create(ilType: ILType) = InterfaceImpl.Create(ilType, emptyILCustomAttrsStored)
1928+
static member Create(ilType: ILType, customAttrsStored: ILAttributesStored) =
1929+
{
1930+
Idx = NoMetadataIdx
1931+
Type = ilType
1932+
CustomAttrsStored = customAttrsStored
1933+
}
19271934

1935+
static member Create(ilType: ILType) =
1936+
InterfaceImpl.Create(ilType, emptyILCustomAttrsStored)
19281937

19291938
[<NoComparison; NoEquality; StructuredFormatDisplay("{DebugText}")>]
19301939
type ILMethodDef
@@ -2575,17 +2584,15 @@ type ILTypeDefAdditionalFlags =
25752584
| CanContainExtensionMethods = 1024
25762585

25772586
let internal typeKindFlags =
2578-
ILTypeDefAdditionalFlags.Class |||
2579-
ILTypeDefAdditionalFlags.ValueType |||
2580-
ILTypeDefAdditionalFlags.Interface |||
2581-
ILTypeDefAdditionalFlags.Enum |||
2582-
ILTypeDefAdditionalFlags.Delegate
2587+
ILTypeDefAdditionalFlags.Class
2588+
||| ILTypeDefAdditionalFlags.ValueType
2589+
||| ILTypeDefAdditionalFlags.Interface
2590+
||| ILTypeDefAdditionalFlags.Enum
2591+
||| ILTypeDefAdditionalFlags.Delegate
25832592

2584-
let inline internal resetTypeKind flags =
2585-
flags &&& ~~~typeKindFlags
2593+
let inline internal resetTypeKind flags = flags &&& ~~~typeKindFlags
25862594

2587-
let (|HasFlag|_|) (flag: ILTypeDefAdditionalFlags) flags =
2588-
flags &&& flag = flag
2595+
let (|HasFlag|_|) (flag: ILTypeDefAdditionalFlags) flags = flags &&& flag = flag
25892596

25902597
let inline typeKindByNames extendsName typeName =
25912598
match extendsName with
@@ -2676,21 +2683,24 @@ type ILTypeDef
26762683

26772684
let hasFlag flag = additionalFlags &&& flag = flag
26782685

2679-
new(name,
2680-
attributes,
2681-
layout,
2682-
implements,
2683-
genericParams,
2684-
extends,
2685-
methods,
2686-
nestedTypes,
2687-
fields,
2688-
methodImpls,
2689-
events,
2690-
properties,
2691-
additionalFlags,
2692-
securityDecls,
2693-
customAttrs) =
2686+
new
2687+
(
2688+
name,
2689+
attributes,
2690+
layout,
2691+
implements,
2692+
genericParams,
2693+
extends,
2694+
methods,
2695+
nestedTypes,
2696+
fields,
2697+
methodImpls,
2698+
events,
2699+
properties,
2700+
additionalFlags,
2701+
securityDecls,
2702+
customAttrs
2703+
) =
26942704
ILTypeDef(
26952705
name,
26962706
attributes,
@@ -2710,23 +2720,27 @@ type ILTypeDef
27102720
NoMetadataIdx
27112721
)
27122722

2713-
new(name,
2714-
attributes,
2715-
layout,
2716-
implements,
2717-
genericParams,
2718-
extends,
2719-
methods,
2720-
nestedTypes,
2721-
fields,
2722-
methodImpls,
2723-
events,
2724-
properties,
2725-
securityDecls,
2726-
customAttrs) =
2723+
new
2724+
(
2725+
name,
2726+
attributes,
2727+
layout,
2728+
implements,
2729+
genericParams,
2730+
extends,
2731+
methods,
2732+
nestedTypes,
2733+
fields,
2734+
methodImpls,
2735+
events,
2736+
properties,
2737+
securityDecls,
2738+
customAttrs
2739+
) =
27272740
let additionalFlags =
2728-
ILTypeDefAdditionalFlags.CanContainExtensionMethods |||
2729-
typeKindOfFlags name extends (int attributes)
2741+
ILTypeDefAdditionalFlags.CanContainExtensionMethods
2742+
||| typeKindOfFlags name extends (int attributes)
2743+
27302744
ILTypeDef(
27312745
name,
27322746
attributes,
@@ -2955,10 +2969,10 @@ and [<NoEquality; NoComparison>] ILPreTypeDef =
29552969
and [<Sealed>] ILPreTypeDefImpl(nameSpace: string list, name: string, metadataIndex: int32, storage: ILTypeDefStored) =
29562970
let stored =
29572971
lazy
2958-
match storage with
2959-
| ILTypeDefStored.Given td -> td
2960-
| ILTypeDefStored.Computed f -> f ()
2961-
| ILTypeDefStored.Reader f -> f metadataIndex
2972+
match storage with
2973+
| ILTypeDefStored.Given td -> td
2974+
| ILTypeDefStored.Computed f -> f ()
2975+
| ILTypeDefStored.Reader f -> f metadataIndex
29622976

29632977
interface ILPreTypeDef with
29642978
member _.Namespace = nameSpace
@@ -4248,25 +4262,31 @@ let mkILStorageCtorWithParamNames (preblock: ILInstr list, ty, extraParams, flds
42484262
| Some x -> I_seqpoint x
42494263
| None -> ()
42504264
yield! preblock
4251-
for (n, (_pnm, nm, fieldTy,_attrs)) in List.indexed flds do
4265+
for (n, (_pnm, nm, fieldTy, _attrs)) in List.indexed flds do
42524266
mkLdarg0
42534267
mkLdarg (uint16 (n + 1))
42544268
mkNormalStfld (mkILFieldSpecInTy (ty, nm, fieldTy))
42554269
]
42564270

42574271
let body = mkMethodBody (false, [], 2, nonBranchingInstrsToCode code, tag, imports)
4258-
let fieldParams =
4272+
4273+
let fieldParams =
42594274
[
4260-
for (pnm,_,ty,attrs) in flds do
4275+
for (pnm, _, ty, attrs) in flds do
42614276
let ilParam = mkILParamNamed (pnm, ty)
4277+
42624278
let ilParam =
42634279
match attrs with
42644280
| [] -> ilParam
4265-
| attrs -> {ilParam with CustomAttrsStored = storeILCustomAttrs (mkILCustomAttrs attrs ) }
4281+
| attrs ->
4282+
{ ilParam with
4283+
CustomAttrsStored = storeILCustomAttrs (mkILCustomAttrs attrs)
4284+
}
4285+
42664286
yield ilParam
4267-
]
4287+
]
42684288

4269-
mkILCtor (access, fieldParams @ extraParams , body)
4289+
mkILCtor (access, fieldParams @ extraParams, body)
42704290

42714291
let mkILSimpleStorageCtorWithParamNames (baseTySpec, ty, extraParams, flds, access, tag, imports) =
42724292
let preblock =

‎src/Compiler/AbstractIL/ilreflect.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ type TypeBuilder with
164164
printfn "typeBuilder%d.CreateType()" (abs <| hash typB)
165165

166166
//Buggy annotation in ns20, will not be fixed.
167-
#if NETSTANDARD && !NO_CHECKNULLS
167+
#if NETSTANDARD
168168
!!(typB.CreateTypeInfo()) :> Type
169169
#else
170170
typB.CreateTypeInfo() :> Type

‎src/Compiler/AbstractIL/ilwrite.fs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -362,11 +362,7 @@ let envForOverrideSpec (ospec: ILOverridesSpec) = { EnclosingTyparCount=ospec.De
362362
//---------------------------------------------------------------------
363363

364364
[<NoEquality; NoComparison>]
365-
type MetadataTable<'T
366-
#if !NO_CHECKNULLS
367-
when 'T:not null
368-
#endif
369-
> =
365+
type MetadataTable<'T when 'T:not null> =
370366
{ name: string
371367
dict: Dictionary<'T, int> // given a row, find its entry number
372368
mutable rows: ResizeArray<'T> }

‎src/Compiler/DependencyManager/AssemblyResolveHandler.fsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ type AssemblyResolutionProbe = delegate of Unit -> seq<string>
1212
type AssemblyResolveHandler =
1313

1414
/// Construct a new DependencyProvider
15-
new: assemblyProbingPaths: AssemblyResolutionProbe|null -> AssemblyResolveHandler
15+
new: assemblyProbingPaths: AssemblyResolutionProbe | null -> AssemblyResolveHandler
1616

1717
/// Construct a new DependencyProvider
1818
internal new: assemblyProbingPaths: AssemblyResolutionProbe option -> AssemblyResolveHandler

0 commit comments

Comments
 (0)