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

Everything contains everything!

Browse Source 
This can't possibly be true. But right now somethings haven't been
highlighted correctly because the wrapper types have been blocking them.
Now these are explicitly marked as containing ALL, which works in the
example.swift file. I'm sure we're going to have to back this off, and
we'll do that case by case.
This commit is contained in:
Keith Smiley
2016-01-08 14:51:04 -08:00
parent d87608dcd1
commit fa61881d9c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
example/example.swift
View File

@@ -309,3 +309,8 @@ public let fareEstimate: FareEstimate //= (nil, nil) // comment should be highli
key = map.optionalFrom("string") ?? [] key = map.optionalFrom("string") ?? []
key = map.optionalFrom("string") key = map.optionalFrom("string")
thing = map.optionalFrom("string") ?? .Fallback thing = map.optionalFrom("string") ?? .Fallback
guard let path = NSBundle.mainBundle().pathForResource(imageName, ofType: "png"),
let data = NSData(contentsOfFile: path) else
{
}

4
syntax/swift.vim
View File

@@ -199,9 +199,9 @@ syntax keyword swiftStructure
\ struct \ struct
\ enum \ enum
syntax region swiftTypeWrapper start="\v:\s*" skip="\s*,\s*$*\s*" end="$\|/"me=e-1 contains=swiftString,swiftBoolean,swiftNumber,swiftType,swiftGenericsWrapper transparent syntax region swiftTypeWrapper start="\v:\s*" skip="\s*,\s*$*\s*" end="$\|/"me=e-1 contains=ALL transparent
syntax region swiftGenericsWrapper start="\v\<" end="\v\>" contains=swiftType transparent oneline syntax region swiftGenericsWrapper start="\v\<" end="\v\>" contains=swiftType transparent oneline
syntax region swiftLiteralWrapper start="\v\=\s*" skip="\v[^\[\]]\(\)" end="\v(\[\]|\(\))" contains=swiftType,swiftString,swiftMethod,swiftOperator transparent oneline syntax region swiftLiteralWrapper start="\v\=\s*" skip="\v[^\[\]]\(\)" end="\v(\[\]|\(\))" contains=ALL transparent oneline
syntax region swiftReturnWrapper start="\v-\>\s*" end="\v(\{|$)" contains=swiftType transparent oneline syntax region swiftReturnWrapper start="\v-\>\s*" end="\v(\{|$)" contains=swiftType transparent oneline
syntax match swiftType "\v<\u\w*" contained containedin=swiftGenericsWrapper,swiftTypeWrapper,swiftLiteralWrapper,swiftGenericsWrapper syntax match swiftType "\v<\u\w*" contained containedin=swiftGenericsWrapper,swiftTypeWrapper,swiftLiteralWrapper,swiftGenericsWrapper