| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
This variable is not set in older Vims (early 6.x), and I think it's
worth guarding for.
|
|
|
|
|
|
| |
This error seems to be raised when ShellCheck can't source a file
because its filename is not known until runtime. I don't want it to do
that anyway, so I've just excluded it by default.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is a relatively drastic change that should have been done
progressively, but I got carried away in ripping everything out and
putting it back in again.
Reading the documentation for writing a Vim script (:help usr_41.txt), I
am convinced that all of the content that was in the vim/ftplugin
directory and some of the vim/indent directory actually belonged in
vim/after/ftplugin and vim/after/indent respectively.
This is because the section on filetypes makes the distinction between
replacing the core filetype or indent plugins and merely adding to or
editing them after the fact; from :help ftplugin:
> If you do want to use the default plugin, but overrule one of the
> settings, you can write the different setting in a script:
>
> setlocal textwidth=70
>
> Now write this in the "after" directory, so that it gets sourced after
> the distributed "vim.vim" ftplugin after-directory. For Unix this
> would be "~/.vim/after/ftplugin/vim.vim". Note that the default
> plugin will have set "b:did_ftplugin", but it is ignored here.
Therefore, I have deleted the user_indent.vim and user_ftplugin.vim
plugins and their documentation that I wrote, and their ftplugin.vim and
indent.vim shims in ~/.vim, in an attempt to make these plugins
elegantly undo-ready, and instead embraced the way the documentation and
$VIMRUNTIME structure seems to suggest.
I broke the ftplugin files up by function and put them under
subdirectories of vim/after named by filetype, as the 'runtimepath'
layout permits. In doing so, I also carefully applied the
documentation's advice:
* Short-circuiting repeated loads
* Checking for existing mappings using the <Plug> prefix approach
* Avoiding repeated function declarations overwriting each other
* Guarding against 'cpotions' mangling things (by simply
short-circuiting if 'compatible' is set).
I've made the b:undo_ftplugin and b:undo_indent commands less forgiving,
and append commands to it inline with the initial establishment of the
setup they're reversing, including checking that the b:undo_* variable
actually exists in the first place.
For the indentation scripts, however, three of the four files originally
in vim/indent actually do belong there:
1. csv.vim, because it doesn't have an indent file in the core.
2. tsv.vim, because it doesn't have an indent file in the core.
3. php.vim, because it does what ftplugins are allowed to do in
preventing the core indent rules from running at all.
The indent/vim.vim rules, however, have been moved to
after/indent/vim.vim, because the tweaks it makes for two-space
indentation are designed to supplement the core indent rules, not
replace them.
Finally, I've adjusted Makefile targets accordingly for the above, given
the vim/ftplugin directory is now empty and there are three new
directories in vim/after to install. We wrap these under a single
`install-vim-after` parent target for convenience. The
`install-vim-after-ftplugin` target accommodates the additional level of
filetype directories beneath it.
|
|
|
|
|
|
| |
The syntax highlighter flags this code with an error on the final square
bracket: `case $foo in [![:ascii:]]) ;; esac`, but that's all legal. I'm
not yet sure how to fix it, so will just turn the error group for now.
|
|
|
|
|
|
|
| |
These two changes coax syntax/sh.vim into realising that POSIX shell
does not specify 'until' as a builtin (that's a Bash/Ksh thing), and
that POSIX shell is able to nest 'while' loops within other blocks
(that's not a Bash/Ksh thing).
|
|
|
|
|
|
| |
This is what was missing after I initially redefined these groups and
stopped all POSIX shell scripts thinking they were POSIX. The words now
highlight correctly when within control structures again.
|
|
|
|
|
| |
It's not a shell builtin in `dash`, but it is in `Bash`, and I kind of
think of it that way.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
The defaults for these groups don't make much sense to me, so I
completely reset them.
This isn't quite complete yet; for some reason as soon as e.g. an IFS=
setting is contained in e.g. an "if" or "while" block, they don't
highlight correctly anymore. There's probably some other part of the
core syntax/sh.vim file I need to include here.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rather than setting g:is_posix and working around core syntax/sh.vim's
ideas about Korn and POSIX shells, forego sh.vim's efforts to guess what
shell the system /bin/sh is entirely. It's irrelevant to me anyway,
since I'll often be writing shell scripts to run on an entirely
different system.
Instead, if we have a #!/bin/sh shebang reflected in the b:is_sh
variable set by core filetype.vim, and we don't have any other
buffer-level indication of what shell this is, assume it's POSIX,
because I very rarely write Bourne.
Then, after the syntax file is loaded, clear away all but one of the
resulting b:is_* variables.
I have a feeling this is going to end with me re-implementing this
syntax file, possibly as separate sh.vim, bash.vim, and ksh.vim files.
|
|
|
|
|
|
| |
This was unintentionally committed in e36efd4. The correct name of the
variable is b:is_ksh. b:is_kornshell_proper was a rejected first
revision of the name.
|
|
|
|
| |
No functional effect.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Move the rule setting the custom b:is_ksh variable used for this
workaround (established in 52615f6) into an ftplugin file, rather than
into ftdetect; the latter seems a much more appropriate place since by
this point we've definitely decided the file type is "sh".
From the revised comment in this changeset:
>Setting g:is_posix above also prompts Vim's core syntax/sh.vim script
>to set g:is_kornshell and thereby b:is_kornshell to the same value as
>g:is_posix.
>
>That's very confusing, so before it happens we'll copy b:is_kornshell's
>value as determined by filetype.vim and ~/.vim/ftdetect/sh.vim into a
>custom variable b:is_ksh, before its meaning gets confused.
>
>b:is_ksh as a name is more inline with b:is_bash and b:is_sh, anyway,
>so we'll just treat b:is_kornshell like it's both misnamed and broken.
>
>We can then switch on our custom variable in ~/.vim/after/syntax/sh.vim
>to apply settings that actually *are* unique to Korn shell and its
>derivatives.
|
|
|
|
|
| |
This and the other files in the now-removed vim/after/ftdetect directory
were moved to vim/ftdetect in f8af47b.
|
|
|
|
|
|
|
|
|
| |
None of the settings in here need to be run after the core configuration
files are loaded, so I'll put them in a slightly more accessible or
logical place.
This adds a new target `install-vim-ftplugin`, and makes that a
prerequisite of the `install-vim` target.
|
|
|
|
|
|
| |
Setting these options globally is probably what's been causing me to get
so confused by my indentation level changing to zero when editing other
files in the same Vim instance as a VimL file. This should correct it.
|
|
|
|
|
|
|
|
|
| |
This method short-circuits the unwanted PHP expression-based indenting
configuration completely, rather than running it all and then undoing it
after the fact.
This involves creating a new direction ~/.vim/indent, and a Makefile
target install-vim-indent to copy everything into it.
|
|
|
|
|
|
|
|
|
| |
There's no particular reason to run these file detection rules after the
plugins have run, so we'll put them in a more expected directory.
I've created a new Makefile target to install this,
`install-vim-ftdetect`, which is included as a prerequisite of the
`install-vim` target.
|
|
|
|
|
|
|
|
|
|
| |
There's no particular need to set these options after netrw has loaded;
they can be set before it's loaded, and the plugin will still observe
them.
This empties the vim/after/plugin directory. It doesn't need to be
removed from the Makefile as there are no references to it; it was
installed by a glob cp(1).
|
|
|
|
|
| |
Remove some person and system specific stuff, including my signature;
nothing complex about that, after all.
|
| |
|
| |
|
|
|
|
| |
As part of a foray into more active use of ksh and derivatives.
|
| |
|
| |
|
|
|
|
| |
So that it actually runs at the right time ...
|
| |
|
|
|
|
|
| |
Until I can figure out what's wrong with this syntax, or why the syntax
highlighter thinks it's an error
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
There's been a lot of work done to sh.vim since these customisations
were made, and I can't remember why I made some of them. I'll work
without them for a while and reapply any of them if needed.
|
| |
|
|
|
|
| |
This probably contains a few mistakes
|
| |
|
|
|
|
| |
Turned out to be a bad idea.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|