From b7cdccec938c16c186315ec4b7903365c78dbb0b Mon Sep 17 00:00:00 2001 From: Tyler Fowler Date: Thu, 5 Apr 2018 23:25:02 -0500 Subject: [PATCH 1/3] Add initial value for reduction --- lib/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main.js b/lib/main.js index fc72db2..6c9de10 100644 --- a/lib/main.js +++ b/lib/main.js @@ -209,7 +209,7 @@ class JavaLanguageClient extends AutoLanguageClient { return atom.packages.getLoadedPackages() .filter(pkg => Array.isArray(pkg.metadata.javaExtensions)) .map(pkg => pkg.metadata.javaExtensions.map(p => path.resolve(pkg.path, p))) - .reduce(e => e.concat([])); + .reduce(e => e.concat([]), []); } updateInstallStatus (status) { From f20d9f47caa2ffd59f67f10c9f9c9a9d63fa9414 Mon Sep 17 00:00:00 2001 From: Tyler Fowler Date: Thu, 5 Apr 2018 23:25:33 -0500 Subject: [PATCH 2/3] Refocus active pane after import list is closed --- lib/views/importSuggestionListView.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/views/importSuggestionListView.js b/lib/views/importSuggestionListView.js index c5d239b..6306cbd 100644 --- a/lib/views/importSuggestionListView.js +++ b/lib/views/importSuggestionListView.js @@ -1,3 +1,4 @@ +const { TextEditor } = require('atom') const SelectList = require('atom-select-list') class ImportSuggestionListView { @@ -28,14 +29,22 @@ class ImportSuggestionListView { }) this.selectList = new SelectList(listInitializer) - this.panel = atom.workspace.addModalPanel({ item: this.selectList.element }) - this.selectList.focus() this.panel.show() + this.selectList.focus() } waitForConfirmOrCancel() { return this._promise } - close() { if (this.panel) this.panel.destroy() } + + close() { + if (this.panel) { + this.panel.destroy() + + const activeItem = atom.workspace.getActivePaneItem() + if (activeItem && activeItem instanceof TextEditor) + activeItem.element.focus(); + } + } } module.exports = ImportSuggestionListView From 0c58006bbeb047bf54fc3c36208a158132207e10 Mon Sep 17 00:00:00 2001 From: Tyler Fowler Date: Thu, 5 Apr 2018 23:29:45 -0500 Subject: [PATCH 3/3] Remove unnecessary class member --- lib/views/importSuggestionListView.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/views/importSuggestionListView.js b/lib/views/importSuggestionListView.js index 6306cbd..d3823a6 100644 --- a/lib/views/importSuggestionListView.js +++ b/lib/views/importSuggestionListView.js @@ -6,8 +6,6 @@ class ImportSuggestionListView { if (importSuggestions.length === 0) throw new Error('Import suggestions list cannot be empty') - this.importSuggestions = importSuggestions - let listInitializer = { items: importSuggestions, elementForItem: (itm, { index }) => {