Merge branch 'master' into local2

* master: Preserve code in cells during execution and edits (#10981) Replace spinner with custom icon when downloading MPLS/Insiders build (#10687) Style speedups for the monaco editor (#11014) Force kernel syncing (#10955) Consolidate the info for internal scripts to one place. (#10876) Update experiments json to include ipywidgets (#10992) Separate Python env from exec. (#10883) Secondary fix for 9523 - Exception for loading should show in the ouptut (#10990)
Don Jayamanne (DonJayamanne) · Apr 10, 2020 · Apr 2, 2020 · Apr 2, 2020 · Apr 2, 2020 · Apr 2, 2020
commit 278341aad7cf4484fbdf9d4e9829d57ac6f1525c
diff --git a/src/client/datascience/ipywidgets/ipywidgetHandler.ts b/src/client/datascience/ipywidgets/ipywidgetHandler.ts
@@ -44,7 +44,9 @@ export class IPyWidgetHandler implements IInteractiveWindowListener {
     constructor(
         @inject(INotebookProvider) notebookProvider: INotebookProvider,
         @inject(IDisposableRegistry) private readonly disposables: IDisposableRegistry,
-        @inject(IPyWidgetMessageDispatcherFactory) private readonly widgetMessageDispatcherFactory: IPyWidgetMessageDispatcherFactory
+        @inject(IPyWidgetMessageDispatcherFactory)
+        private readonly widgetMessageDispatcherFactory: IPyWidgetMessageDispatcherFactory,
+        @inject(IExperimentsManager) readonly experimentsManager: IExperimentsManager
     ) {
         disposables.push(
             notebookProvider.onNotebookCreated(async (e) => {

diff --git a/src/datascience-ui/interactive-common/cellOutput.tsx b/src/datascience-ui/interactive-common/cellOutput.tsx
@@ -31,6 +31,7 @@ import { TrimmedOutputMessage } from './trimmedOutputLink';
 interface ICellOutputProps {
     cellVM: ICellViewModel;
     baseTheme: string;
+    loadWidgetScriptsFromThirdPartySource: boolean;
     maxTextSize?: number;
     hideOutput?: boolean;
     themeMatplotlibPlots?: boolean;
@@ -472,7 +473,25 @@ export class CellOutput extends React.Component<ICellOutputProps> {
         transformedList.forEach((transformed, index) => {
             const mimetype = transformed.output.mimeType;
             if (isIPyWidgetOutput(transformed.output.mimeBundle)) {
-                return;
+                if (this.props.loadWidgetScriptsFromThirdPartySource) {
+                    // Create a view for this output if not already there.
+                    this.renderWidget(transformed.output);
+                } else {
+                    // If loading of widget source is not allowed, display a message.
+                    const errorMessage = getLocString(
+                        'DataScience.loadThirdPartyWidgetScriptsDisabled',
+                        "Loading of Widgets is disabled by default. Click <a href='https://command:python.datascience.loadWidgetScriptsFromThirdPartySource'>here</a> to enable the setting 'python.dataScience.loadWidgetScriptsFromThirdPartySource'. Once enabled you will need to restart the Kernel"
+                    );
+
+                    // tslint:disable: react-no-dangerous-html
+                    buffer.push(
+                        <div role="group" key={index}>
+                            <span className={'cell-output-html cell-output-error'}>
+                                <div dangerouslySetInnerHTML={{ __html: errorMessage }} />
+                            </span>
+                        </div>
+                    );
+                }
             } else if (mimetype && isMimeTypeSupported(mimetype)) {
                 // If that worked, use the transform
                 // Get the matching React.Component for that mimetype