Implement indentation #47
Conversation
|
@MoisMoshev thank you for the PR. I will review, and if things go well, merge it in. Thank you for the contribution!!! |
|
@MoisMoshev I am really swamped this week, but will look at it in more detail either later half of the week or this weekend. This is going to a major feature in the next version of the release. Thank you very much for contributing the PR! |
|
Excellent, makes me very happy! |
|
Perfect. Thanks @MoisMoshev. Will get this merged in asap. Something came up this weekend and going to have to delay my review until mid next week. my apologies. I'm looking forward to the review. |
|
@MoisMoshev firstly, thank you for the PR. I really appreciate it. I would love to get it in, but there are some problems. Would you mind taking a look at some of the comments and seeing if you could fix them?
|
|
|
||
| (defun d2--sort-tokens-by-line (tokens) | ||
| "Sort TOKENS by line number." | ||
| (sort tokens |
There was a problem hiding this comment.
@MoisMoshev I ran this locally, and also ran into this problem. 3 arguments, but only accepts two. Can you clean this up?
There was a problem hiding this comment.
Hmm I'm confused by this, sort takes just one positional, and key arguments:
(sort SEQ &key KEY LESSP REVERSE IN-PLACE)
So it looks ok...? I don't think this changed recently. I'm running emacs 30.0.50
There was a problem hiding this comment.
Nevermind, just checked in Emacs 29 and indeed the signature changed. It should be
(sort SEQ PREDICATE)
brb
d2-mode.el
Outdated
| "->" "--" "<-")) | ||
| (? (group ":" (one-or-more space))) | ||
| (? (group (one-or-more (not (any ?{ ?}))))) | ||
| "{" |
d2-mode.el
Outdated
| (? (group ":" (one-or-more space))) | ||
| (? (group (one-or-more (not (any ?{ ?}))))) | ||
| "{" | ||
| )) |
d2-mode.el
Outdated
| (list node subnode-start end connection))) | ||
|
|
||
| ;;; declaration part handling | ||
| (defun d2--decl-tag (decl) (car decl)) |
There was a problem hiding this comment.
TODO: Please update with doc strings
|
@MoisMoshev once the build checks are passing, I'll be happy to re-evaluate this and try to merge it in. The PR was really helpful. Thank you again. |
|
Thanks, I'll take care of it in the coming days. |
|
Everything fixed |
Running everything over CI/CD. Then will check locally. If looks good, will merge in. Thank you! |
|
Some seem like an issue in the environment, e.g.: This one I might have to fix: |
Fixes #45
Implements simple parsing of current and previous lines, and calculation of indentation, depending on the syntax.
It is still a bit rough, the regexes might have to be adjusted.