-
Notifications
You must be signed in to change notification settings - Fork 33
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
Indentation and completion improvements #15
Open
alexsmith1612
wants to merge
20
commits into
beancount:main
Choose a base branch
from
alexsmith1612:indentation-and-completion-updates
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+360
−71
Open
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
ed0099e
Fix indentation of directives not preceeded by empty line
alexsmith1612 7017a94
Indent posting metadata lines an additional level
alexsmith1612 fdfa9c2
Align numbers in balance and price directives in addition to postings
alexsmith1612 b4f14e4
Align open directive currencies to number alignment + 1
alexsmith1612 80a3e8b
Add customizable variable for minimum number alignment separation
alexsmith1612 01c5a74
Add customizable variable to enable number alignment with tab-dwim
alexsmith1612 013e57a
Add more generic beancount-indent-directive function
alexsmith1612 90c54d4
Always call indent-region on TAB if the region is active
alexsmith1612 aff0255
Update indentation tests
alexsmith1612 c232302
Fix link-at-point-003 unit test
alexsmith1612 ee36fcc
Explicitly require imenu in beancount.el
alexsmith1612 2489f46
Require org for org-level-x faces
alexsmith1612 6df3934
Don't insert space after completions
alexsmith1612 7d07c48
Limit non-timestamped directives completions
alexsmith1612 2518f70
Allow completion of tags and links not on their own line
alexsmith1612 c9725e3
Move posting completions after tag and link completions
alexsmith1612 c880cf6
Don't attempt completion inside strings except for options
alexsmith1612 4102a12
Don't collect matches inside strings
alexsmith1612 a721f15
Add more completion tests
alexsmith1612 cc8ea35
Update copyright and author information
alexsmith1612 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
;;; beancount-test.el --- ERT for beancount-mode -*- lexical-binding: t -*- | ||
|
||
;; Copyright 2019 Daniele Nicolodi <[email protected]> | ||
;; Copyright 2019 Alex Smith <[email protected]> | ||
|
||
;; This file is not part of GNU Emacs. | ||
|
||
|
@@ -133,21 +134,71 @@ Return a list of substrings each followed by its face." | |
:tags '(indent regress) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please add the tests in the same commit that extends the functionality. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok, will change. |
||
(with-temp-buffer | ||
(insert " | ||
2019-01-01 * \"Example\" | ||
2019-01-01 * \"Example\" | ||
transaction: metadata | ||
#foo | ||
^bar | ||
also_transaction: metadata | ||
Expenses:Example 1.00 USD | ||
Assets:Checking 1.00 USD | ||
posting: metadata | ||
also_posting: metadata | ||
Assets:Checking -1.00 USD | ||
second_posting: metadata | ||
") | ||
(beancount-mode) | ||
(forward-line -1) | ||
(beancount-indent-transaction) | ||
(beancount-indent-directive) | ||
(should (equal (buffer-string) " | ||
2019-01-01 * \"Example\" | ||
transaction: metadata | ||
#foo | ||
^bar | ||
also_transaction: metadata | ||
Expenses:Example 1.00 USD | ||
Assets:Checking 1.00 USD | ||
posting: metadata | ||
also_posting: metadata | ||
Assets:Checking -1.00 USD | ||
second_posting: metadata | ||
")))) | ||
|
||
(ert-deftest beancount/indent-002 () | ||
:tags '(indent regress) | ||
(with-temp-buffer | ||
(insert " | ||
2019-01-01 open Assets:Checking USD | ||
|
||
2019-01-01 * \"Example\" | ||
transaction: metadata | ||
#foo | ||
^bar | ||
also_transaction: metadata | ||
Expenses:Example 1.00 USD | ||
posting: metadata | ||
also_posting: metadata | ||
Assets:Checking -1.00 USD | ||
second_posting: metadata | ||
2019-01-02 balance Assets:Checking -1.00 USD | ||
|
||
2019-01-03 price FOOBAR 123.456 USD | ||
") | ||
(beancount-mode) | ||
(indent-region (point-min) (point-max)) | ||
(should (equal (buffer-string) " | ||
2019-01-01 open Assets:Checking USD | ||
|
||
2019-01-01 * \"Example\" | ||
transaction: metadata | ||
#foo | ||
^bar | ||
also_transaction: metadata | ||
Expenses:Example 1.00 USD | ||
posting: metadata | ||
also_posting: metadata | ||
Assets:Checking -1.00 USD | ||
second_posting: metadata | ||
2019-01-02 balance Assets:Checking -1.00 USD | ||
|
||
2019-01-03 price FOOBAR 123.456 USD | ||
")))) | ||
|
||
(ert-deftest beancount/options-001 () | ||
|
@@ -188,6 +239,57 @@ known option nmaes." | |
")) | ||
(should (equal beancount-accounts '("Assets:Checking" "Expenses:Test"))))) | ||
|
||
(ert-deftest beancount-completion-002 () | ||
:tags '(completion regress) | ||
(with-temp-buffer | ||
(insert " | ||
2019-01-01 ope Assets:Checking | ||
") | ||
(beancount-mode) | ||
(search-backward "p") | ||
(completion-at-point) | ||
(should (equal (buffer-string) " | ||
2019-01-01 open Assets:Checking | ||
")))) | ||
|
||
(ert-deftest beancount-completion-003 () | ||
:tags '(completion regress) | ||
(with-temp-buffer | ||
(insert " | ||
option \"operating_ \"USD\" | ||
") | ||
(beancount-mode) | ||
(search-backward "p") | ||
(completion-at-point) | ||
(should (equal (buffer-string) " | ||
option \"operating_currency\" \"USD\" | ||
")))) | ||
|
||
(ert-deftest beancount-completion-004 () | ||
:tags '(completion regress) | ||
(with-temp-buffer | ||
(insert " | ||
2019-01-01 * \"Example ^foo-something-link-like-in-string\" ^foo-link/_.etc ^bar-link #foo-tag.more_/cruft #bar-tag | ||
Expenses:Test 1.00 USD | ||
Assets:Checking | ||
|
||
2019-01-01 * \"Example\" ^f #b | ||
") | ||
(beancount-mode) | ||
(goto-char (point-max)) | ||
(search-backward "^f") | ||
(completion-at-point) | ||
(goto-char (point-max)) | ||
(search-backward "#b") | ||
(completion-at-point) | ||
(should (equal (buffer-string) " | ||
2019-01-01 * \"Example ^foo-something-link-like-in-string\" ^foo-link/_.etc ^bar-link #foo-tag.more_/cruft #bar-tag | ||
Expenses:Test 1.00 USD | ||
Assets:Checking | ||
|
||
2019-01-01 * \"Example\" ^foo-link/_.etc #bar-tag | ||
")))) | ||
|
||
(ert-deftest beancount/outline-001 () | ||
:tags '(outline) | ||
(with-temp-buffer | ||
|
@@ -322,5 +424,5 @@ known option nmaes." | |
:tags '(regress thing-at-point) | ||
(with-temp-buffer | ||
(insert "foo ^link baz") | ||
(goto-char 15) | ||
(goto-char 5) | ||
(should (equal (thing-at-point 'beancount-link) "^link")))) |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2019?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Whoops, that was a case of "thinking one thing but typing what I'm looking at". Will fix.