Skip to content
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

Use a more accurate range for CE Combine methods #18394

Merged
merged 11 commits into from
Mar 31, 2025
Merged

Use a more accurate range for CE Combine methods #18394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4c71580
Use a more accurate range for ce Combine methods
Mar 19, 2025
9c55a8b
fix test
Mar 20, 2025
6f3945f
Merge branch 'main' into improve-ce-combine-method-range
edgarfgp Mar 20, 2025
abdf473
one more test
Mar 21, 2025
a3af8dd
Merge branch 'improve-ce-combine-method-range' of github.com:edgarfgp…
Mar 21, 2025
3a19b97
more tests
Mar 25, 2025
004b5b7
release notes
Mar 25, 2025
f91b0c6
simplify check and add more tests
Mar 25, 2025
e39e950
Merge branch 'main' into improve-ce-combine-method-range
edgarfgp Mar 26, 2025
588b8f4
Merge branch 'main' into improve-ce-combine-method-range
edgarfgp Mar 26, 2025
4e61208
Merge branch 'main' into improve-ce-combine-method-range
edgarfgp Mar 27, 2025
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
1 change: 1 addition & 0 deletions docs/release-notes/.FSharp.Compiler.Service/9.0.300.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
* Symbols: Add FSharpAssembly.IsFSharp ([PR #18290](https://github.com/dotnet/fsharp/pull/18290))
* Type parameter constraint `null` in generic code will now automatically imply `not struct` ([Issue #18320](https://github.com/dotnet/fsharp/issues/18320), [PR #18323](https://github.com/dotnet/fsharp/pull/18323))
* Add a switch to determine whether to generate a default implementation body for overridden method when completing. [PR #18341](https://github.com/dotnet/fsharp/pull/18341)
* Use a more accurate range for CE Combine methods. [PR #18394](https://github.com/dotnet/fsharp/pull/18394)


### Changed
Expand Down
11 changes: 9 additions & 2 deletions src/Compiler/Checking/Expressions/CheckComputationExpressions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1612,6 +1612,12 @@ let rec TryTranslateComputationExpression
// "cexpr; cexpr" is treated as builder.Combine(cexpr1, cexpr1)
let m1 = rangeForCombine innerComp1

let combineDelayRange =
match innerComp2 with
| SynExpr.YieldOrReturn(trivia = yieldOrReturn) -> yieldOrReturn.YieldOrReturnKeyword
| SynExpr.YieldOrReturnFrom(trivia = yieldOrReturnFrom) -> yieldOrReturnFrom.YieldOrReturnFromKeyword
| expr -> expr.Range

if
isNil (
TryFindIntrinsicOrExtensionMethInfo
Expand All @@ -1624,7 +1630,8 @@ let rec TryTranslateComputationExpression
ceenv.builderTy
)
then
error (Error(FSComp.SR.tcRequireBuilderMethod ("Combine"), m))

error (Error(FSComp.SR.tcRequireBuilderMethod "Combine", combineDelayRange))

if
isNil (
Expand All @@ -1638,7 +1645,7 @@ let rec TryTranslateComputationExpression
ceenv.builderTy
)
then
error (Error(FSComp.SR.tcRequireBuilderMethod ("Delay"), m))
error (Error(FSComp.SR.tcRequireBuilderMethod "Delay", combineDelayRange))

let combineCall =
mkSynCall
Expand Down
Loading