Skip to content

Commit 2bf6d6a

Browse files
authored
Merge pull request #168 from nojaf/update-fcs-43-8-100
Update SDK, FCS and tools.
2 parents ae263a5 + 9b06739 commit 2bf6d6a

File tree

8 files changed

+41
-28
lines changed

8 files changed

+41
-28
lines changed

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"isRoot": true,
44
"tools": {
55
"fantomas": {
6-
"version": "6.2.1",
6+
"version": "6.3.0-alpha-003",
77
"commands": [
88
"fantomas"
99
]
1010
},
1111
"fsdocs-tool": {
12-
"version": "20.0.0-alpha-009",
12+
"version": "20.0.0-alpha-014",
1313
"commands": [
1414
"fsdocs"
1515
]

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
66
to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [0.21.0] - 2023-11-22
9+
10+
### Changed
11+
* [Update FCS to 43.8.100](https://github.com/ionide/FSharp.Analyzers.SDK/pull/168) (thanks @nojaf!)
12+
813
## [0.20.2] - 2023-11-14
914

1015
### Fixed

Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<DisableImplicitLibraryPacksFolder>true</DisableImplicitLibraryPacksFolder>
88
<ChangelogFile>$(MSBuildThisFileDirectory)CHANGELOG.md</ChangelogFile>
99
<PackageReadmeFile>README.md</PackageReadmeFile>
10+
<WarnOn>$(WarnOn);1182</WarnOn> <!-- Unused variables,https://learn.microsoft.com/en-us/dotnet/fsharp/language-reference/compiler-options#opt-in-warnings -->
11+
<WarnOn>$(WarnOn);3390</WarnOn><!-- Malformed XML doc comments -->
12+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1013
<OtherFlags>$(OtherFlags) --test:GraphBasedChecking --test:ParallelOptimization --test:ParallelIlxGen</OtherFlags>
1114
</PropertyGroup>
1215

Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageVersion Include="CliWrap" Version="3.6.4" />
8-
<PackageVersion Include="FSharp.Core" Version="[7.0.400]" />
9-
<PackageVersion Include="FSharp.Compiler.Service" Version="[43.7.400]" />
8+
<PackageVersion Include="FSharp.Core" Version="[8.0.100]" />
9+
<PackageVersion Include="FSharp.Compiler.Service" Version="[43.8.100]" />
1010
<PackageVersion Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" PrivateAssets="all" />
1111
<PackageVersion Include="McMaster.NETCore.Plugins" Version="1.4.0" />
1212
<PackageVersion Include="Argu" Version="6.1.1" />

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "7.0.400",
3+
"version": "8.0.100",
44
"rollForward": "latestMinor"
55
}
66
}

src/FSharp.Analyzers.SDK/ASTCollecting.fs

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,10 @@ module ASTCollecting =
121121

122122
and walkAttribute (attr: SynAttribute) = walkExpr attr.ArgExpr
123123

124-
and walkTyparDecl (SynTyparDecl(attributes = AllAttrs attrs; Item2 = typar)) =
124+
and walkTyparDecl (SynTyparDecl(attributes = AllAttrs attrs; typar = typar; intersectionConstraints = ts)) =
125125
List.iter walkAttribute attrs
126126
walkTypar typar
127+
List.iter walkType ts
127128

128129
and walkTyparDecls (typars: SynTyparDecls) =
129130
typars.TyparDecls |> List.iter walkTyparDecl
@@ -180,7 +181,6 @@ module ASTCollecting =
180181
| SynPat.Record(_, r) -> ()
181182
| SynPat.Null r -> ()
182183
| SynPat.OptionalVal(_, r) -> ()
183-
| SynPat.DeprecatedCharRange(_, _, r) -> ()
184184
| SynPat.InstanceMember(_, _, _, accessibility, r) -> ()
185185
| SynPat.FromParseError(_, r) -> ()
186186
| SynPat.As(lpat, rpat, r) ->
@@ -251,6 +251,9 @@ module ASTCollecting =
251251
walkType lhs
252252
walkType rhs
253253
| SynType.FromParseError r -> ()
254+
| SynType.Intersection(typar, types, _, _) ->
255+
Option.iter walkTypar typar
256+
List.iter walkType types
254257

255258
and walkClause (SynMatchClause(pat, e1, e2, r, _, _) as s) =
256259
walker.WalkClause s
@@ -365,52 +368,58 @@ module ASTCollecting =
365368
walkType t
366369
walkMemberSig sign
367370
walkExpr e
368-
| SynExpr.Const(SynConst.Measure(_, _, m), r) -> walkMeasure m
371+
| SynExpr.Const(SynConst.Measure(synMeasure = m), _) -> walkMeasure m
369372
| SynExpr.Const(_, r) -> ()
370373
| SynExpr.AnonRecd(isStruct, copyInfo, recordFields, r, trivia) -> ()
371374
| SynExpr.Sequential(seqPoint, isTrueSeq, expr1, expr2, r) -> ()
372375
| SynExpr.Ident _ -> ()
373376
| SynExpr.LongIdent(isOptional, longDotId, altNameRefCell, r) -> ()
374-
| SynExpr.Set(_, _, r) -> ()
377+
| SynExpr.Set(range = r) -> ()
375378
| SynExpr.Null r -> ()
376379
| SynExpr.ImplicitZero r -> ()
377380
| SynExpr.MatchBang(range = r) -> ()
378-
| SynExpr.LibraryOnlyILAssembly(_, _, _, _, r) -> ()
379-
| SynExpr.LibraryOnlyStaticOptimization(_, _, _, r) -> ()
381+
| SynExpr.LibraryOnlyILAssembly(range = r) -> ()
382+
| SynExpr.LibraryOnlyStaticOptimization(range = r) -> ()
380383
| SynExpr.LibraryOnlyUnionCaseFieldGet(expr, longId, _, r) -> ()
381-
| SynExpr.LibraryOnlyUnionCaseFieldSet(_, longId, _, _, r) -> ()
384+
| SynExpr.LibraryOnlyUnionCaseFieldSet(longId = longId; range = r) -> ()
382385
| SynExpr.ArbitraryAfterError(debugStr, r) -> ()
383386
| SynExpr.FromParseError(expr, r) -> ()
384-
| SynExpr.DiscardAfterMissingQualificationAfterDot(_, _, r) -> ()
387+
| SynExpr.DiscardAfterMissingQualificationAfterDot(range = r) -> ()
385388
| SynExpr.Fixed(expr, r) -> ()
386389
| SynExpr.InterpolatedString(parts, kind, r) ->
387390

388391
for part in parts do
389392
walkInterpolatedStringPart part
390393
| SynExpr.IndexFromEnd(itemExpr, r) -> walkExpr itemExpr
391-
| SynExpr.IndexRange(e1, _, e2, _, _, r) ->
394+
| SynExpr.IndexRange(expr1 = e1; expr2 = e2; range = r) ->
392395
Option.iter walkExpr e1
393396
Option.iter walkExpr e2
394397
| SynExpr.DebugPoint(innerExpr = expr) -> walkExpr expr
395398
| SynExpr.Dynamic(funcExpr = e1; argExpr = e2; range = range) ->
396399
walkExpr e1
397400
walkExpr e2
398401
| SynExpr.Typar(t, r) -> walkTypar t
402+
| SynExpr.DotLambda(expr = e) -> walkExpr e
403+
| SynExpr.WhileBang(whileExpr = whileExpr; doExpr = doExpr) ->
404+
walkExpr whileExpr
405+
walkExpr doExpr
399406

400407
and walkMeasure s =
401408
walker.WalkMeasure s
402409

403410
match s with
404-
| SynMeasure.Product(m1, m2, r)
405-
| SynMeasure.Divide(m1, m2, r) ->
411+
| SynMeasure.Product(measure1 = m1; measure2 = m2) ->
406412
walkMeasure m1
407413
walkMeasure m2
408-
| SynMeasure.Named(longIdent, r) -> ()
409-
| SynMeasure.Seq(ms, r) -> List.iter walkMeasure ms
410-
| SynMeasure.Power(m, _, r) -> walkMeasure m
411-
| SynMeasure.Var(ty, r) -> walkTypar ty
412-
| SynMeasure.Paren(m, r) -> walkMeasure m
413-
| SynMeasure.One
414+
| SynMeasure.Divide(measure1 = m1; measure2 = m2) ->
415+
Option.iter walkMeasure m1
416+
walkMeasure m2
417+
| SynMeasure.Named _ -> ()
418+
| SynMeasure.Seq(ms, _) -> List.iter walkMeasure ms
419+
| SynMeasure.Power(measure = m) -> walkMeasure m
420+
| SynMeasure.Var(ty, _) -> walkTypar ty
421+
| SynMeasure.Paren(m, _) -> walkMeasure m
422+
| SynMeasure.One _
414423
| SynMeasure.Anon _ -> ()
415424

416425
and walkSimplePat s =

src/FSharp.Analyzers.SDK/FSharp.Analyzers.SDK.fs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ type EditorAnalyzerAttribute
9090

9191
member _.Name = name
9292

93-
type Context =
94-
interface
95-
end
93+
type Context = interface end
9694

9795
type CliContext =
9896
{

src/FSharp.Analyzers.SDK/FSharp.Analyzers.SDK.fsi

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ type EditorAnalyzerAttribute =
4444
member Name: string
4545

4646
/// Marker interface which both the CliContext and EditorContext implement
47-
type Context =
48-
interface
49-
end
47+
type Context = interface end
5048

5149
/// All the relevant compiler information for a given file.
5250
/// Contains the source text, untyped and typed tree information.

0 commit comments

Comments
 (0)