Skip to content

Commit 117ef26

Browse files
Merge branch 'dev' into delay-restart-2
2 parents 0c8729f + 755c09e commit 117ef26

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.github/workflows/spelling.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
steps:
7474
- name: check-spelling
7575
id: spelling
76-
uses: check-spelling/check-spelling@main
76+
uses: check-spelling/check-spelling@v0.0.22
7777
with:
7878
suppress_push_for_open_pull_request: 1
7979
checkout: true
@@ -89,12 +89,13 @@ jobs:
8989
check_extra_dictionaries: ''
9090
quit_without_error: true
9191
extra_dictionaries:
92-
cspell:software-terms/src/software-terms.txt
92+
cspell:software-terms/dict/softwareTerms.txt
9393
cspell:win32/src/win32.txt
9494
cspell:php/php.txt
9595
cspell:filetypes/filetypes.txt
9696
cspell:csharp/csharp.txt
9797
cspell:dotnet/dotnet.txt
98+
cspell:python/src/common/extra.txt
9899
cspell:python/src/python/python-lib.txt
99100
cspell:aws/aws.txt
100101
cspell:companies/src/companies.txt
@@ -113,7 +114,7 @@ jobs:
113114
# if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
114115
# steps:
115116
# - name: comment
116-
# uses: check-spelling/check-spelling@main
117+
# uses: check-spelling/check-spelling@@v0.0.22
117118
# with:
118119
# checkout: true
119120
# spell_check_this: check-spelling/spell-check-this@main
@@ -129,7 +130,7 @@ jobs:
129130
if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
130131
steps:
131132
- name: comment
132-
uses: check-spelling/check-spelling@main
133+
uses: check-spelling/check-spelling@v0.0.22
133134
with:
134135
checkout: true
135136
spell_check_this: check-spelling/spell-check-this@main
@@ -153,7 +154,7 @@ jobs:
153154
# cancel-in-progress: false
154155
# steps:
155156
# - name: apply spelling updates
156-
# uses: check-spelling/check-spelling@main
157+
# uses: check-spelling/check-spelling@v0.0.22
157158
# with:
158159
# experimental_apply_changes_via_bot: 1
159160
# checkout: true

Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ private void EnumerateFolderBookmark(JsonElement folderElement, List<Bookmark> b
5454
switch (subElement.GetProperty("type").GetString())
5555
{
5656
case "folder":
57+
case "workspace": // Edge Workspace
5758
EnumerateFolderBookmark(subElement, bookmarks, source);
5859
break;
5960
default:

Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ private static Win32 LnkProgram(string path)
313313
if (!string.IsNullOrEmpty(target) && File.Exists(target))
314314
{
315315
program.LnkResolvedPath = Path.GetFullPath(target);
316-
program.ExecutableName = Path.GetFileName(target);
316+
program.ExecutableName = Path.GetFileNameWithoutExtension(target);
317317

318318
var args = _helper.arguments;
319319
if (!string.IsNullOrEmpty(args))

0 commit comments

Comments
 (0)