This repository has been archived by the owner on May 25, 2019. It is now read-only.
Ansible functions #28
Open
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
Closed
Add this cluster, then replace a bunch of containedin=jinjaVarBlock,jinjaNested clauses with contains=@jinjaNestedElement on the jinjaVarBlock and jinjaNested syntax groups.
These replace the jinja variants for mappings where the key is one of the Ansible keywords when, changed_when, or with_*. The ansibleVarBlock item can contain exactly the same things as the jinjaVarBlock element, namely the @jinjaNestedElement syntax cluster.
benjifisher
force-pushed
the
ansible_functions
branch
from
29c7269
to
c9ed0f8
Compare
|
I was testing this and noticed that a lot of the syntax highlighting was messed up. Then I realized that the problem was coming from 8050b3f, which we have since reverted. So I rebased this branch onto master. In part, I was curious to see how GitHub would treat a rebase on a pending PR. Somewhat to my surprise, it updated the PR automatically. As I write this, the two commits were "added" 22 days ago, but "committed" about 15 minutes ago. I think that this patch works well: it fixes #2 and does not seem to cause any other problems. I would like another pair of eyes on it before I merge. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This needs thorough testing, but I think it solves #2. The first commit reorganizes parts of the jinja syntax file, but should have no effect at all on the highlighting. The second commit uses the syntax cluster defined in the first commit to get the desired effect, highlighting "foo bar" in
when: foo barthe same way it is highlighted in"yaml string {{ foo bar }}".Note that #26 currently breaks some test cases, so that should probably be resolved before this is considered.