Closes #69

alefragnani · May 23, 2017 · f6dd524 · f6dd524
1 parent b13f84d
commit f6dd524
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/src/Bookmark.ts b/src/Bookmark.ts
@@ -95,13 +95,13 @@ export class Bookmark {
 
             // no bookmark, returns empty
             if (this.bookmarks.length === 0) {
-                resolve({});
+                resolve(undefined);
                 return;
             }
 
             // file does not exist, returns empty
             if (!fs.existsSync(this.fsPath)) {
-                resolve({});
+                resolve(undefined);
                 return;
             }
 

diff --git a/src/extension.ts b/src/extension.ts
@@ -545,27 +545,31 @@ export function activate(context: vscode.ExtensionContext) {
               for (let element of values) {
                   // let element = values[index];
 
-                  // for (let indexInside = 0; indexInside < element.length; indexInside++) {
-                  for (let elementInside of element) {
-                      // let elementInside = element[indexInside];
-
-                      if (elementInside.detail.toString().toLowerCase() === activeTextEditorPath.toLowerCase()) {
-                          items.push(
-                              {
-                                  label: elementInside.label,
-                                  description: elementInside.description
-                              }
-                          );
-                      } else {
-                          let itemPath = removeRootPathFrom(elementInside.detail);
-                          items.push(
-                              {
-                                  label: elementInside.label,
-                                  description: elementInside.description,
-                                  detail: itemPath
-                              }
-                          );
-                      }
+                  if (element) {
+
+                    // for (let indexInside = 0; indexInside < element.length; indexInside++) {
+                    for (let elementInside of element) {
+                        // let elementInside = element[indexInside];
+
+                        if (elementInside.detail.toString().toLowerCase() === activeTextEditorPath.toLowerCase()) {
+                            items.push(
+                                {
+                                    label: elementInside.label,
+                                    description: elementInside.description
+                                }
+                            );
+                        } else {
+                            let itemPath = removeRootPathFrom(elementInside.detail);
+                            items.push(
+                                {
+                                    label: elementInside.label,
+                                    description: elementInside.description,
+                                    detail: itemPath
+                                }
+                            );
+                        }
+                    }
+
                   }
 
               }
@@ -622,7 +626,8 @@ export function activate(context: vscode.ExtensionContext) {
                       } else {
                         let uriDocument: vscode.Uri = vscode.Uri.file(filePath);
                         vscode.workspace.openTextDocument(uriDocument).then(doc => {
-                            vscode.window.showTextDocument(doc, undefined, true).then(editor => {
+                            // vscode.window.showTextDocument(doc, undefined, true).then(editor => {
+                            vscode.window.showTextDocument(doc, {preserveFocus: true, preview: true}).then(editor => {
                                 revealLine(parseInt(item.label, 10) - 1);
                             });
                         });