From 1d54c74832ad76073e481fe668b89bdb450989bb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Feb 2024 18:29:45 -0500
Subject: [PATCH] Mention VS Code supports xonsh as default shell (#5273)

* Add paragraph about support for xonsh as the default shell.

Ref #4469

Also, updated the text to use 'VS Code', which is the preferred short name.

* Add news entry.
---
 docs/editors.rst                   | 12 ++++++++----
 news/docs-4469-vs-code-support.rst | 23 +++++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 news/docs-4469-vs-code-support.rst

diff --git a/docs/editors.rst b/docs/editors.rst
index 8ca8c7996..3f76605b7 100644
--- a/docs/editors.rst
+++ b/docs/editors.rst
@@ -20,16 +20,20 @@ There is a `xonsh package`_ for **Sublime Text 4** (build > 4075). To install:
 .. _Sublime Text packages: https://www.sublimetext.com/docs/packages.html
 
 
-Visual Studio Code (VSCode)
-===========================
-There is `xonsh extension for VSCode`_. To install search "xonsh" using extensions
+Visual Studio Code (VS Code)
+============================
+There is `xonsh extension for VS Code`_. To install search "xonsh" using extensions
 menu or just press ``F1`` and run without `>` preceding:
 
 .. code-block::
 
     ext install jnoortheen.xonsh
 
-.. _xonsh extension for VSCode: https://marketplace.visualstudio.com/items?itemName=jnoortheen.xonsh
+.. https://github.com/microsoft/vscode/issues/200374
+
+Since version 1.86 of VS Code, the editor also supports loading the environment for users with xonsh as their default shell.
+
+.. _xonsh extension for VS Code: https://marketplace.visualstudio.com/items?itemName=jnoortheen.xonsh
 
 
 Emacs
diff --git a/news/docs-4469-vs-code-support.rst b/news/docs-4469-vs-code-support.rst
new file mode 100644
index 000000000..32a07430e
--- /dev/null
+++ b/news/docs-4469-vs-code-support.rst
@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* Updated docs to reflect VS Code support for xonsh as the user's default shell.
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>