Use a more accurate range for ce Combine methods

Edgar Gonzalez · Edgar Gonzalez · commit 35ba66bff1e4 · 2025-03-19T17:11:35.000Z
diff --git a/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs b/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs
@@ -1624,7 +1624,7 @@ let rec TryTranslateComputationExpression
                                 ceenv.builderTy
                         )
                     then
-                        error (Error(FSComp.SR.tcRequireBuilderMethod ("Combine"), m))
+                        error (Error(FSComp.SR.tcRequireBuilderMethod ("Combine"), innerComp2.RangeOfFirstPortion))
 
                     if
                         isNil (
diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fs b/src/Compiler/SyntaxTree/SyntaxTree.fs
@@ -861,6 +861,8 @@ type SynExpr =
         | SynExpr.Sequential(expr1 = e1)
         | SynExpr.SequentialOrImplicitYield(expr1 = e1)
         | SynExpr.App(funcExpr = e1) -> e1.RangeOfFirstPortion
+        | SynExpr.YieldOrReturn(trivia = synExprYieldOrReturnTrivia) -> synExprYieldOrReturnTrivia.YieldOrReturnKeyword
+        | SynExpr.YieldOrReturnFrom(trivia = synExprYieldOrReturnFromTrivia) -> synExprYieldOrReturnFromTrivia.YieldOrReturnFromKeyword
         | SynExpr.ForEach(pat = pat; range = r) ->
             let e = (pat.Range: range).Start
             withEnd e r
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs

Original file line number	Diff line number	Diff line change
`@@ -1624,7 +1624,7 @@ let rec TryTranslateComputationExpression`
`1624`	`1624`	`ceenv.builderTy`
`1625`	`1625`	`)`
`1626`	`1626`	`then`
`1627`		`- error (Error(FSComp.SR.tcRequireBuilderMethod ("Combine"), m))`
	`1627`	`+ error (Error(FSComp.SR.tcRequireBuilderMethod ("Combine"), innerComp2.RangeOfFirstPortion))`
`1628`	`1628`
`1629`	`1629`	`if`
`1630`	`1630`	`isNil (`