Show status when running lua.update.lua-lsp

josa42 · Sep 30, 2020 · 3ce6f66 · 3ce6f66
1 parent cae4d61
commit 3ce6f66
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/src/commands.ts b/src/commands.ts
@@ -1,11 +1,11 @@
-import path from 'path'
-import fs from 'fs'
-import {workspace, LanguageClient} from 'coc.nvim'
-import {installLuaLsp} from './utils/tools'
+import path from "path"
+import fs from "fs"
+import { workspace, LanguageClient } from "coc.nvim"
+import { installLuaLsp } from "./utils/tools"
 
 export async function version(): Promise<void> {
-  const { version } = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', 'package.json'), 'utf-8'))
-  workspace.showMessage(`Version: ${version}`, 'more')
+  const { version } = JSON.parse(fs.readFileSync(path.resolve(__dirname, "..", "package.json"), "utf-8"))
+  workspace.showMessage(`Version: ${version}`, "more")
 }
 
 export async function updateLuaLsp(client: LanguageClient): Promise<void> {
@@ -16,6 +16,3 @@ export async function updateLuaLsp(client: LanguageClient): Promise<void> {
     await client.start()
   }
 }
-
-
-
diff --git a/src/extension.ts b/src/extension.ts
@@ -26,10 +26,10 @@ export async function activate(context: ExtensionContext): Promise<void> {
 
   const [command, args] = config.commandPath ? [config.commandPath, []] : await luaLspBin()
 
-  if (!(await commandExists(command))) {
-    const useSumnekoLs = workspace.getConfiguration().get("lua.useSumnekoLs", false)
+  const useSumnekoLs = workspace.getConfiguration().get("lua.useSumnekoLs", false)
+  const name = useSumnekoLs ? "sumneko/lua-language-server" : "Alloyed/lua-lsp"
 
-    const name = useSumnekoLs ? "sumneko/lua-language-server" : "Alloyed/lua-lsp"
+  if (!(await commandExists(command))) {
     await showInstallStatus(name, async () => {
       await installLuaLsp()
     })
@@ -46,7 +46,9 @@ export async function activate(context: ExtensionContext): Promise<void> {
   context.subscriptions.push(
     services.registLanguageClient(client),
     commands.registerCommand("lua.version", () => version()),
-    commands.registerCommand("lua.update.lua-lsp", () => updateLuaLsp(client))
+    commands.registerCommand("lua.update.lua-lsp", async () =>
+      showInstallStatus(name, async () => await updateLuaLsp(client))
+    )
   )
 }
 

diff --git a/src/utils/installer.ts b/src/utils/installer.ts
@@ -16,7 +16,7 @@ const tmpBaseDir = os.tmpdir()
 const { join } = path
 
 export async function install(dir: string): Promise<void> {
-  const { path: tmpDir, dispose } = await mkTmpDir("coc-lua")
+  const { path: tmpDir, dispose } = await mkTmpDir(`coc-lua-${new Date().getTime()}`)
   const { ninjaZip, buildFile } = osEnv()
 
   const ninjaUrl = `https://github.com/ninja-build/ninja/releases/download/${ninjaVersion}/${ninjaZip}`