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

reduce padding for virtual lines #70

Merged
merged 1 commit into from
Nov 17, 2023
Merged

Conversation

Beastwick18
Copy link
Contributor

Hello, this PR reduces the padding of virtual lines so that lines with multiple formulas or text following formulas so they are more condensed.

Before:
Before

After:
After

I'm fairly inexperienced with lua, so the code may have a better possible implementation.

@max397574
Copy link
Contributor

  1. squash commits
  2. couldn't you just remove empty strings or whitespace from the beginning and end of the table?
    or perhaps just add one whitespace of padding

@Beastwick18
Copy link
Contributor Author

Sorry about all the commits, for some reason I'm unable to squash them without errors.

I'm not quite sure what you mean by the second part. The way I thought it was working was that the whitespace was appended onto the above and below virt lines, and then they were merged into one line.

Also, yes, one whitespace of padding could be added back.

@max397574
Copy link
Contributor

oh I see
didn't really look at the code for the second part but it makes sense what you're saying
I thought there was a much simpler solution then what you did but there isn't

also what kind of errors do you get when trying to squash?

@Beastwick18
Copy link
Contributor Author

I'm trying to squash on GitHub Desktop, but it says

Unable to squash. Squashing replays all commits up to the last one required for the squash. A merge commit cannot exist among those commits

I think it might be because I should have squashed them before pushing to remote?

@max397574
Copy link
Contributor

the error messages says that there is a problem because of the merge commit
perhaps squash all the other ones then

after all this doesn't matter because there likely will be a squash merge or a merge commit only anyway but it just makes the pr look nicer

@Beastwick18
Copy link
Contributor Author

For some reason I get the same error no matter the combination of commits I try to squash. If you'd like I could open another PR with a branch that has few commits.

@Beastwick18
Copy link
Contributor Author

Ok just figured out the squash issue, should be good now.

@jbyuki jbyuki merged commit f5aff14 into jbyuki:master Nov 17, 2023
@jbyuki
Copy link
Owner

jbyuki commented Nov 17, 2023

All the tests pass, merging.
Thanks!

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.

3 participants