Move MarkersViewState to markersTreeViewer and remove markersPanelActions from strict null checks

src/tsconfig.strictNullChecks.json

@@ -618,7 +618,6 @@
 		"./vs/workbench/parts/markers/electron-browser/markersFileDecorations.ts",
 		"./vs/workbench/parts/markers/electron-browser/markersFilterOptions.ts",
 		"./vs/workbench/parts/markers/electron-browser/markersModel.ts",
-		"./vs/workbench/parts/markers/electron-browser/markersPanelActions.ts",
 		"./vs/workbench/parts/markers/electron-browser/messages.ts",
 		"./vs/workbench/parts/outline/electron-browser/outline.ts",
 		"./vs/workbench/parts/output/common/output.ts",

src/vs/workbench/parts/markers/electron-browser/markersPanel.ts

@@ -33,7 +33,7 @@ import { IExpression, getEmptyExpression } from 'vs/base/common/glob';
 import { mixin, deepClone } from 'vs/base/common/objects';
 import { IWorkspaceFolder, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { isAbsolute, join } from 'vs/base/common/paths';
-import { FilterData, FileResourceMarkersRenderer, Filter, VirtualDelegate, ResourceMarkersRenderer, MarkerRenderer, RelatedInformationRenderer, TreeElement, MarkersTreeAccessibilityProvider } from 'vs/workbench/parts/markers/electron-browser/markersTreeViewer';
+import { FilterData, FileResourceMarkersRenderer, Filter, VirtualDelegate, ResourceMarkersRenderer, MarkerRenderer, RelatedInformationRenderer, TreeElement, MarkersTreeAccessibilityProvider, MarkersViewState } from 'vs/workbench/parts/markers/electron-browser/markersTreeViewer';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { Separator, ActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
@@ -41,7 +41,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { domEvent } from 'vs/base/browser/event';
-import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 
 function createModelIterator(model: MarkersModel): Iterator<ITreeElement<TreeElement>> {
 	const resourcesIt = Iterator.fromArray(model.resourceMarkers);
@@ -665,27 +665,4 @@ export class MarkersPanel extends Panel implements IMarkerFilterController {
 		this.markersViewState.dispose();
 		this.disposables = dispose(this.disposables);
 	}
-}
-
-export class MarkersViewState extends Disposable {
-
-	private readonly _onDidChangeViewState: Emitter<void> = this._register(new Emitter<void>());
-	readonly onDidChangeViewState: Event<void> = this._onDidChangeViewState.event;
-
-	constructor(multiline: boolean = true) {
-		super();
-		this._multiline = multiline;
-	}
-
-	private _multiline: boolean = true;
-	get multiline(): boolean {
-		return this._multiline;
-	}
-
-	set multiline(value: boolean) {
-		if (this._multiline !== value) {
-			this._multiline = value;
-			this._onDidChangeViewState.fire();
-		}
-	}
 }
\ No newline at end of file

src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts

@@ -32,7 +32,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
 import { Event } from 'vs/base/common/event';
 import { FilterOptions } from 'vs/workbench/parts/markers/electron-browser/markersFilterOptions';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { MarkersViewState } from 'vs/workbench/parts/markers/electron-browser/markersPanel';
+import { MarkersViewState } from 'vs/workbench/parts/markers/electron-browser/markersTreeViewer';
 
 export class ToggleMarkersPanelAction extends TogglePanelAction {
 

src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts

@@ -24,10 +24,9 @@ import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { ITreeFilter, TreeVisibility, TreeFilterResult, ITreeRenderer, ITreeNode } from 'vs/base/browser/ui/tree/tree';
 import { FilterOptions } from 'vs/workbench/parts/markers/electron-browser/markersFilterOptions';
 import { IMatch } from 'vs/base/common/filters';
-import { Event } from 'vs/base/common/event';
+import { Event, Emitter } from 'vs/base/common/event';
 import { IAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
 import { isUndefinedOrNull } from 'vs/base/common/types';
-import { MarkersViewState } from 'vs/workbench/parts/markers/electron-browser/markersPanel';
 
 export type TreeElement = ResourceMarkers | Marker | RelatedInformation;
 
@@ -451,3 +450,26 @@ export class Filter implements ITreeFilter<TreeElement, FilterData> {
 		return parentVisibility;
 	}
 }
+
+export class MarkersViewState extends Disposable {
+
+	private readonly _onDidChangeViewState: Emitter<void> = this._register(new Emitter<void>());
+	readonly onDidChangeViewState: Event<void> = this._onDidChangeViewState.event;
+
+	constructor(multiline: boolean = true) {
+		super();
+		this._multiline = multiline;
+	}
+
+	private _multiline: boolean = true;
+	get multiline(): boolean {
+		return this._multiline;
+	}
+
+	set multiline(value: boolean) {
+		if (this._multiline !== value) {
+			this._multiline = value;
+			this._onDidChangeViewState.fire();
+		}
+	}
+}
\ No newline at end of file