From 72d92413a2d7c88e3b63e3fcc5963f70eb1c3d3a Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 17 Mar 2021 14:27:30 -0400 Subject: [PATCH] Upgrade check-spelling to 0.0.17-alpha (#10173) * spelling: snapped Signed-off-by: Josh Soref * spelling: split Signed-off-by: Josh Soref * ci: update to Spell check to 0.0.17a In the past, plurals `foo`+`s` and past tenses `foo`+`ed` were automatically tolerated. This turned out to be a bad design choice on my part. The basic example is that `potatos` would sometimes be treated as a mistake and sometimes not (depending on the presence of `potato`). You can see in this PR, that this logic resulted in `SNAPED` being accepted as a word along with `actioned` -- there's nothing intrinsically wrong w/ the latter, but unfortunately in order to screen out the former, my shortcut just couldn't stick around. This means that the `expect` files will grow perhaps by a tiny bit, but as you can see, not really by much. When GitHub initially introduced GitHub Actions, the event for `pull_request` was created without enough permission for a tool like this to work properly. I worked around that by using the `schedule` event. In 2020, they introduced a replacement event `pull_request_target` which has enough permission. This means that I can stop relying on the `schedule` event. --- .github/actions/spell-check/excludes.txt | 18 ++- .github/actions/spell-check/expect.txt | 126 ++++-------------- .github/actions/spell-check/patterns.txt | 20 ++- .github/workflows/spelling.yml | 22 +-- src/modules/launcher/Wox.Plugin/Query.cs | 4 +- src/modules/shortcut_guide/overlay_window.cpp | 36 ++--- 6 files changed, 88 insertions(+), 138 deletions(-) diff --git a/.github/actions/spell-check/excludes.txt b/.github/actions/spell-check/excludes.txt index 22c9a4820c..f67ef73b90 100644 --- a/.github/actions/spell-check/excludes.txt +++ b/.github/actions/spell-check/excludes.txt @@ -1,3 +1,13 @@ +# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes +(?:^|/)(?i)COPYRIGHT +(?:^|/)(?i)LICEN[CS]E +(?:^|/)package(?:-lock)\.json$ +(?:^|/)vendor/ +/package(?:-lock|)\.json$ +/pinyindb/ +/settings-html/ +ignore$ +[/.][a-z]{2}(?:-[a-zA-Z]{2}|)\. \.ai$ \.bmp$ \.dat$ @@ -7,13 +17,13 @@ \.ico$ \.jpg$ \.lcl$ +\.lock$ +\.min\. +\.mod$ \.pdf$ \.png$ \.PNG$ \.woff$ \.zip$ +^\.github/ ^\.github/actions/spell-check/ -/package(?:-lock|)\.json$ -/pinyindb/ -/settings-html/ -[/.][a-z]{2}(?:-[a-zA-Z]{2}|)\. diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index 7d0d417e86..436038accd 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -3,13 +3,10 @@ AAD abcd abcdef abcdefgh -ABCDEFGHIJKLMNOPQRSTUVWXYZ abgr ABlocked Abug -acb accctrl -accd Acceleratorkeys ACCEPTFILES accessibile @@ -20,13 +17,14 @@ AColumn acos acrt Actioncenter +actioned activatable ACTIVATEAPP -activationaction Addavirtualdesktop Addins ADDUNDORECORD ADifferent +ADMINS adopsinsider advapi advfirewall @@ -53,7 +51,6 @@ AMirror AModifier anges ansicolor -ansicpg antialiased ANull AOC @@ -121,7 +118,6 @@ aumid AUTHN AUTOAPPEND autocomplete -autogenerated autogenerates AUTOHIDE AUTOMATIONPROPERTIES @@ -131,18 +127,14 @@ autoupdate AValid azurecr azurewebsites -baae -baccda backend backtracer bak -bbe bbwe bc bcc bck Bcl -bddac BEGINLABELEDIT betadele betsegaw @@ -172,6 +164,7 @@ bms BNumber Bokm BOKMAL +Bools bootstrapper BOTTOMALIGN BPBF @@ -181,7 +174,6 @@ bricelam BRIGHTGREEN Browsable bsd -BSODs bstr BText bti @@ -203,7 +195,6 @@ Captureascreenshot CAPTURECHANGED CASESENSITIVE CAtl -cbfbad CCDDEE ccf cch @@ -211,15 +202,12 @@ CCom CContext CDATA CDBECF -cde cdecl CDeclaration cdpx cdpxwin CENTERALIGN cfg -changecursor -Changemove charconv charset chdir @@ -238,7 +226,6 @@ chrono chrzan CHT CImage -cimv cinttypes cla clangformat @@ -262,12 +249,12 @@ CMDARG cmder Cmdlet cmdline +Cmds CMIC CMINVOKECOMMANDINFO CMINVOKECOMMANDINFOEX CMock CMONITORS -cmpr cmyk cn cnt @@ -275,13 +262,10 @@ coclass codebase codecvt codeofconduct -codeql codereview Codespaces COINIT colorconv -colorhistory -colorhistorylimit colorpicker colorpickerref COLORREF @@ -318,7 +302,6 @@ CONTROLL CONTROLPARENT Controlz coords -copiedcolorrepresentation COPYDATASTRUCT corehr cortana @@ -348,7 +331,6 @@ critsec crlf CRM crmcustomerinsightsapp -cron CRSEL crutkas CSearch @@ -371,12 +353,12 @@ ctime CTLCOLORSTATIC ctor CTRLALTDEL +Ctrls Ctx CUI currentculture CURSORINFO cursorpos -customaction CUSTOMACTIONTEST cvd cw @@ -428,8 +410,6 @@ DEFAULTTONEAREST DEFAULTTONULL DEFAULTTOPRIMARY DEFERERASE -deff -deflang DEFPUSHBUTTON deinitialization DELA @@ -454,7 +434,6 @@ DEU Devagya devblogs devdocs -devenv df DFactory Dialpad @@ -555,7 +534,7 @@ EBE EBEC EBEE EBEF -ebf +EBF EBFC ECAA ECAB @@ -568,6 +547,7 @@ ECDC ECDE ECDF ECEB +ECED ECEE ecef ECFE @@ -628,7 +608,7 @@ EFBA EFC EFDA EFDE -efe +EFE EFEB EFFC EFFE @@ -647,6 +627,7 @@ endregion Enque ENTERSIZEMOVE Entireitemname +Entitlements entrypoint ENU enum @@ -664,7 +645,6 @@ ERRORTITLE esize estdir etcore -etcoreapp etl etw EUQ @@ -711,12 +691,9 @@ FANCYZONESEDITOR Farbraum FARPROC Favicon -fcharset fd -fda feimage ffcd -ffd FFDDDDDD fff figcaption @@ -741,13 +718,11 @@ Fle fluentui flyout fmtlib -fnil fody FOF FOFX FOLDERID folderpath -fonttbl FORCEOFFLINE foreach formatetc @@ -776,8 +751,6 @@ gdi gdiplus GDISCALED generatesqlfromuserquery -getancestor -getasynckeystate GETDISPINFO GETDLGCODE GETEMPTYMARKUP @@ -806,7 +779,6 @@ GUITHREADINFO GValue gwl GWLP -gwmi HACCEL hangeul hanja @@ -921,7 +893,6 @@ IComparer ICONERROR ICONINFORMATION ICONQUESTION -Iconsempty Iconset IContext ICONWARNING @@ -971,7 +942,6 @@ Iindex IInitialize IInput IInspectable -IIO IItem IJson IList @@ -979,7 +949,6 @@ ILogon IMAGEHLP imageresizer IMAGERESIZEREXT -imageresizersettings IMain IMarkdown ime @@ -1010,7 +979,6 @@ inout INPC inprivate inproc -inputdev INPUTHARDWARE INPUTKEYBOARD INPUTLANGCHANGED @@ -1054,7 +1022,6 @@ IPlugin IPower ipp IPreview -ipreviewhandler ipreviewhandlertranslateaccelerator ipreviewhandlervisualssetfont IPrincipal @@ -1079,7 +1046,6 @@ IShell ISingle ismethod isocpp -issuecomment IStorage IStream istreambuf @@ -1095,7 +1061,6 @@ ith IThrottled IThumbnail ITrigger -itsme IUI IUnknown IUri @@ -1112,7 +1077,6 @@ IZoom JArray jarro Jarryd -javascript jfif jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi jjw @@ -1123,7 +1087,6 @@ jpeg jpg JPN json -JSONOf jsonval jsx junja @@ -1268,6 +1231,7 @@ LVHT LVIF LVIS LVN +LVS LVSIL LWA lwin @@ -1309,7 +1273,6 @@ Mensching menuitem MENUITEMINFO MENUITEMINFOW -menurc messagebox messageboxes METACHARSET @@ -1363,7 +1326,7 @@ msclr mscoree mscorlib msdata -msdn +MSDN msedge mshtmdid msi @@ -1415,7 +1378,7 @@ NCMBUTTONDOWN NCMBUTTONUP NCMOUSELEAVE NCMOUSEMOVE -ncol +NCol NCPAINT NCRBUTTONDBLCLK NCRBUTTONDOWN @@ -1427,7 +1390,6 @@ NESW netcore netcoreapp netframework -NETFX netsh netstandard Neue @@ -1435,8 +1397,7 @@ newcolor newitem newpath newrow -newtonsoft -nf +Newtonsoft niels nielslaute NIF @@ -1497,7 +1458,6 @@ npmjs npos NResize ntdll -NTFS NTSTATUS nuget nullopt @@ -1528,9 +1488,7 @@ oldpath oldtheme oleaut OLECHAR -oledb -oledbcommand -oledbconnection +OLEDB OLIVEGREEN OLogo Onboarding @@ -1555,15 +1513,12 @@ ostringstream OSVERSIONINFOEXW osx otating -ouicompat OUTOFCONTEXT OUTOFMEMORY Outptr outro -outsettings OVERLAPPEDWINDOW overlaywindow -owidctlpar OWNDC PACL PAINTSTRUCT @@ -1580,7 +1535,6 @@ PARENTRELATIVEPARSING parray PARTIALCONFIRMATIONDIALOGTITLE pathcch -pavelzw pb pbc Pbgra @@ -1671,7 +1625,7 @@ PREMULTIPLIED prevhost previewer PREVIEWGROUP -previewhandlerframeinfo +PREVIEWHANDLERFRAMEINFO previewpane PREVIOUSVERSIONSINSTALLED prevpane @@ -1681,7 +1635,6 @@ PRINTCLIENT printf Printfax prm -proactively PROCESSKEY PRODUCTVERSION Progman @@ -1728,10 +1681,8 @@ qianlifeng qit QITAB QITABENT -qryidx Queryable QUERYENDSESSION -queryfocus QUERYOPEN QUEUESYNC qwertyuiopasdfghjklzxcvbnm @@ -1759,6 +1710,7 @@ READWRITE RECTDESTINATION RECTL rectp +rects recyclebin redirectedfrom refactor @@ -1794,16 +1746,15 @@ rescap resgen resheader Resizable +resizers resmimetype RESOURCEID -resourcemanager RESTORESIZE RESTORETOMAXIMIZED restrictedcapabilities resultlist resw resx -returnvalue retval rexit rfind @@ -1815,7 +1766,6 @@ Rgn rgs rhs ricardosantos -Riched Richtext RIGHTSCROLLBAR riid @@ -1864,7 +1814,6 @@ SAMESHORTCUTPREVIOUSLYMAPPED SAVEFAILED scancode scanled -Schd Scn SCOPEID screenshot @@ -1876,15 +1825,12 @@ sdk SDKDDK searchbox SEARCHFOR -searchqueryhelper SEARCHREPLACEGROUP searchterm Secur -securityoverview -segoe +Segoe Sekan SENDCHANGE -sendinput sendvirtualinput serializationexception serializer @@ -1896,7 +1842,6 @@ SETFOCUS SETFOREGROUND SETICON setlocal -setnt SETRANGE Setrect SETREDRAW @@ -1905,10 +1850,8 @@ SETTEXT SETTINGCHANGE settingsheader settingshotkeycontrol -settingsui settingsv Setttings -setwindowpos SETWORKAREA sfgao SFGAOF @@ -1941,18 +1884,15 @@ SHORTCUTSTARTWITHMODIFIER Shortcuttool shortdate SHORTPATH -showcolorname SHOWDEFAULT SHOWELEVATIONPROMPT SHOWMAXIMIZED SHOWMINIMIZED SHOWNA SHOWNORMAL -showwindow +SHOWWINDOW shtypes sid -sideload -sideloading sidepanel siex SIGABRT @@ -1983,7 +1923,7 @@ sln SLogo SMALLICON SMTO -snd +Snd somil SORTDOWN SOURCECLIENTAREAONLY @@ -1994,7 +1934,6 @@ spdth spec'ing spesi spinbuttonref -splitee splitwstring spoprod spsi @@ -2028,7 +1967,7 @@ STARTUPINFOEX STARTUPINFOW startupscreen STATEIMAGEMASK -statflag +STATFLAG STATICEDGE STATSTG stdafx @@ -2095,10 +2034,9 @@ SYSCOLORCHANGE SYSCOMMAND SYSDEADCHAR SYSICONINDEX -sysinfo SYSKEY syskeydown -syskeyup +SYSKEYUP syslog SYSMENU systemd @@ -2130,7 +2068,6 @@ tcscpy TCustom td TDevice -technet Telemarketer Templated templatenamespace @@ -2145,7 +2082,6 @@ textblock textbox TEXTINCLUDE textref -tf TFVC tga thead @@ -2171,7 +2107,6 @@ toggleref toggleright toggleswitch toolbar -Toolchain toolset tooltip toolwindow @@ -2184,7 +2119,6 @@ towupper tracelogging traies TRAYMOUSEMESSAGE -TRCA TRK trl truetype @@ -2210,10 +2144,8 @@ Tz UAC UAL uap -ubuntu udit UIA -uiauto Uid uifabric uifabricicons @@ -2261,7 +2193,6 @@ unremapped unsubscribe Unsync Untag -upd Updatelayout UPDOWNKEYDROPSLIST UPGRADINGPRODUCTCODE @@ -2311,17 +2242,14 @@ VFT vh vid viewbox -viewkind viewmodel virtualization -visiblecolorformats Visibletrue Visio visualbrush visualstudio vk VKey -VKTAB vm vmax vmin @@ -2359,7 +2287,6 @@ wcslen wcsncmp wcsnicmp wdp -wds wdupenv weakme webapp @@ -2383,7 +2310,6 @@ wikipedia wil wildcards winapi -winauto wincolor windef windevbuildagents @@ -2408,7 +2334,6 @@ Winhook winkey WINL winmd -winmsg winnt winres winrt @@ -2417,8 +2342,6 @@ winsdkver winspool winstore winui -winuser -winver winxamlmanager withinrafael Withscript @@ -2454,7 +2377,6 @@ wprintf wprp wregex WResize -wrl wsf wsh wsl @@ -2465,7 +2387,6 @@ wstringstream wsz WTS WTSAT -wtypes wu Wwan www @@ -2476,7 +2397,6 @@ xaml XAngle XAttribute xbf -XBind XBUTTON XBUTTONDBLCLK XBUTTONDOWN @@ -2502,7 +2422,7 @@ XStr XToolset xunit XY -yaml +Yaml YAngle YDiff YESNO diff --git a/.github/actions/spell-check/patterns.txt b/.github/actions/spell-check/patterns.txt index feea6756e0..385cda1c05 100644 --- a/.github/actions/spell-check/patterns.txt +++ b/.github/actions/spell-check/patterns.txt @@ -1,11 +1,25 @@ +# 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 ://github\.(?:com|blog)/[^\w")]+ +(?:\[[0-9a-f]+\]\(https:/|)/github\.com/[^/]+/[^/]+/[^/]+/[0-9a-f]+(?:[-0-9a-zA-Z/#.]*|)\b +# githubusercontent ://githubusercontent\.com/[^\w")]+ +# gist github +/gist\.github\.com/[^/]+/[0-9a-f]+ + +# msdn +\b(?:download\.visualstudio|docs|msdn)\.microsoft\.com/[-_a-zA-Z0-9()=./]* + data:[a-zA-Z=;,/0-9+-]+ 0x[0-9a-fA-F](?:\.[0-9a-fA-F]*|)[pP] (?:0[Xx]|U\+|#)[a-f0-9A-FGgRr]{2,}[Uu]?[Ll]{0,2}\b -[{"][0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}[}"] -\b([A-Za-z])\1{3,}\b +# uuid: +[-<({"'>][0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}[<'"})>] + +# ignore long runs of a single character: +\b([A-Za-z])\g{-1}{3,}\b (?:L"[abAB]+", ){3}L"[abAB]+" "Lorem[^"]+?\." TestCase\("[^"]+" @@ -45,3 +59,5 @@ TestCase\("[^"]+" # marker for ignoring a comment to the end of the line ^.*/\* #no-spell-check-line \*/.*$ // #no-spell-check.*$ + +http://tes/ diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index 3174c7c1dd..e1a4335cbb 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -1,20 +1,24 @@ name: Spell checking on: + pull_request_target: push: - schedule: - # * is a special character in YAML so you have to quote this string - - cron: '15 * * * *' jobs: build: name: Spell checking runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.0.0 + - name: checkout-merge + if: "contains(github.event_name, 'pull_request')" + uses: actions/checkout@v2.0.0 + with: + ref: refs/pull/${{github.event.pull_request.number}}/merge + fetch-depth: 5 + - name: checkout + if: "!contains(github.event_name, 'pull_request')" + uses: actions/checkout@v2.0.0 with: fetch-depth: 5 - - uses: check-spelling/check-spelling@0.0.16-alpha - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - bucket: .github/actions - project: spell-check + - uses: check-spelling/check-spelling@0.0.17-alpha + with: + config: .github/actions/spell-check diff --git a/src/modules/launcher/Wox.Plugin/Query.cs b/src/modules/launcher/Wox.Plugin/Query.cs index 99d850ebaa..99c2965ae4 100644 --- a/src/modules/launcher/Wox.Plugin/Query.cs +++ b/src/modules/launcher/Wox.Plugin/Query.cs @@ -68,7 +68,7 @@ namespace Wox.Plugin private ReadOnlyCollection _terms; /// - /// Gets the raw query splited into a string array. + /// Gets the raw query split into a string array. /// public ReadOnlyCollection Terms { @@ -89,7 +89,7 @@ namespace Wox.Plugin } /// - /// Query can be splited into multiple terms by whitespace + /// Query can be split into multiple terms by whitespace /// public const string TermSeparator = " "; diff --git a/src/modules/shortcut_guide/overlay_window.cpp b/src/modules/shortcut_guide/overlay_window.cpp index 4e04af5459..0d07c4c191 100644 --- a/src/modules/shortcut_guide/overlay_window.cpp +++ b/src/modules/shortcut_guide/overlay_window.cpp @@ -32,12 +32,12 @@ namespace UNKNOWN, MINIMIZED, MAXIMIZED, - SNAPED_TOP_LEFT, - SNAPED_LEFT, - SNAPED_BOTTOM_LEFT, - SNAPED_TOP_RIGHT, - SNAPED_RIGHT, - SNAPED_BOTTOM_RIGHT, + SNAPPED_TOP_LEFT, + SNAPPED_LEFT, + SNAPPED_BOTTOM_LEFT, + SNAPPED_TOP_RIGHT, + SNAPPED_RIGHT, + SNAPPED_BOTTOM_RIGHT, RESTORED }; @@ -78,17 +78,17 @@ namespace bool bottom_right = monitor.rcWork.bottom == rect.bottom && monitor.rcWork.right == rect.right; if (top_left && bottom_left) - return SNAPED_LEFT; + return SNAPPED_LEFT; if (top_left) - return SNAPED_TOP_LEFT; + return SNAPPED_TOP_LEFT; if (bottom_left) - return SNAPED_BOTTOM_LEFT; + return SNAPPED_BOTTOM_LEFT; if (top_right && bottom_right) - return SNAPED_RIGHT; + return SNAPPED_RIGHT; if (top_right) - return SNAPED_TOP_RIGHT; + return SNAPPED_TOP_RIGHT; if (bottom_right) - return SNAPED_BOTTOM_RIGHT; + return SNAPPED_BOTTOM_RIGHT; return RESTORED; } @@ -900,37 +900,37 @@ void D2DOverlayWindow::render(ID2D1DeviceContext5* d2d_dc) up_disabled = true; down = GET_RESOURCE_STRING(IDS_RESTORE); break; - case SNAPED_TOP_LEFT: + case SNAPPED_TOP_LEFT: left = GET_RESOURCE_STRING(IDS_SNAP_UPPER_RIGHT); right = GET_RESOURCE_STRING(IDS_SNAP_UPPER_RIGHT); up = GET_RESOURCE_STRING(IDS_MAXIMIZE); down = GET_RESOURCE_STRING(IDS_SNAP_LEFT); break; - case SNAPED_LEFT: + case SNAPPED_LEFT: left = GET_RESOURCE_STRING(IDS_SNAP_RIGHT); right = GET_RESOURCE_STRING(IDS_RESTORE); up = GET_RESOURCE_STRING(IDS_SNAP_UPPER_LEFT); down = GET_RESOURCE_STRING(IDS_SNAP_LOWER_LEFT); break; - case SNAPED_BOTTOM_LEFT: + case SNAPPED_BOTTOM_LEFT: left = GET_RESOURCE_STRING(IDS_SNAP_LOWER_RIGHT); right = GET_RESOURCE_STRING(IDS_SNAP_LOWER_RIGHT); up = GET_RESOURCE_STRING(IDS_SNAP_LEFT); down = GET_RESOURCE_STRING(IDS_MINIMIZE); break; - case SNAPED_TOP_RIGHT: + case SNAPPED_TOP_RIGHT: left = GET_RESOURCE_STRING(IDS_SNAP_UPPER_LEFT); right = GET_RESOURCE_STRING(IDS_SNAP_UPPER_LEFT); up = GET_RESOURCE_STRING(IDS_MAXIMIZE); down = GET_RESOURCE_STRING(IDS_SNAP_RIGHT); break; - case SNAPED_RIGHT: + case SNAPPED_RIGHT: left = GET_RESOURCE_STRING(IDS_RESTORE); right = GET_RESOURCE_STRING(IDS_SNAP_LEFT); up = GET_RESOURCE_STRING(IDS_SNAP_UPPER_RIGHT); down = GET_RESOURCE_STRING(IDS_SNAP_LOWER_RIGHT); break; - case SNAPED_BOTTOM_RIGHT: + case SNAPPED_BOTTOM_RIGHT: left = GET_RESOURCE_STRING(IDS_SNAP_LOWER_LEFT); right = GET_RESOURCE_STRING(IDS_SNAP_LOWER_LEFT); up = GET_RESOURCE_STRING(IDS_SNAP_RIGHT);