From be21aa5cda39850d9f0261e3b6cac9d48a170756 Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Wed, 17 Oct 2018 18:11:41 +0300
Subject: New linter: dls (#1992)

* New linter: dls
---
 ale_linters/d/dls.vim | 22 ++++++++++++++++++++++
 ale_linters/d/dmd.vim | 16 +---------------
 2 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 ale_linters/d/dls.vim

(limited to 'ale_linters')

diff --git a/ale_linters/d/dls.vim b/ale_linters/d/dls.vim
new file mode 100644
index 00000000..7210d21e
--- /dev/null
+++ b/ale_linters/d/dls.vim
@@ -0,0 +1,22 @@
+" Author: aurieh <me@aurieh.me>
+" Description: A Language Server implementation for D
+
+call ale#Set('d_dls_executable', 'dls')
+
+function! ale_linters#d#dls#GetExecutable(buffer) abort
+    return ale#Var(a:buffer, 'd_dls_executable')
+endfunction
+
+function! ale_linters#d#dls#FindProjectRoot(buffer) abort
+    " Note: this will return . if dub config is empty
+    " dls can run outside DUB projects just fine
+    return fnamemodify(ale#d#FindDUBConfig(a:buffer), ':h')
+endfunction
+
+call ale#linter#Define('d', {
+\   'name': 'dls',
+\   'lsp': 'stdio',
+\   'executable_callback': 'ale_linters#d#dls#GetExecutable',
+\   'command_callback': 'ale_linters#d#dls#GetExecutable',
+\   'project_root_callback': 'ale_linters#d#dls#FindProjectRoot',
+\})
diff --git a/ale_linters/d/dmd.vim b/ale_linters/d/dmd.vim
index d64b6c3d..c816d592 100644
--- a/ale_linters/d/dmd.vim
+++ b/ale_linters/d/dmd.vim
@@ -1,20 +1,6 @@
 " Author: w0rp <devw0rp@gmail.com>
 " Description: "dmd for D files"
 
-function! s:FindDUBConfig(buffer) abort
-    " Find a DUB configuration file in ancestor paths.
-    " The most DUB-specific names will be tried first.
-    for l:possible_filename in ['dub.sdl', 'dub.json', 'package.json']
-        let l:dub_file = ale#path#FindNearestFile(a:buffer, l:possible_filename)
-
-        if !empty(l:dub_file)
-            return l:dub_file
-        endif
-    endfor
-
-    return ''
-endfunction
-
 function! ale_linters#d#dmd#DUBCommand(buffer) abort
     " If we can't run dub, then skip this command.
     if !executable('dub')
@@ -22,7 +8,7 @@ function! ale_linters#d#dmd#DUBCommand(buffer) abort
         return ''
     endif
 
-    let l:dub_file = s:FindDUBConfig(a:buffer)
+    let l:dub_file = ale#d#FindDUBConfig(a:buffer)
 
     if empty(l:dub_file)
         return ''
-- 
cgit v1.2.3