From a397e72eb0616dcaae511ef4aa1aedab70cdd050 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 27 Jul 2022 06:39:46 -0400 Subject: [PATCH] [ci]Upgrade check-spelling to v0.0.20 (#19574) --- .github/actions/spell-check/advice.md | 22 +++++++++---------- .github/actions/spell-check/excludes.txt | 2 +- .github/actions/spell-check/expect.txt | 8 ++++--- .../spell-check/line_forbidden.patterns | 11 ++++++++-- .github/actions/spell-check/patterns.txt | 6 +++++ .github/workflows/spelling2.yml | 5 ----- 6 files changed, 32 insertions(+), 22 deletions(-) diff --git a/.github/actions/spell-check/advice.md b/.github/actions/spell-check/advice.md index c83423a8ef..54f0c9b5e5 100644 --- a/.github/actions/spell-check/advice.md +++ b/.github/actions/spell-check/advice.md @@ -1,7 +1,17 @@ -
If the flagged items do not appear to be text +
If the flagged items are false positives If items relate to a ... +* binary file (or some other file you wouldn't want to check at all). + + Please add a file path to the `excludes.txt` file matching the containing file. + + File paths are Perl 5 Regular Expressions - you can [test]( +https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files. + + `^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md]( +../tree/HEAD/README.md) (on whichever branch you're using). + * well-formed pattern. If you can write a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it, @@ -12,14 +22,4 @@ https://www.regexplanet.com/advanced/perl/) yours before committing to verify it Note that patterns can't match multiline strings. -* binary file. - - Please add a file path to the `excludes.txt` file matching the containing file. - - File paths are Perl 5 Regular Expressions - you can [test]( -https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files. - - `^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md]( -../tree/HEAD/README.md) (on whichever branch you're using). -
diff --git a/.github/actions/spell-check/excludes.txt b/.github/actions/spell-check/excludes.txt index c6be09996b..959ee2d7c9 100644 --- a/.github/actions/spell-check/excludes.txt +++ b/.github/actions/spell-check/excludes.txt @@ -71,7 +71,7 @@ ignore$ ^src/modules/previewpane/UnitTests-MarkdownPreviewHandler/HelperFiles/MarkdownWithHTMLImageTag.txt$ ^tools/CleanUp_tool/CleanUp_tool\.vcxproj\.filters$ ^tools/Verification scripts/Check preview handler registration\.ps1$ -^\.github/ ^\.github/actions/spell-check/ ^\.gitmodules$ +^\Q.github/workflows/spelling2.yml\E$ ^\Q.pipelines/ESRPSigning_core.json\E$ diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index 3a4747ffe1..5f193fcc9a 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -393,7 +393,6 @@ dcomp dcompi DComposition ddf -DDLM Deact debian debugbreak @@ -978,6 +977,7 @@ IVirtual IWbem IWIC iwindow +iwr IXml IYUV IZone @@ -1292,7 +1292,6 @@ MYTZ NAMECHANGE nameof namespace -namespaceanddescendants Navassa naveensrinivasan NCACTIVATE @@ -1403,6 +1402,7 @@ NUMLOCK NUMPAD Nunavut Nusa +nushell nwc NWSE Objbase @@ -1726,7 +1726,6 @@ Rsp rst Rstrtmgr RTB -RTCS RTLREADING RTSS runas @@ -2078,6 +2077,7 @@ TYPESHORTCUT UAC UAL uap +ubuntu udit Udk Udmurtia @@ -2262,6 +2262,7 @@ winexe winforms winfx winget +wingetcreate Winhook winkey WINL @@ -2369,6 +2370,7 @@ YVYU Zabaykalsky ZEROINIT ZIndex +zipfile zonable ZONECOLOR ZONEHIGHLIGHTCOLOR diff --git a/.github/actions/spell-check/line_forbidden.patterns b/.github/actions/spell-check/line_forbidden.patterns index cd42ca310f..4ca15837cc 100644 --- a/.github/actions/spell-check/line_forbidden.patterns +++ b/.github/actions/spell-check/line_forbidden.patterns @@ -14,13 +14,20 @@ \bMicroSoft\b # s.b. another -\ban other\b +\ban[- ]other\b + +# s.b. greater than +\bgreater then\b + +# s.b. less than +\bless then\b # s.b. otherwise -\bother wise\b +\bother[- ]wise\b # s.b. nonexistent \bnon existing\b +\b[Nn]o[nt][- ]existent\b # s.b. preexisting [Pp]re-existing diff --git a/.github/actions/spell-check/patterns.txt b/.github/actions/spell-check/patterns.txt index 8d93f27f5d..7b05b48264 100644 --- a/.github/actions/spell-check/patterns.txt +++ b/.github/actions/spell-check/patterns.txt @@ -1,4 +1,5 @@ # See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns + https?://(?:(?:www\.|)youtube\.com|youtu.be)/[-a-zA-Z0-9?&=]* # GitHub SHAs \bapi.github\.com/repos/[^/]+/[^/]+/[^/]+/[0-9a-f]+\b @@ -104,7 +105,12 @@ http://tes/ # tar arguments \b(?:\\n|)tar(?:\s+-[a-zA-Z]+|\s[a-z]+)+ +# fabricbot.json +"id": "\S+" +"commentPattern": ".*" + # acceptable duplicates +# ls directory listings # /bin/ls -l output [-bcdlpsw](?:[-r][-w][-sx]){3}\s+\d+\s+(\S+)\s+\g{-1}\s+\d+\s+ # C types diff --git a/.github/workflows/spelling2.yml b/.github/workflows/spelling2.yml index 6364c5b49b..8887946da3 100644 --- a/.github/workflows/spelling2.yml +++ b/.github/workflows/spelling2.yml @@ -51,8 +51,3 @@ jobs: config: .github/actions/spell-check checkout: true task: ${{ needs.spelling.outputs.followup }} - extra_dictionaries: - cspell:filetypes/filetypes.txt - cspell:html/html.txt - cspell:css/css.txt - check_extra_dictionaries: ''