fix(vscode): repeat registration on reload (#3005)

Co-authored-by: Anthony Fu <anthonyfu117@hotmail.com>
unocss · Aug 19, 2023 · abacd5b · abacd5b
1 parent 8df256a
commit abacd5b
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/packages/vscode/src/index.ts b/packages/vscode/src/index.ts
@@ -15,7 +15,6 @@ async function registerRoot(ext: ExtensionContext, status: StatusBarItem, cwd: s
   await contextLoader.ready
 
   const hasConfig = await contextLoader.loadContextInDirectory(cwd)
-  // TODO: improve this to re-enable after configuration created
   if (hasConfig) {
     registerAutoComplete(cwd, contextLoader, ext)
     registerAnnotations(cwd, contextLoader, status, ext)
@@ -77,19 +76,23 @@ export async function activate(ext: ExtensionContext) {
     ? path.resolve(projectPath, root)
     : projectPath
 
-  try {
-    ext.subscriptions.push(
-      commands.registerCommand('unocss.reload', async () => {
-        const contextLoader = await registerRoot(ext, status, cwd)
-        log.appendLine('🔁 Reloading...')
-        await contextLoader.reload()
-        log.appendLine('✅ Reloaded.')
-      }),
-    )
-  }
-  catch (e: any) {
-    log.appendLine(String(e.stack ?? e))
-  }
+  const contextLoader = await registerRoot(ext, status, cwd)
+  ext.subscriptions.push(
+    commands.registerCommand('unocss.reload', async () => {
+      log.appendLine('🔁 Reloading...')
+      if (contextLoader.contextsMap.get(cwd) === null) {
+        contextLoader.contextsMap.delete(cwd)
+        const hasConfig = await contextLoader.loadContextInDirectory(cwd)
+        if (hasConfig) {
+          registerAutoComplete(cwd, contextLoader, ext)
+          registerAnnotations(cwd, contextLoader, status, ext)
+          registerSelectionStyle(cwd, contextLoader)
+        }
+      }
+      contextLoader.reload()
+      log.appendLine('✅ Reloaded.')
+    }),
+  )
 }
 
 export function deactivate() {}