fix #67949

src/tsconfig.strictNullChecks.json

@@ -17,6 +17,7 @@
 		"./vs/editor/contrib/smartSelect/**/*.ts",
 		"./vs/editor/contrib/snippet/**/*.ts",
 		"./vs/editor/contrib/suggest/**/*.ts",
+		"./vs/editor/contrib/documentSymbols/**/*.ts",
 		"./vs/editor/test/**/*.ts",
 		"./vs/workbench/browser/parts/notifications/**/*",
 		"./vs/workbench/browser/parts/quickinput/**/*",
@@ -54,8 +55,6 @@
 		"./vs/editor/contrib/cursorUndo/cursorUndo.ts",
 		"./vs/editor/contrib/dnd/dnd.ts",
 		"./vs/editor/contrib/dnd/dragAndDropCommand.ts",
-		"./vs/editor/contrib/documentSymbols/outline.ts",
-		"./vs/editor/contrib/documentSymbols/outlineModel.ts",
 		"./vs/editor/contrib/find/findController.ts",
 		"./vs/editor/contrib/find/findDecorations.ts",
 		"./vs/editor/contrib/find/findModel.ts",

src/vs/editor/contrib/documentSymbols/outlineTree.ts

@@ -31,7 +31,7 @@ export class OutlineNavigationLabelProvider implements IKeyboardNavigationLabelP
 
 	getKeyboardNavigationLabel(element: OutlineItem): { toString(): string; } {
 		if (element instanceof OutlineGroup) {
-			return element.provider.displayName;
+			return element.provider.displayName || element.id;
 		} else {
 			return element.symbol.name;
 		}
@@ -122,7 +122,7 @@ export class OutlineElementRenderer implements ITreeRenderer<OutlineElement, Fuz
 		const { element } = node;
 		const options = {
 			matches: createMatches(node.filterData),
-			extraClasses: [],
+			extraClasses: <string[]>[],
 			title: localize('title.template', "{0} ({1})", element.symbol.name, OutlineElementRenderer._symbolKindNames[element.symbol.kind])
 		};
 		if (this._configurationService.getValue(OutlineConfigKeys.icons)) {

src/vs/editor/contrib/documentSymbols/test/outlineModel.test.ts

@@ -101,9 +101,9 @@ suite('OutlineModel', function () {
 
 		group.updateMarker(data);
 		assert.equal(data.length, 0); // all 'stolen'
-		assert.equal(e0.marker.count, 1);
+		assert.equal(e0.marker!.count, 1);
 		assert.equal(e1.marker, undefined);
-		assert.equal(e2.marker.count, 2);
+		assert.equal(e2.marker!.count, 2);
 
 		group.updateMarker([]);
 		assert.equal(e0.marker, undefined);
@@ -127,8 +127,8 @@ suite('OutlineModel', function () {
 		];
 
 		group.updateMarker(data);
-		assert.equal(p.marker.count, 0);
-		assert.equal(c1.marker.count, 1);
+		assert.equal(p.marker!.count, 0);
+		assert.equal(c1.marker!.count, 1);
 		assert.equal(c2.marker, undefined);
 
 		data = [
@@ -137,18 +137,18 @@ suite('OutlineModel', function () {
 			fakeMarker(new Range(7, 6, 7, 8)),
 		];
 		group.updateMarker(data);
-		assert.equal(p.marker.count, 0);
-		assert.equal(c1.marker.count, 2);
-		assert.equal(c2.marker.count, 1);
+		assert.equal(p.marker!.count, 0);
+		assert.equal(c1.marker!.count, 2);
+		assert.equal(c2.marker!.count, 1);
 
 		data = [
 			fakeMarker(new Range(1, 4, 1, 11)),
 			fakeMarker(new Range(7, 6, 7, 8)),
 		];
 		group.updateMarker(data);
-		assert.equal(p.marker.count, 1);
+		assert.equal(p.marker!.count, 1);
 		assert.equal(c1.marker, undefined);
-		assert.equal(c2.marker.count, 1);
+		assert.equal(c2.marker!.count, 1);
 	});
 
 	test('OutlineElement - updateMarker/multiple groups', function () {
@@ -178,9 +178,9 @@ suite('OutlineModel', function () {
 
 		model.updateMarker(data);
 
-		assert.equal(model.children['g1'].children['c1'].marker.count, 2);
-		assert.equal(model.children['g2'].children['c2'].children['c2.1'].marker.count, 1);
-		assert.equal(model.children['g2'].children['c2'].children['c2.2'].marker.count, 1);
+		assert.equal(model.children['g1']!.children['c1'].marker!.count, 2);
+		assert.equal(model.children['g2']!.children['c2'].children['c2.1'].marker!.count, 1);
+		assert.equal(model.children['g2']!.children['c2'].children['c2.2'].marker!.count, 1);
 	});
 
 });