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.

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

Fix continuation section #260

Merged
merged 16 commits into from
Nov 15, 2022

Conversation

kyklish
Copy link
Contributor

@kyklish kyklish commented Oct 24, 2022

Closes #184.
Closes #222. (Partial fix, formatter not align objects)

Changes proposed in this pull request:

Discussion #259.

Fully implemented nested object continuation section:

obj := { 0:0
    , a: {}
    , b: "string"
    , c: { d: "open brace"
        , e: "nested object"
        , f: { g: "open brace"
            , h: "double nested object"
            , i: "close brace" }
        , j: "close brace" }
    , k: { l: 4 } }
MsgBox

Notifying @mark-wiemer

@kyklish kyklish force-pushed the bug/continuation-section branch 2 times, most recently from 90551a1 to b5b7c49 Compare October 24, 2022 20:15
@kyklish kyklish marked this pull request as draft October 25, 2022 03:14
@kyklish kyklish force-pushed the bug/continuation-section branch from b5b7c49 to f7edf3d Compare October 25, 2022 15:45
@kyklish kyklish marked this pull request as ready for review October 25, 2022 15:50
@kyklish
Copy link
Contributor Author

kyklish commented Oct 25, 2022

Ready for review.

@mark-wiemer
Copy link
Owner

Thanks @kyklish , I'm sick this week but should be better next week to review this one :)

@kyklish
Copy link
Contributor Author

kyklish commented Oct 28, 2022

Thanks @kyklish , I'm sick this week but should be better next week to review this one :)

Get well Mark.

Bugs fixed, now it's truly ready for review.

Copy link
Owner

@mark-wiemer mark-wiemer left a comment

Choose a reason for hiding this comment

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

Fantastic fix, thank you! Just a bit of cleanup, as usual, you know me :)

src/providers/formattingProvider.ts Outdated Show resolved Hide resolved
src/providers/formattingProvider.ts Outdated Show resolved Hide resolved
src/providers/formattingProvider.ts Outdated Show resolved Hide resolved
src/providers/formattingProvider.ts Outdated Show resolved Hide resolved
src/providers/formattingProvider.ts Outdated Show resolved Hide resolved
src/providers/formattingProvider.utils.ts Outdated Show resolved Hide resolved
src/providers/formattingProvider.utils.ts Outdated Show resolved Hide resolved
@mark-wiemer mark-wiemer enabled auto-merge (squash) November 15, 2022 06:02
@mark-wiemer mark-wiemer merged commit b210681 into mark-wiemer:main Nov 15, 2022
@kyklish kyklish deleted the bug/continuation-section branch November 15, 2022 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Formatter incorrectly indents object literals Formatter incorrectly indents object literals
2 participants