Change cache clean to manual command

Cleaning the cache could take a few seconds, and it prevented other
extension commands from running while it was working.

extension/package.json

@@ -83,6 +83,11 @@
                 "title": "%command.checkForUpdates.title%",
                 "category": "%command.category%"
             },
+            {
+                "command": "privateExtensions.cleanCache",
+                "title": "%command.cleanCache.title%",
+                "category": "%command.category%"
+            },
             {
                 "command": "privateExtensions.configureWorkspaceRegistries",
                 "title": "%command.configureWorkspaceRegistries.title%",

extension/package.nls.json

@@ -5,6 +5,7 @@
     "configuration.updateCheckInterval.description": "Number of seconds between checks for updates to private extensions. Set to 0 to disable automatic update checks.",
     "command.category": "Private Extensions",
     "command.checkForUpdates.title": "Check for Extension Updates",
+    "command.cleanCache.title": "Clean NPM Cache",
     "command.configureWorkspaceRegistries.title": "Configure Workspace Registries",
     "command.configureRecommendedExtensions.title": "Configure Recommended Extensions",
     "command.refresh.title": "Refresh",

extension/src/commands/cacheCommands.ts

@@ -0,0 +1,36 @@
+import cacache = require('cacache');
+import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
+
+import { Command } from '../commandManager';
+import { getLogger } from '../logger';
+import { getNpmCacheDir } from '../util';
+
+const localize = nls.loadMessageBundle();
+
+/**
+ * Opens extensions.private.json to the "registries" element.
+ */
+export class CleanCacheCommand implements Command {
+    public readonly id = 'privateExtensions.cleanCache';
+
+    public async execute() {
+        const cache = getNpmCacheDir();
+
+        if (!cache) {
+            vscode.window.showErrorMessage(localize('cache.missing', 'NPM cache is missing.'));
+            return;
+        }
+
+        vscode.window.withProgress(
+            {
+                title: localize('cleaning.npm.cache', 'Cleaning NPM cache.'),
+                location: vscode.ProgressLocation.Notification,
+            },
+            async () => {
+                const stats = await cacache.verify(cache);
+                getLogger().log(`Cleaned NPM cache: ${JSON.stringify(stats)}`);
+            },
+        );
+    }
+}

extension/src/commands/index.ts

@@ -1,3 +1,4 @@
+export * from './cacheCommands';
 export * from './configCommands';
 export * from './extensionCommands';
 export * from './registryCommands';

extension/src/extension.ts

@@ -1,4 +1,3 @@
-import cacache = require('cacache');
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 
@@ -9,7 +8,7 @@ import { ExtensionInfoService } from './extensionInfo';
 import { ExtensionsFileFeatures } from './extensionsFileFeatures';
 import { RegistryProvider } from './RegistryProvider';
 import { UpdateChecker } from './UpdateChecker';
-import { deleteNpmDownloads, getNpmCacheDir } from './util';
+import { deleteNpmDownloads } from './util';
 import { RegistryView } from './views/registryView';
 
 // TODO: notify user if extensions.private.json recommends extensions that are
@@ -36,8 +35,6 @@ export function activate(context: vscode.ExtensionContext) {
         registerCommands(registryProvider, registryView, updateChecker, extensionInfo),
         registerLanguageFeatures(registryProvider),
     );
-
-    verifyCache();
 }
 
 export async function deactivate() {
@@ -78,6 +75,9 @@ function registerCommands(
         // Configuration commands
         new commands.ConfigureWorkspaceRegistries(),
         new commands.ConfigureRecommendedExtensions(),
+
+        // Other commands
+        new commands.CleanCacheCommand(),
     );
 
     return commandManager;
@@ -86,11 +86,3 @@ function registerCommands(
 function registerLanguageFeatures(registryProvider: RegistryProvider): vscode.Disposable {
     return vscode.Disposable.from(new ExtensionsFileFeatures(registryProvider));
 }
-
-async function verifyCache() {
-    const cache = getNpmCacheDir();
-    if (cache) {
-        const stats = await cacache.verify(cache);
-        console.log('Cleaned private extension manager cache:', stats);
-    }
-}