averello/vim-swift-mirror
1
0
Fork 0
mirror of https://github.com/keith/swift.vim.git synced 2025-12-17 12:00:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix square bracket indents

Browse Source
This commit is contained in:
Keith Smiley
2014-08-24 18:35:48 -07:00
parent edcbcd7bcb
commit 1acdb2f128
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
example/example.swift
View File

@@ -255,3 +255,11 @@ func foo () {
let foo = CGRectMake(0, (5 - 2), let foo = CGRectMake(0, (5 - 2),
100, 100,
200) 200)
let dict = [
"foo": "Bar",
"nest": [
"fadsf",
],
]

5
indent/swift.vim
View File

@@ -12,6 +12,7 @@ let s:cpo_save = &cpo
set cpo&vim set cpo&vim
setlocal indentexpr=SwiftIndent() setlocal indentexpr=SwiftIndent()
setlocal indentkeys+=0[,0]
function! s:NumberOfMatches(char, string) function! s:NumberOfMatches(char, string)
let regex = "[^" . a:char . "]" let regex = "[^" . a:char . "]"
@@ -31,6 +32,10 @@ function! SwiftIndent()
return indent(previousNum) + &tabstop return indent(previousNum) + &tabstop
endif endif
if line =~ "^\\s*],\\?$"
return indent(previousNum) - &tabstop
endif
" Indent multi line declarations see #19 " Indent multi line declarations see #19
" Allow statements to also be in parens " Allow statements to also be in parens
let numOpenParens = s:NumberOfMatches("(", previous) let numOpenParens = s:NumberOfMatches("(", previous)