[5.5][Diagnostics] Correct the insert location of missing return type fix-it. #38144

hborla · 2021-06-29T00:51:29Z

Cherry-pick of #38112

Explanation: In 5.5, a new fix-it was added to automatically insert a return type placeholder for a function that mistakenly returns a non-Void result from a Void function. This fix-it is always inserted after the parameter list, which isn't correct for functions with effects like throws and async. This change moves the fix-it location to after the effects if they exist.
Scope: This change only affects invalid code that returns a non-Void result from a Void function.
Risk: Very low.
Testing: Added a handful of diagnostics tests that check the fix-it location.
Reviewer: @xedin @theblixguy

Resolves: rdar://79345188

after any effects specifiers like async, throws, rethrows, etc.

hborla · 2021-06-29T00:51:43Z

@swift-ci please test

hborla · 2021-06-29T15:28:58Z

@swift-ci please test Windows platform

[Diagnostics] In ExtraneousReturnFailure, insert the return type fix-it

298cccb

after any effects specifiers like async, throws, rethrows, etc.

hborla requested a review from a team as a code owner June 29, 2021 00:51

hborla added the r5.5 label Jun 29, 2021

DougGregor approved these changes Jun 29, 2021

View reviewed changes

hborla merged commit 66710b0 into swiftlang:release/5.5 Jun 29, 2021

hborla deleted the 5.5-return-type-fixit-loc branch June 29, 2021 18:01

AnthonyLatsis added 🍒 release cherry pick Flag: Release branch cherry picks swift 5.5 labels Jan 8, 2023

Provide feedback