X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=runtime%2Fplugins%2Flinter%2Flinter.lua;h=e1ec97732a2ae4d7e5bdf7570780fb1ba9171fcb;hb=f2006f592ad10ae1fbe5d212aff08087e4a7b3b5;hp=9fb347f50b1931a877db2e429748c3ab41ca3b6f;hpb=a549d12808833c73876af9f2fa85fc908205708a;p=micro.git

diff --git a/runtime/plugins/linter/linter.lua b/runtime/plugins/linter/linter.lua
index 9fb347f5..e1ec9773 100644
--- a/runtime/plugins/linter/linter.lua
+++ b/runtime/plugins/linter/linter.lua
@@ -12,25 +12,46 @@ end
 function runLinter()
     local ft = CurView().Buf:FileType()
     local file = CurView().Buf.Path
-    local devnull = "/dev/null"
+    local dir = DirectoryName(file)
     if OS == "windows" then
         devnull = "NUL"
+    else
+        devnull = "/dev/null"
     end
-    if ft == "go" then
-        lint("gobuild", "go build -o " .. devnull, "%f:%l: %m")
-        lint("golint", "golint " .. CurView().Buf.Path, "%f:%l:%d+: %m")
-    elseif ft == "lua" then
-        lint("luacheck", "luacheck --no-color " .. file, "%f:%l:%d+: %m")
-    elseif ft == "python" then
-        lint("pyflakes", "pyflakes " .. file, "%f:%l:.-:? %m")
-    elseif ft == "c" then
-        lint("gcc", "gcc -fsyntax-only -Wall -Wextra " .. file, "%f:%l:%d+:.+: %m")
+
+    if ft == "c" then
+        lint("gcc", "gcc", {"-fsyntax-only", "-Wall", "-Wextra", file}, "%f:%l:%d+:.+: %m")
+    elseif ft == "c++" then
+        lint("gcc", "gcc", {"-fsyntax-only","-std=c++14", "-Wall", "-Wextra", file}, "%f:%l:%d+:.+: %m")
     elseif ft == "d" then
-        lint("dmd", "dmd -color=off -o- -w -wi -c " .. file, "%f%(%l%):.+: %m")
+        lint("dmd", "dmd", {"-color=off", "-o-", "-w", "-wi", "-c", file}, "%f%(%l%):.+: %m")
+    elseif ft == "go" then
+        lint("gobuild", "go", {"build", "-o", devnull}, "%f:%l: %m")
+        lint("golint", "golint", {file}, "%f:%l:%d+: %m")
     elseif ft == "java" then
-        lint("javac", "javac " .. file, "%f:%l: error: %m")
+        lint("javac", "javac", {"-d", dir, file}, "%f:%l: error: %m")
     elseif ft == "javascript" then
-        lint("jshint", "jshint " .. file, "%f: line %l,.+, %m")
+        lint("jshint", "jshint", {file}, "%f: line %l,.+, %m")
+    elseif string.match(ft, "literate") then
+        lint("literate", "lit", {"-c", file}, "%f:%l:%m")
+    elseif ft == "lua" then
+        lint("luacheck", "luacheck", {"--no-color", file}, "%f:%l:%d+: %m")
+    elseif ft == "nim" then
+        lint("nim", "nim", {"check", "--listFullPaths", "--stdout", "--hints:off", file}, "%f.%l, %d+. %m")
+    elseif ft == "Objective-C" then
+        lint("clang", "xcrun", {"clang", "-fsyntax-only", "-Wall", "-Wextra", file}, "%f:%l:%d+:.+: %m")
+    elseif ft == "python" then
+        lint("pyflakes", "pyflakes", {file}, "%f:%l:.-:? %m")
+        lint("mypy", "mypy", {file}, "%f:%l: %m")
+        lint("pylint", "pylint", {"--output-format=parseable", "--reports=no", file}, "%f:%l: %m")
+    elseif ft == "shell" then
+        lint("shfmt", "shfmt", {file}, "%f:%l:%d+: %m")
+    elseif ft == "swift" and OS == "darwin" then
+        lint("switfc", "xcrun", {"swiftc", file}, "%f:%l:%d+:.+: %m")
+    elseif ft == "swift" and OS == "linux" then
+        lint("switfc", "swiftc", {file}, "%f:%l:%d+:.+: %m")
+    elseif ft == "yaml" then
+        lint("yaml", "yamllint", {"--format", "parsable", file}, "%f:%l:%d+:.+ %m")
     end
 end
 
@@ -42,10 +63,10 @@ function onSave(view)
     end
 end
 
-function lint(linter, cmd, errorformat)
+function lint(linter, cmd, args, errorformat)
     CurView():ClearGutterMessages(linter)
 
-    JobStart(cmd, "", "", "linter.onExit", linter, errorformat)
+    JobSpawn(cmd, args, "", "", "linter.onExit", linter, errorformat)
 end
 
 function onExit(output, linter, errorformat)
@@ -74,6 +95,10 @@ function split(str, sep)
 end
 
 function basename(file)
-    local name = string.gsub(file, "(.*/)(.*)", "%2")
+    local sep = "/"
+    if OS == "windows" then
+        sep = "\\"
+    end
+    local name = string.gsub(file, "(.*" .. sep .. ")(.*)", "%2")
     return name
 end