Skip to content

Commit 99152ad

Browse files
committed
initialize lastEditor and lastTerminal after package activation
1 parent d1cb82b commit 99152ad

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

lib/ui/focusutils.js

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,25 @@ class FocusHistory {
4545

4646
export function activate (ink) {
4747
subs = new CompositeDisposable()
48-
49-
subs.add(atom.workspace.onDidStopChangingActivePaneItem((item) => {
50-
if (item instanceof TextEditor) {
51-
lastEditor = item
52-
} else if (item instanceof ink.InkTerminal) {
53-
lastTerminal = item
54-
}
55-
}))
48+
49+
subs.add(
50+
atom.workspace.onDidStopChangingActivePaneItem(item => {
51+
if (item instanceof TextEditor) {
52+
lastEditor = item
53+
} else if (item instanceof ink.InkTerminal) {
54+
lastTerminal = item
55+
}
56+
},
57+
atom.packages.onDidActivateInitialPackages(() => {
58+
lastEditor = atom.workspace.getActiveTextEditor()
59+
atom.workspace.getPanes().forEach(pane => {
60+
const item = pane.getActiveItem()
61+
if (item instanceof ink.InkTerminal) {
62+
lastTerminal = item
63+
}
64+
})
65+
})
66+
))
5667

5768
const history = new FocusHistory(30)
5869
ink.Opener.onDidOpen(({newLocation, oldLocation}) => {

0 commit comments

Comments
 (0)