Fix strict null errors related to getActivePanel

mjbvz · mjbvz · commit a7ef42a93cbc · 2019-02-11T16:56:17.000-08:00
diff --git a/src/vs/workbench/browser/actions/navigationActions.ts b/src/vs/workbench/browser/actions/navigationActions.ts
@@ -68,7 +68,7 @@ abstract class BaseNavigationAction extends Action {
 			return false;
 		}
 
-		const activePanelId = this.panelService.getActivePanel().getId();
+		const activePanelId = this.panelService.getActivePanel()!.getId();
 
 		return this.panelService.openPanel(activePanelId, true);
 	}
diff --git a/src/vs/workbench/browser/panel.ts b/src/vs/workbench/browser/panel.ts
@@ -95,7 +95,7 @@ export abstract class TogglePanelAction extends Action {
 	private isPanelActive(): boolean {
 		const activePanel = this.panelService.getActivePanel();
 
-		return activePanel && activePanel.getId() === this.panelId;
+		return !!activePanel && activePanel.getId() === this.panelId;
 	}
 
 	private isPanelFocused(): boolean {
diff --git a/src/vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts
@@ -924,7 +924,7 @@ export class TerminalInstance implements ITerminalInstance {
 
 	private _refreshSelectionContextKey() {
 		const activePanel = this._panelService.getActivePanel();
-		const isActive = activePanel && activePanel.getId() === TERMINAL_PANEL_ID;
+		const isActive = !!activePanel && activePanel.getId() === TERMINAL_PANEL_ID;
 
 		this._terminalHasTextContextKey.set(isActive && this.hasSelection());
 	}
diff --git a/src/vs/workbench/services/timer/electron-browser/timerService.ts b/src/vs/workbench/services/timer/electron-browser/timerService.ts
@@ -378,6 +378,7 @@ class TimerService implements ITimerService {
 		}
 
 		const activeViewlet = this._viewletService.getActiveViewlet();
+		const activePanel = this._panelService.getActivePanel();
 		return {
 			version: 2,
 			ellapsed: perf.getDuration(startMark, 'didStartWorkbench'),
@@ -389,7 +390,7 @@ class TimerService implements ITimerService {
 			windowCount: await this._windowsService.getWindowCount(),
 			viewletId: activeViewlet ? activeViewlet.getId() : undefined,
 			editorIds: this._editorService.visibleEditors.map(input => input.getTypeId()),
-			panelId: this._panelService.getActivePanel() ? this._panelService.getActivePanel().getId() : undefined,
+			panelId: activePanel ? activePanel.getId() : undefined,
 
 			// timers
 			timers: {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ abstract class BaseNavigationAction extends Action {`
`68`	`68`	`return false;`
`69`	`69`	`}`
`70`	`70`
`71`		`- const activePanelId = this.panelService.getActivePanel().getId();`
	`71`	`+ const activePanelId = this.panelService.getActivePanel()!.getId();`
`72`	`72`
`73`	`73`	`return this.panelService.openPanel(activePanelId, true);`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ export abstract class TogglePanelAction extends Action {`
`95`	`95`	`private isPanelActive(): boolean {`
`96`	`96`	`const activePanel = this.panelService.getActivePanel();`
`97`	`97`
`98`		`- return activePanel && activePanel.getId() === this.panelId;`
	`98`	`+ return !!activePanel && activePanel.getId() === this.panelId;`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`private isPanelFocused(): boolean {`
Original file line number	Diff line number	Diff line change
`@@ -924,7 +924,7 @@ export class TerminalInstance implements ITerminalInstance {`
`924`	`924`
`925`	`925`	`private _refreshSelectionContextKey() {`
`926`	`926`	`const activePanel = this._panelService.getActivePanel();`
`927`		`- const isActive = activePanel && activePanel.getId() === TERMINAL_PANEL_ID;`
	`927`	`+ const isActive = !!activePanel && activePanel.getId() === TERMINAL_PANEL_ID;`
`928`	`928`
`929`	`929`	`this._terminalHasTextContextKey.set(isActive && this.hasSelection());`
`930`	`930`	`}`