Skip to content

Resolve conflicts #3928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 31, 2025
Merged

Resolve conflicts #3928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
601e140
Merge pull request #3269 from Flow-Launcher/dev
jjw24 Jun 3, 2025
7ae91b1
Release 1.20.1 | Plugin 4.6.0 (#3706)
jjw24 Jun 14, 2025
2e0dd1c
Release 1.20.2 | Plugin 4.7.0 (#3820)
jjw24 Jul 13, 2025
e1cc50c
Merge remote-tracking branch 'origin/master' into resolve_conflicts
jjw24 Aug 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Flow.Launcher.Core/Plugin/PluginInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
Expand Down Expand Up @@ -389,7 +389,7 @@
else
{
API.ShowMsg(
API.GetTranslation("updatebtn"),

Check warning on line 392 in Flow.Launcher.Core/Plugin/PluginInstaller.cs

View workflow job for this annotation

GitHub Actions / Check Spelling 

`updatebtn` is not a recognized word. (unrecognized-spelling)
API.GetTranslation("PluginsUpdateSuccessNoRestart"));
}
}
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher.Core/Resource/Internationalization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher.Infrastructure/UserSettings/Settings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Text.Json.Serialization;
using System.Windows;
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher.Infrastructure/Win32Helper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Enforce UTF-8 without BOM repo-wide to prevent regressions.

Add EditorConfig/Git attributes and verify no stray BOMs remain.

Proposed settings:

.editorconfig

root = true

[*]
end_of_line = crlf
insert_final_newline = true

[*.{cs,csproj,xaml,props,targets}]
charset = utf-8

.gitattributes

* text=auto
*.cs     text
*.xaml   text
*.csproj text
*.props  text
*.targets text

Script to spot any remaining BOMs:

🏁 Script executed:

#!/bin/bash
# Find UTF-8 BOMs at start of files (excluding build artifacts)
rg -nU --hidden -g '!**/bin/**' -g '!**/obj/**' -g '!**/.git/**' '^\xEF\xBB\xBF' || true

Length of output: 89

🏁 Script executed:

#!/bin/bash
# Check for existing EditorConfig and Git attributes files
if [ -f .editorconfig ]; then echo ".editorconfig exists"; else echo ".editorconfig missing"; fi
if [ -f .gitattributes ]; then echo ".gitattributes exists"; else echo ".gitattributes missing"; fi

Length of output: 158

🏁 Script executed:

#!/bin/bash
# Display first 50 lines of .editorconfig and verify charset setting
echo "=== .editorconfig ==="
sed -n '1,50p' .editorconfig
grep -n '^charset' .editorconfig || echo "charset setting missing"

# Display first 50 lines of .gitattributes and verify text attributes
echo
echo "=== .gitattributes ==="
sed -n '1,50p' .gitattributes
grep -n 'text=' .gitattributes || echo "text attribute entries missing"

Length of output: 4311

Update .editorconfig and .gitattributes to enforce UTF-8 without BOM

  • In .editorconfig (currently charset = utf-8-bom), change to charset = utf-8.
  • In .gitattributes, add explicit *.cs text, *.xaml text, *.csproj text, *.props text and *.targets text entries alongside * text=auto.
    Rerun the BOM detection script to confirm no stray BOMs remain.
🧰 Tools
🪛 GitHub Actions: Check Spelling

[warning] Spell check warnings: Unrecognized words detected: Dwm, PInvoke, DWMWINDOWATTRIBUTE, DWMWA, SYSTEMBACKDROP, DWMSBT, TRANSIENTWINDOW, MAINWINDOW, TABBEDWINDOW, DWMWCP, DONOTROUND, ROUNDSMALL, GWL, toolbar, Wnd, WINTAB, Progman, WORKERW, SHELLDLL, hkl, LCIDTo, nqo, tsf, DWord, regionlanguage, Noto, noto, uxtheme.

🤖 Prompt for AI Agents 
Flow.Launcher.Infrastructure/Win32Helper.cs around lines 1 to 1: repository
.editorconfig currently sets charset = utf-8-bom and .gitattributes lacks
explicit text entries for some source types, causing stray BOMs; update
.editorconfig to set charset = utf-8 (no BOM), add the following entries to
.gitattributes alongside "* text=auto": "*.cs text", "*.xaml text", "*.csproj
text", "*.props text", "*.targets text", then re-save any affected files
(including Flow.Launcher.Infrastructure/Win32Helper.cs) encoded as UTF-8 without
BOM and rerun the BOM detection script to confirm no BOMs remain.

using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
Expand Down Expand Up @@ -43,7 +43,7 @@
{
var cloaked = cloak ? 1 : 0;

return PInvoke.DwmSetWindowAttribute(

Check warning on line 46 in Flow.Launcher.Infrastructure/Win32Helper.cs

View workflow job for this annotation

GitHub Actions / Check Spelling 

`Dwm` is not a recognized word. (unrecognized-spelling)
GetWindowHandle(window),
DWMWINDOWATTRIBUTE.DWMWA_CLOAK,
&cloaked,
Expand All @@ -55,12 +55,12 @@
var backdropType = backdrop switch
{
BackdropTypes.Acrylic => DWM_SYSTEMBACKDROP_TYPE.DWMSBT_TRANSIENTWINDOW,
BackdropTypes.Mica => DWM_SYSTEMBACKDROP_TYPE.DWMSBT_MAINWINDOW,

Check warning on line 58 in Flow.Launcher.Infrastructure/Win32Helper.cs

View workflow job for this annotation

GitHub Actions / Check Spelling 

`SYSTEMBACKDROP` is not a recognized word. (unrecognized-spelling)

Check warning on line 58 in Flow.Launcher.Infrastructure/Win32Helper.cs

View workflow job for this annotation

GitHub Actions / Check Spelling 

`DWMSBT` is not a recognized word. (unrecognized-spelling)
BackdropTypes.MicaAlt => DWM_SYSTEMBACKDROP_TYPE.DWMSBT_TABBEDWINDOW,

Check warning on line 59 in Flow.Launcher.Infrastructure/Win32Helper.cs

View workflow job for this annotation

GitHub Actions / Check Spelling 

`SYSTEMBACKDROP` is not a recognized word. (unrecognized-spelling)

Check warning on line 59 in Flow.Launcher.Infrastructure/Win32Helper.cs

View workflow job for this annotation

GitHub Actions / Check Spelling 

`DWMSBT` is not a recognized word. (unrecognized-spelling)
_ => DWM_SYSTEMBACKDROP_TYPE.DWMSBT_AUTO

Check warning on line 60 in Flow.Launcher.Infrastructure/Win32Helper.cs

View workflow job for this annotation

GitHub Actions / Check Spelling 

`SYSTEMBACKDROP` is not a recognized word. (unrecognized-spelling)

Check warning on line 60 in Flow.Launcher.Infrastructure/Win32Helper.cs

View workflow job for this annotation

GitHub Actions / Check Spelling 

`DWMSBT` is not a recognized word. (unrecognized-spelling)
};

return PInvoke.DwmSetWindowAttribute(

Check warning on line 63 in Flow.Launcher.Infrastructure/Win32Helper.cs

View workflow job for this annotation

GitHub Actions / Check Spelling 

`PInvoke` is not a recognized word. (unrecognized-spelling)

Check warning on line 63 in Flow.Launcher.Infrastructure/Win32Helper.cs

View workflow job for this annotation

GitHub Actions / Check Spelling 

`Dwm` is not a recognized word. (unrecognized-spelling)
GetWindowHandle(window),
DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE,
&backdropType,
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel;
using System.Linq;
using System.Media;
Expand Down Expand Up @@ -818,7 +818,7 @@

public void UpdatePosition()
{
// Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910

Check failure on line 821 in Flow.Launcher/MainWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / Check Spelling 

`work around` matches a line_forbidden.patterns entry: `\bwork[- ]arounds?\b`. (forbidden-pattern)
if (_viewModel.IsDialogJumpWindowUnderDialog())
{
InitializeDialogJumpPosition();
Expand All @@ -842,7 +842,7 @@

private void InitializePosition()
{
// Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910

Check failure on line 845 in Flow.Launcher/MainWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / Check Spelling 

`work around` matches a line_forbidden.patterns entry: `\bwork[- ]arounds?\b`. (forbidden-pattern)
InitializePositionInner();
InitializePositionInner();
return;
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher/PublicAPIInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Collections.Specialized;
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher/Resources/CustomControlTemplate.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ResourceDictionary
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mdagif="clr-namespace:MdXaml.AnimatedGif;assembly=MdXaml.AnimatedGif"
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ui:Page
<ui:Page
x:Class="Flow.Launcher.SettingPages.Views.SettingsPanePluginStore"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Flow.Launcher.Plugin.BrowserBookmark/Helper/FaviconHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using SkiaSharp;
using Svg.Skia;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Library</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Quick sanity check for any remaining BOMs.
Run this repo-safe scan; fails if any tracked file still starts with a UTF‑8 BOM.

🏁 Script executed:

#!/bin/bash
set -euo pipefail
python - <<'PY'
import subprocess, sys
files = subprocess.check_output(['git','ls-files']).decode().splitlines()
bad=[]
for f in files:
    try:
        with open(f,'rb') as fh:
            if fh.read(3) == b'\xef\xbb\xbf':
                bad.append(f)
    except Exception:
        pass
if bad:
    print("Files starting with UTF-8 BOM:", len(bad))
    print("\n".join(bad))
    sys.exit(1)
print("OK: No UTF-8 BOM at file starts detected.")
PY

Length of output: 38918

Remove UTF-8 BOM from all tracked files
706 files still start with a UTF-8 BOM; strip the BOM from each file (e.g. via dos2unix --keepdate --remove-bom) to satisfy the sanity check.

🤖 Prompt for AI Agents 
In Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs around
lines 1 to 1 the file begins with a UTF-8 BOM (byte order mark); remove the BOM
so the file starts with the "#nullable enable" text only. Open the file in an
editor that can save without BOM or run a tool like dos2unix --remove-bom (or
dos2unix --keepdate --remove-bom) on the file, verify it no longer contains the
BOM, then save and recommit the file so the sanity check passes.


namespace Flow.Launcher.Plugin.Explorer.ViewModels
{
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<UserControl
<UserControl
x:Class="Flow.Launcher.Plugin.Explorer.Views.PreviewPanel"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Flow.Launcher.Plugin.Shell/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
Expand Down
Loading