Improve vim syntax files. #226
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
added 2 commits
August 11, 2023 13:25
This adds autoindent, based on the Python indentation files from neovim. The directory layout is modified so that the repo can be checked out unchanged in your .vim/pack directory for Vim 8 compatibility.
floitsch
approved these changes
Aug 11, 2023
start/vim/indent/toit.vim
Outdated
| " | ||
| " Vim indent file | ||
| " Language: Toit | ||
| " Maintainer: Bram Moolenaar <Bram@vim.org> |
start/vim/indent/toit.vim
Outdated
| " Language: Toit | ||
| " Maintainer: Bram Moolenaar <Bram@vim.org> | ||
| " Original Author: David Bustos <bustos@caltech.edu> | ||
| " Last Change: 2021 Sep 26 |
start/vim/indent/toit.vim
Outdated
| setlocal autoindent " indentexpr isn't much help otherwise | ||
|
|
||
| setlocal indentexpr=ToitGetIndent(v:lnum) | ||
| setlocal indentkeys+=<:>,=elif,=except |
There was a problem hiding this comment.
elif and except don't make sense.
start/vim/indent/toit.vim
Outdated
|
|
||
| let b:undo_indent = "setl ai< inde< indk< lisp<" | ||
|
|
||
| " Support for Python indenting, see runtime/indent/python.vim |
start/vim/indent/toit.vim
Outdated
| return indent(a:lnum) <= a:expected - s:normal_indent | ||
| endfunction | ||
|
|
||
| " Some other filetypes which embed Python have slightly different indent |
start/vim/indent/toit.vim
Outdated
| endif | ||
|
|
||
| " If the current line begins with a keyword that lines up with "try" | ||
| if getline(a:lnum) =~ '^\s*\(except\|finally\)\>' |
There was a problem hiding this comment.
We don't have 'except'.
Is this trying to unindent?
start/vim/indent/toit.vim
Outdated
| if getline(a:lnum) =~ '^\s*\(except\|finally\)\>' | ||
| let lnum = a:lnum - 1 | ||
| while lnum >= 1 | ||
| if getline(lnum) =~ '^\s*\(try\|except\)\>' |
There was a problem hiding this comment.
ditto: we don't have 'except'.
start/vim/indent/toit.vim
Outdated
| endif | ||
|
|
||
| " If the current line begins with a header keyword, dedent | ||
| if getline(a:lnum) =~ '^\s*\(elif\|else\)\>' |
start/vim/indent/toit.vim
Outdated
| if getline(a:lnum) =~ '^\s*\(elif\|else\)\>' | ||
|
|
||
| " Unless the previous line was a one-liner | ||
| if getline(plnumstart) =~ '^\s*\(for\|if\|elif\|try\)\>' |
There was a problem hiding this comment.
ditto: we don't have elif.
and the try probably doesn't behave the same.
| return plindent - s:normal_indent | ||
| endif | ||
|
|
||
| " When after a () construct we probably want to go back to the start line. |
There was a problem hiding this comment.
Not sure that's really true for Toit.
added 4 commits
August 11, 2023 13:42
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.
This adds autoindent, based on the Python indentation files from neovim.
The directory layout is modified so that the repo can be checked out unchanged in your .vim/pack directory for Vim 8 compatibility.