Add support for funced #35
Closed
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
The `shiftwidth` option can be set to 0, in which case the tabstop value is used instead. In order to always set the correct shiftwidth, the Vim docs advise the use of the `shiftwidth()` function.
Additions are based in part on Yann Monclair's syntax at http://www.vim.org/scripts/script.php?script_id=1394
- matched keyword pairs (begin... end, function... end) - cleaned up/clarified matched pair operators (brace expansion, variable substitution) - added test regions & operators - added several errors (syntax used in Bourne-style shells)
- matched keyword pairs (begin... end, function... end) - cleaned up/clarified matched pair operators (brace expansion, variable substitution) - added test regions & operators - added several errors (syntax used in Bourne-style shells)
Conflicts: syntax/fish.vim
There's no standard extension for these files, so no ftdetect, but an ftplugin called `fishprofile` is defined that sets up tabstop and folding to make it easier to read/navigate these files. When reading a fish profile file, run `:setf fishprofile` to turn on the plugin.
Clean up the ftplugin a bit. Use the save_cpo pattern to ensure cpo is set appropriately, and define a b:undo_ftplugin. Change the b:match_words definition to match else/else if.
* 'master' of https://github.com/patrick-conley/vim-fish: Use fish't test options, add all builtin keywords Added several keywords, tokens for invalid syntax Don't highlight numbers in function names Highlight arguments to "set", more sh-like colors Added several language features to syntax Added several language features to syntax Simplified & extended syntax file
* 'shiftwidth-function' of https://github.com/ajaam/vim-fish: Use `shiftwidth()` instead of `&shiftwidth`
Commands/builtins/etc should only highlight if they're at the start of a line. This includes command substitutions and semicolons.
We can terminate keywordprg with a backslash in order to escape the space Vim adds between it and the keyword. This means we don't need the wrapper script anymore. Fixes dag#1.
Add 'abbr' keyword
Also fixed moving cursor to first empty line when using funced
Open
|
Just checked this out (your master branch) and this is working great! Finally a pleasure to use funced with vim! Tabs and indents all work as expected and don't get reset every time I save. This PR appears to have grown quite large and likely won't get merged as is. We should split this out to a specific branch with just the stuff needed to support |
|
You are right, I forgot to put these changes on a branch (or better I never expected it to not get merged for so long and did not expect that any changes would be added to master in the mean time). I now created a new branch "funced" only containing the relevant commits in my repo but there seams to be no way to change the source branch of a PR, is there? |
|
Correct, there is no way to do so. You have to open a new one and close this one and link this one to the new one. |
Closed
|
Closed in favor of #41. |
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.
Also fixed moving cursor to first empty line when using funced