Fix range start of INTERP_STRING_PART #16785

dawedawe · 2024-02-28T15:31:36Z

Description

This uses the same mechanism we used to fix the range start of INTERP_STRING_END to also fix the range start of INTERP_STRING_PART.
Not pretty but should do till I come up with a better approach.

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:
- More inlines for Result module. (PR #16106)
- Correctly handle assembly imports with public key token of 0 length. (Issue #16359, PR #16363)
  *while! (Language suggestion #1038, PR #14238)
If you believe that release notes are not necessary for this PR, please add NO_RELEASE_NOTES label to the pull request.

…G_END to also fix the range start of INTERP_STRING_PART

github-actions · 2024-02-28T15:32:33Z

❗ Release notes required

✅ Found changes and release notes in following paths:

Change path Release notes path Description

src/Compiler docs/release-notes/.FSharp.Compiler.Service/8.0.300.md

- clean up work around structures introduced before and not needed anymore with this

This reverts commit 4d01cda.

psfinaki

Any ideas on how to make this actually a "pretty" fix? :)

src/Compiler/pars.fsy

dawedawe · 2024-02-29T21:29:34Z

Any ideas on how to make this actually a "pretty" fix? :)

I think, we should find a solution that doesn't need special handling in pars.fsy.
I tried something with 4d01cda but there's more to it...
I'll work on a follow up clean up PR in the next couple of days.

* Real accessibility (#15484) * merge * remove unused binding * temp * temp * temp * temp * temp * temp * fantomas * temp * temp * quotes * temp * realsig build and test * tuples, staticint tests * SerializableAttribute tests * SeqExpressionStepping * AsyncExpressionStepping * misc * AttributeTargets * CCtorDUWithMember ListExpressionStepping * temp * cleanup * fantomas * temp * temp * temp * Automated command ran: fantomas Co-authored-by: KevinRansom <5175830+KevinRansom@users.noreply.github.com> * Some cleanup * clean * fantoms * temp * merge issues * fantomas * temp * Update src/Compiler/TypedTree/TypedTreeBasics.fs Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com> * Update src/Compiler/Optimize/Optimizer.fs Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com> * inline * Fix plain build. * Update changelog * Fixed release notes * feedback * remove surplus realsigs * Update src/Compiler/TypedTree/TypedTree.fsi Co-authored-by: Petr Pokorny <petr@innit.cz> * Update tests/FSharp.Compiler.ComponentTests/EmittedIL/ComputationExpressions/ComputationExpressions.fs Co-authored-by: Petr Pokorny <petr@innit.cz> * baselines * baselines * baselines * build.sh * restore quotes * moar quotes * mutable police * fantomas * t * Update baselines * Shadowing/LinqCount.fsx baseline * Shadowing lingcount * access.fsx --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com> Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Petr Pokorny <petr@innit.cz> * Fix range start of INTERP_STRING_PART (#16785) * use the same mechanism we used to fix the range start of INTERP_STRING_END to also fix the range start of INTERP_STRING_PART * - use a new rule for '"}" +' to catch the correct range start - clean up work around structures introduced before and not needed anymore with this * Revert "- use a new rule for '"}" +' to catch the correct range start" This reverts commit 4d01cda. * add second PR to changelog * remove commented poc code * Enforce union case declarations AttributeTargets (#16764) * Enforce union-cases AttributeTargets * release notes * LanguageFeature.EnforceAttributeTargetsUnionCaseDeclarations * release notes * format code * improve naming * Update src/Compiler/Checking/CheckExpressions.fs Co-authored-by: Brian Rourke Boll <brianrourkeboll@users.noreply.github.com> * Fix merge conflict --------- Co-authored-by: Brian Rourke Boll <brianrourkeboll@users.noreply.github.com> * Don't consider parse warnings as errors in ComputeTcIntermediate (#16792) * Fix seqexpression testcases (#16795) * correct realsignature test cases for seqexpr tests * rename typo --------- Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com> Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Petr Pokorny <petr@innit.cz> Co-authored-by: dawe <dawedawe@posteo.de> Co-authored-by: Edgar Gonzalez <edgar.gonzalez@fundourselves.com> Co-authored-by: Brian Rourke Boll <brianrourkeboll@users.noreply.github.com> Co-authored-by: Florian Verdonck <florian.verdonck@outlook.com>

use the same mechanism we used to fix the range start of INTERP_STRIN…

369bbfb

…G_END to also fix the range start of INTERP_STRING_PART

dawedawe requested a review from a team as a code owner February 28, 2024 15:31

dawedawe added 3 commits February 29, 2024 11:57

- use a new rule for '"}" +' to catch the correct range start

4d01cda

- clean up work around structures introduced before and not needed anymore with this

Revert "- use a new rule for '"}" +' to catch the correct range start"

be31d00

This reverts commit 4d01cda.

add second PR to changelog

1907702

edgarfgp approved these changes Feb 29, 2024

View reviewed changes

psfinaki approved these changes Feb 29, 2024

View reviewed changes

src/Compiler/pars.fsy Outdated Show resolved Hide resolved

abonie approved these changes Feb 29, 2024

View reviewed changes

remove commented poc code

b8492a1

abonie merged commit 1da032a into dotnet:main Mar 1, 2024
29 checks passed

dawedawe mentioned this pull request Mar 1, 2024

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

Merged

3 tasks

nojaf mentioned this pull request Mar 4, 2024

Fantomas reports an error when formatting interpolated string with tripple quotes fsprojects/fantomas#3049

Closed

4 tasks

dotnet-bot mentioned this pull request Mar 12, 2024

[Automated] PRs inserted in VS build main-34712.16 #16864

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix range start of INTERP_STRING_PART #16785

Fix range start of INTERP_STRING_PART #16785

dawedawe commented Feb 28, 2024 •

edited

Loading

github-actions bot commented Feb 28, 2024 •

edited

Loading

psfinaki left a comment

dawedawe commented Feb 29, 2024

Fix range start of INTERP_STRING_PART #16785

Fix range start of INTERP_STRING_PART #16785

Conversation

dawedawe commented Feb 28, 2024 • edited Loading

Description

Checklist

github-actions bot commented Feb 28, 2024 • edited Loading

❗ Release notes required

psfinaki left a comment

Choose a reason for hiding this comment

dawedawe commented Feb 29, 2024

dawedawe commented Feb 28, 2024 •

edited

Loading

github-actions bot commented Feb 28, 2024 •

edited

Loading