refactor(bucketExplorer): refactor bucket register

Author: fangbinwei

src/extension.ts

@@ -6,7 +6,6 @@ import { setOSSConfiguration } from './commands/setOSSConfiguration'
 import deleteByHover from './commands/deleteByHover'
 import hover from './language/hover'
 import Logger from './utils/log'
-import { BucketExplorerProvider } from './views/bucket'
 import { ext } from '@/extensionVariables'
 import { getElanConfiguration } from '@/utils/index'
 import { registerBucket } from './views/registerBucket'
@@ -17,9 +16,7 @@ import { registerBucket } from './views/registerBucket'
 export function activate(context: vscode.ExtensionContext): void {
   initializeExtensionVariables(context)
   Logger.channel = vscode.window.createOutputChannel('Elan')
-  ext.bucketExplorer = new BucketExplorerProvider()
-
-  const registerCommands = [
+  const registeredCommands = [
     vscode.commands.registerCommand(
       'elan.setOSSConfiguration',
       setOSSConfiguration
@@ -40,10 +37,10 @@ export function activate(context: vscode.ExtensionContext): void {
     vscode.languages.registerHoverProvider('markdown', hover)
     // TODO: command registry refactor
   ]
-  context.subscriptions.push(...registerCommands)
+  context.subscriptions.push(...registeredCommands)
 
   // views/bucket
-  registerBucket(context)
+  context.subscriptions.push(...registerBucket())
 }
 
 // this method is called when your extension is deactivated

src/views/registerBucket.ts

@@ -6,16 +6,18 @@ import { uploadFromBucketExplorerClipboard } from '@/commands/bucketExplorer/upl
 import { copyLinkFromBucketExplorer } from '@/commands/bucketExplorer/copyLink'
 import { copyFromBucketExplorerContext } from '@/commands/bucketExplorer/copyFromContext'
 import { moveFromBucketExplorerContext } from '@/commands/bucketExplorer/moveFromContext'
+import { BucketExplorerProvider } from './bucket'
 import { CommandContext } from '@/constant'
 
-export function registerBucket(context: vscode.ExtensionContext): void {
+export function registerBucket(): vscode.Disposable[] {
+  ext.bucketExplorer = new BucketExplorerProvider()
   ext.bucketExplorerTreeView = vscode.window.createTreeView('bucketExplorer', {
     treeDataProvider: ext.bucketExplorer,
     // TODO: support select many
     // canSelectMany: true,
     showCollapseAll: true
   })
-  const registerCommands = [
+  const _disposable = [
     vscode.commands.registerCommand(
       uploadFromBucketExplorerContext.command,
       uploadFromBucketExplorerContext
@@ -43,13 +45,16 @@ export function registerBucket(context: vscode.ExtensionContext): void {
     vscode.commands.registerCommand(
       copyFromBucketExplorerContext.command,
       copyFromBucketExplorerContext
-    )
+    ),
+    ext.bucketExplorerTreeView
   ]
-  context.subscriptions.push(ext.bucketExplorerTreeView)
-  context.subscriptions.push(...registerCommands)
-  context.subscriptions.push(
-    ext.bucketExplorerTreeView.onDidChangeVisibility(({ visible }) => {
+
+  ext.bucketExplorerTreeView.onDidChangeVisibility(
+    ({ visible }) => {
       ext.bucketExplorerTreeViewVisible = visible
-    })
+    },
+    null,
+    _disposable
   )
+  return _disposable
 }