This commit is contained in:
Adam Stankiewicz
2015-05-11 15:05:13 +02:00
parent acd7ce5950
commit 271b63d717
33 changed files with 712 additions and 382 deletions

62
indent/blade.vim Normal file
View File

@@ -0,0 +1,62 @@
" Language: Blade
" Author: Barry Deeney <sitemaster16@gmail.com>
" Version: 0.1
" Description: BLADE indent file based on HTML indentation...
" Check if this file has already been loaded
if exists("b:did_indent")
finish
endif
" Include HTML
runtime! indent/html.vim
runtime! indent/php.vim
silent! unlet b:did_indent
" What function do we need to use to detect indentation?
setlocal indentexpr=BladeIndent()
" What keys would trigger indentation?
setlocal indentkeys=o,O,<Return>,<>>,{,},!^F,0{,0},0),:,!^F,o,O,e,*<Return>,=?>,=<?,=*/
" THE MAIN INDENT FUNCTION. Return the amount of indent for v:lnum.
func! BladeIndent()
" What is the current line?
let current_line = v:lnum
" What is the current text?
let current_text = tolower(getline(current_line))
" What was the last non blank line?
let previous_line = prevnonblank(current_line)
" What was the last non blank text?
let previous_text = tolower(getline(previous_line))
" How large are indents??
let indent_size = &sw
" Check if we have a PHPIndent value...
let indent = GetPhpIndent()
" check if we have indent
if indent == -1
" Check if we have BLADE
if current_text =~ '^\s*@' || previous_text =~ '^\s*@'
" We need to add to the indent
return indent_size * indent(previous_text)
endif
" Check if we have HTML
if current_text =~ '^\s*<' || previous_text =~ '^\s*<'
" We now give the honors to HtmlIndent()
let indent = HtmlIndent()
endif
endif
" Give the indent back!
return indent
endfunc
" Make sure we store that flag!
let b:did_indent = 1

View File

@@ -25,6 +25,7 @@ let s:block_skip = "synIDattr(synID(line('.'),col('.'),1),'name') =~? '" . s:s
let s:block_start = 'do\|fn'
let s:block_middle = 'else\|match\|elsif\|catch\|after\|rescue'
let s:block_end = 'end'
let s:symbols_end = '\]\|}'
let s:arrow = '^.*->$'
let s:pipeline = '^\s*|>.*$'
@@ -59,7 +60,11 @@ function! GetElixirIndent()
let ind += opened_symbol * &sw
if current_line =~ '^\s*\(\]\|}\)'
if last_line =~ '^\s*\(' . s:symbols_end . '\)'
let ind += &sw
endif
if current_line =~ '^\s*\(' . s:symbols_end . '\)'
let ind -= &sw
endif

5
indent/gohtmltmpl.vim Normal file
View File

@@ -0,0 +1,5 @@
if exists("b:did_indent")
finish
endif
runtime! indent/html.vim

View File

@@ -48,11 +48,6 @@ function! GetPerlIndent()
return 0
endif
" Don't reindent comments on first column
if cline =~ '^#.'
return 0
endif
" Get current syntax item at the line's first char
let csynid = ''
if b:indent_use_syntax

View File

@@ -60,11 +60,6 @@ function! GetPerl6Indent()
return 0
endif
" Don't reindent coments on first column
if cline =~ '^#'
return 0
endif
" Get current syntax item at the line's first char
let csynid = ''
if b:indent_use_syntax

View File

@@ -101,9 +101,21 @@ function! Latexbox_CallIndent()
let window = getpos('.')
call setpos('.', cursor)
" Get first non-whitespace character of current line.
let line_start_char = matchstr(getline('.'), '\S')
" Get initial tab position.
let initial_tab = stridx(getline('.'), line_start_char)
" Execute the command.
execute 'normal! =='
" Get tab position difference.
let difference = stridx(getline('.'), line_start_char) - initial_tab
" Set new cursor Y position based on calculated difference.
let cursor[2] = cursor[2] + difference
" Restore the previous window position.
call setpos('.', window)
normal! zt

View File

@@ -3,6 +3,10 @@
" Maintainer: None! Wanna improve this?
" Last Change: 2015 Mar 07
if get(g:, 'typescript_indent_disable')
finish
endif
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
finish
@@ -54,6 +58,12 @@ function GetTypescriptIndent()
return indent(prev)
endif
" If a variable was declared and the semicolon omitted, do not indent
" the next line
if getline(prev) =~ '^\s*var\s\+\w\+'
return indent(prev)
endif
" Try to find out whether the last `}` ended a `<variable> : {` block
if getline(prev) =~ '};\s*$'
" jump to matching `{` bracket