-
Notifications
You must be signed in to change notification settings - Fork 79
Separating function from phpKeyword to phpKeywordFunction #4
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
Open
manojo123
wants to merge
170
commits into
vim-scripts:master
Choose a base branch
from
StanAngeloff:master
base: master
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.
Conversation
This file contains hidden or 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
Rebuilt on PHP 5.3.6/Ubuntu with most extensions installed from main repo.
Conflicts: syntax/php.vim These were borrowed from paulyg/Vim-PHP-Stuff.
This commit introduces a new template file which will be used when re-generating the syntax from within PHP. In addition, several less commonly used extensions are turned off to speed up loading of the php.vim file on start up.
This commit adds support for: - New Core constants, - New language keywords: trait, insteadof, - New types, e.g., calleable and binary numbers.
> Use MySQL for Syntax Highlighting. > > Rather than use the limited SQL syntax, why not use the full MySQL syntax?
This commit does not add support for the new 5.5 keywords or language constructs.
This commit merges parts of: aantonello@9d24eab aantonello@63c93d8 The syntax file is more closely aligned with the generic syntax highlighting groups in Vim. This didn't change highlighting for my custom syntax colours, hopefully it will not affect others as well.
This commit merges parts of: https://github.com/pixelastic/php.vim/commit/8b4b165bab59fba80efda8dbe0e431605ab94669
This commit merges parts of: joshtronic@e9c5d0f The 'finally' keyword was added to the list of recognised keywords.
$ php -v PHP 5.5.7-1+sury.org~saucy+1 (cli) (built: Dec 12 2013 21:54:59) Copyright (c) 1997-2013 The PHP Group Zend Engine v2.5.0, Copyright (c) 1998-2013 Zend Technologies with Zend OPcache v7.0.3-dev, Copyright (c) 1999-2013, by Zend Technologies with Xdebug v2.2.3, Copyright (c) 2002-2013, by Derick Rethans
This commit merges parts of: paulyg/Vim-PHP-Stuff@b9b2b2d paulyg/Vim-PHP-Stuff@e3333be
This commit merges parts of: vim-scripts/php.vim--Nicholson@9d1e381
Problem: The new Java-like syntax highligting added phpDocComment, et al. However phpDocParams highlighted indented html tags in a file with no doc comments. Fix: Mark phpDocParams as contained, so phpDocParams must reside in phpDocComments to receive vim highlights. Signed-off-by: Justin Charette <[email protected]>
Let the User customise those and pick sensible defaults. Closes #4.
Closes #31 (and more specifically #31 (comment)) The new highlighting groups are linked to their parents to avoid breaking existing syntax colouring.
utf8_{encode,decode} were added in manually. Closes #74.
This follows from #78 which failed to remove the NULL keyword from `phpType`.
Add 'strip_maximum_size' to remove Vim 7.4 specific syntax.
Use XML syntax highlighting within `<<<XML` and `<<<'XML'` heredoc/nowdoc strings.
Co-Authored-By: akrabat <[email protected]>
Co-Authored-By: akrabat <[email protected]>
Co-Authored-By: akrabat <[email protected]>
Co-Authored-By: akrabat <[email protected]>
Add support for XML heredoc and nowdoc
This commit also reworks the Dockerfile to pull multiple versions of PHP and rebuild the syntax against each one.
Because: - In PHP >= 7.3 Whitespace is allowed before the ending/closing tag of a herdoc/nowdoc - https://www.php.net/manual/en/migration73.new-features.php#migration73.new-features.core.heredoc - Currently `php.vim` only catches closing tags without whitespace before This commit: - Changes the end tag delimeter, per @weirdan fix
Allow Whitespace Before Heredoc / Nowdoc Block Endings
Add `g:php_version_id` documentation.
Whoops, trim extra space inside inline code block.
Allow whitespaces after '<<<' operator in Heredoc
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.
Its possible now to separate function keyword to a standalone syntax highlight using phpKeywordFunction
and
871 syn keyword phpKeywordFunction function contained
and
885 syn cluster phpClConst contains=phpFunctions,phpClasses,phpStaticClasses,phpIdentifier,phpStatement,phpKeyword,phpKeywordFunction,phpOperator,phpSplatOperator,phpStringSingle,phpStringDouble,phpBacktick,php Number,phpType,phpNullValue,phpBoolean,phpStructure,phpMethodsVar,phpConstants,phpException,phpSuperglobals,phpMagicConstants,phpServerVars