diff --git a/src/vs/editor/contrib/quickOpen/quickOpen.ts b/src/vs/editor/contrib/quickOpen/quickOpen.ts
index fb054ae7f618ce36f445a428afc6e0cf2c90b52b..2730114175b262c52a5e47a74750ce6a0bf7fdfe 100644
--- a/src/vs/editor/contrib/quickOpen/quickOpen.ts
+++ b/src/vs/editor/contrib/quickOpen/quickOpen.ts
@@ -3,44 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { illegalArgument, onUnexpectedExternalError } from 'vs/base/common/errors';
+import { illegalArgument } from 'vs/base/common/errors';
 import { URI } from 'vs/base/common/uri';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
 import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
-import { DocumentSymbol, DocumentSymbolProviderRegistry } from 'vs/editor/common/modes';
+import { DocumentSymbol } from 'vs/editor/common/modes';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { OutlineModel, OutlineElement } from 'vs/editor/contrib/documentSymbols/outlineModel';
+import { values } from 'vs/base/common/collections';
 
-export function getDocumentSymbols(model: ITextModel, flat: boolean, token: CancellationToken): Promise<DocumentSymbol[]> {
+export async function getDocumentSymbols(document: ITextModel, flat: boolean, token: CancellationToken): Promise<DocumentSymbol[]> {
 
-	let roots: DocumentSymbol[] = [];
-
-	let promises = DocumentSymbolProviderRegistry.all(model).map(support => {
-
-		return Promise.resolve(support.provideDocumentSymbols(model, token)).then(result => {
-			if (Array.isArray(result)) {
-				roots.push(...result);
-			}
-		}, err => {
-			onUnexpectedExternalError(err);
-		});
-	});
-
-	return Promise.all(promises).then(() => {
-		let flatEntries: DocumentSymbol[] = [];
-		if (token.isCancellationRequested) {
-			return flatEntries;
-		}
-		if (flat) {
-			flatten(flatEntries, roots, '');
+	const model = await OutlineModel.create(document, token);
+	const roots: DocumentSymbol[] = [];
+	for (const child of values(model.children)) {
+		if (child instanceof OutlineElement) {
+			roots.push(child.symbol);
 		} else {
-			flatEntries = roots;
+			roots.push(...values(child.children).map(child => child.symbol));
 		}
-		flatEntries.sort(compareEntriesUsingStart);
+	}
+
+	let flatEntries: DocumentSymbol[] = [];
+	if (token.isCancellationRequested) {
 		return flatEntries;
-	});
+	}
+	if (flat) {
+		flatten(flatEntries, roots, '');
+	} else {
+		flatEntries = roots;
+	}
+
+	return flatEntries.sort(compareEntriesUsingStart);
 }
 
 function compareEntriesUsingStart(a: DocumentSymbol, b: DocumentSymbol): number {