2 files changed, 12 insertions, 11 deletions
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 1e6ac8dddf..624436bc9b 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -348,19 +348,19 @@ local function location_handler(_, result, ctx, config)
   -- https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_definition
 
   if vim.tbl_islist(result) then
-    util.jump_to_location(result[1], client.offset_encoding, config.reuse_win)
-
-    if #result > 1 then
-      local title = 'LSP locations'
-      local items = util.locations_to_items(result, client.offset_encoding)
+    local title = 'LSP locations'
+    local items = util.locations_to_items(result, client.offset_encoding)
 
-      if config.on_list then
-        assert(type(config.on_list) == 'function', 'on_list is not a function')
-        config.on_list({ title = title, items = items })
-      else
-        vim.fn.setqflist({}, ' ', { title = title, items = items })
-        api.nvim_command('botright copen')
+    if config.on_list then
+      assert(type(config.on_list) == 'function', 'on_list is not a function')
+      config.on_list({ title = title, items = items })
+    else
+      if #result == 1 then
+        util.jump_to_location(result[1], client.offset_encoding, config.reuse_win)
+        return
       end
+      vim.fn.setqflist({}, ' ', { title = title, items = items })
+      api.nvim_command('botright copen')
     end
   else
     util.jump_to_location(result, client.offset_encoding, config.reuse_win)
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 8e89d92a56..eac21db386 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -106,6 +106,7 @@ end
 
 ---@private
 local function split_lines(value)
+  value = string.gsub(value, '\r\n?', '\n')
   return split(value, '\n', true)
 end