microsoft · DavidKutu · Aug 5, 2020 · Jul 29, 2020 · Jul 31, 2020 · Jul 31, 2020
diff --git a/news/1 Enhancements/13177.md b/news/1 Enhancements/13177.md
@@ -0,0 +1 @@
+The gather icon will change and get disabled while gather is executing.
diff --git a/package.nls.json b/package.nls.json
@@ -486,7 +486,7 @@
     "DataScience.findJupyterCommandProgressCheckInterpreter": "Checking {0}.",
     "DataScience.findJupyterCommandProgressSearchCurrentPath": "Searching current path.",
     "DataScience.gatherError": "Gather internal error",
-    "DataScience.gatheredScriptDescription": "# This file was generated by the Gather Extension.\n# It requires version 2020.7.94776 (or newer) of the Python Extension.\n#\n#     The intent is that it contains only the code required to produce\n#     the same results as the cell originally selected for gathering.\n#     Please note that the Python analysis is quite conservative, so if\n#     it is unsure whether a line of code is necessary for execution, it\n#     will err on the side of including it.\n#\n# Please let us know if you are satisfied with what was gathered here:\n# https://aka.ms/gathersurvey\n\n",
+    "DataScience.gatheredScriptDescription": "# This file was generated by the Gather Extension.\n# It requires version 2020.7.94776 (or newer) of the Python Extension.\n#\n#     The intent is that it contains only the code required to produce\n#     the same results as the cell originally selected for gathering.\n#     Please note that the Python analysis is quite conservative, so if\n#     it is unsure whether a line of code is necessary for execution, it\n#     will err on the side of including it.\n#\n# Please let us know if you are satisfied with what was gathered here:\n# https://aka.ms/gatherfeedback\n\n",
     "DataScience.gatheredNotebookDescriptionInMarkdown": "## Gathered Notebook\nGathered from ```{0}```\n\n|   |   |\n|---|---|\n|&nbsp;&nbsp;&nbsp|This notebook was generated by the Gather Extension. It requires version 2020.7.94776 (or newer) of the Python Extension, please update [here](https://command:python.datascience.latestExtension). The intent is that it contains only the code and cells required to produce the same results as the cell originally selected for gathering. Please note that the Python analysis is quite conservative, so if it is unsure whether a line of code is necessary for execution, it will err on the side of including it.|\n\n**Are you satisfied with the code that was gathered?**\n\n[Yes](https://command:python.datascience.gatherquality?yes) [No](https://command:python.datascience.gatherquality?no)",
     "DataScience.savePngTitle": "Save Image",
     "DataScience.jupyterSelectURIQuickPickTitle": "Pick how to connect to Jupyter",
@@ -570,10 +570,10 @@
     "DataScienceRendererExtension.downloadCompletedOutputMessage": "Notebook Renderers extension download complete.",
     "DataScience.uriProviderDescriptionFormat": "{0} (From {1} extension)",
     "DataScience.unknownPackage": "unknown",
-    "DataScience.interactiveWindowTitle" : "Python Interactive",
-    "DataScience.interactiveWindowTitleFormat" : "Python Interactive - {0}",
-    "DataScience.interactiveWindowModeBannerTitle" : "Do you want to open a new Python Interactive window for this file? [More Information](command:workbench.action.openSettings?%5B%22python.dataScience.interactiveWindowMode%22%5D).",
-    "DataScience.interactiveWindowModeBannerSwitchYes" : "Yes",
-    "DataScience.interactiveWindowModeBannerSwitchAlways" : "Always",
-    "DataScience.interactiveWindowModeBannerSwitchNo" : "No"
+    "DataScience.interactiveWindowTitle": "Python Interactive",
+    "DataScience.interactiveWindowTitleFormat": "Python Interactive - {0}",
+    "DataScience.interactiveWindowModeBannerTitle": "Do you want to open a new Python Interactive window for this file? [More Information](command:workbench.action.openSettings?%5B%22python.dataScience.interactiveWindowMode%22%5D).",
+    "DataScience.interactiveWindowModeBannerSwitchYes": "Yes",
+    "DataScience.interactiveWindowModeBannerSwitchAlways": "Always",
+    "DataScience.interactiveWindowModeBannerSwitchNo": "No"
 }
diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts
@@ -925,7 +925,7 @@ export namespace DataScience {
     export const gatherError = localize('DataScience.gatherError', 'Gather internal error');
     export const gatheredScriptDescription = localize(
         'DataScience.gatheredScriptDescription',
-        '# This file was generated by the Gather Extension.\n# It requires version 2020.7.94776 (or newer) of the Python Extension.\n#\n#     The intent is that it contains only the code required to produce\n#     the same results as the cell originally selected for gathering.\n#     Please note that the Python analysis is quite conservative, so if\n#     it is unsure whether a line of code is necessary for execution, it\n#     will err on the side of including it.\n#\n# Please let us know if you are satisfied with what was gathered here:\n# https://aka.ms/gathersurvey\n\n'
+        '# This file was generated by the Gather Extension.\n# It requires version 2020.7.94776 (or newer) of the Python Extension.\n#\n#     The intent is that it contains only the code required to produce\n#     the same results as the cell originally selected for gathering.\n#     Please note that the Python analysis is quite conservative, so if\n#     it is unsure whether a line of code is necessary for execution, it\n#     will err on the side of including it.\n#\n# Please let us know if you are satisfied with what was gathered here:\n# https://aka.ms/gatherfeedback\n\n'
     );
     export const gatheredNotebookDescriptionInMarkdown = localize(
         'DataScience.gatheredNotebookDescriptionInMarkdown',

diff --git a/src/client/datascience/commands/commandRegistry.ts b/src/client/datascience/commands/commandRegistry.ts
@@ -397,7 +397,7 @@ export class CommandRegistry implements IDisposable {
 
     private reportGatherQuality(val: string) {
         sendTelemetryEvent(Telemetry.GatherQualityReport, undefined, { result: val[0] === 'no' ? 'no' : 'yes' });
-        env.openExternal(Uri.parse(`https://aka.ms/gathersurvey?succeed=${val[0]}`));
+        env.openExternal(Uri.parse(`https://aka.ms/gatherfeedback?succeed=${val[0]}`));
     }
 
     private openPythonExtensionPage() {

diff --git a/src/client/datascience/gather/gatherListener.ts b/src/client/datascience/gather/gatherListener.ts
@@ -74,10 +74,18 @@ export class GatherListener implements IInteractiveWindowListener {
                 break;
 
             case InteractiveWindowMessages.GatherCode:
+                this.postEmitter.fire({
+                    message: InteractiveWindowMessages.Gathering,
+                    payload: { cellId: payload.id, gathering: true }
+                });
                 this.handleMessage(message, payload, this.doGather);
                 break;
 
             case InteractiveWindowMessages.GatherCodeToScript:
+                this.postEmitter.fire({
+                    message: InteractiveWindowMessages.Gathering,
+                    payload: { cellId: payload.id, gathering: true }
+                });
                 this.handleMessage(message, payload, this.doGatherToScript);
                 break;
 
@@ -142,18 +150,32 @@ export class GatherListener implements IInteractiveWindowListener {
         }
     }
 
-    private doGather(payload: ICell): void {
-        this.gatherCodeInternal(payload).catch((err) => {
-            traceError(`Gather to Notebook error: ${err}`);
-            this.applicationShell.showErrorMessage(err);
-        });
+    private doGather(payload: ICell): Promise<void> {
+        return this.gatherCodeInternal(payload)
+            .catch((err) => {
+                traceError(`Gather to Notebook error: ${err}`);
+                this.applicationShell.showErrorMessage(err);
+            })
+            .finally(() =>
+                this.postEmitter.fire({
+                    message: InteractiveWindowMessages.Gathering,
+                    payload: { cellId: payload.id, gathering: false }
+                })
+            );
     }
 
-    private doGatherToScript(payload: ICell): void {
-        this.gatherCodeInternal(payload, true).catch((err) => {
-            traceError(`Gather to Script error: ${err}`);
-            this.applicationShell.showErrorMessage(err);
-        });
+    private doGatherToScript(payload: ICell): Promise<void> {
+        return this.gatherCodeInternal(payload, true)
+            .catch((err) => {
+                traceError(`Gather to Script error: ${err}`);
+                this.applicationShell.showErrorMessage(err);
+            })
+            .finally(() =>
+                this.postEmitter.fire({
+                    message: InteractiveWindowMessages.Gathering,
+                    payload: { cellId: payload.id, gathering: false }
+                })
+            );
     }
 
     private gatherCodeInternal = async (cell: ICell, toScript: boolean = false) => {

diff --git a/src/client/datascience/interactive-common/interactiveWindowTypes.ts b/src/client/datascience/interactive-common/interactiveWindowTypes.ts
@@ -10,6 +10,7 @@ import { DebugProtocol } from 'vscode-debugprotocol';
 import {
     CommonActionType,
     IAddCellAction,
+    IChangeGatherStatus,
     ILoadIPyWidgetClassFailureAction,
     IVariableExplorerHeight,
     LoadIPyWidgetClassLoadAction,
@@ -98,6 +99,7 @@ export enum InteractiveWindowMessages {
     StopDebugging = 'stop_debugging',
     GatherCode = 'gather_code',
     GatherCodeToScript = 'gather_code_to_script',
+    Gathering = 'gathering',
     LaunchNotebookTrustPrompt = 'launch_notebook_trust_prompt',
     TrustNotebookComplete = 'trust_notebook_complete',
     LoadAllCells = 'load_all_cells',
@@ -630,6 +632,7 @@ export class IInteractiveWindowMapping {
     public [InteractiveWindowMessages.StopDebugging]: never | undefined;
     public [InteractiveWindowMessages.GatherCode]: ICell;
     public [InteractiveWindowMessages.GatherCodeToScript]: ICell;
+    public [InteractiveWindowMessages.Gathering]: IChangeGatherStatus;
     public [InteractiveWindowMessages.LaunchNotebookTrustPrompt]: never | undefined;
     public [InteractiveWindowMessages.TrustNotebookComplete]: never | undefined;
     public [InteractiveWindowMessages.LoadAllCells]: ILoadAllCells;

diff --git a/src/client/datascience/interactive-common/synchronization.ts b/src/client/datascience/interactive-common/synchronization.ts
@@ -129,6 +129,7 @@ const messageWithMessageTypes: MessageMapping<IInteractiveWindowMapping> & Messa
     [InteractiveWindowMessages.FocusedCellEditor]: MessageType.syncWithLiveShare,
     [InteractiveWindowMessages.GatherCode]: MessageType.other,
     [InteractiveWindowMessages.GatherCodeToScript]: MessageType.other,
+    [InteractiveWindowMessages.Gathering]: MessageType.other,
     [InteractiveWindowMessages.GetAllCells]: MessageType.other,
     [InteractiveWindowMessages.ForceVariableRefresh]: MessageType.other,
     [InteractiveWindowMessages.GetVariablesRequest]: MessageType.other,

diff --git a/src/datascience-ui/history-react/interactiveCell.tsx b/src/datascience-ui/history-react/interactiveCell.tsx
@@ -195,8 +195,13 @@ export class InteractiveCell extends React.Component<IInteractiveCellProps> {
                         !this.props.settings.gatherIsInstalled
                     }
                     tooltip={getLocString('DataScience.gatherCodeTooltip', 'Gather code')}
+                    disabled={this.props.cellVM.gathering}
                 >
-                    <Image baseTheme={this.props.baseTheme} class="image-button-image" image={ImageName.GatherCode} />
+                    <Image
+                        baseTheme={this.props.baseTheme}
+                        class="image-button-image"
+                        image={this.props.cellVM.gathering ? ImageName.Sync : ImageName.GatherCode}
+                    />
                 </ImageButton>
                 <ImageButton
                     baseTheme={this.props.baseTheme}

diff --git a/src/datascience-ui/history-react/interactivePanel.less b/src/datascience-ui/history-react/interactivePanel.less
@@ -1,5 +1,5 @@
 /* Import common styles and then override them below */
-@import "../interactive-common/common.css";
+@import '../interactive-common/common.css';
 
 .toolbar-menu-bar-child {
     background: var(--override-background, var(--vscode-editor-background));
@@ -37,27 +37,26 @@
 }
 
 .cell-outer {
-    display:grid;
+    display: grid;
     grid-template-columns: auto minmax(0, 1fr) 8px;
     grid-column-gap: 3px;
     width: 100%;
 }
 
-
 .cell-output {
     margin: 0px;
     width: 100%;
     overflow-x: scroll;
     background: transparent;
 }
 
-.cell-output>div {
+.cell-output > div {
     background: var(--override-widget-background, var(--vscode-notifications-background));
 }
 
 xmp {
     margin: 0px;
-} 
+}
 
 .cell-input {
     margin: 0;
@@ -72,4 +71,4 @@ xmp {
     white-space: pre-wrap;
     word-break: break-all;
     overflow-x: hidden;
-}
+}
diff --git a/src/datascience-ui/history-react/redux/reducers/index.ts b/src/datascience-ui/history-react/redux/reducers/index.ts
@@ -71,5 +71,6 @@ export const reducerMap: Partial<IInteractiveActionMapping> = {
     [InteractiveWindowMessages.UpdateKernel]: Kernel.updateStatus,
     [SharedMessages.LocInit]: CommonEffects.handleLocInit,
     [InteractiveWindowMessages.UpdateDisplayData]: CommonEffects.handleUpdateDisplayData,
-    [InteractiveWindowMessages.HasCell]: Transfer.hasCell
+    [InteractiveWindowMessages.HasCell]: Transfer.hasCell,
+    [InteractiveWindowMessages.Gathering]: Transfer.gathering
 };
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		The gather icon will change and get disabled while gather is executing.