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

Jump to bottom

Clean up the fixes from 16774 and 16785 to not spill over into pars.fsy #16796

Merged
merged 1 commit into from
Mar 4, 2024
Merged

Clean up the fixes from 16774 and 16785 to not spill over into pars.fsy #16796

merged 1 commit into from
Mar 4, 2024

Conversation

dawedawe
Copy link
Contributor

@dawedawe dawedawe commented Mar 1, 2024

Description

As promised, here's a cleanup for #16774 and #16785
There's now no spillover into pars.fsy which was by far the worst part of these PRs.

(No release notes needed, I think)

Checklist

  • Test cases added

  • Performance benchmarks added in case of performance changes

  • Release notes entry updated:

    Please make sure to add an entry with short succinct description of the change as well as link to this pull request to the respective release notes file, if applicable.

    Release notes files:

    • If anything under src/Compiler has been changed, please make sure to make an entry in docs/release-notes/.FSharp.Compiler.Service/<version>.md, where <version> is usually "highest" one, e.g. 42.8.200
    • If language feature was added (i.e. LanguageFeatures.fsi was changed), please add it to docs/releae-notes/.Language/preview.md
    • If a change to FSharp.Core was made, please make sure to edit docs/release-notes/.FSharp.Core/<version>.md where version is "highest" one, e.g. 8.0.200.

    Information about the release notes entries format can be found in the documentation.
    Example:

    If you believe that release notes are not necessary for this PR, please add NO_RELEASE_NOTES label to the pull request.

@dawedawe dawedawe requested a review from a team as a code owner March 1, 2024 22:59
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 1, 2024 •
edited
Loading

⚠️ Release notes required, but author opted out

Warning

Author opted out of release notes, check is disabled for this pull request.
cc @dotnet/fsharp-team-msft

dawedawe
dawedawe commented Mar 1, 2024
View reviewed changes
tests/FSharp.Compiler.ComponentTests/Language/InterpolatedStringsTests.fs
@@ -70,7 +70,7 @@ printfn \"%s\" s"
|> withLangVersion80
|> compile
|> shouldFail
|> withSingleDiagnostic (Error 1249, Line 1, Col 15, Line 1, Col 21, "The interpolated string contains unmatched closing braces.")
|> withSingleDiagnostic (Error 1249, Line 1, Col 14, Line 1, Col 21, "The interpolated string contains unmatched closing braces.")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I'm counting correctly, this also starts now at the correct position.

nojaf
nojaf approved these changes Mar 4, 2024
View reviewed changes
Copy link
Contributor

@nojaf nojaf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, this looks much better that pars.fsy stays clean.

@nojaf nojaf added the NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes label Mar 4, 2024
@vzarytovskii
Copy link
Member

Thanks, this looks much better that pars.fsy stays clean.

Yeah, looks cleaner, thanks @dawedawe

@vzarytovskii vzarytovskii merged commit 77b9afd into dotnet:main Mar 4, 2024
31 of 32 checks passed
@dawedawe dawedawe deleted the rm_pars.fsy_lex_spillover branch March 4, 2024 11:21
@nojaf nojaf mentioned this pull request Mar 4, 2024
Closed
4 tasks
@psfinaki
Copy link
Member

psfinaki commented Mar 4, 2024

Thanks for the cleanup, good stuff :)

@dotnet-bot dotnet-bot mentioned this pull request Mar 12, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nojaf nojaf nojaf approved these changes

@edgarfgp edgarfgp edgarfgp approved these changes

Assignees
No one assigned
Labels
NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes
Projects
F# Compiler and Tooling
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dawedawe @vzarytovskii @psfinaki @nojaf @edgarfgp