Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Deprioritize keys #52

Merged
merged 2 commits into from
Sep 25, 2016
Merged

Deprioritize keys #52

merged 2 commits into from
Sep 25, 2016

Conversation

winstliu
Copy link
Contributor

Fixes #21

/cc @rpendleton @szhu @yajo @code-tree @Ajedi32: if one of you could test this out, that would be appreciated. Let me know if you need instructions on how to link this with Atom.

@winstliu winstliu changed the title Prioritize strings over keys Deprioritize keys Sep 12, 2016
@yajo
Copy link

yajo commented Sep 12, 2016

Instructions, please

@Ajedi32
Copy link

Ajedi32 commented Sep 12, 2016

Seems to be working for my use case:

image

@Ajedi32
Copy link

Ajedi32 commented Sep 12, 2016

@yajo:

apm develop language-yaml language-yaml # Clone the project to the current directory
cd language-yaml/ # cd to the newly cloned project directory
git checkout wl-prioritize-strings # Checkout this PR

Then:

  1. Open Atom
  2. Press Ctrl+Shift+P to open the command pallet
  3. Select Application: Open Dev
  4. Open a folder
  5. Test your changes

Not sure if that works on Windows though, since it apparently symlinks ~/atom/dev/packages/language-yaml to the cloned directory, and Windows doesn't allow non-root users to create symlinks. @50Wliu, would you happen to know how that works?

@winstliu
Copy link
Contributor Author

It does work! apm uses the junction symlink which doesn't require Administrator escalation.

@winstliu winstliu merged commit 29d4b54 into master Sep 25, 2016
@winstliu winstliu deleted the wl-prioritize-strings branch September 25, 2016 19:58
winstliu added a commit that referenced this pull request Jan 9, 2017
* Pulled standalone `- stuff` (aka tags without a colon) into its own
match
* This greatly simplifies the main tag match, meaning that we no longer
have three nested non-capturing groups
* Ensure that spaces follow the ending colon (fixes the second part of
#52)
* Use a consistent blacklist across tag matches (fixes the first part of
#51)
* Fix `constant.other.date.yaml` being misapplied to the entire match,
rather than just the date
* Integrate `!!omap` matching into the existing tag matches
* Make variable matching stricter
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants