| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
More correctly handle indentation of lines enclosed in [] when the
contents themselves contain [], such as arrays of object references
for requires.
Exclude newlines from more of the parsing regexes for more accurate
results.
Fontify references to objects even if they're not at the start of a
line.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Indentation of multiple nested blocks was broken; the closing braces
of all the outer blocks were put into column 0 because finding the
block indentation failed. Do normal indentation if finding a block
indentation fails, but more importantly, be smarter about searching
backwards to find the beginning of the current block, taking balanced
braces into account.
There is probably some less-ugly and more Emacs-native way of doing
this.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
More correctly handle multiple resources in a block, such as:
type {
"name":
attr => foo,
oattr => bar;
"other":
attr => baz;
}
Handle continued arguments in parentheses, such as define or realize
arguments. Try to be a bit more robust about indenting in general.
Add the remaining Puppet language keywords (I think) and improve the
handling of type references at the top level. Remove the hack for
continued include lines and fix it properly.
Remove more non-Puppet code left over from the mode this one was
based on. Use a more straightforward method of setting up the font-lock
keywords and do it the same way for both XEmacs and Emacs since I think
they can both handle the current method (and other modes agree).
|
| |
|
|
|
|
| |
Replace count-matches with a puppet-count-matches function that does
the same as the Emacs 22 count-matches. The Emacs 21 count-matches
is different and not useful for our purposes.
|
| | |
|
| |
|
|
| |
This reverts commit bb65226e54d5e476581118e7c2c5e42275a6b290.
|
| | |
|
| | |
|
| |
|
|
| |
somewhat after commit 738d275f41f3eaf015800021dd2dfe6c42a1ae79, as promised.
|
| |
|
|
|
|
|
| |
sophisticated about what we do at the beginning of the buffer, so that the first expression after an block-opening statement that happens to begin at the beginning of the buffer gets indented correctly. This may need some cleanup, but I wanted to get the correct behavior committed first.
Reported by: Micah Anderson
(Who again supplied the reproduction case.)
|
| |
|
|
|
|
|
|
|
| |
* puppet/ext/emacs/puppet-mode.el
(puppet-indent-line): When iterating backwards, test for
beginning-of-buffer first, to avoid an infinite loop.
Reported by: Micah Anderson
(He also supplied a clear reproduction recipe.)
|
| |
|
|
|
|
|
|
|
|
|
| |
helper functions. (puppet-indent-line): Rewrite to handle three more situations: indent elements in an array, indent single-line blocks, and ignore previous comment content when indenting non-comment lines.
Suggested by: Micah Anderson
(He also provided the test data.)
Notes: Michah points out that this change may have introduced an
infinite loop (he can cause Emacs to hang now). Will investigate and
fix in a separate change.
|
| | |
|
| |
|
|
| |
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2065 980ebf18-57e1-0310-9a29-db15c13687c0
|
| |
|
|
| |
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2064 980ebf18-57e1-0310-9a29-db15c13687c0
|
|
|
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@874 980ebf18-57e1-0310-9a29-db15c13687c0
|
