From 35e24fa31aabbbd24f62311b78478edb5f4945f1 Mon Sep 17 00:00:00 2001 From: greazer Date: Wed, 11 Mar 2020 12:54:53 -0700 Subject: [PATCH 1/5] don't include gather-specific build items --- build/webpack/webpack.extension.config.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/webpack/webpack.extension.config.js b/build/webpack/webpack.extension.config.js index 64fabb1664ef..4d0ec3f8e1d5 100644 --- a/build/webpack/webpack.extension.config.js +++ b/build/webpack/webpack.extension.config.js @@ -15,7 +15,9 @@ const existingModulesInOutDir = common.getListOfExistingModulesInOutDir(); const FileManagerPlugin = require('filemanager-webpack-plugin'); // If ENABLE_GATHER variable is defined, don't exclude the python-program-analysis pacakge. // See externals, below. -const ppaPackageList = process.env.ENABLE_GATHER ? [] : ['@msrvida/python-program-analysis']; +const ppaPackageList = process.env.ENABLE_GATHER + ? [] + : ['@msrvida/python-program-analysis', 'vscode-python-vsix', '.gather_npmrc']; const config = { mode: 'production', target: 'node', @@ -61,7 +63,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'), From a3ba064c0c20191ad87ce32fab56872677b20db0 Mon Sep 17 00:00:00 2001 From: greazer Date: Wed, 11 Mar 2020 12:54:53 -0700 Subject: [PATCH 2/5] don't include gather-specific build items --- build/webpack/webpack.extension.config.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/webpack/webpack.extension.config.js b/build/webpack/webpack.extension.config.js index 64fabb1664ef..4d0ec3f8e1d5 100644 --- a/build/webpack/webpack.extension.config.js +++ b/build/webpack/webpack.extension.config.js @@ -15,7 +15,9 @@ const existingModulesInOutDir = common.getListOfExistingModulesInOutDir(); const FileManagerPlugin = require('filemanager-webpack-plugin'); // If ENABLE_GATHER variable is defined, don't exclude the python-program-analysis pacakge. // See externals, below. -const ppaPackageList = process.env.ENABLE_GATHER ? [] : ['@msrvida/python-program-analysis']; +const ppaPackageList = process.env.ENABLE_GATHER + ? [] + : ['@msrvida/python-program-analysis', 'vscode-python-vsix', '.gather_npmrc']; const config = { mode: 'production', target: 'node', @@ -61,7 +63,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'), From 6935ff809a053871713d5a3e01a9b316bc2f076d Mon Sep 17 00:00:00 2001 From: greazer Date: Wed, 11 Mar 2020 17:16:25 -0700 Subject: [PATCH 3/5] Reverse defaults --- package.json | 8 ++++---- src/client/datascience/gather/gather.ts | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index aacf11a830f5..353a5f63b291 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": "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": "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' From 1bab72dbd027f169c399fa0374be4a847e58f9ee Mon Sep 17 00:00:00 2001 From: greazer Date: Thu, 12 Mar 2020 11:48:29 -0700 Subject: [PATCH 4/5] Don't bother changing exceptions for webpack --- build/webpack/webpack.extension.config.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build/webpack/webpack.extension.config.js b/build/webpack/webpack.extension.config.js index 4d0ec3f8e1d5..54e7c49ef16d 100644 --- a/build/webpack/webpack.extension.config.js +++ b/build/webpack/webpack.extension.config.js @@ -15,9 +15,7 @@ const existingModulesInOutDir = common.getListOfExistingModulesInOutDir(); const FileManagerPlugin = require('filemanager-webpack-plugin'); // If ENABLE_GATHER variable is defined, don't exclude the python-program-analysis pacakge. // See externals, below. -const ppaPackageList = process.env.ENABLE_GATHER - ? [] - : ['@msrvida/python-program-analysis', 'vscode-python-vsix', '.gather_npmrc']; +const ppaPackageList = process.env.ENABLE_GATHER ? [] : ['@msrvida/python-program-analysis']; const config = { mode: 'production', target: 'node', From 68c3c37b1c485f998df9f21f063bf01082c72179 Mon Sep 17 00:00:00 2001 From: greazer Date: Thu, 12 Mar 2020 13:45:02 -0700 Subject: [PATCH 5/5] Update gather icons and tweak settings desc. --- package.json | 4 ++-- .../react-common/images/GatherCode/gather_dark.svg | 13 +++++++++++-- .../images/GatherCode/gather_light.svg | 14 ++++++++++++-- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 353a5f63b291..e244ba37206d 100644 --- a/package.json +++ b/package.json @@ -1833,13 +1833,13 @@ "python.dataScience.enableGather": { "type": "boolean", "default": true, - "description": "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.", + "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": false, - "description": "If experimental gather feature is enabled, gather code to a python script rather than a notebook.", + "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/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 + + + + + + +