cmp is back baby

lua/config/notify.lua

@@ -1,7 +1,7 @@
-vim.notify = require('notify')
-local dap = require('dap')
+vim.notify = require "notify"
+local dap = require "dap"
 
-require('notify').setup({
+require("notify").setup {
 	render = "wrapped-default",
 	timeout = 6000,
 	max_width = 50,
@@ -17,9 +17,9 @@ require('notify').setup({
 	},
 	on_open = function(win)
 		-- vim.api.nvim_win_set_option(win, 'wrap', true)
-		vim.api.nvim_win_set_option(win, 'breakat', ' ')
+		vim.api.nvim_win_set_option(win, "breakat", " ")
 	end,
-})
+}
 
 -- Utility functions shared between progress reports for LSP and DAP
 
@@ -37,8 +37,8 @@ local function get_notif_data(client_id, token)
 	return client_notifs[client_id][token]
 end
 
-
-local spinner_frames = { "⣾", "⣽", "⣻", "⢿", "⡿", "⣟", "⣯", "⣷" }
+local spinner_frames =
+	{ "⣾", "⣽", "⣻", "⢿", "⡿", "⣟", "⣯", "⣷" }
 
 local function update_spinner(client_id, token)
 	local notif_data = get_notif_data(client_id, token)
@@ -67,85 +67,52 @@ local function format_message(message, percentage)
 	return (percentage and percentage .. "%\t" or "") .. (message or "")
 end
 
--- vim.lsp.handlers["$/progress"] = function(_, result, ctx)
--- 	local client_id = ctx.client_id
---
--- 	local val = result.value
---
--- 	if not val.kind then
--- 		return
--- 	end
---
--- 	local notif_data = get_notif_data(client_id, result.token)
---
--- 	if val.kind == "begin" then
--- 		local message = format_message(val.message, val.percentage)
---
--- 		notif_data.notification = vim.notify(message, "info", {
--- 			title = format_title(val.title, vim.lsp.get_client_by_id(client_id).name),
--- 			icon = spinner_frames[1],
--- 			timeout = false,
--- 			hide_from_history = false,
--- 		})
---
--- 		notif_data.spinner = 1
--- 		update_spinner(client_id, result.token)
--- 	elseif val.kind == "report" and notif_data then
--- 		notif_data.notification = vim.notify(format_message(val.message, val.percentage), "info", {
--- 			replace = notif_data.notification,
--- 			hide_from_history = false,
--- 		})
--- 	elseif val.kind == "end" and notif_data then
--- 	notif_data.notification =
--- 	vim.notify(val.message and format_message(val.message) or "Complete", "info", {
--- 		icon = "",
--- 		replace = notif_data.notification,
--- 		timeout = 6000,
--- 	})
---
--- 	notif_data.spinner = nil
--- end
--- end
---
--- local severity = {
--- 	"error",
--- 	"warn",
--- 	"info",
--- 	"info", -- map both hint and info to info?
--- }
--- vim.lsp.handlers["window/showMessage"] = function(err, method, params, client_id)
--- 	vim.notify(method.message, severity[params.type])
--- end
---
--- dap.listeners.before['event_progressStart']['progress-notifications'] = function(session, body)
--- 	local notif_data = get_notif_data("dap", body.progressId)
---
--- 	local message = format_message(body.message, body.percentage)
--- 	notif_data.notification = vim.notify(message, "info", {
--- 		title = format_title(body.title, session.config.type),
--- 		icon = spinner_frames[1],
--- 		timeout = false,
--- 		hide_from_history = false,
--- 	})
---
--- 	notif_data.notification.spinner = 1,
--- 	update_spinner("dap", body.progressId)
--- end
---
--- dap.listeners.before['event_progressUpdate']['progress-notifications'] = function(session, body)
--- 	local notif_data = get_notif_data("dap", body.progressId)
--- 	notif_data.notification = vim.notify(format_message(body.message, body.percentage), "info", {
--- 		replace = notif_data.notification,
--- 		hide_from_history = false,
--- 	})
--- end
---
--- dap.listeners.before['event_progressEnd']['progress-notifications'] = function(session, body)
--- 	local notif_data = client_notifs["dap"][body.progressId]
--- 	notif_data.notification = vim.notify(body.message and format_message(body.message) or "Complete", "info", {
--- 		icon = "",
--- 		replace = notif_data.notification,
--- 		timeout = 6000
--- 	})
--- 	notif_data.spinner = nil
--- end
+-- LSP integration
+-- Make sure to also have the snippet with the common helper functions in your config!
+
+vim.lsp.handlers["$/progress"] = function(_, result, ctx)
+	local client_id = ctx.client_id
+
+	local val = result.value
+
+	if not val.kind then
+		return
+	end
+
+	local notif_data = get_notif_data(client_id, result.token)
+
+	if val.kind == "begin" then
+		local message = format_message(val.message, val.percentage)
+
+		notif_data.notification = vim.notify(message, "info", {
+			title = format_title(
+				val.title,
+				vim.lsp.get_client_by_id(client_id).name
+			),
+			icon = spinner_frames[1],
+			timeout = false,
+			hide_from_history = false,
+		})
+
+		notif_data.spinner = 1
+		update_spinner(client_id, result.token)
+	elseif val.kind == "report" and notif_data then
+		notif_data.notification =
+			vim.notify(format_message(val.message, val.percentage), "info", {
+				replace = notif_data.notification,
+				hide_from_history = false,
+			})
+	elseif val.kind == "end" and notif_data then
+		notif_data.notification = vim.notify(
+			val.message and format_message(val.message) or "Complete",
+			"info",
+			{
+				icon = "",
+				replace = notif_data.notification,
+				timeout = 3000,
+			}
+		)
+
+		notif_data.spinner = nil
+	end
+end