Better error handling when kernel crashes due to overridden built in modules

.vscode/launch.json

@@ -193,7 +193,7 @@
             "env": {
                 "VSC_JUPYTER_CI_TEST_GREP": "", // Leave as `VSCode Notebook` to run only Notebook tests.
                 "VSC_JUPYTER_CI_TEST_INVERT_GREP": "", // Initialize this to invert the grep (exclude tests with value defined in grep).
-                "CI_PYTHON_PATH": "/home/don/samples/pySamples/crap/.venv/bin/python", // Update with path to real python interpereter used for testing.
+                "CI_PYTHON_PATH": "", // Update with path to real python interpereter used for testing.
                 "VSC_FORCE_REAL_JUPYTER": "true", // Enalbe tests that require Jupyter.
                 "VSC_JUPYTER_CI_RUN_NON_PYTHON_NB_TEST": "", // Initialize this to run tests again Julia & other kernels.
                 "VSC_JUPYTER_RUN_NB_TEST": "true", // Initialize this to run notebook tests (must be using VSC Insiders).
@@ -209,7 +209,7 @@
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": ["${workspaceFolder}/out/**/*.js", "!${workspaceFolder}/**/node_modules**/*"],
-            // "preLaunchTask": "Compile",
+            "preLaunchTask": "Compile",
             "skipFiles": ["<node_internals>/**"],
             "presentation": {
                 "group": "2_tests",

package.nls.json

@@ -441,6 +441,7 @@
     "DataScience.failedToInterruptKernel": "Failed to interrupt the Kernel.",
     "DataScience.kernelDied": "The kernel died. View Jupyter [log](command:jupyter.viewOutput) for further details. \nError: {0}...",
     "DataScience.kernelDiedWithoutError": "The kernel '{0}' died. View Jupyter [log](command:jupyter.viewOutput) for further details.",
+    "DataScience.fileSeemsToBeInterferingWithKernelStartup": "The file '{0}' seems to be overriding built in modules and interfering with the startup of the kernel. Consider renaming the file and starting the kernel again.",
     "DataScience.cannotRunCellKernelIsDead": "Cannot run cells, as the kernel '{0}' is dead.",
     "DataScience.waitingForJupyterSessionToBeIdle": "Waiting for Jupyter Session to be idle",
     "DataScience.gettingListOfKernelsForLocalConnection": "Fetching Kernels",

pythonFiles/vscode_datascience_helpers/kernel_launcher.py

@@ -11,9 +11,6 @@
 # See comment at the point of our use of Popen
 from subprocess import Popen, PIPE  # nosec
 
-from ipython_genutils.encoding import getdefaultencoding
-from ipython_genutils.py3compat import cast_bytes_py2
-
 
 def launch_kernel(
     cmd,
@@ -79,7 +76,6 @@ def launch_kernel(
 
     env = env if (env is not None) else os.environ.copy()
 
-    encoding = getdefaultencoding(prefer_stream=False)
     kwargs = kw.copy()
     main_args = dict(
         stdin=_stdin,
@@ -92,10 +88,7 @@ def launch_kernel(
 
     # Spawn a kernel.
     if sys.platform == "win32":
-        # Popen on Python 2 on Windows cannot handle unicode args or cwd
-        cmd = [cast_bytes_py2(c, encoding) for c in cmd]
         if cwd:
-            cwd = cast_bytes_py2(cwd, sys.getfilesystemencoding() or "ascii")
             kwargs["cwd"] = cwd
 
         from .win_interrupt import create_interrupt_event

src/client/common/cancellation.ts

@@ -24,11 +24,18 @@ export class CancellationError extends BaseError {
  * @param {({ defaultValue: T; token: CancellationToken; cancelAction: 'reject' | 'resolve' })} options
  * @returns {Promise<T>}
  */
-export function createPromiseFromCancellation<T>(options: {
-    defaultValue: T;
-    token?: CancellationToken;
-    cancelAction: 'reject' | 'resolve';
-}): Promise<T> {
+export function createPromiseFromCancellation<T>(
+    options:
+        | {
+              defaultValue: T;
+              token?: CancellationToken;
+              cancelAction: 'resolve';
+          }
+        | {
+              token?: CancellationToken;
+              cancelAction: 'reject';
+          }
+): Promise<T> {
     return new Promise<T>((resolve, reject) => {
         // Never resolve.
         if (!options.token) {