fix: splitting crlf lines (#137)

* fix: crlf lines * fix: crlf for formatting
nvimdev · Jan 13, 2024 · 383883a · 383883a
1 parent 6a27c57
commit 383883a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/doc/guard.nvim.txt b/doc/guard.nvim.txt
@@ -1,4 +1,4 @@
-*guard.nvim.txt*          For NVIM v0.8.0         Last change: 2024 January 12
+*guard.nvim.txt*          For NVIM v0.8.0         Last change: 2024 January 13
 
 ==============================================================================
 Table of Contents                               *guard.nvim-table-of-contents*

diff --git a/lua/guard/format.lua b/lua/guard/format.lua
@@ -41,7 +41,8 @@ local function update_buffer(bufnr, prev_lines, new_lines)
     return
   end
   local views = save_views(bufnr)
-  new_lines = vim.split(new_lines, '\n')
+  -- \r\n for windows compatibility
+  new_lines = vim.split(new_lines, '\r?\n')
   if new_lines[#new_lines] == '' then
     new_lines[#new_lines] = nil
   end

diff --git a/lua/guard/lint.lua b/lua/guard/lint.lua
@@ -139,9 +139,10 @@ local function from_json(opts)
     local diags, offences = {}, {}
 
     if opts.lines then
+      -- \r\n for windows compatibility
       vim.tbl_map(function(line)
         offences[#offences + 1] = opts.get_diagnostics(line)
-      end, vim.split(result, '\n', { trimempty = true }))
+      end, vim.split(result, '\r?\n', { trimempty = true }))
     else
       offences = opts.get_diagnostics(result)
     end
@@ -176,8 +177,8 @@ local function from_regex(opts)
 
   return function(result, buf)
     local diags, offences = {}, {}
-
-    local lines = vim.split(result, '\n', { trimempty = true })
+    -- \r\n for windows compatibility
+    local lines = vim.split(result, '\r?\n', { trimempty = true })
 
     for _, line in ipairs(lines) do
       local offence = {}