diff --git a/build/webpack/webpack.extension.config.js b/build/webpack/webpack.extension.config.js index 64fabb1664ef..54e7c49ef16d 100644 --- a/build/webpack/webpack.extension.config.js +++ b/build/webpack/webpack.extension.config.js @@ -61,7 +61,7 @@ const config = { }, // Packages listed in externals keeps webpack from trying to package them. // The ppaPackageList variable is set to non-empty if the build pipeline has been - //authenticated to install @msrvida/python-program-analysis. + // authenticated to install @msrvida/python-program-analysis. externals: ['vscode', 'commonjs', ...ppaPackageList, ...existingModulesInOutDir], plugins: [ ...common.getDefaultPlugins('extension'), diff --git a/package.json b/package.json index aacf11a830f5..e244ba37206d 100644 --- a/package.json +++ b/package.json @@ -1832,14 +1832,14 @@ }, "python.dataScience.enableGather": { "type": "boolean", - "default": false, - "description": "Enable experimental code gathering for executed cells. For a gathered cell, that cell and only the code it depends on will be exported to a new notebook.", + "default": true, + "description": "Python Insiders Only: Enable experimental gather feature for executed cells. For a gathered cell, that cell and only the code it depends on will be exported to a new notebook.", "scope": "resource" }, "python.dataScience.gatherToScript": { "type": "boolean", - "default": true, - "description": "If experimental code gather is enabled, gather code to a python script rather than a notebook.", + "default": false, + "description": "Python Insiders Only: If experimental gather feature is enabled, gather code to a python script rather than a notebook.", "scope": "resource" }, "python.dataScience.codeLenses": { diff --git a/src/client/datascience/gather/gather.ts b/src/client/datascience/gather/gather.ts index 77aca9dddcbb..97d74d54a977 100644 --- a/src/client/datascience/gather/gather.ts +++ b/src/client/datascience/gather/gather.ts @@ -25,6 +25,7 @@ export class GatherProvider implements IGatherProvider { @inject(IDisposableRegistry) private disposables: IDisposableRegistry, @inject(ICommandManager) private commandManager: ICommandManager ) { + // Disable gather if we're not running on insiders. this._enabled = this.configService.getSettings().datascience.enableGather && this.configService.getSettings().insidersChannel !== 'off' diff --git a/src/datascience-ui/react-common/images/GatherCode/gather_dark.svg b/src/datascience-ui/react-common/images/GatherCode/gather_dark.svg index d7c83695d8c2..135fc3c97683 100644 --- a/src/datascience-ui/react-common/images/GatherCode/gather_dark.svg +++ b/src/datascience-ui/react-common/images/GatherCode/gather_dark.svg @@ -1,3 +1,12 @@ - - + + + + + GatherIcon_16x + + + + + + diff --git a/src/datascience-ui/react-common/images/GatherCode/gather_light.svg b/src/datascience-ui/react-common/images/GatherCode/gather_light.svg index e04ab69b2f23..72ec63e06b65 100644 --- a/src/datascience-ui/react-common/images/GatherCode/gather_light.svg +++ b/src/datascience-ui/react-common/images/GatherCode/gather_light.svg @@ -1,3 +1,13 @@ - - + + + + + GatherIcon_16x + + + + + + +