Small improvements. #28
Conversation
Raimondi
force-pushed
the
small_improvements
branch
from
40c5a6f
to
a93c82a
Compare
- funced and fish_indent always uses tabs for indentation, use fish#Indent() to fix it. Works better with the improved fish#Indent(). - ftdetect should contain filetype detection code. Move autocmds to plugin/fish.vim. - Match new funced temp file name. - Add "else", "else if" and "case" to b:match_words to follow what's used by Vim's ftplugins. - Use "syn sync fromstart" for a more accurate highlighting.
Raimondi
force-pushed
the
small_improvements
branch
from
a93c82a
to
ab4ce9f
Compare
|
👍 |
| @@ -26,6 +26,8 @@ function! fish#Format() | |||
| let l:command = v:lnum.','.(v:lnum+v:count-1).'!fish_indent' | |||
| echo l:command | |||
| execute l:command | |||
| " Fix indentation and replace tabs with spaces if necessary. | |||
| normal! '[='] | |||
There was a problem hiding this comment.
Should probably use :retab for this. Why do you feel you need to fix the indentation of the output from the program that is made for fixing indentation? Does it get something wrong?
| let b:match_words = | ||
| \ escape('<%(begin|function|if|switch|while|for)>:<end>', '<>%|)') |
There was a problem hiding this comment.
Any particular reason you dropped this use of escape? I think it's more readable.
| @@ -1,23 +1,13 @@ | |||
| autocmd BufRead,BufNewFile *.fish setfiletype fish | |||
|
|
|||
| " Set filetype when using funced. | |||
| autocmd BufRead fish_funced.* setfiletype fish | |||
There was a problem hiding this comment.
Should maybe try to keep support for old-style funced file names too.
| autocmd BufRead,BufNewFile ~/.config/fish/fishd.* setlocal readonly | ||
| " | ||
| " Move cursor to first empty line when using funced. | ||
| autocmd BufRead fish_funced.* exec "normal! gg=G" | call search('^\s*\zs$') |
There was a problem hiding this comment.
Why are you forcing a reindent here?
|
|
||
| " Mimic `funced` when manually creating functions. | ||
| autocmd BufNewFile ~/.config/fish/functions/*.fish | ||
| \ call setline(1, ['function '.expand('%:t:r'), |
There was a problem hiding this comment.
Any particular reason for preferring setline over append here?
| @@ -2,6 +2,9 @@ if exists('b:current_syntax') | |||
| finish | |||
| endif | |||
|
|
|||
| syntax sync clear | |||
There was a problem hiding this comment.
This shouldn't be necessary in a syntax file.
| @@ -2,6 +2,9 @@ if exists('b:current_syntax') | |||
| finish | |||
| endif | |||
|
|
|||
| syntax sync clear | |||
| syntax sync fromstart | |||
There was a problem hiding this comment.
Is this necessary? It can be slow for large files, or Vim would just do it by default for all filetypes. It should only really be used for things like heredocs, which last I checked fish didn't have, but I guess it has multiline strings that can be used similarly. But how often do you have strings span more than a few lines? Do you really need to sync all the way from start?
- funced and fish_indent always uses tabs for indentation, use fish#Indent() to fix it. Works better with the improved fish#Indent(). - ftdetect should contain filetype detection code. Move autocmds to plugin/fish.vim. - Match new funced temp file name. - Add "else", "else if" and "case" to b:match_words to follow what's used by Vim's ftplugins. blankname: - dropped the syntax changes (cc: dag#28) Co-authored-by: blankname <>
fish#Indent() to fix it. Works better with the improved fish#Indent().
plugin/fish.vim.
used by Vim's ftplugins.