From b305c597ff073bf22d482f9e25f8fbd60251eed5 Mon Sep 17 00:00:00 2001
From: Jason Dent <Jason3S@users.noreply.github.com>
Date: Tue, 26 Jul 2022 19:54:57 +0200
Subject: [PATCH] fix: Support spell checking commit message (#2106)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See: [SCM: Support input box spell checking · Issue #35571 · microsoft/vscode](https://github.com/microsoft/vscode/issues/35571#issuecomment-1195219643)
---
 .../_includes/generated-docs/configuration.md |  4 +-
 package.json                                  |  3 +-
 .../_server/spell-checker-config.schema.json  |  3 +-
 packages/_server/src/config/cspellConfig.ts   | 79 ++++++++++---------
 4 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/docs/_includes/generated-docs/configuration.md b/docs/_includes/generated-docs/configuration.md
index 747783f53..118c68ebc 100644
--- a/docs/_includes/generated-docs/configuration.md
+++ b/docs/_includes/generated-docs/configuration.md
@@ -578,7 +578,7 @@ Description
     - `vscode-userdata` - Needed to spell check `.code-snippets`
 
 Default
-: [ _`"file"`_, _`"gist"`_, _`"sftp"`_, _`"untitled"`_, _`"vscode"`_, _`"vscode-notebook-cell"`_, _`"vscode-userdata"`_ ]
+: [ _`"file"`_, _`"gist"`_, _`"sftp"`_, _`"untitled"`_, _`"vscode-notebook-cell"`_, _`"vscode-scm"`_, _`"vscode-userdata"`_ ]
 
 ---
 
@@ -1396,6 +1396,6 @@ Description
 : Specify a list of file types to spell check. It is better to use `#cSpell.enableFiletypes#` to Enable / Disable checking files types.
 
 Default
-: [ _`"asciidoc"`_, _`"c"`_, _`"cpp"`_, _`"csharp"`_, _`"css"`_, _`"elixir"`_, _`"git-commit"`_, _`"go"`_, _`"graphql"`_, _`"handlebars"`_, _`"haskell"`_, _`"html"`_, _`"jade"`_, _`"java"`_, _`"javascript"`_, _`"javascriptreact"`_, _`"json"`_, _`"jsonc"`_, _`"jupyter"`_, _`"latex"`_, _`"less"`_, _`"markdown"`_, _`"php"`_, _`"plaintext"`_, _`"python"`_, _`"pug"`_, _`"restructuredtext"`_, _`"rust"`_, _`"scala"`_, _`"scss"`_, _`"swift"`_, _`"text"`_, _`"typescript"`_, _`"typescriptreact"`_, _`"vue"`_, _`"yaml"`_, _`"yml"`_ ]
+: [ _`"asciidoc"`_, _`"c"`_, _`"cpp"`_, _`"csharp"`_, _`"css"`_, _`"elixir"`_, _`"git-commit"`_, _`"go"`_, _`"graphql"`_, _`"handlebars"`_, _`"haskell"`_, _`"html"`_, _`"jade"`_, _`"java"`_, _`"javascript"`_, _`"javascriptreact"`_, _`"json"`_, _`"jsonc"`_, _`"jupyter"`_, _`"latex"`_, _`"less"`_, _`"markdown"`_, _`"php"`_, _`"plaintext"`_, _`"python"`_, _`"pug"`_, _`"restructuredtext"`_, _`"rust"`_, _`"scala"`_, _`"scss"`_, _`"scminput"`_, _`"swift"`_, _`"text"`_, _`"typescript"`_, _`"typescriptreact"`_, _`"vue"`_, _`"yaml"`_, _`"yml"`_ ]
 
 ---
diff --git a/package.json b/package.json
index a9482027d..03d6a33a6 100644
--- a/package.json
+++ b/package.json
@@ -1122,8 +1122,8 @@
               "gist",
               "sftp",
               "untitled",
-              "vscode",
               "vscode-notebook-cell",
+              "vscode-scm",
               "vscode-userdata"
             ],
             "items": {
@@ -2006,6 +2006,7 @@
               "rust",
               "scala",
               "scss",
+              "scminput",
               "swift",
               "text",
               "typescript",
diff --git a/packages/_server/spell-checker-config.schema.json b/packages/_server/spell-checker-config.schema.json
index f8b6f8d9f..0b6c481c4 100644
--- a/packages/_server/spell-checker-config.schema.json
+++ b/packages/_server/spell-checker-config.schema.json
@@ -745,8 +745,8 @@
             "gist",
             "sftp",
             "untitled",
-            "vscode",
             "vscode-notebook-cell",
+            "vscode-scm",
             "vscode-userdata"
           ],
           "items": {
@@ -1629,6 +1629,7 @@
             "rust",
             "scala",
             "scss",
+            "scminput",
             "swift",
             "text",
             "typescript",
diff --git a/packages/_server/src/config/cspellConfig.ts b/packages/_server/src/config/cspellConfig.ts
index 423dd9fc3..e46aed0ac 100644
--- a/packages/_server/src/config/cspellConfig.ts
+++ b/packages/_server/src/config/cspellConfig.ts
@@ -52,7 +52,7 @@ export interface SpellCheckerSettings extends SpellCheckerShouldCheckDocSettings
      * - `vscode-notebook-cell` - Used for validating segments of a Notebook.
      * - `vscode-userdata` - Needed to spell check `.code-snippets`
      * @scope window
-     * @default ["file", "gist", "sftp", "untitled", "vscode", "vscode-notebook-cell", "vscode-userdata"]
+     * @default ["file", "gist", "sftp", "untitled", "vscode-notebook-cell", "vscode-scm", "vscode-userdata"]
      */
     allowedSchemas?: string[];
 
@@ -589,44 +589,45 @@ interface CSpellSettingsPackageProperties extends CSpellSettings {
      * Specify a list of file types to spell check. It is better to use `#cSpell.enableFiletypes#` to Enable / Disable checking files types.
      * @uniqueItems true
      * @default [
-     *       "asciidoc",
-     *       "c",
-     *       "cpp",
-     *       "csharp",
-     *       "css",
-     *       "elixir",
-     *       "git-commit",
-     *       "go",
-     *       "graphql",
-     *       "handlebars",
-     *       "haskell",
-     *       "html",
-     *       "jade",
-     *       "java",
-     *       "javascript",
-     *       "javascriptreact",
-     *       "json",
-     *       "jsonc",
-     *       "jupyter",
-     *       "latex",
-     *       "less",
-     *       "markdown",
-     *       "php",
-     *       "plaintext",
-     *       "python",
-     *       "pug",
-     *       "restructuredtext",
-     *       "rust",
-     *       "scala",
-     *       "scss",
-     *       "swift",
-     *       "text",
-     *       "typescript",
-     *       "typescriptreact",
-     *       "vue",
-     *       "yaml",
-     *       "yml"
-     *     ]
+     *      "asciidoc",
+     *      "c",
+     *      "cpp",
+     *      "csharp",
+     *      "css",
+     *      "elixir",
+     *      "git-commit",
+     *      "go",
+     *      "graphql",
+     *      "handlebars",
+     *      "haskell",
+     *      "html",
+     *      "jade",
+     *      "java",
+     *      "javascript",
+     *      "javascriptreact",
+     *      "json",
+     *      "jsonc",
+     *      "jupyter",
+     *      "latex",
+     *      "less",
+     *      "markdown",
+     *      "php",
+     *      "plaintext",
+     *      "python",
+     *      "pug",
+     *      "restructuredtext",
+     *      "rust",
+     *      "scala",
+     *      "scss",
+     *      "scminput",
+     *      "swift",
+     *      "text",
+     *      "typescript",
+     *      "typescriptreact",
+     *      "vue",
+     *      "yaml",
+     *      "yml"
+     *  ]
      */
     enabledLanguageIds?: string[];