More improvements on cc-mode based font locking #167
Merged
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
php-extra-constants and web-mode-extra-php-constants can be used to define additional symbols as constant, but this now only makes sense for lower or camel-cased constants Ideally we'd implement this using the cc-lang constructs but c-constant-kwds does not allow user customization (c-lang-defconst). For identifier keywords cc-mode has the *-extra-types variables but this does not work for constant keywords.
All identifiers are recognized as words in cc-mode/php-mode, so special care is taken to have our custom highlighting pattern for variable names not include the separator.
Issue emacs-php#9 is not fixed (and expected to fail) but because of the different highlighting of unmatched string delimiters in the cc-mode branch the test passed. This commit makes the assertion more specific so it fails again.
Related to issue-115, added test case
Those two were removed in the first cc-mode conversion commit. Below a short summary of the styles and how I intend them to behave in this branch. Drupal: Sets indentation to two spaces, some indentation tweaks. Does automatic removal of trailing whitespace. Wordpress: Indentation tweaks and tab-width of four spaces. PSR2, Symfony2 and PEAR: They are basically the same. The Symfony2 style allows the unofficial 'hanging semicolon' behaviour. PEAR is the default. I think it would be better for php-mode to just forget about PEAR, drop Symfony2 as a style (the framework uses PSR-2) and use PSR-2 as default. The hanging semicolon could be a configurable option, independent of the style in effect. This commit fixes the failing test on whitespace removal (issue 53).
|
Thanks for keeping up the great work! I've updated the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I managed to get the rough edges off the experimental branch and fix a few existing bugs along the way. I think most of them can be backported relatively easy regardless of using the cc-mode changes, lets discuss in issue #66.
The following issues seem to be fixed in this branch while still broken on master: #143, #138, #135, #130, #128, #100, #49.