From b202da10154b62c0ce79e3f60b27df118a62b104 Mon Sep 17 00:00:00 2001 From: Mitchell Hanberg Date: Sun, 13 Aug 2023 13:55:22 -0400 Subject: [PATCH] refactor: move token function to progress module (#175) --- lib/next_ls.ex | 15 ++++----------- lib/next_ls/progress.ex | 7 +++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/next_ls.ex b/lib/next_ls.ex index 0b95e77d..7353c60c 100644 --- a/lib/next_ls.ex +++ b/lib/next_ls.ex @@ -364,7 +364,7 @@ defmodule NextLS do GenLSP.log(lsp, "[NextLS] Booting runtimes...") for %{uri: uri, name: name} <- lsp.assigns.workspace_folders do - token = token() + token = Progress.token() Progress.start(lsp, token, "Initializing NextLS runtime for folder #{name}...") parent = self() working_dir = URI.parse(uri).path @@ -417,7 +417,7 @@ defmodule NextLS do refresh_refs = dispatch(lsp.assigns.registry, :runtimes, fn entries -> for {pid, %{name: name, uri: wuri, db: db}} <- entries, String.starts_with?(uri, wuri), into: %{} do - token = token() + token = Progress.token() Progress.start(lsp, token, "Compiling...") task = @@ -479,7 +479,7 @@ defmodule NextLS do for %{name: name, uri: uri} <- added, name not in names do GenLSP.log(lsp, "[NextLS] Adding workspace folder #{name}") - token = token() + token = Progress.token() Progress.start(lsp, token, "Initializing NextLS runtime for folder #{name}...") parent = self() working_dir = URI.parse(uri).path @@ -590,7 +590,7 @@ defmodule NextLS do end def handle_info({:runtime_ready, name, runtime_pid}, lsp) do - token = token() + token = Progress.token() Progress.start(lsp, token, "Compiling...") task = @@ -626,13 +626,6 @@ defmodule NextLS do {:noreply, lsp} end - defp token do - 8 - |> :crypto.strong_rand_bytes() - |> Base.url_encode64(padding: false) - |> binary_part(0, 8) - end - defp version do case :application.get_key(:next_ls, :vsn) do {:ok, version} -> to_string(version) diff --git a/lib/next_ls/progress.ex b/lib/next_ls/progress.ex index d67c78c6..007d60f0 100644 --- a/lib/next_ls/progress.ex +++ b/lib/next_ls/progress.ex @@ -23,4 +23,11 @@ defmodule NextLS.Progress do } }) end + + def token do + 8 + |> :crypto.strong_rand_bytes() + |> Base.url_encode64(padding: false) + |> binary_part(0, 8) + end end