diff --git a/ale_linters/swift/swiftlint.vim b/ale_linters/swift/swiftlint.vim
index b7dcf935..697d246b 100644
--- a/ale_linters/swift/swiftlint.vim
+++ b/ale_linters/swift/swiftlint.vim
@@ -1,9 +1,51 @@
 " Author: David Mohundro <david@mohundro.com>
 " Description: swiftlint for swift files
 
+
+function! ale_linters#swift#swiftlint#Handle(buffer, lines) abort
+    let l:pattern = '\v^([a-zA-Z]?:?[^:]+):(\d+):(\d+)?:? ([^:]+): (.+)$'
+    let l:output = []
+
+    for l:match in ale#util#GetMatches(a:lines, l:pattern)
+        let l:item = {
+        \   'lnum': str2nr(l:match[2]),
+        \   'type': l:match[4] is# 'error' ? 'E' : 'W',
+        \   'text': l:match[5],
+        \}
+
+        if l:match[4] is# 'error'
+            let l:item.type = 'E'
+        elseif l:match[4] is# 'note'
+            let l:item.type = 'I'
+        endif
+
+        if !empty(l:match[3])
+            let l:item.col = str2nr(l:match[3])
+        endif
+
+        " If the filename is something like <stdin>, <nofile> or -, then
+        " this is an error for the file we checked.
+        if l:match[1] isnot# '-' && l:match[1][0] isnot# '<'
+            let l:item['filename'] = l:match[1]
+        endif
+
+        " Parse the code if it's there.
+        let l:code_match = matchlist(l:item.text, '\v^(.+) \(([^ (]+)\)$')
+
+        if !empty(l:code_match)
+            let l:item.text = l:code_match[1]
+            let l:item.code = l:code_match[2]
+        endif
+
+        call add(l:output, l:item)
+    endfor
+
+    return l:output
+endfunction
+
 call ale#linter#Define('swift', {
 \   'name': 'swiftlint',
 \   'executable': 'swiftlint',
 \   'command': 'swiftlint lint --use-stdin',
-\   'callback': 'ale#handlers#gcc#HandleGCCFormat',
+\   'callback': 'ale_linters#swift#swiftlint#Handle',
 \})
diff --git a/test/handler/test_swiftlint_handler.vader b/test/handler/test_swiftlint_handler.vader
index b77b4420..725ff97c 100644
--- a/test/handler/test_swiftlint_handler.vader
+++ b/test/handler/test_swiftlint_handler.vader
@@ -1,21 +1,29 @@
+Before:
+  runtime ale_linters/swift/swiftlint.vim
+
+After:
+  call ale#linter#Reset()
+
 Execute(The swiftint handler should parse error messages correctly):
   AssertEqual
   \ [
   \   {
   \     'lnum': 1,
   \     'col': 7,
-  \     'text': 'Operator Usage Whitespace Violation: Operators should be surrounded by a single whitespace when they are being used. (operator_usage_whitespace)',
+  \     'text': 'Operator Usage Whitespace Violation: Operators should be surrounded by a single whitespace when they are being used.',
+  \     'code': 'operator_usage_whitespace',
   \     'type': 'W',
   \   },
   \   {
   \     'lnum': 1,
   \     'col': 11,
-  \     'text': 'Operator Usage Whitespace Violation: Operators should be surrounded by a single whitespace when they are being used. (operator_usage_whitespace)',
+  \     'text': 'Operator Usage Whitespace Violation: Operators should be surrounded by a single whitespace when they are being used.',
+  \     'code': 'operator_usage_whitespace',
   \     'type': 'W',
   \   },
   \
   \ ],
-  \ ale#handlers#gcc#HandleGCCFormat(347, [
+  \ ale_linters#swift#swiftlint#Handle(bufnr(''), [
   \   'This line should be ignored',
   \   '<nopath>:1:7: warning: Operator Usage Whitespace Violation: Operators should be surrounded by a single whitespace when they are being used. (operator_usage_whitespace)',
   \   '<nopath>:1:11: warning: Operator Usage Whitespace Violation: Operators should be surrounded by a single whitespace when they are being used. (operator_usage_whitespace)',