[WIP] Add blank lines after semicolons #31
Closed
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
Vertical spacing makes the code more legible. This version adds a single
blank line after almost every semicolon.
There are two exceptions:
- If there`s a `within` on a given line, a blank line won't be added.
- If inside matrix (i.e. `[]`), a blank line won't be added.
Example output:
parameter Integer[2,2] A = [
1,2;
3,4];
Also:
- Add example with formatting arrays and matrices
Known issues:
- The formatted file will have two blank lines at the end. The solution
would be to detect if we're on line with the last `end` within the
file, and then skip adding an additional blank line. There might be
multiple `end` in a file, so this is not that obvious to solve.
We need to find a way to get rid of duplicated blank line at the end of files that have semicolon in the last line.
|
This looks good! I went ahead and addressed the issue you mentioned (extra blank lines at end of file) in #33. I'll close this PR now that #33 includes your changes and the fix |
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.
A blank line is added after every line that:
withinstatement on it[](matrix notation)Issues:
Two blank lines are added if a file ends with a semicolon. The tests are not passing because of that.
I am not sure how to solve this problem. I thought about checking for
endon a given line, but we can have multipleendin one file. And this should only care about the lastend.One of my ideas is to check for main class/model name (i.e. the one in the 2nd line) and add another
ifstatement that checks if we're in the correctendstatement. But I noticed that you have trailing comments at the end of test files (e.g. this one) so this approach would also break here, because a blank line would be missing, but it shouldn't.Any better ideas? I am not too familiar with antrl 😄
I added new test
.mofiles that help to verify:withinstatement from any reason (might be useful for formatting code snippets etc.)