cleanup for pull request

CommanderPho · Sep 6, 2024 · ad35eab · ad35eab
1 parent 03779f6
commit ad35eab
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 29 deletions.
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
 			},
 			{
 				"command": "jupyter-cell-tags.addTagsToSelectedCells",
-				"title": "🏷️➕🗂️ Add Tags to Selected Cells",
+				"title": "Add Tags to Selected Cells",
 				"icon": "$(add)",
 				"when": "jupyter-cell-tags.multipleCellsSelected"
 			},			
@@ -73,7 +73,7 @@
 				{
 					"command": "jupyter-cell-tags.addTagsToSelectedCells",
 					"when": "jupyter-cell-tags.multipleCellsSelected",
-					"group": "jupytercelltags@2"
+					"group": "jupytercelltags@1"
 				},
 				{
 					"command": "jupyter-cell-tags.editTagsInJSON",

diff --git a/src/cellTags.ts b/src/cellTags.ts
@@ -184,30 +184,35 @@ export function register(context: vscode.ExtensionContext) {
 	    }
 	    const disposables: vscode.Disposable[] = [];
 	    try {
-	        const knownTags = activeCells.map(cell => cell.metadata.custom?.metadata?.tags ?? []).flat().sort();
-	        const knownTagsLowerCased = new Set(knownTags.map(tag => tag.toLowerCase()));
-	        const knownTagQuickPickItems = Array.from(new Set(knownTags)).map(tag => ({ label: tag }));
-	        const quickPick = vscode.window.createQuickPick();
-	        disposables.push(quickPick);
-	        quickPick.placeholder = 'Type to select or create a cell tag';
-	        quickPick.items = knownTagQuickPickItems;
-	        quickPick.show();
-	        quickPick.onDidChangeValue(e => {
-	            e = e.trim().toLowerCase();
-	            if (!e || knownTagsLowerCased.has(e)) {
-	                return;
-	            }
-	            quickPick.items = knownTagQuickPickItems.concat({ label: e }).sort();
-	        }, undefined, disposables);
-	        const tag = await new Promise<string>(resolve => {
-	            quickPick.onDidHide(() => resolve(''), undefined, disposables);
-	            quickPick.onDidAccept(() => {
-	                if (quickPick.selectedItems.length) {
-	                    resolve(quickPick.selectedItems[0].label);
-	                    quickPick.hide();
-	                }
-	            }, undefined, disposables);
-	        });
+	        // const knownTags = activeCells.map(cell => cell.metadata.custom?.metadata?.tags ?? []).flat().sort();
+	        // const knownTagsLowerCased = new Set(knownTags.map(tag => tag.toLowerCase()));
+	        // const knownTagQuickPickItems = Array.from(new Set(knownTags)).map(tag => ({ label: tag }));
+	        // // const quickPick = vscode.window.createQuickPick();
+	        // // disposables.push(quickPick);
+	        // // quickPick.placeholder = 'Type to select or create a cell tag';
+	        // // quickPick.items = knownTagQuickPickItems;
+	        // // quickPick.show();
+	        // // quickPick.onDidChangeValue(e => {
+	        // //     e = e.trim().toLowerCase();
+	        // //     if (!e || knownTagsLowerCased.has(e)) {
+	        // //         return;
+	        // //     }
+	        // //     quickPick.items = knownTagQuickPickItems.concat({ label: e }).sort();
+	        // // }, undefined, disposables);
+	        // const tag = await new Promise<string>(resolve => {
+	        //     quickPick.onDidHide(() => resolve(''), undefined, disposables);
+	        //     quickPick.onDidAccept(() => {
+	        //         if (quickPick.selectedItems.length) {
+	        //             resolve(quickPick.selectedItems[0].label);
+	        //             quickPick.hide();
+	        //         }
+	        //     }, undefined, disposables);
+	        // });
+
+			const tag = await vscode.window.showInputBox({
+				placeHolder: 'Type to create a cell tag'
+			});
+
 	        if (tag) {
 	            await addTagsToMultipleCells(activeCells, [tag]);
 	        }

diff --git a/src/extension.ts b/src/extension.ts
@@ -23,7 +23,6 @@ function updateContext() {
         vscode.commands.executeCommand('setContext', 'jupyter-cell-tags.singleCellSelected', false);
         vscode.commands.executeCommand('setContext', 'jupyter-cell-tags.multipleCellsSelected', false);
         console.log('No active notebook editor');
-        debugSelectedCellsStatusBarItem.hide();
         return;
     }
 
@@ -35,8 +34,6 @@ function updateContext() {
     console.log(`Single cell selected: ${selectionCount === 1}`);
     console.log(`Multiple cells selected: ${selectionCount > 1}`);
 
-    debugSelectedCellsStatusBarItem.text = `$(notebook) ${selectionCount} Cell(s) Selected`;
-    debugSelectedCellsStatusBarItem.show();
 }