X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=runtime%2Fplugins%2Flinter%2Flinter.lua;h=88892797b5a48f1611cc973c96c0f7c1742d13f5;hb=ea57d8b883ef3337471564c5b5a6a32129fbbddb;hp=090603c114783e7a23f739af311589ca3562bf4b;hpb=e2efc963b73e9800db99f8cc65e2d2e733840b46;p=micro.git

diff --git a/runtime/plugins/linter/linter.lua b/runtime/plugins/linter/linter.lua
index 090603c1..88892797 100644
--- a/runtime/plugins/linter/linter.lua
+++ b/runtime/plugins/linter/linter.lua
@@ -2,56 +2,75 @@ if GetOption("linter") == nil then
     AddOption("linter", true)
 end
 
-function linter_onSave()
+MakeCommand("lint", "linter.lintCommand", 0)
+
+function lintCommand()
+    CurView():Save(false)
+    runLinter()
+end
+
+function runLinter()
+    local ft = CurView().Buf:FileType()
+    local file = CurView().Buf.Path
+    local devnull = "/dev/null"
+    local temp = os.getenv("TMPDIR")
+    if OS == "windows" then
+        devnull = "NUL"
+        temp = os.getenv("TEMP")
+    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")
+        lint("mypy", "mypy", {file}, "%f:%l: %m")
+        lint("pylint", "pylint", {"--output-format=parseable", "--reports=no", file}, "%f:%l: %m")
+    elseif ft == "c" then
+        lint("gcc", "gcc", {"-fsyntax-only", "-Wall", "-Wextra", 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 == "d" then
+        lint("dmd", "dmd", {"-color=off", "-o-", "-w", "-wi", "-c", file}, "%f%(%l%):.+: %m")
+    elseif ft == "java" then
+        lint("javac", "javac", {"-d", temp, file}, "%f:%l: error: %m")
+    elseif ft == "javascript" then
+        lint("jshint", "jshint", {file}, "%f: line %l,.+, %m")
+    end
+end
+
+function onSave(view)
     if GetOption("linter") then
-        local ft = view.Buf.FileType
-        local file = view.Buf.Path
-        local devnull = "/dev/null"
-        if OS == "windows" then
-            devnull = "NUL"
-        end
-        if ft == "Go" then
-            linter_lint("gobuild", "go build -o " .. devnull, "%f:%l: %m")
-            linter_lint("golint", "golint " .. view.Buf.Path, "%f:%l:%d+: %m")
-        elseif ft == "Lua" then
-            linter_lint("luacheck", "luacheck --no-color " .. file, "%f:%l:%d+: %m")
-        elseif ft == "Python" then
-            linter_lint("pyflakes", "pyflakes " .. file, "%f:%l: %m")
-        elseif ft == "C" then
-            linter_lint("gcc", "gcc -fsyntax-only -Wall -Wextra " .. file, "%f:%l:%d+:.+: %m")
-        elseif ft == "D" then
-            linter_lint("dmd", "dmd -color=off -o- -w -wi -c " .. file, "%f%(%l%):.+: %m")
-        elseif ft == "Java" then
-            linter_lint("javac", "javac " .. file, "%f:%l: error: %m")
-        elseif ft == "JavaScript" then
-            linter_lint("jshint", "jshint " .. file, "%f: line %l,.+, %m")
-        end
+        runLinter()
     else
-        view:ClearAllGutterMessages()
+        CurView():ClearAllGutterMessages()
     end
 end
 
-function linter_lint(linter, cmd, errorformat)
-    view:ClearGutterMessages(linter)
+function lint(linter, cmd, args, errorformat)
+    CurView():ClearGutterMessages(linter)
+
+    JobSpawn(cmd, args, "", "", "linter.onExit", linter, errorformat)
+end
 
-    local handle = io.popen("(" .. cmd .. ")" .. " 2>&1")
-    local lines = linter_split(handle:read("*a"), "\n")
-    handle:close()
+function onExit(output, linter, errorformat)
+    local lines = split(output, "\n")
 
-    local regex = errorformat:gsub("%%f", "(.+)"):gsub("%%l", "(%d+)"):gsub("%%m", "(.+)")
+    local regex = errorformat:gsub("%%f", "(..-)"):gsub("%%l", "(%d+)"):gsub("%%m", "(.+)")
     for _,line in ipairs(lines) do
         -- Trim whitespace
         line = line:match("^%s*(.+)%s*$")
         if string.find(line, regex) then
             local file, line, msg = string.match(line, regex)
-            if linter_basename(view.Buf.Path) == linter_basename(file) then
-                view:GutterMessage(linter, tonumber(line), msg, 2)
+            if basename(CurView().Buf.Path) == basename(file) then
+                CurView():GutterMessage(linter, tonumber(line), msg, 2)
             end
         end
     end
 end
 
-function linter_split(str, sep)
+function split(str, sep)
     local result = {}
     local regex = ("([^%s]+)"):format(sep)
     for each in str:gmatch(regex) do
@@ -60,7 +79,7 @@ function linter_split(str, sep)
     return result
 end
 
-function linter_basename(file)
+function basename(file)
     local name = string.gsub(file, "(.*/)(.*)", "%2")
     return name
 end