From 5deeb3bba4a2e644e2cefc0d853acf4ea070de35 Mon Sep 17 00:00:00 2001
From: Ian Huff <ian.huff@gmail.com>
Date: Thu, 20 Feb 2020 13:58:36 -0800
Subject: [PATCH] add kernel connection sys info string

---
 news/2 Fixes/9132.md                                 |  1 +
 package.nls.json                                     |  1 +
 src/client/common/utils/localize.ts                  |  1 +
 .../interactive-common/interactiveBase.ts            | 12 ++++++++++--
 .../interactive-common/interactiveWindowTypes.ts     |  3 ++-
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 news/2 Fixes/9132.md

diff --git a/news/2 Fixes/9132.md b/news/2 Fixes/9132.md
new file mode 100644
index 000000000000..e7b32a58069f
--- /dev/null
+++ b/news/2 Fixes/9132.md	
@@ -0,0 +1 @@
+Have sys info show that we have connected to an existing server.
\ No newline at end of file
diff --git a/package.nls.json b/package.nls.json
index a0f3388551bf..d3dde7184731 100644
--- a/package.nls.json
+++ b/package.nls.json
@@ -178,6 +178,7 @@
     "DataScience.pythonVersionHeader": "Python version:",
     "DataScience.pythonRestartHeader": "Restarted kernel:",
     "DataScience.pythonNewHeader": "Started new kernel:",
+    "DataScience.pythonConnectHeader": "Connected to kernel:",
     "DataScience.executingCodeFailure": "Executing code failed : {0}",
     "DataScience.inputWatermark": "Type code here and press shift-enter to run",
     "DataScience.deleteButtonTooltip": "Remove cell",
diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts
index f1f1951f9641..167f970d0116 100644
--- a/src/client/common/utils/localize.ts
+++ b/src/client/common/utils/localize.ts
@@ -409,6 +409,7 @@ export namespace DataScience {
     export const pythonVersionHeader = localize('DataScience.pythonVersionHeader', 'Python Version:');
     export const pythonRestartHeader = localize('DataScience.pythonRestartHeader', 'Restarted Kernel:');
     export const pythonNewHeader = localize('DataScience.pythonNewHeader', 'Started new kernel:');
+    export const pythonConnectHeader = localize('DataScience.pythonConnectHeader', 'Connected to kernel:');
 
     export const jupyterSelectURIPrompt = localize(
         'DataScience.jupyterSelectURIPrompt',
diff --git a/src/client/datascience/interactive-common/interactiveBase.ts b/src/client/datascience/interactive-common/interactiveBase.ts
index a12ae459e72e..d59512819fb5 100644
--- a/src/client/datascience/interactive-common/interactiveBase.ts
+++ b/src/client/datascience/interactive-common/interactiveBase.ts
@@ -1361,6 +1361,9 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
             case SysInfoReason.New:
                 return localize.DataScience.pythonNewHeader();
                 break;
+            case SysInfoReason.Connect:
+                return localize.DataScience.pythonConnectHeader();
+                break;
             default:
                 traceError('Invalid SysInfoReason');
                 return '';
@@ -1479,8 +1482,13 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
         }
         await this.commandManager.executeCommand(Commands.SwitchJupyterKernel, this._notebook);
     }
-    private async kernelChangeHandler(_kernel: IJupyterKernelSpec | LiveKernelModel) {
-        await this.addSysInfo(SysInfoReason.New);
+    private async kernelChangeHandler(kernel: IJupyterKernelSpec | LiveKernelModel) {
+        // Check if we are changing to LiveKernelModel
+        if (kernel.hasOwnProperty('numberOfConnections')) {
+            await this.addSysInfo(SysInfoReason.Connect);
+        } else {
+            await this.addSysInfo(SysInfoReason.New);
+        }
     }
 
     private openSettings(setting: string | undefined) {
diff --git a/src/client/datascience/interactive-common/interactiveWindowTypes.ts b/src/client/datascience/interactive-common/interactiveWindowTypes.ts
index c690e2d2b738..028aa09a9791 100644
--- a/src/client/datascience/interactive-common/interactiveWindowTypes.ts
+++ b/src/client/datascience/interactive-common/interactiveWindowTypes.ts
@@ -147,7 +147,8 @@ export enum SysInfoReason {
     Start,
     Restart,
     Interrupt,
-    New
+    New,
+    Connect
 }
 
 export interface IAddedSysInfo {