From 451e99341ea2abf48ec2e7318748e688a9a93b90 Mon Sep 17 00:00:00 2001
From: Charles B Johnson <mail@cbjohnson.info>
Date: Tue, 19 Jan 2021 23:07:55 -0600
Subject: [PATCH] xo: refactor to function

---
 autoload/ale/handlers/xo.vim | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/autoload/ale/handlers/xo.vim b/autoload/ale/handlers/xo.vim
index 2439b4f9..c63278c0 100644
--- a/autoload/ale/handlers/xo.vim
+++ b/autoload/ale/handlers/xo.vim
@@ -7,14 +7,7 @@ call ale#Set('typescript_xo_use_global', get(g:, 'ale_use_global_executables', 0
 call ale#Set('typescript_xo_options', '')
 
 function! ale#handlers#xo#GetExecutable(buffer) abort
-    let l:filetype = getbufvar(a:buffer, '&filetype')
-    let l:type = ''
-
-    if l:filetype =~# 'javascript'
-        let l:type = 'javascript'
-    elseif l:filetype =~# 'typescript'
-        let l:type = 'typescript'
-    endif
+    let l:type = ale#handlers#xo#GetType(a:buffer)
 
     return ale#node#FindExecutable(a:buffer, l:type . '_xo', [
     \   'node_modules/xo/cli.js',
@@ -29,14 +22,7 @@ function! ale#handlers#xo#GetLintCommand(buffer) abort
 endfunction
 
 function! ale#handlers#xo#GetOptions(buffer) abort
-    let l:filetype = getbufvar(a:buffer, '&filetype')
-    let l:type = ''
-
-    if l:filetype =~# 'javascript'
-        let l:type = 'javascript'
-    elseif l:filetype =~# 'typescript'
-        let l:type = 'typescript'
-    endif
+    let l:type = ale#handlers#xo#GetType(a:buffer)
 
     return ale#Var(a:buffer, l:type . '_xo_options')
 endfunction
@@ -45,3 +31,14 @@ endfunction
 function! ale#handlers#xo#HandleJSON(buffer, lines) abort
     return ale#handlers#eslint#HandleJSON(a:buffer, a:lines)
 endfunction
+
+function! ale#handlers#xo#GetType(buffer) abort
+    let l:filetype = getbufvar(a:buffer, '&filetype')
+    let l:type = 'javascript'
+
+    if l:filetype =~# 'typescript'
+        let l:type = 'typescript'
+    endif
+
+    return l:type
+endfunction