From b08b71f7e468f583cac0b320e8ce43c57bfaa943 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Fri, 10 Aug 2018 12:18:07 +0200
Subject: [PATCH] Adopt monaco-editor-core@0.14.1

---
 package-lock.json       | 29 ++++++++++++++---------------
 package.json            |  4 ++--
 src/languageFeatures.ts | 15 +++++++--------
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7211a869..1740681f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,16 +4,23 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "commander": {
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
+      "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
+      "dev": true
+    },
     "monaco-editor-core": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.12.0.tgz",
-      "integrity": "sha512-wOoEVAoZtrarDRcQC32Fp0ocacpQd6/Nb0FmUZOHeD3swZuPZhDLOxTyoNLjKq3d+h/6g+IARBLnDaLT5OQD4g==",
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.14.1.tgz",
+      "integrity": "sha512-bWJuPbDEftxaN2bG+JZ29+aJhg0rmq+y6VmCUqPZpmw8bSevoYjuTcdLkt9BbNaGnwosAVy+vSktXgs/JW7OvQ==",
       "dev": true
     },
     "monaco-languages": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.4.0.tgz",
-      "integrity": "sha512-39MZMAEKToktfSpOS0Soj05IvkT5vbebL9AIBGPn8fGi8WgJOcfS3YLiMu07gZKViR7CFZ4RyQJKJHglx0fPdA=="
+      "integrity": "sha512-39MZMAEKToktfSpOS0Soj05IvkT5vbebL9AIBGPn8fGi8WgJOcfS3YLiMu07gZKViR7CFZ4RyQJKJHglx0fPdA==",
+      "dev": true
     },
     "monaco-plugin-helpers": {
       "version": "1.0.2",
@@ -51,21 +58,13 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.4.6",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz",
-      "integrity": "sha512-O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg==",
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.7.tgz",
+      "integrity": "sha512-J0M2i1mQA+ze3EdN9SBi751DNdAXmeFLfJrd/MDIkRc3G3Gbb9OPVSx7GIQvVwfWxQARcYV2DTxIkMyDAk3o9Q==",
       "dev": true,
       "requires": {
         "commander": "2.16.0",
         "source-map": "0.6.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.16.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
-          "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
-          "dev": true
-        }
       }
     }
   }
diff --git a/package.json b/package.json
index 81098e1e..27c72723 100644
--- a/package.json
+++ b/package.json
@@ -20,11 +20,11 @@
     "url": "https://github.com/Microsoft/monaco-typescript/issues"
   },
   "devDependencies": {
-    "monaco-editor-core": "0.12.0",
+    "monaco-editor-core": "0.14.1",
     "monaco-languages": "^1.4.0",
     "monaco-plugin-helpers": "^1.0.2",
     "requirejs": "^2.3.5",
     "typescript": "3.0.1",
-    "uglify-js": "^3.4.6"
+    "uglify-js": "^3.4.7"
   }
 }
diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts
index bb826a94..cb9ba7f4 100644
--- a/src/languageFeatures.ts
+++ b/src/languageFeatures.ts
@@ -461,7 +461,7 @@ export class ReferenceAdapter extends Adapter implements monaco.languages.Refere
 
 export class OutlineAdapter extends Adapter implements monaco.languages.DocumentSymbolProvider {
 
-	public provideDocumentSymbols(model: monaco.editor.IReadOnlyModel, token: CancellationToken): Thenable<monaco.languages.SymbolInformation[]> {
+	public provideDocumentSymbols(model: monaco.editor.IReadOnlyModel, token: CancellationToken): Thenable<monaco.languages.DocumentSymbol[]> {
 		const resource = model.uri;
 
 		return wireCancellationToken(token, this._worker(resource).then(worker => worker.getNavigationBarItems(resource.toString())).then(items => {
@@ -469,14 +469,13 @@ export class OutlineAdapter extends Adapter implements monaco.languages.Document
 				return;
 			}
 
-			const convert = (bucket: monaco.languages.SymbolInformation[], item: ts.NavigationBarItem, containerLabel?: string): void => {
-				let result: monaco.languages.SymbolInformation = {
+			const convert = (bucket: monaco.languages.DocumentSymbol[], item: ts.NavigationBarItem, containerLabel?: string): void => {
+				let result: monaco.languages.DocumentSymbol = {
 					name: item.text,
+					detail: '',
 					kind: <monaco.languages.SymbolKind>(outlineTypeTable[item.kind] || monaco.languages.SymbolKind.Variable),
-					location: {
-						uri: resource,
-						range: this._textSpanToRange(resource, item.spans[0])
-					},
+					range: this._textSpanToRange(resource, item.spans[0]),
+					selectionRange: this._textSpanToRange(resource, item.spans[0]),
 					containerName: containerLabel
 				};
 
@@ -489,7 +488,7 @@ export class OutlineAdapter extends Adapter implements monaco.languages.Document
 				bucket.push(result);
 			}
 
-			let result: monaco.languages.SymbolInformation[] = [];
+			let result: monaco.languages.DocumentSymbol[] = [];
 			items.forEach(item => convert(result, item));
 			return result;
 		}));