Merge pull request #34 from tintinweb/feat/visibleEditorCommands

add commands to list/select from visible editors

Author: tintinweb

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.0.22
+- new: command `List Visible Bookmarks` prints bookmarks for currently visible editors (use `List Bookmarks` if you want to print all bookmarks)
+- new: command `Select Visible Bookmark` that allows to quickly jump to bookmarks in currently visible editors (use `Select Bookmark` if you want to select from an unfiltered list)
+- 
 ## 0.0.21
 - fixed: an update to vscode caused the list-view selection tracking to fail with "cannot read property '_uri'  of undefined" - see #33 
 

package.json

@@ -2,7 +2,7 @@
     "name": "vscode-inline-bookmarks",
     "displayName": "Inline Bookmarks",
     "description": "Customizable inline Bookmarks",
-    "version": "0.0.21",
+    "version": "0.0.22",
     "keywords": [
         "bookmark",
         "bookmarks",
@@ -39,7 +39,11 @@
         "onCommand:inlineBookmarks.toggleShowVisibleFilesOnly",
         "onCommand:inlineBookmarks.toggleViewKeepFilesExpanded",
         "onCommand:inlineBookmarks.debug.state.reset",
-        "onCommand:inlineBookmarks.showSelectBookmark"
+        "onCommand:inlineBookmarks.showSelectBookmark",
+        "onCommand:inlineBookmarks.showSelectVisibleBookmark",
+        "onCommand:inlineBookmarks.listBookmarks",
+        "onCommand:inlineBookmarks.listVisibleBookmarks",
+        "onCommand:inlineBookmarks.scanWorkspace"
     ],
     "main": "./src/extension.js",
     "contributes": {
@@ -100,11 +104,21 @@
                 "title": "Select Bookmark",
                 "category": "InlineBookmarks"
             },
+            {
+                "command": "inlineBookmarks.showSelectVisibleBookmark",
+                "title": "Select Visible Bookmark",
+                "category": "InlineBookmarks"
+            },
             {
                 "command": "inlineBookmarks.listBookmarks",
                 "title": "List Bookmarks",
                 "category": "InlineBookmarks"
             },
+            {
+                "command": "inlineBookmarks.listVisibleBookmarks",
+                "title": "List Visible Bookmarks",
+                "category": "InlineBookmarks"
+            },
             {
                 "command": "inlineBookmarks.scanWorkspace",
                 "title": "Scan Workspace for Bookmarks",

src/extension.js

@@ -204,12 +204,24 @@ function onActivate(context) {
         })
     );
 
+    context.subscriptions.push(
+        vscode.commands.registerCommand("inlineBookmarks.showSelectVisibleBookmark", () => {
+            auditTags.commands.showSelectVisibleBookmark();
+        })
+    );
+
     context.subscriptions.push(
         vscode.commands.registerCommand("inlineBookmarks.listBookmarks", () => {
             auditTags.commands.showListBookmarks();
         })
     );
 
+    context.subscriptions.push(
+        vscode.commands.registerCommand("inlineBookmarks.listVisibleBookmarks", () => {
+            auditTags.commands.showListVisibleBookmarks();
+        })
+    );
+
     context.subscriptions.push(
         vscode.commands.registerCommand("inlineBookmarks.scanWorkspace", () => {
             auditTags.commands.scanWorkspaceBookmarks();

src/features/inlineBookmarks.js

@@ -26,13 +26,17 @@ class Commands {
         }, this);
     }
 
-    showSelectBookmark() {
+    showSelectBookmark(filter, placeHolder) {
 
         let entries = [];
         Object.keys(this.controller.bookmarks).forEach(uri => {
             let resource = vscode.Uri.parse(uri).fsPath;
             let fname = path.parse(resource).base;
 
+            if(!filter(resource)){
+                return;
+            }
+
             Object.keys(this.controller.bookmarks[uri]).forEach(cat => {
                 this.controller.bookmarks[uri][cat].forEach(b => {
                     entries.push({
@@ -45,12 +49,17 @@ class Commands {
 
         }, this);
 
-        vscode.window.showQuickPick(entries, { placeHolder: 'Select bookmarks' }).then(item => {
+        vscode.window.showQuickPick(entries, { placeHolder: placeHolder || 'Select bookmarks' }).then(item => {
             vscode.commands.executeCommand("inlineBookmarks.jumpToRange", item.target.uri, item.target.range);
         });
     }
 
-    showListBookmarks() {
+    showSelectVisibleBookmark() {
+        let visibleEditorUris = vscode.window.visibleTextEditors.map(te => te.document.uri.fsPath);
+        this.showSelectBookmark((resFsPath) => visibleEditorUris.includes(resFsPath), "Select visible bookmarks");
+    }
+
+    showListBookmarks(filter) {
 
         if (!vscode.window.outputChannel) {
             vscode.window.outputChannel = vscode.window.createOutputChannel('inlineBookmarks');
@@ -64,6 +73,10 @@ class Commands {
             let resource = vscode.Uri.parse(uri).fsPath;
             let fname = path.parse(resource).base;
 
+            if(!filter(resource)){
+                return;
+            }
+
             Object.keys(this.controller.bookmarks[uri]).forEach(cat => {
                 this.controller.bookmarks[uri][cat].forEach(b => {
                     entries.push({
@@ -98,6 +111,11 @@ class Commands {
         vscode.window.outputChannel.show();
     }
 
+    showListVisibleBookmarks() {
+        let visibleEditorUris = vscode.window.visibleTextEditors.map(te => te.document.uri.fsPath);
+        this.showListBookmarks((resFsPath) => visibleEditorUris.includes(resFsPath));
+    }
+
     scanWorkspaceBookmarks() {
 
         function arrayToSearchGlobPattern(config) {