Fix monaco editor style differences between insiders and shipping

news/2 Fixes/8006.md

@@ -0,0 +1 @@
+Signature help is overflowing out of the signature help widget on the Notebook Editor.

package.json

@@ -2856,7 +2856,7 @@
         "mocha": "^6.1.4",
         "mocha-junit-reporter": "^1.17.0",
         "mocha-multi-reporters": "^1.1.7",
-        "monaco-editor": "0.16.2",
+        "monaco-editor": "0.18.1",
         "monaco-editor-webpack-plugin": "^1.7.0",
         "nock": "^10.0.6",
         "node-has-native-dependencies": "^1.0.2",

src/datascience-ui/interactive-common/intellisenseProvider.ts

@@ -3,8 +3,10 @@
 'use strict';
 import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api';
 import * as uuid from 'uuid/v4';
+
 import { IDisposable } from '../../client/common/types';
 import { createDeferred, Deferred } from '../../client/common/utils/async';
+import { noop } from '../../client/common/utils/misc';
 import {
     IInteractiveWindowMapping,
     InteractiveWindowMessages,
@@ -25,7 +27,7 @@ export class IntellisenseProvider implements monacoEditor.languages.CompletionIt
     public readonly signatureHelpRetriggerCharacters?: ReadonlyArray<string> = [')'];
     private completionRequests: Map<string, IRequestData<monacoEditor.languages.CompletionList>> = new Map<string, IRequestData<monacoEditor.languages.CompletionList>>();
     private hoverRequests: Map<string, IRequestData<monacoEditor.languages.Hover>> = new Map<string, IRequestData<monacoEditor.languages.Hover>>();
-    private signatureHelpRequests: Map<string, IRequestData<monacoEditor.languages.SignatureHelp>> = new Map<string, IRequestData<monacoEditor.languages.SignatureHelp>>();
+    private signatureHelpRequests: Map<string, IRequestData<monacoEditor.languages.SignatureHelpResult>> = new Map<string, IRequestData<monacoEditor.languages.SignatureHelpResult>>();
     private registerDisposables: monacoEditor.IDisposable[] = [];
     constructor(private postOffice: PostOffice, private getCellId: (modelId: string) => string) {
         // Register a completion provider
@@ -79,10 +81,10 @@ export class IntellisenseProvider implements monacoEditor.languages.CompletionIt
         model: monacoEditor.editor.ITextModel,
         position: monacoEditor.Position,
         token: monacoEditor.CancellationToken,
-        context: monacoEditor.languages.SignatureHelpContext): monacoEditor.languages.ProviderResult<monacoEditor.languages.SignatureHelp> {
+        context: monacoEditor.languages.SignatureHelpContext): monacoEditor.languages.ProviderResult<monacoEditor.languages.SignatureHelpResult> {
         // Emit a new request
         const requestId = uuid();
-        const promise = createDeferred<monacoEditor.languages.SignatureHelp>();
+        const promise = createDeferred<monacoEditor.languages.SignatureHelpResult>();
 
         const cancelDisposable = token.onCancellationRequested(() => {
             promise.resolve();
@@ -167,7 +169,10 @@ export class IntellisenseProvider implements monacoEditor.languages.CompletionIt
             // Resolve our waiting promise if we have one
             const waiting = this.signatureHelpRequests.get(response.requestId);
             if (waiting) {
-                waiting.promise.resolve(response.signatureHelp);
+                waiting.promise.resolve({
+                    value: response.signatureHelp,
+                    dispose: noop
+                });
                 this.signatureHelpRequests.delete(response.requestId);
             }
         }

src/datascience-ui/react-common/monacoEditor.css

@@ -126,3 +126,7 @@
     border-right-style: solid;
     border-right-width: 1px;
 }
+
+.monaco-editor .parameter-hints-widget > .wrapper {
+	overflow: hidden;
+}