-
Notifications
You must be signed in to change notification settings - Fork 11
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 nested one command code flow control #261
Merged
mark-wiemer
merged 58 commits into
mark-wiemer:main
from
kyklish:bug/nested-one-command-code
Nov 22, 2022
Merged
Fix nested one command code flow control #261
mark-wiemer
merged 58 commits into
mark-wiemer:main
from
kyklish:bug/nested-one-command-code
Nov 22, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kyklish
force-pushed
the
bug/nested-one-command-code
branch
from
October 29, 2022 21:48
57d2a8b
to
abf6292
Compare
kyklish
force-pushed
the
bug/nested-one-command-code
branch
from
November 1, 2022 19:22
04f5968
to
8ec224f
Compare
kyklish
force-pushed
the
bug/nested-one-command-code
branch
from
November 2, 2022 19:47
8ec224f
to
6c9823a
Compare
kyklish
force-pushed
the
bug/nested-one-command-code
branch
from
November 5, 2022 17:08
b2038aa
to
ba3d900
Compare
kyklish
force-pushed
the
bug/nested-one-command-code
branch
2 times, most recently
from
November 13, 2022 08:17
edc22fe
to
e66be65
Compare
kyklish
force-pushed
the
bug/nested-one-command-code
branch
from
November 14, 2022 18:04
686106f
to
3249f8c
Compare
# Conflicts: # src/providers/formattingProvider.ts # src/providers/formattingProvider.utils.ts
…-code # Conflicts: # src/providers/formattingProvider.ts # src/providers/formattingProvider.utils.ts # src/test/suite/format/samples/184-continuation-section.in.ahk # src/test/suite/format/samples/184-continuation-section.out.ahk # src/test/suite/format/samples/185-block-comment.in.ahk # src/test/suite/format/samples/185-block-comment.out.ahk # src/test/suite/format/samples/ahk-explorer.out.ahk
This is a big PR! I'll review it soon enough. My main goal right now is getting AHK+ updated to match AHK++ :) |
mark-wiemer
requested changes
Nov 21, 2022
src/test/suite/format/samples/255-nested-one-command-code.in.ahk
Outdated
Show resolved
Hide resolved
src/test/suite/providers/formatting/formattingProvider.utils.test.ts
Outdated
Show resolved
Hide resolved
mark-wiemer
approved these changes
Nov 22, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #255.
Fix bug in PR #260: continuation section in nested objects initialization.
This PR and PR #260 makes single-line comments jump +-1 indent. Revise single-line comments by explicitly aligning single-line comments to the next line of code after the main code has been formatted. In addition, this reduces possible formatting errors when we encounter blank lines or single-line comments in the file.
Extract oneCommandCode detection to util function
nextLineIsOneCommandCode(...)
Notifying @mark-wiemer