From 37f6c649ba8e9b4f2b7e9c86f1603816c12be7c1 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Fri, 6 Sep 2019 18:49:49 +0200
Subject: [PATCH] Fix microsoft/monaco-editor#1576 update dependency to core

* Update dependency to monaco-editor-core to 0.18.0
* Fix typing errors:
    * SignatureHelpAdapter#provideSignatureHelp return a wrapped SignatureHelpResult
    * monaco.languages.DocumentSymbol has got a new property: tags

The tags are an array SymbolTags, and the only existing SymbolTag is "Deprecated".
I did not find any information about that in the ts.NavigationBarItem, so the tags
are always an empty array for now.
---
 package-lock.json       |  6 +++---
 package.json            |  2 +-
 src/languageFeatures.ts | 10 ++++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 60ed776e..515b7349 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,9 +11,9 @@
       "dev": true
     },
     "monaco-editor-core": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.16.0.tgz",
-      "integrity": "sha512-8tm8vq0SVuQ+VXZFtPIEIronK3102SYCWe8wviWu/5TV4zlDQcf4YdzI6A4CrNqbUc46dD0ngijaKWoRSViI8g==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.18.0.tgz",
+      "integrity": "sha512-URcHNAqH9X2JvO2skkIisAL4XAcZXxrDC8kcyr453sXQpOHUxicZpXHQb4/arXGvxrWvei3a6zZzpdT1gjeVJA==",
       "dev": true
     },
     "monaco-languages": {
diff --git a/package.json b/package.json
index 946a9582..9765ba72 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "url": "https://github.com/Microsoft/monaco-typescript/issues"
   },
   "devDependencies": {
-    "monaco-editor-core": "^0.16.0",
+    "monaco-editor-core": "^0.18.0",
     "monaco-languages": "^1.7.0",
     "monaco-plugin-helpers": "^1.0.2",
     "requirejs": "^2.3.6",
diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts
index 4dde0166..fe344ce9 100644
--- a/src/languageFeatures.ts
+++ b/src/languageFeatures.ts
@@ -316,7 +316,7 @@ export class SignatureHelpAdapter extends Adapter implements monaco.languages.Si
 
 	public signatureHelpTriggerCharacters = ['(', ','];
 
-	provideSignatureHelp(model: monaco.editor.IReadOnlyModel, position: Position, token: CancellationToken): Thenable<monaco.languages.SignatureHelp> {
+	provideSignatureHelp(model: monaco.editor.IReadOnlyModel, position: Position, token: CancellationToken): Thenable<monaco.languages.SignatureHelpResult> {
 		let resource = model.uri;
 		return this._worker(resource).then(worker => worker.getSignatureHelpItems(resource.toString(), this._positionToOffset(resource, position))).then(info => {
 
@@ -334,7 +334,6 @@ export class SignatureHelpAdapter extends Adapter implements monaco.languages.Si
 
 				let signature: monaco.languages.SignatureInformation = {
 					label: '',
-					documentation: null,
 					parameters: []
 				};
 
@@ -355,8 +354,10 @@ export class SignatureHelpAdapter extends Adapter implements monaco.languages.Si
 				ret.signatures.push(signature);
 			});
 
-			return ret;
-
+			return {
+				value: ret,
+				dispose() {}
+			};
 		});
 	}
 }
@@ -494,6 +495,7 @@ export class OutlineAdapter extends Adapter implements monaco.languages.Document
 					kind: <monaco.languages.SymbolKind>(outlineTypeTable[item.kind] || monaco.languages.SymbolKind.Variable),
 					range: this._textSpanToRange(resource, item.spans[0]),
 					selectionRange: this._textSpanToRange(resource, item.spans[0]),
+					tags: [],
 					containerName: containerLabel
 				};