Skip to content

Commit 0d8fedb

Browse files
T-Gropsfinakiauduchinok
authored
[automated] Merge branch 'main' => 'release/dev18.0' (#18458)
* Fix a copypaste checking bug in unpickling (#18430) * Tooltips: fix `null` annotation highlighting (#18457) * Tooltips: fix `null` annotation highlighting * Release notes --------- Co-authored-by: Petr <psfinaki@users.noreply.github.com> Co-authored-by: Eugene Auduchinok <eugene.auduchinok@gmail.com>
2 parents a973a86 + 0cb37ab commit 0d8fedb

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020
* Fix duplicate parse error reporting for GetBackgroundCheckResultsForFileInProject ([Issue #18379](https://github.com/dotnet/fsharp/issues/18379) [PR #18380](https://github.com/dotnet/fsharp/pull/18380))
2121
* Fix MethodDefNotFound when compiling code invoking delegate with option parameter ([Issue #5171](https://github.com/dotnet/fsharp/issues/5171), [PR #18385](https://github.com/dotnet/fsharp/pull/18385))
2222
* Fix #r nuget ..." downloads unneeded packages ([Issue #18231](https://github.com/dotnet/fsharp/issues/18231), [PR #18393](https://github.com/dotnet/fsharp/pull/18393))
23+
* Fix checking bug in unpickling [PR #18430](https://github.com/dotnet/fsharp/pull/18430)
2324
* Reenable β-reduction and subsequent reoptimization of immediately-invoked F#-defined generic delegates. ([PR #18401](https://github.com/dotnet/fsharp/pull/18401))
2425
* Fixed [#18433](https://github.com/dotnet/fsharp/issues/18433), a rare case of an internal error in xml comment processing. ([PR #18436](https://github.com/dotnet/fsharp/pull/18436))
26+
* Fix missing `null` highlighting in tooltips ([PR #18457](https://github.com/dotnet/fsharp/pull/18457))
2527

2628
### Added
2729
* Added missing type constraints in FCS. ([PR #18241](https://github.com/dotnet/fsharp/pull/18241))

src/Compiler/Checking/NicePrint.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ module PrintTypes =
944944
// Show nullness annotations unless explicitly turned off
945945
if denv.showNullnessAnnotations <> Some false then
946946
match nullness.Evaluate() with
947-
| NullnessInfo.WithNull -> part2 ^^ wordL (tagText "| null")
947+
| NullnessInfo.WithNull -> part2 ^^ wordL (tagPunctuation "|") ^^ wordL (tagKeyword "null")
948948
| NullnessInfo.WithoutNull -> part2
949949
| NullnessInfo.AmbivalentToNull -> part2 //^^ wordL (tagText "__maybenull")
950950
else

src/Compiler/TypedTree/TypedTreePickle.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@ let unpickleObjWithDanglingCcus
11221122

11231123
let res = u st1
11241124
check viewedScope st1.ientities
1125-
check viewedScope st1.ientities
1125+
check viewedScope st1.ianoninfos
11261126
check viewedScope st1.ivals
11271127
check viewedScope st1.itypars
11281128
res

0 commit comments

Comments
 (0)