Array.skip 1))\n \n@@ -49,12 +49,12 @@ let private win32CheckUAC() =\n proc.WaitForExit()\n false\n else\n- trace \"FVim is elevated\"\n+ trace \"%s\" \"FVim is elevated\"\n true\n \n let private win32RegisterFileAssociation() =\n \n- trace \"registering file associations...\"\n+ trace \"%s\" \"registering file associations...\"\n \n let HKCR = Registry.ClassesRoot\n let HKLM = Registry.LocalMachine\n@@ -116,7 +116,7 @@ let private win32RegisterFileAssociation() =\n extKey.SetValue(\"\", progId)\n \n let private win32UnregisterFileAssociation() =\n- trace \"unregistering file associations...\"\n+ trace \"%s\" \"unregistering file associations...\"\n let HKCR = Registry.ClassesRoot\n let HKLM = Registry.LocalMachine\n \n@@ -145,7 +145,7 @@ let uninstall() =\n 0\n \n let daemon (port: uint16 option) (pipe: string option) {args=args; program=program; stderrenc = enc} = \n- trace \"Running as daemon.\"\n+ trace \"%s\" \"Running as daemon.\"\n let pipe = pipe |> Option.defaultValue FVimServerAddress\n trace \"FVimServerName = %s\" pipe\n let pipeArgs = \ndiff --git a/states.fs b/states.fs\nindex 983c3fe..2c2ffce 100644\n--- a/states.fs\n+++ b/states.fs\n@@ -271,7 +271,7 @@ let msg_dispatch =\n error \"rpc\" \"neovim: %s\" err\n _errormsgs.Add err\n | Exit -> \n- trace \"rpc\" \"shutting down application lifetime\"\n+ trace \"rpc\" \"%s\" \"shutting down application lifetime\"\n _appLifetime.Shutdown()\n | Crash code -> \n trace \"rpc\" \"neovim crashed with code %d\" code\ndiff --git a/theme.fs b/theme.fs\nindex 45640ac..51298f7 100644\n--- a/theme.fs\n+++ b/theme.fs\n@@ -114,11 +114,11 @@ let setDefaultColors fg bg sp =\n undercurl = false\n }\n }\n- trace \"setDefaultColors: %A %A %A\" fg bg sp\n+ (*trace \"setDefaultColors: %A %A %A\" fg bg sp*)\n \n \n let setOption (opt: UiOption) = \n- trace \"setOption: %A\" opt\n+ (*trace \"setOption: %A\" opt*)\n \n let (|FN|_|) (x: string) =\n // try to parse with 'font\\ name:hNN'\n"},"changed_files":{"kind":"list like","value":["Program.fs","ViewModels/EditorViewModel.fs","Views/Cursor.xaml.fs","Views/Editor.xaml.fs","Views/MainWindow.xaml","Views/MainWindow.xaml.fs","Views/PopupMenu.xaml.fs","log.fs","model.fs","neovim.fs","profiling/trace.nettrace","profiling/trace.speedscope.json","shell.fs","states.fs","theme.fs"],"string":"[\n \"Program.fs\",\n \"ViewModels/EditorViewModel.fs\",\n \"Views/Cursor.xaml.fs\",\n \"Views/Editor.xaml.fs\",\n \"Views/MainWindow.xaml\",\n \"Views/MainWindow.xaml.fs\",\n \"Views/PopupMenu.xaml.fs\",\n \"log.fs\",\n \"model.fs\",\n \"neovim.fs\",\n \"profiling/trace.nettrace\",\n \"profiling/trace.speedscope.json\",\n \"shell.fs\",\n \"states.fs\",\n \"theme.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86268,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":127,"string":"127"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Clean up CFBundleDocumentTypes"},"pr_body":{"kind":"string","value":"Apple has the concept of Uniform Type Identifiers[1] which allows to associate an app to a bunch of file-types at once. This commit add the `public.text` TUI to the Info.plist file and removes unneeded declarations. I didn't test all of them, but they can be added as needed\r\n\r\n[1]: https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/understanding_utis"},"base_sha":{"kind":"string","value":"7565393f2c19f9a837e79c623f8bd668a9ecedae"},"head_sha":{"kind":"string","value":"736473a7d4e15940d1c0770865e21cfa85bf31d8"},"gold_diff":{"kind":"string","value":"diff --git a/lib/Info.plist b/lib/Info.plist\nindex 6ba30ea..6b6fede 100644\n--- a/lib/Info.plist\n+++ b/lib/Info.plist\n@@ -16,1061 +16,195 @@\n <string>True</string>\n <key>CFBundleDocumentTypes</key>\n <array>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>vim</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>vim</string>\n- <key>CFBundleTypeName</key>\n- <string>Vim Script File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>txt</string>\n- <string>text</string>\n- <string>utf8</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>txt</string>\n- <key>CFBundleTypeMIMETypes</key>\n- <array>\n- <string>text/plain</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Plain Text File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>tex</string>\n- <string>sty</string>\n- <string>cls</string>\n- <string>ltx</string>\n- <string>ins</string>\n- <string>dtx</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>tex</string>\n- <key>CFBundleTypeName</key>\n- <string>TeX File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>h</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>h</string>\n- <key>CFBundleTypeName</key>\n- <string>C Header Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.c-header</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>hh</string>\n- <string>hp</string>\n- <string>hpp</string>\n- <string>hxx</string>\n- <string>h++</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>hh</string>\n- <key>CFBundleTypeName</key>\n- <string>C++ Header Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>c</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>c</string>\n- <key>CFBundleTypeName</key>\n- <string>C Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.c-source</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>m</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>c</string>\n- <key>CFBundleTypeName</key>\n- <string>Objective-C Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.objective-c-source</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>mm</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>c</string>\n- <key>CFBundleTypeName</key>\n- <string>Objective-C++ Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.objective-c-plus-plus-source</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>cc</string>\n- <string>cp</string>\n- <string>cpp</string>\n- <string>cxx</string>\n- <string>c++</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>cpp</string>\n- <key>CFBundleTypeName</key>\n- <string>C++ Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.c-plus-plus-source</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>s</string>\n- <string>asm</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>asm</string>\n- <key>CFBundleTypeName</key>\n- <string>Assembly Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.assembler-source</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>java</string>\n- <string>jav</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>java</string>\n- <key>CFBundleTypeName</key>\n- <string>Java Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>com.sun.java-source</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>l</string>\n- <string>lm</string>\n- <string>lmm</string>\n- <string>lpp</string>\n- <string>lxx</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>l</string>\n- <key>CFBundleTypeName</key>\n- <string>Lex Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.lex-source</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>y</string>\n- <string>ym</string>\n- <string>ymm</string>\n- <string>ypp</string>\n- <string>yxx</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>y</string>\n- <key>CFBundleTypeName</key>\n- <string>Yacc Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.yacc-source</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>pas</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>pas</string>\n- <key>CFBundleTypeName</key>\n- <string>Pascal Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <false/>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.pascal-source</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>html</string>\n- <string>phtml</string>\n- <string>shtml</string>\n- <string>xhtml</string>\n- <string>htm</string>\n- <string>pht</string>\n- <string>sht</string>\n- <string>xht</string>\n- <string>phtm</string>\n- <string>shtm</string>\n- <string>xhtm</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>html</string>\n- <key>CFBundleTypeMIMETypes</key>\n- <array>\n- <string>text/html</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>HTML Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.html</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>xml</string>\n- <string>rss</string>\n- <string>tld</string>\n- <string>pt</string>\n- <string>cpt</string>\n- <string>dtml</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>xml</string>\n- <key>CFBundleTypeMIMETypes</key>\n- <array>\n- <string>text/xml</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>XML Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.xml</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>js</string>\n- <string>htc</string>\n- <string>jscript</string>\n- <string>javascript</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>js</string>\n- <key>CFBundleTypeMIMETypes</key>\n- <array>\n- <string>text/javascript</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>JavaScript Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>com.netscape.javascript-source</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>pl</string>\n- <string>pm</string>\n- <string>pod</string>\n- <string>perl</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>pl</string>\n- <key>CFBundleTypeMIMETypes</key>\n- <array>\n- <string>text/x-perl-script</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Perl Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.perl-script</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>py</string>\n- <string>rpy</string>\n- <string>cpy</string>\n- <string>python</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>py</string>\n- <key>CFBundleTypeMIMETypes</key>\n- <array>\n- <string>text/x-python-script</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Python Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.python-script</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>php</string>\n- <string>php3</string>\n- <string>php4</string>\n- <string>php5</string>\n- <string>ph3</string>\n- <string>ph4</string>\n- <string>phtml</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>php</string>\n- <key>CFBundleTypeMIMETypes</key>\n- <array>\n- <string>text/php</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>PHP Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.php-script</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>rb</string>\n- <string>rbw</string>\n- <string>rbx</string>\n- <string>rjs</string>\n- <string>rxml</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>rb</string>\n- <key>CFBundleTypeMIMETypes</key>\n- <array>\n- <string>text/ruby-script</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Ruby Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.ruby-script</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>sh</string>\n- <string>csh</string>\n- <string>command</string>\n- <string>ss</string>\n- <string>bashrc</string>\n- <string>bash_profile</string>\n- <string>bash_login</string>\n- <string>profile</string>\n- <string>bash_logout</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>sh</string>\n- <key>CFBundleTypeName</key>\n- <string>Shell script</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.shell-script</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>patch</string>\n- <string>diff</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>txt</string>\n- <key>CFBundleTypeName</key>\n- <string>Patch File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSIsAppleDefaultForType</key>\n- <true/>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>strings</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Strings File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>public.strings-text</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>*</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Text File</string>\n- <key>CFBundleTypeOSTypes</key>\n- <array>\n- <string>****</string>\n- </array>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>applescript</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>AppleScript Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- <key>LSItemContentTypes</key>\n- <array>\n- <string>com.apple.applescript.text</string>\n- </array>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>as</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>ActionScript Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>asp</string>\n- <string>asa</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>asp</string>\n- <key>CFBundleTypeName</key>\n- <string>ASP document</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>aspx</string>\n- <string>ascx</string>\n- <string>asmx</string>\n- <string>ashx</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>asp</string>\n- <key>CFBundleTypeName</key>\n- <string>ASP.NET document</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>bib</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>bib</string>\n- <key>CFBundleTypeName</key>\n- <string>BibTeX bibliography</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>cs</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>cs</string>\n- <key>CFBundleTypeName</key>\n- <string>C# Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>fs</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>fs</string>\n- <key>CFBundleTypeName</key>\n- <string>F# Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>cfdg</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Context Free Design Grammar</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>csv</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>csv</string>\n- <key>CFBundleTypeName</key>\n- <string>Comma separated values</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>tsv</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>tsv</string>\n- <key>CFBundleTypeName</key>\n- <string>Tab separated values</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>cgi</string>\n- <string>fcgi</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>CGI script</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>cfg</string>\n- <string>conf</string>\n- <string>config</string>\n- <string>htaccess</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>cfg</string>\n- <key>CFBundleTypeName</key>\n- <string>Configuration file</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>css</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>css</string>\n- <key>CFBundleTypeName</key>\n- <string>Cascading style sheet</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>dtd</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>xml</string>\n- <key>CFBundleTypeName</key>\n- <string>Document Type Definition</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>dylan</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Dylan Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>erl</string>\n- <string>hrl</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Erlang Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>fscript</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>F-Script Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>hs</string>\n- <string>lhs</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>hs</string>\n- <key>CFBundleTypeName</key>\n- <string>Haskell Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>inc</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>txt</string>\n- <key>CFBundleTypeName</key>\n- <string>Include file</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>ics</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>txt</string>\n- <key>CFBundleTypeName</key>\n- <string>iCalendar schedule</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>ini</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>ini</string>\n- <key>CFBundleTypeName</key>\n- <string>MS Windows initialization file</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>io</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Io Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>bsh</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>sh</string>\n- <key>CFBundleTypeName</key>\n- <string>BeanShell script</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>properties</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>txt</string>\n- <key>CFBundleTypeName</key>\n- <string>Java properties file</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>jsp</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>java</string>\n- <key>CFBundleTypeName</key>\n- <string>Java Server Page</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>lisp</string>\n- <string>cl</string>\n- <string>l</string>\n- <string>lsp</string>\n- <string>mud</string>\n- <string>el</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>lisp</string>\n- <key>CFBundleTypeName</key>\n- <string>LISP Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>log</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>log</string>\n- <key>CFBundleTypeName</key>\n- <string>Log file</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>wiki</string>\n- <string>wikipedia</string>\n- <string>mediawiki</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>md</string>\n- <key>CFBundleTypeName</key>\n- <string>Mediawiki document</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>ps</string>\n- <string>eps</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>ps</string>\n- <key>CFBundleTypeName</key>\n- <string>PostScript Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>scm</string>\n- <string>sch</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Scheme Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>sql</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>sql</string>\n- <key>CFBundleTypeName</key>\n- <string>SQL Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>tcl</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Tcl Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>xsl</string>\n- <string>xslt</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>xml</string>\n- <key>CFBundleTypeName</key>\n- <string>XSL stylesheet</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>vcf</string>\n- <string>vcard</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Electronic business card</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>vb</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>vb</string>\n- <key>CFBundleTypeName</key>\n- <string>Visual Basic Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>yaml</string>\n- <string>yml</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>yml</string>\n- <key>CFBundleTypeName</key>\n- <string>YAML document</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>gtd</string>\n- <string>gtdlog</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>md</string>\n- <key>CFBundleTypeName</key>\n- <string>GTD document</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>markdown</string>\n- <string>markd</string>\n- <string>mdown</string>\n- <string>md</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>md</string>\n- <key>CFBundleTypeName</key>\n- <string>Markdown document</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>rst</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>rst</string>\n- <key>CFBundleTypeName</key>\n- <string>reStructuredText document</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>vba</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>vim</string>\n- <key>CFBundleTypeName</key>\n- <string>Vimball Archive</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>vhd</string>\n- <string>vhdl</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>v</string>\n- <key>CFBundleTypeName</key>\n- <string>VHDL Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>lua</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>lua</string>\n- <key>CFBundleTypeMIMETypes</key>\n- <array>\n- <string>text/x-lua-script</string>\n- </array>\n- <key>CFBundleTypeName</key>\n- <string>Lua Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>v</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>v</string>\n- <key>CFBundleTypeName</key>\n- <string>Verilog HDL Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n- <dict>\n- <key>CFBundleTypeExtensions</key>\n- <array>\n- <string>vh</string>\n- </array>\n- <key>CFBundleTypeIconFile</key>\n- <string>v</string>\n- <key>CFBundleTypeName</key>\n- <string>Verilog HDL Header Source File</string>\n- <key>CFBundleTypeRole</key>\n- <string>Editor</string>\n- </dict>\n+ <dict>\n+ <key>LSItemContentTypes</key>\n+ <array>\n+ <string>public.text</string>\n+ </array>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>vim</string>\n+ </array>\n+ <key>CFBundleTypeIconFile</key>\n+ <string>vim</string>\n+ <key>CFBundleTypeName</key>\n+ <string>Vim Script File</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ <key>LSIsAppleDefaultForType</key>\n+ <true/>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>bib</string>\n+ </array>\n+ <key>CFBundleTypeIconFile</key>\n+ <string>bib</string>\n+ <key>CFBundleTypeName</key>\n+ <string>BibTeX bibliography</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>cfg</string>\n+ <string>conf</string>\n+ <string>config</string>\n+ <string>htaccess</string>\n+ </array>\n+ <key>CFBundleTypeIconFile</key>\n+ <string>cfg</string>\n+ <key>CFBundleTypeName</key>\n+ <string>Configuration file</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>hs</string>\n+ <string>lhs</string>\n+ </array>\n+ <key>CFBundleTypeIconFile</key>\n+ <string>hs</string>\n+ <key>CFBundleTypeName</key>\n+ <string>Haskell Source File</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>wiki</string>\n+ <string>wikipedia</string>\n+ <string>mediawiki</string>\n+ </array>\n+ <key>CFBundleTypeIconFile</key>\n+ <string>md</string>\n+ <key>CFBundleTypeName</key>\n+ <string>Mediawiki document</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>ps</string>\n+ <string>eps</string>\n+ </array>\n+ <key>CFBundleTypeIconFile</key>\n+ <string>ps</string>\n+ <key>CFBundleTypeName</key>\n+ <string>PostScript Source File</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>scm</string>\n+ <string>sch</string>\n+ </array>\n+ <key>CFBundleTypeName</key>\n+ <string>Scheme Source File</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>sql</string>\n+ </array>\n+ <key>CFBundleTypeIconFile</key>\n+ <string>sql</string>\n+ <key>CFBundleTypeName</key>\n+ <string>SQL Source File</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>tcl</string>\n+ </array>\n+ <key>CFBundleTypeName</key>\n+ <string>Tcl Source File</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>gtd</string>\n+ <string>gtdlog</string>\n+ </array>\n+ <key>CFBundleTypeIconFile</key>\n+ <string>md</string>\n+ <key>CFBundleTypeName</key>\n+ <string>GTD document</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>rst</string>\n+ </array>\n+ <key>CFBundleTypeIconFile</key>\n+ <string>rst</string>\n+ <key>CFBundleTypeName</key>\n+ <string>reStructuredText document</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>vba</string>\n+ </array>\n+ <key>CFBundleTypeIconFile</key>\n+ <string>vim</string>\n+ <key>CFBundleTypeName</key>\n+ <string>Vimball Archive</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>vhd</string>\n+ <string>vhdl</string>\n+ </array>\n+ <key>CFBundleTypeIconFile</key>\n+ <string>v</string>\n+ <key>CFBundleTypeName</key>\n+ <string>VHDL Source File</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n+ <dict>\n+ <key>CFBundleTypeExtensions</key>\n+ <array>\n+ <string>lua</string>\n+ </array>\n+ <key>CFBundleTypeIconFile</key>\n+ <string>lua</string>\n+ <key>CFBundleTypeMIMETypes</key>\n+ <array>\n+ <string>text/x-lua-script</string>\n+ </array>\n+ <key>CFBundleTypeName</key>\n+ <string>Lua Source File</string>\n+ <key>CFBundleTypeRole</key>\n+ <string>Editor</string>\n+ </dict>\n </array>\n-\n <key>CFBundleShortVersionString</key>\n <string>0.01</string>\n <key>CFBundleInfoDictionaryVersion</key>\n"},"changed_files":{"kind":"list like","value":["lib/Info.plist"],"string":"[\n \"lib/Info.plist\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86269,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":119,"string":"119"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"bg transparency"},"pr_body":{"kind":"string","value":""},"base_sha":{"kind":"string","value":"769a7ac88b7b296db251231536fc8190af9a1ede"},"head_sha":{"kind":"string","value":"f3ad7adff5fbd7f9b330bd9fb86f87ee41907e1a"},"gold_diff":{"kind":"string","value":"diff --git a/README.md b/README.md\nindex 81e7de2..924ae7b 100644\n--- a/README.md\n+++ b/README.md\n@@ -87,6 +87,11 @@ FVimCursorSmoothBlink v:true\n FVimBackgroundComposition 'acrylic' \" 'none', 'blur' or 'acrylic'\n FVimBackgroundOpacity 0.85 \" value between 0 and 1, default bg opacity.\n FVimBackgroundAltOpacity 0.85 \" value between 0 and 1, non-default bg opacity.\n+FVimBackgroundImage 'C:/foobar.png' \" background image\n+FVimBackgroundImageVAlign 'center' \" vertial position, 'top', 'center' or 'bottom'\n+FVimBackgroundImageHAlign 'center' \" horizontal position, 'left', 'center' or 'right'\n+FVimBackgroundImageStretch 'fill' \" 'none', 'fill', 'uniform', 'uniformfill'\n+FVimBackgroundImageOpacity 0.85 \" value between 0 and 1, bg image opacity\n \n \" Title bar tweaks\n FVimCustomTitleBar v:true \" themed with colorscheme\ndiff --git a/ViewModels/EditorViewModel.fs b/ViewModels/EditorViewModel.fs\nindex 8bbb847..bbfb26b 100644\n--- a/ViewModels/EditorViewModel.fs\n+++ b/ViewModels/EditorViewModel.fs\n@@ -432,9 +432,7 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n and set(v) =\n m_gridscale <- v\n \n- member __.BackgroundColor\n- with get(): Color = theme.default_bg\n-\n+ member __.BackgroundColor with get(): Color = theme.default_bg\n member __.BufferHeight with get(): float = m_fb_h\n member __.BufferWidth with get(): float = m_fb_w\n member __.GlyphHeight with get(): float = m_glyphsize.Height\ndiff --git a/ViewModels/MainWindowViewModel.fs b/ViewModels/MainWindowViewModel.fs\nindex 371b2c1..706907c 100644\n--- a/ViewModels/MainWindowViewModel.fs\n+++ b/ViewModels/MainWindowViewModel.fs\n@@ -8,6 +8,9 @@ open Avalonia\n open Avalonia.Controls\n open System\n open ui\n+open Avalonia.Media.Imaging\n+open Avalonia.Media\n+open Avalonia.Layout\n \n #nowarn \"0025\"\n \n@@ -29,11 +32,34 @@ type MainWindowViewModel(cfg: config.ConfigObject.Workspace option, ?_maingrid:\n let mutable m_fullscreen = false\n let mutable m_title = \"FVim\"\n \n+ let mutable m_bgimg_src: Bitmap = null\n+ let mutable m_bgimg_stretch = Stretch.None\n+ let mutable m_bgimg_w = 0.0\n+ let mutable m_bgimg_h = 0.0\n+ let mutable m_bgimg_opacity = 1.0\n+ let mutable m_bgimg_halign = HorizontalAlignment.Left\n+ let mutable m_bgimg_valign = VerticalAlignment.Top\n+\n let toggleFullScreen(gridid: int) =\n if gridid = mainGrid.GridId then\n this.Fullscreen <- not this.Fullscreen\n trace \"ToggleFullScreen %A\" this.Fullscreen\n \n+ let updateBackgroundImage() =\n+ if not <| Object.ReferenceEquals(m_bgimg_src, null) then\n+ m_bgimg_src.Dispose()\n+ m_bgimg_src <- null\n+ try\n+ let new_img = new Bitmap(States.background_image_file)\n+ ignore <| this.RaiseAndSetIfChanged(&m_bgimg_src, new_img, \"BackgroundImage\")\n+ ignore <| this.RaiseAndSetIfChanged(&m_bgimg_w, m_bgimg_src.Size.Width, \"BackgroundImageW\")\n+ ignore <| this.RaiseAndSetIfChanged(&m_bgimg_h, m_bgimg_src.Size.Height, \"BackgroundImageH\")\n+ ignore <| this.RaiseAndSetIfChanged(&m_bgimg_opacity, States.background_image_opacity, \"BackgroundImageOpacity\")\n+ ignore <| this.RaiseAndSetIfChanged(&m_bgimg_halign, States.background_image_halign, \"BackgroundImageHAlign\")\n+ ignore <| this.RaiseAndSetIfChanged(&m_bgimg_valign, States.background_image_valign, \"BackgroundImageVAlign\")\n+ ignore <| this.RaiseAndSetIfChanged(&m_bgimg_stretch, States.background_image_stretch, \"BackgroundImageStretch\")\n+ with _ -> ()\n+\n do\n match cfg with\n | Some cfg ->\n@@ -51,6 +77,7 @@ type MainWindowViewModel(cfg: config.ConfigObject.Workspace option, ?_maingrid:\n this.Watch [\n States.Register.Notify \"ToggleFullScreen\" (fun [| Integer32(gridid) |] -> toggleFullScreen gridid )\n States.Register.Notify \"CustomTitleBar\" (fun [| Bool(v) |] -> this.CustomTitleBar <- v )\n+ States.Register.Watch \"background.image\" (fun _ -> updateBackgroundImage())\n ]\n Model.OnWindowReady this\n \n@@ -92,6 +119,14 @@ type MainWindowViewModel(cfg: config.ConfigObject.Workspace option, ?_maingrid:\n this.RaisePropertyChanged(\"CustomTitleBarHeight\")\n this.RaisePropertyChanged(\"BorderSize\")\n \n+ member __.BackgroundImage with get(): IBitmap = m_bgimg_src :> IBitmap\n+ member __.BackgroundImageHAlign with get(): HorizontalAlignment = m_bgimg_halign\n+ member __.BackgroundImageVAlign with get(): VerticalAlignment = m_bgimg_valign\n+ member __.BackgroundImageW with get(): float = m_bgimg_w\n+ member __.BackgroundImageH with get(): float = m_bgimg_h\n+ member __.BackgroundImageOpacity with get(): float = m_bgimg_opacity\n+ member __.BackgroundImageStretch with get(): Stretch = m_bgimg_stretch\n+\n interface IWindow with\n member __.RootId = this.MainGrid.GridId\n member __.Title\ndiff --git a/Views/Editor.xaml b/Views/Editor.xaml\nindex a494851..b2f963f 100644\n--- a/Views/Editor.xaml\n+++ b/Views/Editor.xaml\n@@ -13,6 +13,7 @@\n <Design.DataContext>\n <fvim:EditorSampleData />\n </Design.DataContext>\n+\n <fvim:Cursor\n DataContext = \"{Binding CursorInfo}\"\n Height = \"{Binding Height, Mode=OneWay}\"\n@@ -29,5 +30,7 @@\n ZIndex = \"10\"\n Focusable = \"True\"\n HorizontalAlignment = \"Left\"\n- VerticalAlignment = \"Top\"/>\n+ VerticalAlignment = \"Top\"\n+ />\n+\n </Canvas>\ndiff --git a/Views/Editor.xaml.fs b/Views/Editor.xaml.fs\nindex 7294693..6d7b6ce 100644\n--- a/Views/Editor.xaml.fs\n+++ b/Views/Editor.xaml.fs\n@@ -172,7 +172,7 @@ type Editor() as this =\n if this.GetVisualRoot() <> null then resizeFrameBuffer())\n \n Observable.interval(TimeSpan.FromMilliseconds 100.0)\n- |> Observable.firstIf(fun _ -> this.IsInitialized)\n+ |> Observable.firstIf(fun _ -> this.IsInitialized && vm.Height > 0.0 && vm.Width > 0.0)\n |> Observable.subscribe(fun _ -> \n Model.OnGridReady(vm :> IGridUI)\n ignore <| Dispatcher.UIThread.InvokeAsync(this.Focus)\n@@ -265,15 +265,6 @@ type Editor() as this =\n if m_debug then\n drawDebug grid_dc\n \n- // doesn't work yet\n- let skia = grid_dc :?> ISkiaDrawingContextImpl\n- use paint = new SKPaint()\n- paint.Color <- SKColor(255uy, 255uy, 255uy, 255uy)\n- use table = SKColorFilter.CreateTable(m_alphaLUT, m_normalLUT, m_normalLUT, m_normalLUT)\n- use shader = SKShader.CreateColorFilter(SKShader.CreateEmpty(), table)\n- paint.Shader <- shader\n- skia.SkCanvas.DrawPaint(paint)\n-\n grid_dc.PopClip()\n timer.Stop()\n trace \"drawing end, time = %dms.\" timer.ElapsedMilliseconds\ndiff --git a/Views/MainWindow.xaml b/Views/MainWindow.xaml\nindex cc4e192..a10b925 100644\n--- a/Views/MainWindow.xaml\n+++ b/Views/MainWindow.xaml\n@@ -30,6 +30,19 @@\n <RowDefinition Height=\"{Binding BorderSize}\"/>\n </Grid.RowDefinitions>\n <fvim:TitleBar Grid.Row=\"0\" Grid.Column=\"1\" IsActive=\"{Binding $parent[Window].IsActive, Mode=OneWay}\" IsVisible=\"{Binding CustomTitleBar}\" HorizontalAlignment=\"Stretch\" Title=\"{Binding Title}\"/>\n+\n+ <Image Grid.Row=\"1\" Grid.Column=\"1\"\n+ Source = \"{Binding BackgroundImage}\"\n+ ZIndex = \"-1\" \n+ Focusable = \"False\"\n+ HorizontalAlignment = \"{Binding BackgroundImageHAlign}\"\n+ VerticalAlignment = \"{Binding BackgroundImageVAlign}\"\n+ Width = \"{Binding BackgroundImageW}\"\n+ Height = \"{Binding BackgroundImageH}\"\n+ Stretch = \"{Binding BackgroundImageStretch}\"\n+ Opacity = \"{Binding BackgroundImageOpacity}\"\n+ />\n+ \n <fvim:Editor Grid.Row=\"1\" Grid.Column=\"1\" DataContext=\"{Binding MainGrid}\" />\n <Panel Name=\"LeftBorder\" Grid.Row=\"0\" Grid.RowSpan=\"3\" Grid.Column=\"0\" IsVisible=\"{Binding CustomTitleBar}\" Background=\"{Binding NormalBackground}\" />\n <Panel Name=\"RightBorder\" Grid.Row=\"0\" Grid.RowSpan=\"3\" Grid.Column=\"2\" IsVisible=\"{Binding CustomTitleBar}\" Background=\"{Binding NormalBackground}\" />\ndiff --git a/Views/MainWindow.xaml.fs b/Views/MainWindow.xaml.fs\nindex 942e638..699fe86 100644\n--- a/Views/MainWindow.xaml.fs\n+++ b/Views/MainWindow.xaml.fs\n@@ -37,9 +37,10 @@ type MainWindow() as this =\n m_bgopacity <- States.background_opacity\n let comp =\n match m_bgcomp with\n- | States.Acrylic -> ui.AdvancedBlur(m_bgopacity, m_bgcolor)\n- | States.Blur -> ui.GaussianBlur(m_bgopacity, m_bgcolor)\n- | _ -> ui.SolidBackground m_bgcolor\n+ | States.Acrylic -> ui.AdvancedBlur(m_bgopacity, m_bgcolor)\n+ | States.Blur -> ui.GaussianBlur(m_bgopacity, m_bgcolor)\n+ | States.Transparent -> ui.TransparentBackground(m_bgopacity, m_bgcolor)\n+ | _ -> ui.SolidBackground(m_bgopacity, m_bgcolor)\n trace \"mainwindow\" \"configBackground: %A\" comp\n ui.SetWindowBackgroundComposition this comp\n \ndiff --git a/model.fs b/model.fs\nindex 800e1c3..177e1a2 100644\n--- a/model.fs\n+++ b/model.fs\n@@ -16,6 +16,7 @@ open Avalonia.Input.Raw\n open FSharp.Control.Reactive\n open System.ComponentModel\n open SkiaSharp\n+open Avalonia.Layout\n \n #nowarn \"0058\"\n #nowarn \"0025\"\n@@ -483,6 +484,11 @@ let Start opts =\n States.Register.Prop<States.BackgroundComposition> States.parseBackgroundComposition \"background.composition\"\n States.Register.Float \"background.opacity\"\n States.Register.Float \"background.altopacity\"\n+ States.Register.Float \"background.image.opacity\"\n+ States.Register.String \"background.image.file\"\n+ States.Register.Prop<Stretch> States.parseStretch \"background.image.stretch\"\n+ States.Register.Prop<HorizontalAlignment> States.parseHorizontalAlignment \"background.image.halign\"\n+ States.Register.Prop<VerticalAlignment> States.parseVerticalAlignment \"background.image.valign\"\n \n \n List.iter ignore [\n@@ -640,6 +646,11 @@ let Start opts =\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimBackgroundOpacity\" 1 (sprintf \"call rpcnotify(%d, 'background.opacity', <args>)\" myChannel))\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimBackgroundComposition\" 1 (sprintf \"call rpcnotify(%d, 'background.composition', <args>)\" myChannel))\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimBackgroundAltOpacity\" 1 (sprintf \"call rpcnotify(%d, 'background.altopacity', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimBackgroundImage\" 1 (sprintf \"call rpcnotify(%d, 'background.image.file', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimBackgroundImageOpacity\" 1 (sprintf \"call rpcnotify(%d, 'background.image.opacity', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimBackgroundImageStretch\" 1 (sprintf \"call rpcnotify(%d, 'background.image.stretch', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimBackgroundImageHAlign\" 1 (sprintf \"call rpcnotify(%d, 'background.image.halign', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimBackgroundImageVAlign\" 1 (sprintf \"call rpcnotify(%d, 'background.image.valign', <args>)\" myChannel))\n \n \n // trigger ginit upon VimEnter\ndiff --git a/states.fs b/states.fs\nindex 80839bd..76097c0 100644\n--- a/states.fs\n+++ b/states.fs\n@@ -6,6 +6,8 @@ open log\n open def\n open System.Reflection\n open Avalonia.Threading\n+open Avalonia.Media\n+open Avalonia.Layout\n \n [<Struct>]\n type Request = \n@@ -92,13 +94,20 @@ let mutable ui_hlstate = false\n \n type BackgroundComposition =\n | NoComposition\n+ | Transparent\n | Blur\n | Acrylic\n \n // background\n-let mutable background_composition = NoComposition\n-let mutable background_opacity = 1.0\n-let mutable background_altopacity = 1.0\n+let mutable background_composition = NoComposition\n+let mutable background_opacity = 1.0\n+let mutable background_altopacity = 1.0\n+let mutable background_image_file = \"\"\n+let mutable background_image_opacity = 1.0\n+let mutable background_image_stretch = Stretch.None\n+let mutable background_image_halign = HorizontalAlignment.Left\n+let mutable background_image_valign = VerticalAlignment.Top\n+\n \n [<Literal>]\n let uiopt_rgb = \"rgb\"\n@@ -190,6 +199,40 @@ let parseBackgroundComposition (v: obj) =\n | \"none\" -> Some NoComposition\n | \"blur\" -> Some Blur\n | \"acrylic\" -> Some Acrylic\n+ | \"transparent\" -> Some Transparent\n+ | _ -> None\n+ | _ -> None\n+\n+let parseStretch (v: obj) = \n+ match v with\n+ | String v ->\n+ match v.ToLower() with\n+ | \"none\" -> Some Stretch.None\n+ | \"fill\" -> Some Stretch.Fill\n+ | \"uniform\" -> Some Stretch.Uniform\n+ | \"uniformfill\" -> Some Stretch.UniformToFill\n+ | _ -> None\n+ | _ -> None\n+\n+let parseHorizontalAlignment (v: obj) = \n+ match v with\n+ | String v ->\n+ match v.ToLower() with\n+ | \"left\" -> Some HorizontalAlignment.Left\n+ | \"center\" -> Some HorizontalAlignment.Center\n+ | \"right\" -> Some HorizontalAlignment.Right\n+ | \"stretch\" -> Some HorizontalAlignment.Stretch\n+ | _ -> None\n+ | _ -> None\n+\n+let parseVerticalAlignment (v: obj) = \n+ match v with\n+ | String v ->\n+ match v.ToLower() with\n+ | \"top\" -> Some VerticalAlignment.Top\n+ | \"center\" -> Some VerticalAlignment.Center\n+ | \"bottom\" -> Some VerticalAlignment.Bottom\n+ | \"stretch\" -> Some VerticalAlignment.Stretch\n | _ -> None\n | _ -> None\n \n@@ -198,6 +241,7 @@ let backgroundCompositionToString =\n | NoComposition -> \"none\"\n | Blur -> \"blur\"\n | Acrylic -> \"acrylic\"\n+ | Transparent -> \"transparent\" \n \n let Shutdown code = _appLifetime.Shutdown code\n \n@@ -235,6 +279,7 @@ let msg_dispatch =\n trace \"rpc\" \"unrecognized event: %A\" other\n \n module Register =\n+ /// Register an rpc handler.\n let Request name fn = \n requestHandlers.Add(name, fun objs ->\n try fn objs\n@@ -242,16 +287,19 @@ module Register =\n error \"Request\" \"exception thrown: %O\" x\n async { return { result = Result.Error(box x) } })\n \n+ /// Register an event handler.\n let Notify name (fn: obj[] -> unit) = \n (getNotificationEvent name).Publish.Subscribe(fun objs -> \n try fn objs\n with x -> error \"Notify\" \"exception thrown: %A\" <| x.ToString())\n \n+ /// Watch for registered state\n let Watch (name: string) fn =\n _stateChangeEvent.Publish\n |> Observable.filter (fun x -> x.StartsWith(name))\n |> Observable.subscribe (fun _ -> fn())\n \n+ /// Registers a state variable. Raises notification on change.\n let Prop<'T> (parser: obj -> 'T option) (fullname: string) =\n let section = fullname.Split(\".\").[0]\n let fieldName = fullname.Replace(\".\", \"_\")\ndiff --git a/theme.fs b/theme.fs\nindex 36f9cd4..45640ac 100644\n--- a/theme.fs\n+++ b/theme.fs\n@@ -60,11 +60,10 @@ let GetDrawAttrs hlid =\n fg <- bg\n bg <- tmp\n \n- if (States.background_composition <> States.BackgroundComposition.NoComposition) then\n- let alpha = \n- if bg = default_bg then 0uy\n- else byte(States.background_altopacity * 255.0)\n- bg <- Avalonia.Media.Color(alpha, bg.R, bg.G, bg.B)\n+ let alpha =\n+ if bg = default_bg then 0uy\n+ else byte(States.background_altopacity * 255.0)\n+ bg <- Avalonia.Media.Color(alpha, bg.R, bg.G, bg.B)\n fg, bg, sp, attrs\n \n \ndiff --git a/ui.fs b/ui.fs\nindex 8033167..8f8659b 100644\n--- a/ui.fs\n+++ b/ui.fs\n@@ -436,7 +436,8 @@ open osx\n open linux\n \n type WindowBackgroundComposition =\n- | SolidBackground of color: Color\n+ | SolidBackground of opacity: float * color: Color\n+ | TransparentBackground of opacity: float * color: Color\n | GaussianBlur of opacity: float * color: Color\n | AdvancedBlur of opacity: float * color: Color\n \n@@ -445,9 +446,13 @@ let SetWindowBackgroundComposition (win: Avalonia.Controls.Window) (composition:\n if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then\n let state, opacity, bgcolor = \n match composition with\n- | SolidBackground c -> \n+ | SolidBackground (_, c) -> \n win.Background <- SolidColorBrush(c)\n AccentState.ACCENT_DISABLED, 0u, 0u\n+ | TransparentBackground (op, c) -> \n+ let c = Color(byte(op * 255.0), c.R, c.G, c.B)\n+ win.Background <- SolidColorBrush(c)\n+ AccentState.ACCENT_ENABLE_TRANSPARENTGRADIENT, 0u, 0u\n | GaussianBlur(op, c) ->\n let c = Color(byte(op * 255.0), c.R, c.G, c.B)\n win.Background <- SolidColorBrush(c)\n@@ -475,8 +480,9 @@ let SetWindowBackgroundComposition (win: Avalonia.Controls.Window) (composition:\n Marshal.FreeHGlobal(accentPtr);\n elif RuntimeInformation.IsOSPlatform(OSPlatform.OSX) then\n match composition with\n- | SolidBackground c ->\n+ | SolidBackground (_, c) ->\n win.Background <- SolidColorBrush(c)\n+ | TransparentBackground(op, c) // TODO verify\n | GaussianBlur(op, c)\n | AdvancedBlur(op, c) ->\n let c = Color(byte(op * 255.0), c.R, c.G, c.B)\n@@ -535,10 +541,10 @@ let SetWindowBackgroundComposition (win: Avalonia.Controls.Window) (composition:\n 1)\n \n match composition with\n- | SolidBackground c ->\n+ | SolidBackground (_, c) ->\n win.Background <- SolidColorBrush(c)\n+ | TransparentBackground(op, c) // TODO verify\n | GaussianBlur(op, c)\n | AdvancedBlur(op, c) ->\n let c = Color(byte(op * 255.0), c.R, c.G, c.B)\n win.Background <- SolidColorBrush(c)\n- (*ignore <| vh_add_view(win.PlatformImpl.Handle.Handle)*)\n"},"changed_files":{"kind":"list like","value":["README.md","ViewModels/EditorViewModel.fs","ViewModels/MainWindowViewModel.fs","Views/Editor.xaml","Views/Editor.xaml.fs","Views/MainWindow.xaml","Views/MainWindow.xaml.fs","model.fs","states.fs","theme.fs","ui.fs"],"string":"[\n \"README.md\",\n \"ViewModels/EditorViewModel.fs\",\n \"ViewModels/MainWindowViewModel.fs\",\n \"Views/Editor.xaml\",\n \"Views/Editor.xaml.fs\",\n \"Views/MainWindow.xaml\",\n \"Views/MainWindow.xaml.fs\",\n \"model.fs\",\n \"states.fs\",\n \"theme.fs\",\n \"ui.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86270,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":113,"string":"113"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Bump MessagePack.ImmutableCollection from 1.7.3.7 to 1.9.3"},"pr_body":{"kind":"string","value":"Bumps [MessagePack.ImmutableCollection](https://github.com/neuecc/MessagePack-CSharp) from 1.7.3.7 to 1.9.3.\n<details>\n<summary>Release notes</summary>\n\n*Sourced from [MessagePack.ImmutableCollection's releases](https://github.com/neuecc/MessagePack-CSharp/releases).*\n\n> ## v1.9.3\n> ## Changes\r\n> \r\n> 🔒 **Security fixes are included in this release**. Read more in our [security advisory](https://github.com/neuecc/MessagePack-CSharp/security/advisories/GHSA-7q36-4xx7-xcxf).\r\n> \r\n> No other changes are included in this release relative to v1.8\n> \n> ## v1.8.80\n> * Adjust assembly version from 1.8.74.32478 to simply 1.8.0.0 ([#604](https://github-redirect.dependabot.com/neuecc/MessagePack-CSharp/issues/604))\r\n> * Update System.Threading.Tasks.Extensions dependency to 4.5.3 ([#610](https://github-redirect.dependabot.com/neuecc/MessagePack-CSharp/issues/610))\r\n> * Publish symbols in snupkg archives to nuget.org ([#624](https://github-redirect.dependabot.com/neuecc/MessagePack-CSharp/issues/624))\n> \n> ## v1.8.74\n> Very few changes since 1.7, but now building from a more serviceable branch.\n</details>\n<details>\n<summary>Commits</summary>\n\n- [`129239b`](https://github.com/neuecc/MessagePack-CSharp/commit/129239b10751dd3815610aaac09ca8420c15f881) Defend against stack overflow from deeply nested object graphs in msgpack\n- [`6f0ec18`](https://github.com/neuecc/MessagePack-CSharp/commit/6f0ec181174ab96a1683d3394067079bddc86914) Stop testing on .NET Core versions that are out of servicing\n- [`74062a1`](https://github.com/neuecc/MessagePack-CSharp/commit/74062a19d5d69998b722210b3d39fafb7423453d) Mitigate risk of hash collision attacks\n- [`caf846f`](https://github.com/neuecc/MessagePack-CSharp/commit/caf846f83d5dc668e1374661224dd776a55add1b) Fix DynamicCodeDumper to build an exe\n- [`185347f`](https://github.com/neuecc/MessagePack-CSharp/commit/185347fcac102441957b468e455054bb66b54800) Update .tt files to match .cs files\n- [`c7a4f10`](https://github.com/neuecc/MessagePack-CSharp/commit/c7a4f10920aaea283106d2dc7a85a7f9038da25c) Merge pull request [#624](https://github-redirect.dependabot.com/neuecc/MessagePack-CSharp/issues/624) from AArnott/snupkg_v1.8\n- [`a63be88`](https://github.com/neuecc/MessagePack-CSharp/commit/a63be88b4cf760d834dd9ee5c71a76d745ac8e04) Build .snupkg archives for nuget.org publishing\n- [`3d68045`](https://github.com/neuecc/MessagePack-CSharp/commit/3d6804526d78c96416e5e3f066e422cd4b515dbb) Merge pull request [#610](https://github-redirect.dependabot.com/neuecc/MessagePack-CSharp/issues/610) from AArnott/fix544\n- [`2f1a4bc`](https://github.com/neuecc/MessagePack-CSharp/commit/2f1a4bcc187499ae4ca5a3124f1a736e84f234f8) don't use expression body for unity\n- [`fcaeeba`](https://github.com/neuecc/MessagePack-CSharp/commit/fcaeeba4e2458e81cd75563226e5d61afc8a593a) add packageexporter to 1.8, [#593](https://github-redirect.dependabot.com/neuecc/MessagePack-CSharp/issues/593)\n- Additional commits viewable in [compare view](https://github.com/neuecc/MessagePack-CSharp/compare/v1.7.3.7...v1.9.3)\n</details>\n<br />\n\n[](https://help.github.com/articles/configuring-automated-security-fixes)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language\n- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language\n- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language\n- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language\n\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/yatli/fvim/network/alerts).\n\n</details>"},"base_sha":{"kind":"string","value":"83a779851ada77ea2857895a02843735793858c4"},"head_sha":{"kind":"string","value":"e1ef30abdd27152774c28190a47f964a5676eb3d"},"gold_diff":{"kind":"string","value":"diff --git a/fvim.fsproj b/fvim.fsproj\nindex 0b045ce..887d0b5 100644\n--- a/fvim.fsproj\n+++ b/fvim.fsproj\n@@ -92,7 +92,7 @@\n <PackageReference Include=\"HarfBuzzSharp.NativeAssets.Linux\" Version=\"1.4.6.2\" />\n <PackageReference Include=\"MessagePack\" Version=\"1.7.3.7\" />\n <PackageReference Include=\"MessagePack.FSharpExtensions\" Version=\"1.4.1\" />\n- <PackageReference Include=\"MessagePack.ImmutableCollection\" Version=\"1.7.3.7\" />\n+ <PackageReference Include=\"MessagePack.ImmutableCollection\" Version=\"1.9.3\" />\n <PackageReference Include=\"Microsoft.Win32.Registry\" Version=\"4.5.0\" />\n <PackageReference Include=\"NSubsys\" Version=\"1.0.0\">\n <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n"},"changed_files":{"kind":"list like","value":["fvim.fsproj"],"string":"[\n \"fvim.fsproj\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86271,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":114,"string":"114"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Bump MessagePack from 1.7.3.7 to 1.9.3"},"pr_body":{"kind":"string","value":"Bumps [MessagePack](https://github.com/neuecc/MessagePack-CSharp) from 1.7.3.7 to 1.9.3.\n<details>\n<summary>Release notes</summary>\n\n*Sourced from [MessagePack's releases](https://github.com/neuecc/MessagePack-CSharp/releases).*\n\n> ## v1.9.3\n> ## Changes\r\n> \r\n> 🔒 **Security fixes are included in this release**. Read more in our [security advisory](https://github.com/neuecc/MessagePack-CSharp/security/advisories/GHSA-7q36-4xx7-xcxf).\r\n> \r\n> No other changes are included in this release relative to v1.8\n> \n> ## v1.8.80\n> * Adjust assembly version from 1.8.74.32478 to simply 1.8.0.0 ([#604](https://github-redirect.dependabot.com/neuecc/MessagePack-CSharp/issues/604))\r\n> * Update System.Threading.Tasks.Extensions dependency to 4.5.3 ([#610](https://github-redirect.dependabot.com/neuecc/MessagePack-CSharp/issues/610))\r\n> * Publish symbols in snupkg archives to nuget.org ([#624](https://github-redirect.dependabot.com/neuecc/MessagePack-CSharp/issues/624))\n> \n> ## v1.8.74\n> Very few changes since 1.7, but now building from a more serviceable branch.\n</details>\n<details>\n<summary>Commits</summary>\n\n- [`129239b`](https://github.com/neuecc/MessagePack-CSharp/commit/129239b10751dd3815610aaac09ca8420c15f881) Defend against stack overflow from deeply nested object graphs in msgpack\n- [`6f0ec18`](https://github.com/neuecc/MessagePack-CSharp/commit/6f0ec181174ab96a1683d3394067079bddc86914) Stop testing on .NET Core versions that are out of servicing\n- [`74062a1`](https://github.com/neuecc/MessagePack-CSharp/commit/74062a19d5d69998b722210b3d39fafb7423453d) Mitigate risk of hash collision attacks\n- [`caf846f`](https://github.com/neuecc/MessagePack-CSharp/commit/caf846f83d5dc668e1374661224dd776a55add1b) Fix DynamicCodeDumper to build an exe\n- [`185347f`](https://github.com/neuecc/MessagePack-CSharp/commit/185347fcac102441957b468e455054bb66b54800) Update .tt files to match .cs files\n- [`c7a4f10`](https://github.com/neuecc/MessagePack-CSharp/commit/c7a4f10920aaea283106d2dc7a85a7f9038da25c) Merge pull request [#624](https://github-redirect.dependabot.com/neuecc/MessagePack-CSharp/issues/624) from AArnott/snupkg_v1.8\n- [`a63be88`](https://github.com/neuecc/MessagePack-CSharp/commit/a63be88b4cf760d834dd9ee5c71a76d745ac8e04) Build .snupkg archives for nuget.org publishing\n- [`3d68045`](https://github.com/neuecc/MessagePack-CSharp/commit/3d6804526d78c96416e5e3f066e422cd4b515dbb) Merge pull request [#610](https://github-redirect.dependabot.com/neuecc/MessagePack-CSharp/issues/610) from AArnott/fix544\n- [`2f1a4bc`](https://github.com/neuecc/MessagePack-CSharp/commit/2f1a4bcc187499ae4ca5a3124f1a736e84f234f8) don't use expression body for unity\n- [`fcaeeba`](https://github.com/neuecc/MessagePack-CSharp/commit/fcaeeba4e2458e81cd75563226e5d61afc8a593a) add packageexporter to 1.8, [#593](https://github-redirect.dependabot.com/neuecc/MessagePack-CSharp/issues/593)\n- Additional commits viewable in [compare view](https://github.com/neuecc/MessagePack-CSharp/compare/v1.7.3.7...v1.9.3)\n</details>\n<br />\n\n[](https://help.github.com/articles/configuring-automated-security-fixes)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language\n- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language\n- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language\n- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language\n\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/yatli/fvim/network/alerts).\n\n</details>"},"base_sha":{"kind":"string","value":"83a779851ada77ea2857895a02843735793858c4"},"head_sha":{"kind":"string","value":"b804b85a3c1ba3671f662cc87beddb4b1526ce6a"},"gold_diff":{"kind":"string","value":"diff --git a/fvim.fsproj b/fvim.fsproj\nindex 0b045ce..ab6e415 100644\n--- a/fvim.fsproj\n+++ b/fvim.fsproj\n@@ -90,7 +90,7 @@\n </PackageReference>\n <PackageReference Include=\"HarfBuzzSharp\" Version=\"1.4.6.2\" />\n <PackageReference Include=\"HarfBuzzSharp.NativeAssets.Linux\" Version=\"1.4.6.2\" />\n- <PackageReference Include=\"MessagePack\" Version=\"1.7.3.7\" />\n+ <PackageReference Include=\"MessagePack\" Version=\"1.9.3\" />\n <PackageReference Include=\"MessagePack.FSharpExtensions\" Version=\"1.4.1\" />\n <PackageReference Include=\"MessagePack.ImmutableCollection\" Version=\"1.7.3.7\" />\n <PackageReference Include=\"Microsoft.Win32.Registry\" Version=\"4.5.0\" />\n"},"changed_files":{"kind":"list like","value":["fvim.fsproj"],"string":"[\n \"fvim.fsproj\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86272,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":74,"string":"74"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Background composition"},"pr_body":{"kind":"string","value":"TODO\r\n-------\r\n\r\n- [x] Custom titlebar ( #83 )\r\n- [x] ~~background transparency without blur~~ (Moved to #95)\r\n- [x] ~~background picture?~~ (Moved to #95)\r\n- [x] font overflow\r\n- [x] ~~custom titlebar buttons not reliable~~ (Moved to #94)\r\n- [x] keep last states in fvim config file so that the startup process is smoother\r\n- [x] osx: Figure out how to add vibrancy to a window\r\n- [x] ~~osx: Build a C binding to the vibrancy helper~~\r\n- [x] linux: Figure out how to add blur bg\r\n"},"base_sha":{"kind":"string","value":"99357d8bc7331f78ec98b6bcd780095d92eebf3f"},"head_sha":{"kind":"string","value":"f4e1ed54a927f5d7037e41a091d75fe806ad5cad"},"gold_diff":{"kind":"string","value":"diff --git a/.gitignore b/.gitignore\nindex 596304e..f7af67d 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -10,3 +10,5 @@ desktop.ini\n *.deb\n *.app\n *.zip\n+native/**/build\n+.ccls-cache\ndiff --git a/Program.fs b/Program.fs\nindex b5b9ffa..e8f969b 100644\n--- a/Program.fs\n+++ b/Program.fs\n@@ -16,6 +16,7 @@ open System\n open System.IO\n open getopt\n open Shell\n+open common\n open MessagePack.Formatters\n \n // Avalonia configuration, don't remove; also used by visual designer.\n@@ -27,7 +28,7 @@ let buildAvaloniaApp() =\n .UseReactiveUI()\n .With(new Win32PlatformOptions(UseDeferredRendering=false, AllowEglInitialization=true))\n .With(new AvaloniaNativePlatformOptions(UseDeferredRendering=false, UseGpu=true))\n- .With(new X11PlatformOptions(UseEGL=true, UseGpu=true))\n+ .With(new X11PlatformOptions(UseEGL=true, UseGpu=false))\n .With(new MacOSPlatformOptions(ShowInDock=true))\n .LogToDebug()\n \n@@ -105,11 +106,17 @@ let main(args: string[]) =\n let cfg = config.load()\n let cwd = Environment.CurrentDirectory |> Path.GetFullPath\n let workspace = cfg.Workspace |> Array.tryFind(fun w -> w.Path = cwd)\n+ workspace \n+ >>= fun workspace -> workspace.Mainwin.BackgroundComposition\n+ >>= fun comp -> States.parseBackgroundComposition(box comp)\n+ >>= fun comp -> States.background_composition <- comp; None\n+ |> ignore\n+\n let mainwin = new MainWindowViewModel(workspace)\n lifetime.MainWindow <- MainWindow(DataContext = mainwin)\n let ret = lifetime.Start(args)\n \n- config.save cfg (int mainwin.X) (int mainwin.Y) mainwin.Width mainwin.Height mainwin.WindowState\n+ config.save cfg (int mainwin.X) (int mainwin.Y) (mainwin.Width) (mainwin.Height) (mainwin.WindowState) (States.backgroundCompositionToString States.background_composition) mainwin.CustomTitleBar\n ret\n | Error ex ->\n let crash = new CrashReportViewModel(ex)\ndiff --git a/ViewModels/EditorViewModel.fs b/ViewModels/EditorViewModel.fs\nindex 29dab70..381be72 100644\n--- a/ViewModels/EditorViewModel.fs\n+++ b/ViewModels/EditorViewModel.fs\n@@ -277,7 +277,7 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n \n let hlConfig(id) =\n if id = 0 then\n- this.RaisePropertyChanged(\"BackgroundBrush\")\n+ this.RaisePropertyChanged(\"BackgroundColor\")\n markAllDirty()\n \n let updateMouseButton (pp: PointerPoint) =\n@@ -345,7 +345,6 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n member __.GetFontAttrs() =\n theme.guifont, theme.guifontwide, m_fontsize\n \n-\n member private __.initBuffer nrow ncol =\n m_gridsize <- { rows = nrow; cols = ncol }\n trace \"buffer resize = %A\" m_gridsize\n@@ -433,8 +432,8 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n and set(v) =\n m_gridscale <- v\n \n- member __.BackgroundBrush\n- with get(): SolidColorBrush = SolidColorBrush(theme.default_bg)\n+ member __.BackgroundColor\n+ with get(): Color = theme.default_bg\n \n member __.BufferHeight with get(): float = m_fb_h\n member __.BufferWidth with get(): float = m_fb_w\ndiff --git a/ViewModels/MainWindowViewModel.fs b/ViewModels/MainWindowViewModel.fs\nindex 51e7791..371b2c1 100644\n--- a/ViewModels/MainWindowViewModel.fs\n+++ b/ViewModels/MainWindowViewModel.fs\n@@ -44,6 +44,9 @@ type MainWindowViewModel(cfg: config.ConfigObject.Workspace option, ?_maingrid:\n match Enum.TryParse<WindowState>(cfg.Mainwin.State) with\n | true, v -> this.WindowState <- v\n | _ -> ()\n+ match cfg.Mainwin.CustomTitleBar with\n+ | Some true -> m_customTitleBar <- true\n+ | _ -> ()\n | None -> ()\n this.Watch [\n States.Register.Notify \"ToggleFullScreen\" (fun [| Integer32(gridid) |] -> toggleFullScreen gridid )\ndiff --git a/Views/Editor.xaml b/Views/Editor.xaml\nindex 15b8ae1..8842a4e 100644\n--- a/Views/Editor.xaml\n+++ b/Views/Editor.xaml\n@@ -6,22 +6,13 @@\n xmlns:fvim = \"clr-namespace:FVim;assembly=FVim\"\n Focusable = \"True\"\n x:Class = \"FVim.Editor\"\n- Background = \"{Binding BackgroundBrush, Mode=OneWay}\"\n+ Background = \"Transparent\"\n Design.Height=\"300\"\n Design.Width=\"400\"\n >\n <Design.DataContext>\n <fvim:EditorSampleData />\n </Design.DataContext>\n- <Image \n- Name = \"FrameBuffer\"\n- Source = \"{Binding FrameBuffer, Mode=OneWay}\"\n- Width = \"{Binding BufferWidth, Mode=OneWay}\"\n- Height = \"{Binding BufferHeight, Mode=OneWay}\"\n- HorizontalAlignment = \"Left\"\n- VerticalAlignment = \"Top\"\n- Focusable = \"False\"\n- />\n <fvim:Cursor\n DataContext = \"{Binding CursorInfo}\"\n Height = \"{Binding Height, Mode=OneWay}\"\ndiff --git a/Views/Editor.xaml.fs b/Views/Editor.xaml.fs\nindex 317072f..695dd69 100644\n--- a/Views/Editor.xaml.fs\n+++ b/Views/Editor.xaml.fs\n@@ -19,6 +19,7 @@ open System\n open System.Collections.Specialized\n open FSharp.Control.Reactive\n open Avalonia.Data\n+open Avalonia.Visuals.Media.Imaging\n \n type Editor() as this =\n inherit Canvas()\n@@ -30,6 +31,9 @@ type Editor() as this =\n let mutable grid_vm: EditorViewModel = Unchecked.defaultof<_>\n \n let mutable m_debug = false\n+ let mutable m_alphaLUT: byte[] = Array.create 256 0uy\n+ let mutable m_normalLUT: byte[] = Array.create 256 0uy\n+ let mutable m_nullLUT: byte[] = Array.create 256 0uy\n \n let trace fmt = \n let nr =\n@@ -38,17 +42,11 @@ type Editor() as this =\n trace (\"editor #\" + nr) fmt\n \n \n- let image() = this.FindControl<Image>(\"FrameBuffer\")\n-\n let resizeFrameBuffer() =\n grid_scale <- this.GetVisualRoot().RenderScaling\n- let image = image()\n- image.Source <- null\n if grid_fb <> null then\n grid_fb.Dispose()\n- grid_fb <- null\n grid_fb <- AllocateFramebuffer (grid_vm.BufferWidth) (grid_vm.BufferHeight) grid_scale\n- image.Source <- grid_fb\n \n //-------------------------------------------------------------------------\n // = The rounding error of the rendering system =\n@@ -219,6 +217,13 @@ type Editor() as this =\n \n \n do\n+\n+ // setup color filter LUTs\n+ for i = 0 to 255 do\n+ m_alphaLUT.[i] <- 0uy\n+ m_normalLUT.[i] <- byte i\n+ m_alphaLUT.[255] <- 255uy\n+\n this.Watch [\n this.GetObservable(Editor.DataContextProperty)\n |> Observable.ofType\n@@ -260,14 +265,27 @@ type Editor() as this =\n if m_debug then\n drawDebug grid_dc\n \n+ // doesn't work yet\n+ let skia = grid_dc :?> ISkiaDrawingContextImpl\n+ use paint = new SKPaint()\n+ paint.Color <- SKColor(255uy, 255uy, 255uy, 255uy)\n+ use table = SKColorFilter.CreateTable(m_alphaLUT, m_normalLUT, m_normalLUT, m_normalLUT)\n+ use shader = SKShader.CreateColorFilter(SKShader.CreateEmpty(), table)\n+ paint.Shader <- shader\n+ skia.SkCanvas.DrawPaint(paint)\n+\n grid_dc.PopClip()\n timer.Stop()\n trace \"drawing end, time = %dms.\" timer.ElapsedMilliseconds\n grid_vm.markClean()\n+ let src_rect = Rect(0.0,0.0,float grid_fb.PixelSize.Width, float grid_fb.PixelSize.Height)\n+ let tgt_rect = Rect(0.0,0.0,grid_fb.Size.Width, grid_fb.Size.Height)\n+\n+ ctx.DrawImage(grid_fb, 1.0, src_rect, tgt_rect, BitmapInterpolationMode.Default)\n \n (*trace \"image size: %A; fb size: %A\" (image().Bounds) (grid_fb.Size)*)\n (*trace \"base rendering\"*)\n- base.Render ctx\n+ (*base.Render ctx*)\n (*trace \"render end\"*)\n \n override this.MeasureOverride(size) =\ndiff --git a/Views/MainWindow.xaml b/Views/MainWindow.xaml\nindex e12c96f..f7bd3fa 100644\n--- a/Views/MainWindow.xaml\n+++ b/Views/MainWindow.xaml\n@@ -13,6 +13,7 @@\n WindowState=\"{Binding WindowState, Mode=TwoWay}\"\n HorizontalAlignment=\"Stretch\"\n VerticalAlignment=\"Stretch\"\n+ Background=\"Transparent\"\n >\n <Design.DataContext>\n <fvim:MainWindowSampleData />\ndiff --git a/Views/MainWindow.xaml.fs b/Views/MainWindow.xaml.fs\nindex 2981d29..2a7cb19 100644\n--- a/Views/MainWindow.xaml.fs\n+++ b/Views/MainWindow.xaml.fs\n@@ -18,12 +18,32 @@ open Avalonia.Interactivity\n \n #nowarn \"0025\"\n \n+open System.Runtime.InteropServices\n+open System.Runtime\n+open Avalonia.Media\n+\n type MainWindow() as this =\n inherit ReactiveWindow<MainWindowViewModel>()\n \n static let XProp = AvaloniaProperty.Register<MainWindow,int>(\"PosX\")\n static let YProp = AvaloniaProperty.Register<MainWindow,int>(\"PosY\")\n \n+ let mutable m_bgcolor: Color = Color()\n+ let mutable m_bgopacity: float = 1.0\n+ let mutable m_bgcomp = States.NoComposition\n+ let mutable m_bgacrylic = false\n+\n+ let configBackground() =\n+ m_bgcomp <- States.background_composition\n+ m_bgopacity <- States.background_opacity\n+ let comp =\n+ match m_bgcomp with\n+ | States.Acrylic -> ui.AdvancedBlur(m_bgopacity, m_bgcolor)\n+ | States.Blur -> ui.GaussianBlur(m_bgopacity, m_bgcolor)\n+ | _ -> ui.SolidBackground m_bgcolor\n+ trace \"mainwindow\" \"configBackground: %A\" comp\n+ ui.SetWindowBackgroundComposition this comp\n+ \n let mutable m_saved_size = Size(100.0,100.0)\n let mutable m_saved_pos = PixelPoint(300, 300)\n let mutable m_saved_state = WindowState.Normal\n@@ -98,6 +118,7 @@ type MainWindow() as this =\n #endif\n \n DragDrop.SetAllowDrop(this, true)\n+ configBackground()\n \n let flushop = \n if RuntimeInformation.IsOSPlatform(OSPlatform.Linux) then\n@@ -112,6 +133,8 @@ type MainWindow() as this =\n this.Bind(XProp, Binding(\"X\", BindingMode.TwoWay))\n this.Bind(YProp, Binding(\"Y\", BindingMode.TwoWay))\n \n+ States.Register.Watch \"background.composition\" configBackground\n+ States.Register.Watch \"background.opacity\" configBackground\n States.Register.Notify \"DrawFPS\" (fun [| Bool(v) |] -> \n trace \"mainwindow\" \"DrawFPS: %A\" v\n this.Renderer.DrawFps <- v)\n@@ -168,6 +191,7 @@ type MainWindow() as this =\n let mutable deltaX = 0\n let mutable deltaY = 0\n this.ViewModel <- ctx\n+ toggleTitleBar ctx.CustomTitleBar\n \n trace \"mainwindow\" \"set position: %d, %d\" pos.X pos.Y\n this.Position <- pos\n@@ -183,6 +207,11 @@ type MainWindow() as this =\n this.SetValue(XProp, p.Point.X - deltaX)\n this.SetValue(YProp, p.Point.Y - deltaY)\n )\n+ ctx.MainGrid.ObservableForProperty(fun x -> x.BackgroundColor) \n+ |> Observable.subscribe(fun c -> \n+ trace \"mainwindow\" \"update background color: %s\" (c.Value.ToString())\n+ m_bgcolor <- c.Value\n+ configBackground())\n ctx.ObservableForProperty((fun x -> x.Fullscreen), skipInitial=true).Subscribe(fun v -> toggleFullscreen <| v.GetValue())\n ctx.ObservableForProperty((fun x -> x.CustomTitleBar), skipInitial=true).Subscribe(fun v -> toggleTitleBar <| v.GetValue())\n ]\ndiff --git a/config.fs b/config.fs\nindex a496e5d..399c534 100644\n--- a/config.fs\n+++ b/config.fs\n@@ -13,6 +13,18 @@ let sample_config = \"\"\"\n [\n {\n \"workspace\": [\n+ {\n+ \"path\": \"C:\\foo\\bar\",\n+ \"mainwin\": {\n+ \"x\": 1030,\n+ \"y\": 200,\n+ \"w\": 800.00,\n+ \"h\": 600.00,\n+ \"state\": \"Normal\",\n+ \"BackgroundComposition\": \"acrylic\",\n+ \"CustomTitleBar\": false\n+ }\n+ },\n {\n \"path\": \"C:\\foo\\bar\",\n \"mainwin\": {\n@@ -56,10 +68,10 @@ let load() =\n cfg\n with _ -> ConfigObject.Parse(\"{}\")\n \n-let save (cfg: ConfigObject.Root) (x: int) (y: int) (w: float) (h: float) (state: WindowState) = \n+let save (cfg: ConfigObject.Root) (x: int) (y: int) (w: float) (h: float) (state: WindowState) (composition: string) (customTitleBar: bool) = \n let dict = cfg.Workspace |> Array.map (fun ws -> (ws.Path, ws)) |> Map.ofArray\n let cwd = Environment.CurrentDirectory |> Path.GetFullPath\n- let ws = ConfigObject.Workspace(cwd, ConfigObject.Mainwin(x, y, int w, int h, state.ToString()))\n+ let ws = ConfigObject.Workspace(cwd, ConfigObject.Mainwin(x, y, int w, int h, state.ToString(), Some composition, Some customTitleBar))\n let dict = dict.Add(cwd, ws)\n let cfg = ConfigObject.Root(dict |> Map.toArray |> Array.map snd, cfg.Logging)\n try File.WriteAllText(configfile, cfg.ToString())\ndiff --git a/lib/libfvim-ext.dylib b/lib/libfvim-ext.dylib\nnew file mode 100755\nindex 0000000..7bed1bf\nBinary files /dev/null and b/lib/libfvim-ext.dylib differ\ndiff --git a/model.fs b/model.fs\nindex 4157ece..8ed178e 100644\n--- a/model.fs\n+++ b/model.fs\n@@ -479,6 +479,11 @@ let Start opts =\n States.Register.Bool \"ui.termcolors\"\n States.Register.Bool \"ui.hlstate\"\n \n+ States.Register.Prop<States.BackgroundComposition> States.parseBackgroundComposition \"background.composition\"\n+ States.Register.Float \"background.opacity\"\n+ States.Register.Float \"background.altopacity\"\n+\n+\n List.iter ignore [\n ev_uiopt.Publish\n |> Observable.throttle(TimeSpan.FromMilliseconds 20.0)\n@@ -547,7 +552,7 @@ let Start opts =\n let clientVersion = \n hashmap [\n \"major\", \"0\"\n- \"minor\", \"1\"\n+ \"minor\", \"2\"\n \"prerelease\", \"dev\"\n ]\n let clientType = \"ui\"\n@@ -630,6 +635,11 @@ let Start opts =\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimDrawFPS\" 1 (sprintf \"call rpcnotify(%d, 'DrawFPS', <args>)\" myChannel))\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimCustomTitleBar\" 1 (sprintf \"call rpcnotify(%d, 'CustomTitleBar', <args>)\" myChannel))\n \n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimBackgroundOpacity\" 1 (sprintf \"call rpcnotify(%d, 'background.opacity', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimBackgroundComposition\" 1 (sprintf \"call rpcnotify(%d, 'background.composition', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimBackgroundAltOpacity\" 1 (sprintf \"call rpcnotify(%d, 'background.altopacity', <args>)\" myChannel))\n+\n+\n // trigger ginit upon VimEnter\n let! _ = Async.AwaitTask(nvim.command \"autocmd VimEnter * runtime! ginit.vim\")\n ()\ndiff --git a/native/osx/CMakeLists.txt b/native/osx/CMakeLists.txt\nnew file mode 100644\nindex 0000000..7f012ee\n--- /dev/null\n+++ b/native/osx/CMakeLists.txt\n@@ -0,0 +1,7 @@\n+PROJECT(fvim-ext)\n+FIND_LIBRARY(COCOA_LIBRARY Cocoa)\n+\n+SET(src vibrancy_helper.m)\n+\n+ADD_LIBRARY(fvim-ext SHARED ${src})\n+TARGET_LINK_LIBRARIES(fvim-ext ${COCOA_LIBRARY})\ndiff --git a/native/osx/compile_commands.json b/native/osx/compile_commands.json\nnew file mode 100644\nindex 0000000..d10da42\n--- /dev/null\n+++ b/native/osx/compile_commands.json\n@@ -0,0 +1,7 @@\n+[\n+{\n+ \"directory\": \"/Users/v-yadli/git/fvim/native/osx/build\",\n+ \"command\": \"/Library/Developer/CommandLineTools/usr/bin/cc -Dfvim_ext_EXPORTS -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.14.sdk -fPIC -o CMakeFiles/fvim-ext.dir/vibrancy_helper.m.o -c /Users/v-yadli/git/fvim/native/osx/vibrancy_helper.m\",\n+ \"file\": \"/Users/v-yadli/git/fvim/native/osx/vibrancy_helper.m\"\n+}\n+]\n\\ No newline at end of file\ndiff --git a/native/osx/vibrancy_helper.m b/native/osx/vibrancy_helper.m\nnew file mode 100644\nindex 0000000..2532f98\n--- /dev/null\n+++ b/native/osx/vibrancy_helper.m\n@@ -0,0 +1,53 @@\n+#define PLATFORM_OSX\n+#include <Foundation/Foundation.h>\n+#include <AppKit/AppKit.h>\n+#include <CoreServices/CoreServices.h>\n+#include <objc/objc-runtime.h>\n+\n+#define VH_MAX_VIEWS 1024\n+\n+static int32_t s_id_arr[VH_MAX_VIEWS];\n+static NSVisualEffectView* s_view_arr[VH_MAX_VIEWS];\n+static int32_t s_arr_size;\n+static int32_t s_next_id;\n+\n+void vh_init() {\n+ s_arr_size = 0;\n+ s_next_id = 0;\n+ memset(s_id_arr, -1, sizeof(s_id_arr));\n+ memset(s_view_arr, 0, sizeof(s_view_arr));\n+}\n+\n+int32_t vh_add_view(NSView* view) {\n+ if(!view) {\n+ printf(\"vh_add_view: view is null\\n\");\n+ return -1;\n+ }\n+\n+ if(s_arr_size >= VH_MAX_VIEWS) {\n+ return -2;\n+ }\n+\n+ NSVisualEffectView* vibrantView = [ \n+ [NSVisualEffectView alloc] \n+ initWithFrame: [[view window] frame]];\n+\n+ printf(\"allocated vibrantView: %llx\\n\", (uint64_t)vibrantView);\n+\n+ [vibrantView setBlendingMode: NSVisualEffectBlendingModeBehindWindow];\n+ [vibrantView setAutoresizingMask: NSViewWidthSizable|NSViewHeightSizable];\n+ [vibrantView setMaterial: NSVisualEffectMaterialUnderWindowBackground];\n+ [view.window.contentView\n+ addSubview: vibrantView\n+ positioned: NSWindowBelow\n+ relativeTo: nil];\n+\n+ int32_t viewId = s_next_id++;\n+ s_id_arr[s_arr_size] = viewId;\n+ s_view_arr[s_arr_size] = vibrantView;\n+ ++s_arr_size;\n+\n+ printf(\"vibrancy OK\\n\");\n+\n+ return viewId;\n+}\ndiff --git a/pack.sh b/pack.sh\nindex 5c2bcc2..01fd912 100755\n--- a/pack.sh\n+++ b/pack.sh\n@@ -51,6 +51,7 @@ function pack-osx-x64()\n mkdir -p publish/Contents/Resources/\n popd\n cp lib/fvim-osx-launcher $PKG_ROOT/Contents/MacOS/fvim-osx-launcher\n+ cp lib/libfvim-ext.dylib $PKG_ROOT/Contents/MacOS/libfvim-ext.dylib\n cp images/icon.icns $PKG_ROOT/Contents/Resources/fvim.icns\n cp lib/Info.plist $PKG_ROOT/Contents/Info.plist\n cp icons-icns/* $PKG_ROOT/Contents/Resources/\ndiff --git a/states.fs b/states.fs\nindex aec7d03..e91bd49 100644\n--- a/states.fs\n+++ b/states.fs\n@@ -87,6 +87,16 @@ let mutable ui_messages = false\n let mutable ui_termcolors = false\n let mutable ui_hlstate = false\n \n+type BackgroundComposition =\n+ | NoComposition\n+ | Blur\n+ | Acrylic\n+\n+// background\n+let mutable background_composition = NoComposition\n+let mutable background_opacity = 1.0\n+let mutable background_altopacity = 1.0\n+\n [<Literal>]\n let uiopt_rgb = \"rgb\"\n [<Literal>]\n@@ -139,7 +149,6 @@ module private Helper =\n error \"states\" \"The property %s is not found\" name\n None\n \n-\n let parseHintLevel (v: obj) = \n match v with\n | String v ->\n@@ -171,6 +180,22 @@ let parseLineHeightOption (v: obj) =\n else None\n | _ -> None\n \n+let parseBackgroundComposition (v: obj) = \n+ match v with\n+ | String v ->\n+ match v.ToLower() with\n+ | \"none\" -> Some NoComposition\n+ | \"blur\" -> Some Blur\n+ | \"acrylic\" -> Some Acrylic\n+ | _ -> None\n+ | _ -> None\n+\n+let backgroundCompositionToString = \n+ function\n+ | NoComposition -> \"none\"\n+ | Blur -> \"blur\"\n+ | Acrylic -> \"acrylic\"\n+\n let Shutdown code = _appLifetime.Shutdown code\n \n let msg_dispatch =\n@@ -239,4 +264,9 @@ module Register =\n \n let Bool = Prop<bool> (|Bool|_|)\n let String = Prop<string> (|String|_|)\n+ let Float = Prop<float> (function\n+ | Integer32 x -> Some(float x)\n+ | :? float as x -> Some x\n+ | _ -> None)\n+\n \ndiff --git a/theme.fs b/theme.fs\nindex 60ce8d8..779c969 100644\n--- a/theme.fs\n+++ b/theme.fs\n@@ -60,8 +60,14 @@ let GetDrawAttrs hlid =\n fg <- bg\n bg <- tmp\n \n+ if (States.background_composition <> States.BackgroundComposition.NoComposition) then\n+ let alpha = \n+ if bg = default_bg then 0uy\n+ else byte(States.background_altopacity * 255.0)\n+ bg <- Avalonia.Media.Color(alpha, bg.R, bg.G, bg.B)\n fg, bg, sp, attrs\n \n+\n do\n let fg,bg,sp,_ = GetDrawAttrs 0\n default_bg <- bg\ndiff --git a/ui.fs b/ui.fs\nindex 48ac606..8033167 100644\n--- a/ui.fs\n+++ b/ui.fs\n@@ -17,6 +17,8 @@ open SkiaSharp.HarfBuzz\n open System\n open System.Reflection\n \n+#nowarn \"0009\"\n+\n type InputEvent = \n | Key of mods: KeyModifiers * key: Key\n | MousePress of mods: KeyModifiers * row: int * col: int * button: MouseButton\n@@ -269,28 +271,32 @@ let SetForegroundBrush(fgpaint: SKPaint, c: Color, fontFace: SKTypeface, fontSiz\n \n let RenderText (ctx: IDrawingContextImpl, region: Rect, scale: float, fg: SKPaint, bg: SKPaint, sp: SKPaint, underline: bool, undercurl: bool, text: string, shaper: SKShaper ValueOption) =\n \n- // don't clip. see #60\n- // ctx.PushClip(region)\n+ // don't clip all along. see #60\n \n // DrawText accepts the coordinate of the baseline.\n-\n+ let region' = region\n let region = region.ToSKRect()\n \n+ // DrawText accepts the coordinate of the baseline.\n+ // h = [padding space 1] + above baseline | below baseline + [padding space 2]\n let h = region.Bottom - region.Top\n- let h' = fg.FontMetrics.Bottom - fg.FontMetrics.Top\n- let total_padding = h - h'\n- let prop = h / h'\n- let baseline = region.Top + ceil((total_padding / 2.0f) - (fg.FontMetrics.Top))\n- (*let baseline = ceil( region.Bottom - (fg.FontMetrics.Bottom * prop))*)\n+ // total_padding = padding space 1 + padding space 2\n+ let total_padding = h - ((fg.FontMetrics.Bottom - fg.FontMetrics.Top))\n+ let baseline = region.Top + ceil((total_padding / 2.0f) - fg.FontMetrics.Top)\n (*printfn \"scale=%A pad=%A base=%A region=%A\" scale total_padding baseline region*)\n- let fontPos = SKPoint(region.Left, baseline)\n+ let fontPos = SKPoint(region.Left, baseline)\n \n let skia = ctx :?> ISkiaDrawingContextImpl\n \n //lol wat??\n //fg.Shader <- SKShader.CreateCompose(SKShader.CreateColor(fg.Color), SKShader.CreatePerlinNoiseFractalNoise(0.1F, 0.1F, 1, 6.41613F))\n \n- skia.SkCanvas.DrawRect(region, bg)\n+ // push clip and fill bg\n+ let _clearColor = Avalonia.Media.Color(bg.Color.Alpha, bg.Color.Red, bg.Color.Green, bg.Color.Blue)\n+ skia.PushClip region'\n+ skia.Clear _clearColor\n+ skia.PopClip ()\n+\n if not <| String.IsNullOrWhiteSpace text then\n if shaper.IsSome then\n skia.SkCanvas.DrawShapedText(shaper.Value, text.TrimEnd(), single fontPos.X, single fontPos.Y, fg)\n@@ -345,4 +351,194 @@ let RenderText (ctx: IDrawingContextImpl, region: Rect, scale: float, fg: SKPain\n px <- px + ff\n skia.SkCanvas.DrawPath(path , sp)\n \n- ctx.PopClip()\n+\n+module internal win32 =\n+ type AccentState =\n+ | ACCENT_DISABLED = 0\n+ | ACCENT_ENABLE_GRADIENT = 1\n+ | ACCENT_ENABLE_TRANSPARENTGRADIENT = 2\n+ | ACCENT_ENABLE_BLURBEHIND = 3\n+ | ACCENT_ENABLE_ACRYLICBLURBEHIND = 4 // RS4 1803\n+ | ACCENT_ENABLE_HOSTBACKDROP = 5 // RS5 1809\n+ | ACCENT_INVALID_STATE = 6\n+\n+ [<Struct>]\n+ [<StructLayout(LayoutKind.Sequential)>]\n+ type AccentPolicy =\n+ {\n+ AccentState: AccentState\n+ AccentFlags: uint32\n+ GradientColor: uint32\n+ AnimationId: uint32\n+ }\n+\n+ type WindowCompositionAttribute =\n+ // ...\n+ | WCA_ACCENT_POLICY = 19\n+ | WCA_USEDARKMODECOLORS = 26\n+ // ...\n+\n+\n+ [<Struct>]\n+ [<StructLayout(LayoutKind.Sequential)>]\n+ type WindowCompositionAttributeData =\n+ {\n+ Attribute: WindowCompositionAttribute\n+ Data: nativeint\n+ SizeOfData: int32\n+ }\n+\n+ [<DllImport(\"user32.dll\")>]\n+ extern int SetWindowCompositionAttribute(nativeint hwnd, WindowCompositionAttributeData& data);\n+\n+module internal osx =\n+ [<DllImport(\"fvim-ext\")>]\n+ extern void vh_init();\n+ [<DllImport(\"fvim-ext\")>]\n+ extern int32 vh_add_view(nativeint hwnd);\n+\n+ if RuntimeInformation.IsOSPlatform(OSPlatform.OSX) then\n+ vh_init()\n+\n+\n+module internal linux =\n+ type PropertyMode =\n+ | Replace = 0\n+ | Prepend = 1\n+ | Append = 2\n+\n+ type AtomType =\n+ | XA_ATOM = 4\n+ | XA_CARDINAL = 6\n+ | XA_STRING = 31\n+\n+ [<DllImport (\"libX11.so.6\")>]\n+ extern int32 XChangeProperty(\n+ nativeint display, \n+ nativeint window, \n+ nativeint property, \n+ nativeint _type, \n+ int32 format, \n+ PropertyMode mode, \n+ nativeint data, \n+ int32 nelements)\n+\n+ [<DllImport (\"libX11.so.6\")>]\n+ extern nativeint XInternAtom(\n+ nativeint display,\n+ string atomName,\n+ bool onlyIfExists)\n+\n+\n+\n+open win32\n+open osx\n+open linux\n+\n+type WindowBackgroundComposition =\n+ | SolidBackground of color: Color\n+ | GaussianBlur of opacity: float * color: Color\n+ | AdvancedBlur of opacity: float * color: Color\n+\n+let SetWindowBackgroundComposition (win: Avalonia.Controls.Window) (composition: WindowBackgroundComposition)=\n+\n+ if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then\n+ let state, opacity, bgcolor = \n+ match composition with\n+ | SolidBackground c -> \n+ win.Background <- SolidColorBrush(c)\n+ AccentState.ACCENT_DISABLED, 0u, 0u\n+ | GaussianBlur(op, c) ->\n+ let c = Color(byte(op * 255.0), c.R, c.G, c.B)\n+ win.Background <- SolidColorBrush(c)\n+ AccentState.ACCENT_ENABLE_BLURBEHIND, uint32(op * 255.0), 0u\n+ | AdvancedBlur(op, c) ->\n+ win.Background <- Brushes.Transparent\n+ // RGB -> BGR\n+ let c = Color(0uy, c.B, c.G, c.R)\n+ AccentState.ACCENT_ENABLE_ACRYLICBLURBEHIND, uint32(op * 255.0), c.ToUint32()\n+\n+ let accent = \n+ { \n+ AccentState = state\n+ GradientColor = (opacity <<< 24) ||| (bgcolor &&& 0xFFFFFFu) \n+ AccentFlags = 0x2u\n+ AnimationId = 0u\n+ }\n+ let accentStructSize = Marshal.SizeOf(accent);\n+ let accentPtr = Marshal.AllocHGlobal(accentStructSize);\n+ Marshal.StructureToPtr(accent, accentPtr, false);\n+\n+ let mutable data = { Attribute = WindowCompositionAttribute.WCA_ACCENT_POLICY; SizeOfData = accentStructSize; Data = accentPtr }\n+ SetWindowCompositionAttribute(win.PlatformImpl.Handle.Handle, &data) |> ignore\n+\n+ Marshal.FreeHGlobal(accentPtr);\n+ elif RuntimeInformation.IsOSPlatform(OSPlatform.OSX) then\n+ match composition with\n+ | SolidBackground c ->\n+ win.Background <- SolidColorBrush(c)\n+ | GaussianBlur(op, c)\n+ | AdvancedBlur(op, c) ->\n+ let c = Color(byte(op * 255.0), c.R, c.G, c.B)\n+ win.Background <- SolidColorBrush(c)\n+ ignore <| vh_add_view(win.PlatformImpl.Handle.Handle)\n+ elif RuntimeInformation.IsOSPlatform(OSPlatform.Linux) then\n+ (**\n+ useful pointers:\n+ https://github.com/mono/mono/blob/c5b88ec4f323f2bdb7c7d0a595ece28dae66579c/mcs/class/System.Windows.Forms/System.Windows.Forms/X11Structs.cs\n+ https://github.com/mono/mono/tree/c5b88ec4f323f2bdb7c7d0a595ece28dae66579c/mcs/class/System.Windows.Forms/System.Windows.Forms\n+ https://github.com/AvaloniaUI/Avalonia/tree/master/src/Avalonia.X11\n+ libX11 doc: https://www.x.org/releases/X11R7.6/doc/libX11/specs/libX11/libX11.html\n+ XChangeProperty in action: https://github.com/KanoComputing/kdesk/blob/master/src/kdesk-blur/kdesk-blur.cpp\n+ tip: use `xprop` to test\n+ xprop -f _KDE_NET_WM_BLUR_BEHIND_REGION 32c -set _KDE_NET_WM_BLUR_BEHIND_REGION '0'\n+ and then, do `xprop` without arguments to inspect a window. setting the right data type is crucial!\n+ *)\n+\n+ let x11win = win.PlatformImpl\n+ let x11win_type = x11win.GetType()\n+\n+ let x11info_field = x11win_type.GetField(\"_x11\", BindingFlags.NonPublic ||| BindingFlags.Instance)\n+ let x11info_type = x11info_field.FieldType\n+ let x11info = x11info_field.GetValue(x11win)\n+\n+ let x11display_field = x11info_type.GetProperty(\"Display\")\n+ let x11display_handle = x11display_field.GetValue(x11info) :?> nativeint\n+ let x11win_handle = x11win.Handle.Handle\n+\n+ let blur_param = [|0|]\n+ use pblur_param = fixed blur_param\n+\n+\n+ // KDE\n+ let blur_atom = XInternAtom(x11display_handle, \"_KDE_NET_WM_BLUR_BEHIND_REGION\", false)\n+ ignore <| XChangeProperty(\n+ x11display_handle, \n+ x11win_handle, \n+ blur_atom, \n+ nativeint AtomType.XA_CARDINAL, \n+ 32, \n+ PropertyMode.Replace, \n+ NativeInterop.NativePtr.toNativeInt pblur_param,\n+ 1)\n+\n+ // Deepin\n+ let blur_atom = XInternAtom(x11display_handle, \"_NET_WM_DEEPIN_BLUR_REGION_ROUNDED\", false)\n+ ignore <| XChangeProperty(\n+ x11display_handle, \n+ x11win_handle, \n+ blur_atom, \n+ nativeint AtomType.XA_CARDINAL, \n+ 32, \n+ PropertyMode.Replace, \n+ NativeInterop.NativePtr.toNativeInt pblur_param,\n+ 1)\n+\n+ match composition with\n+ | SolidBackground c ->\n+ win.Background <- SolidColorBrush(c)\n+ | GaussianBlur(op, c)\n+ | AdvancedBlur(op, c) ->\n+ let c = Color(byte(op * 255.0), c.R, c.G, c.B)\n+ win.Background <- SolidColorBrush(c)\n+ (*ignore <| vh_add_view(win.PlatformImpl.Handle.Handle)*)\n"},"changed_files":{"kind":"list like","value":[".gitignore","Program.fs","ViewModels/EditorViewModel.fs","ViewModels/MainWindowViewModel.fs","Views/Editor.xaml","Views/Editor.xaml.fs","Views/MainWindow.xaml","Views/MainWindow.xaml.fs","config.fs","lib/libfvim-ext.dylib","model.fs","native/osx/CMakeLists.txt","native/osx/compile_commands.json","native/osx/vibrancy_helper.m","pack.sh","states.fs","theme.fs","ui.fs"],"string":"[\n \".gitignore\",\n \"Program.fs\",\n \"ViewModels/EditorViewModel.fs\",\n \"ViewModels/MainWindowViewModel.fs\",\n \"Views/Editor.xaml\",\n \"Views/Editor.xaml.fs\",\n \"Views/MainWindow.xaml\",\n \"Views/MainWindow.xaml.fs\",\n \"config.fs\",\n \"lib/libfvim-ext.dylib\",\n \"model.fs\",\n \"native/osx/CMakeLists.txt\",\n \"native/osx/compile_commands.json\",\n \"native/osx/vibrancy_helper.m\",\n \"pack.sh\",\n \"states.fs\",\n \"theme.fs\",\n \"ui.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86273,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":83,"string":"83"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Custom titlebar"},"pr_body":{"kind":"string","value":""},"base_sha":{"kind":"string","value":"f19607b17e3550159dc1ecd4adbc1c8718809ef1"},"head_sha":{"kind":"string","value":"bacca86560c8c1b7b8b4d4052adc09d6229986c9"},"gold_diff":{"kind":"string","value":"diff --git a/DesignTime/EditorSampleData.fs b/DesignTime/EditorSampleData.fs\nnew file mode 100644\nindex 0000000..e875ad9\n--- /dev/null\n+++ b/DesignTime/EditorSampleData.fs\n@@ -0,0 +1,10 @@\n+namespace FVim\n+\n+open Avalonia.Media\n+open Avalonia.Controls\n+open Avalonia.Media.Imaging\n+\n+type EditorSampleData() =\n+ member this.BackgroundBrush = Brushes.DarkGray\n+ member this.BufferWidth = 400.0\n+ member this.BufferHeight = 300.0\ndiff --git a/DesignTime/MainWindowSampleData.fs b/DesignTime/MainWindowSampleData.fs\nnew file mode 100644\nindex 0000000..2625883\n--- /dev/null\n+++ b/DesignTime/MainWindowSampleData.fs\n@@ -0,0 +1,10 @@\n+namespace FVim\n+\n+open Avalonia.Controls\n+\n+type MainWindowSampleData() =\n+ member __.Title = \"FVim - Test.txt\"\n+ member __.UseCustomTitleBar = true\n+ member __.CustomTitleBarHeight = GridLength 26.0\n+ member __.BorderSize = GridLength 1.0\n+ //member __.MainGrid = EditorSampleData()\ndiff --git a/DesignTime/TitleBarSampleData.fs b/DesignTime/TitleBarSampleData.fs\nnew file mode 100644\nindex 0000000..f8f7283\n--- /dev/null\n+++ b/DesignTime/TitleBarSampleData.fs\n@@ -0,0 +1,14 @@\n+namespace FVim\n+\n+open Avalonia\n+open Avalonia.Media\n+\n+type TitleBarSampleData() =\n+ member __.NormalBackground = Brushes.DarkSlateBlue\n+ member __.NormalForeground = Brushes.White\n+ member __.HoverBackground = Brushes.MediumVioletRed\n+ member __.HoverForeground = Brushes.Blue\n+ member __.SelectBackground = Brushes.Yellow\n+ member __.SelectForeground = Brushes.Green\n+ member __.FontFamily = \"Consolas\"\n+ member __.FontSize = 16.0\ndiff --git a/ViewModels/EditorViewModel.fs b/ViewModels/EditorViewModel.fs\nindex 88a1c73..29dab70 100644\n--- a/ViewModels/EditorViewModel.fs\n+++ b/ViewModels/EditorViewModel.fs\n@@ -44,7 +44,6 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n \n let mutable m_gridsize = _d { rows = 10; cols= 10 } _gridsize\n let mutable m_gridscale = _d 1.0 _gridscale\n- let mutable m_gridfullscreen = false\n let mutable m_gridbuffer = Array2D.create m_gridsize.rows m_gridsize.cols GridBufferCell.empty\n let mutable m_griddirty = GridRegion()\n let mutable m_fontsize = theme.fontsize\n@@ -55,11 +54,6 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n \n let raiseInputEvent e = m_input_ev.Trigger(GridId, e)\n \n- let toggleFullScreen(gridid: int) =\n- if gridid = GridId then\n- trace \"ToggleFullScreen\"\n- this.Fullscreen <- not this.Fullscreen\n-\n let getPos (p: Point) =\n int(p.X / m_glyphsize.Width), int(p.Y / m_glyphsize.Height)\n \n@@ -286,9 +280,6 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n this.RaisePropertyChanged(\"BackgroundBrush\")\n markAllDirty()\n \n- let pumConfig colors =\n- m_popupmenu_vm.SetColors colors\n-\n let updateMouseButton (pp: PointerPoint) =\n let k = pp.Properties.PointerUpdateKind\n match k with\n@@ -337,10 +328,6 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n if m_cursor_vm.ingrid then \n this.setCursorEnabled en)\n \n- theme.pumconfig_ev.Publish\n- |> Observable.subscribe pumConfig\n-\n- States.Register.Notify \"ToggleFullScreen\" (fun [| Integer32(gridid) |] -> toggleFullScreen gridid )\n States.Register.Watch \"font\" fontConfig\n \n ] \n@@ -435,11 +422,6 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n \n (******************* Exposed properties ***********************)\n \n- member this.Fullscreen\n- with get() : bool = m_gridfullscreen\n- and set(v) =\n- ignore <| this.RaiseAndSetIfChanged(&m_gridfullscreen, v)\n-\n member this.CursorInfo\n with get() : CursorViewModel = m_cursor_vm\n \ndiff --git a/ViewModels/MainWindowViewModel.fs b/ViewModels/MainWindowViewModel.fs\nindex f52ff77..51e7791 100644\n--- a/ViewModels/MainWindowViewModel.fs\n+++ b/ViewModels/MainWindowViewModel.fs\n@@ -1,22 +1,38 @@\n namespace FVim\n \n+open log\n+open common\n+\n open ReactiveUI\n open Avalonia\n open Avalonia.Controls\n open System\n+open ui\n+\n+#nowarn \"0025\"\n \n /// <summary>\n /// A MainWindow is a top-level container that holds a main grid as the root.\n /// Other grids may be anchored to the main grid as children.\n /// </summary>\n type MainWindowViewModel(cfg: config.ConfigObject.Workspace option, ?_maingrid: EditorViewModel) as this =\n- inherit ViewModelBase(Some 300.0, Some 300.0, Some 800.0, Some 600.0)\n+ inherit ThemableViewModelBase(Some 300.0, Some 300.0, Some 800.0, Some 600.0)\n \n let mainGrid = \n if _maingrid.IsNone then EditorViewModel(1)\n else _maingrid.Value\n \n+ let trace fmt = trace (sprintf \"MainWindowVM #%d\" mainGrid.GridId) fmt\n+\n let mutable m_windowState = WindowState.Normal\n+ let mutable m_customTitleBar = false\n+ let mutable m_fullscreen = false\n+ let mutable m_title = \"FVim\"\n+\n+ let toggleFullScreen(gridid: int) =\n+ if gridid = mainGrid.GridId then\n+ this.Fullscreen <- not this.Fullscreen\n+ trace \"ToggleFullScreen %A\" this.Fullscreen\n \n do\n match cfg with\n@@ -29,11 +45,53 @@ type MainWindowViewModel(cfg: config.ConfigObject.Workspace option, ?_maingrid:\n | true, v -> this.WindowState <- v\n | _ -> ()\n | None -> ()\n+ this.Watch [\n+ States.Register.Notify \"ToggleFullScreen\" (fun [| Integer32(gridid) |] -> toggleFullScreen gridid )\n+ States.Register.Notify \"CustomTitleBar\" (fun [| Bool(v) |] -> this.CustomTitleBar <- v )\n+ ]\n+ Model.OnWindowReady this\n \n member __.MainGrid = mainGrid\n \n+ member this.Title\n+ with get() = m_title\n+ and set(v) = ignore <| this.RaiseAndSetIfChanged(&m_title, v)\n+\n+ member this.Fullscreen\n+ with get() : bool = m_fullscreen\n+ and set(v) =\n+ m_fullscreen <- v\n+ this.RaisePropertyChanged(\"CustomTitleBarHeight\")\n+ this.RaisePropertyChanged(\"BorderSize\")\n+ this.RaisePropertyChanged(\"Fullscreen\")\n+\n member this.WindowState\n with get(): WindowState = m_windowState\n and set(v) = \n+ this.RaisePropertyChanged(\"BorderSize\")\n ignore <| this.RaiseAndSetIfChanged(&m_windowState, v)\n \n+ member this.CustomTitleBarHeight \n+ with get() =\n+ if this.CustomTitleBar && (not this.Fullscreen) then GridLength 26.0\n+ else GridLength 0.0\n+\n+ member this.BorderSize \n+ with get() =\n+ if this.CustomTitleBar && (not this.Fullscreen) && (this.WindowState <> WindowState.Maximized) \n+ then GridLength 1.0\n+ else GridLength 0.0\n+\n+ member this.CustomTitleBar\n+ with get() = m_customTitleBar\n+ and set(v) = \n+ ignore <| this.RaiseAndSetIfChanged(&m_customTitleBar, v)\n+ this.RaisePropertyChanged(\"CustomTitleBarHeight\")\n+ this.RaisePropertyChanged(\"BorderSize\")\n+\n+ interface IWindow with\n+ member __.RootId = this.MainGrid.GridId\n+ member __.Title\n+ with get() = this.Title\n+ and set (v: string): unit = \n+ this.Title <- v\ndiff --git a/ViewModels/PopupMenuViewModel.fs b/ViewModels/PopupMenuViewModel.fs\nindex ed9470e..5870d52 100644\n--- a/ViewModels/PopupMenuViewModel.fs\n+++ b/ViewModels/PopupMenuViewModel.fs\n@@ -6,30 +6,17 @@ open log\n open ReactiveUI\n open System.Collections.ObjectModel\n open System.Threading\n-open FVim.common.helpers\n open Avalonia\n-open Avalonia.Media\n open Avalonia.Threading\n-#nowarn \"0025\"\n \n type PopupMenuViewModel() =\n- inherit ViewModelBase()\n+ inherit ThemableViewModelBase()\n \n let mutable m_show = false\n let mutable m_selection = -1\n let mutable m_fontFamily = Avalonia.Media.FontFamily(\"\")\n let mutable m_fontSize = 12.0\n \n- // Colors\n- let mutable m_normalFg: IBrush = Brushes.Black :> IBrush\n- let mutable m_normalBg: IBrush = Brushes.White :> IBrush\n- let mutable m_selectFg: IBrush = Brushes.Black :> IBrush\n- let mutable m_selectBg: IBrush = Brushes.AliceBlue :> IBrush\n- let mutable m_hoverBg: IBrush = Brushes.AliceBlue :> IBrush\n- let mutable m_scrollbarFg: IBrush = Brushes.DimGray :> IBrush\n- let mutable m_scrollbarBg: IBrush = Brushes.Gray :> IBrush\n- let mutable m_border: IBrush = Brushes.DarkGray :> IBrush\n-\n let m_items = ObservableCollection<CompletionItemViewModel>()\n let mutable m_cancelSrc: CancellationTokenSource = new CancellationTokenSource()\n let m_itemCommit = Event<int>()\n@@ -47,44 +34,12 @@ type PopupMenuViewModel() =\n member this.Items with get() = m_items\n member this.FontFamily with get() = m_fontFamily\n member this.FontSize with get() = m_fontSize\n- member this.NormalForeground with get() = m_normalFg\n- member this.NormalBackground with get() = m_normalBg\n- member this.SelectForeground with get() = m_selectFg\n- member this.SelectBackground with get() = m_selectBg\n- member this.HoverBackground with get() = m_hoverBg\n- member this.ScrollbarForeground with get() = m_scrollbarFg\n- member this.ScrollbarBackground with get() = m_scrollbarBg\n- member this.BorderColor with get() = m_border\n member this.Commit = m_itemCommit.Publish\n- \n \n member this.SetFont(fontfamily, fontsize) =\n ignore <| this.RaiseAndSetIfChanged(&m_fontFamily, Avalonia.Media.FontFamily(fontfamily), \"FontFamily\")\n ignore <| this.RaiseAndSetIfChanged(&m_fontSize, fontsize, \"FontSize\")\n \n- member this.SetColors(nfg: Color, nbg: Color, sfg: Color, sbg: Color, scfg: Color, scbg: Color, bbg: Color) =\n- let tobrush (x: Color) = SolidColorBrush(x) :> IBrush\n- let (/) (x: Color) (y: float) = \n- Color(\n- byte(float x.A), \n- byte(float x.R / y), \n- byte(float x.G / y), \n- byte(float x.B / y))\n- let (+) (x: Color) (y: Color) = Color(x.A + y.A, x.R + y.R, x.G + y.G, x.B + y.B)\n- let hbg = sbg / 2.0 + nbg / 2.0\n- let [nfg; nbg; sfg; sbg; hbg; scfg; scbg; bbg] = List.map tobrush [ nfg; nbg; sfg; sbg; hbg; scfg; scbg; bbg ]\n-\n- [\n- this.RaiseAndSetIfChanged(&m_normalFg, nfg, \"NormalForeground\")\n- this.RaiseAndSetIfChanged(&m_normalBg, nbg, \"NormalBackground\")\n- this.RaiseAndSetIfChanged(&m_selectFg, sfg, \"SelectForeground\")\n- this.RaiseAndSetIfChanged(&m_selectBg, sbg, \"SelectBackground\")\n- this.RaiseAndSetIfChanged(&m_hoverBg, hbg, \"HoverBackground\")\n- this.RaiseAndSetIfChanged(&m_scrollbarFg, scfg, \"ScrollbarForeground\")\n- this.RaiseAndSetIfChanged(&m_scrollbarBg, scbg, \"ScrollbarBackground\")\n- this.RaiseAndSetIfChanged(&m_border, bbg, \"BorderColor\")\n- ] |> ignore\n-\n member this.SetItems(items: CompleteItem[], textArea: Rect, lineHeight: float, desiredSizeVec: Point, editorSizeVec: Point) =\n m_items.Clear()\n \ndiff --git a/ViewModels/ThemableViewModelBase.fs b/ViewModels/ThemableViewModelBase.fs\nnew file mode 100644\nindex 0000000..9c7f52f\n--- /dev/null\n+++ b/ViewModels/ThemableViewModelBase.fs\n@@ -0,0 +1,60 @@\n+namespace FVim\n+\n+open ReactiveUI\n+open Avalonia.Media\n+open Avalonia\n+\n+#nowarn \"0025\"\n+\n+type ThemableViewModelBase(x, y, w, h) as this = \n+ inherit ViewModelBase(x, y, w, h)\n+\n+ // Colors\n+ let mutable m_normalFg: IBrush = Brushes.Black :> IBrush\n+ let mutable m_normalBg: IBrush = Brushes.White :> IBrush\n+ let mutable m_selectFg: IBrush = Brushes.Black :> IBrush\n+ let mutable m_selectBg: IBrush = Brushes.AliceBlue :> IBrush\n+ let mutable m_hoverBg: IBrush = Brushes.AliceBlue :> IBrush\n+ let mutable m_scrollbarFg: IBrush = Brushes.DimGray :> IBrush\n+ let mutable m_scrollbarBg: IBrush = Brushes.Gray :> IBrush\n+ let mutable m_border: IBrush = Brushes.DarkGray :> IBrush\n+\n+ do\n+ this.Watch [\n+ theme.themeconfig_ev.Publish\n+ |> Observable.subscribe this.SetColors\n+ ]\n+\n+ new() = ThemableViewModelBase(None, None, None, None)\n+ member this.NormalForeground with get() = m_normalFg\n+ member this.NormalBackground with get() = m_normalBg\n+ member this.SelectForeground with get() = m_selectFg\n+ member this.SelectBackground with get() = m_selectBg\n+ member this.HoverBackground with get() = m_hoverBg\n+ member this.ScrollbarForeground with get() = m_scrollbarFg\n+ member this.ScrollbarBackground with get() = m_scrollbarBg\n+ member this.BorderColor with get() = m_border\n+\n+ member this.SetColors(nfg: Color, nbg: Color, sfg: Color, sbg: Color, scfg: Color, scbg: Color, bbg: Color) =\n+ let tobrush (x: Color) = SolidColorBrush(x) :> IBrush\n+ let (/) (x: Color) (y: float) = \n+ Color(\n+ byte(float x.A), \n+ byte(float x.R / y), \n+ byte(float x.G / y), \n+ byte(float x.B / y))\n+ let (+) (x: Color) (y: Color) = Color(x.A + y.A, x.R + y.R, x.G + y.G, x.B + y.B)\n+ let hbg = sbg / 2.0 + nbg / 2.0\n+ let [nfg; nbg; sfg; sbg; hbg; scfg; scbg; bbg] = List.map tobrush [ nfg; nbg; sfg; sbg; hbg; scfg; scbg; bbg ]\n+\n+ [\n+ this.RaiseAndSetIfChanged(&m_normalFg, nfg, \"NormalForeground\")\n+ this.RaiseAndSetIfChanged(&m_normalBg, nbg, \"NormalBackground\")\n+ this.RaiseAndSetIfChanged(&m_selectFg, sfg, \"SelectForeground\")\n+ this.RaiseAndSetIfChanged(&m_selectBg, sbg, \"SelectBackground\")\n+ this.RaiseAndSetIfChanged(&m_hoverBg, hbg, \"HoverBackground\")\n+ this.RaiseAndSetIfChanged(&m_scrollbarFg, scfg, \"ScrollbarForeground\")\n+ this.RaiseAndSetIfChanged(&m_scrollbarBg, scbg, \"ScrollbarBackground\")\n+ this.RaiseAndSetIfChanged(&m_border, bbg, \"BorderColor\")\n+ ] |> ignore\n+\ndiff --git a/ViewModels/TitleBarViewModel.fs b/ViewModels/TitleBarViewModel.fs\nnew file mode 100644\nindex 0000000..621d088\n--- /dev/null\n+++ b/ViewModels/TitleBarViewModel.fs\n@@ -0,0 +1,17 @@\n+namespace FVim\n+\n+open ReactiveUI\n+\n+type TitleBarViewModel() =\n+ inherit ThemableViewModelBase()\n+\n+ let mutable m_onright = true\n+ let mutable m_title = \"\"\n+\n+ member this.ButtonsOnRightSide\n+ with get() = m_onright\n+ and set(v) = ignore <| this.RaiseAndSetIfChanged(&m_onright, v)\n+\n+ member this.Title\n+ with get() = m_title\n+ and set(v) = ignore <| this.RaiseAndSetIfChanged(&m_title, v)\ndiff --git a/Views/Editor.xaml b/Views/Editor.xaml\nindex c0509fe..15b8ae1 100644\n--- a/Views/Editor.xaml\n+++ b/Views/Editor.xaml\n@@ -7,8 +7,12 @@\n Focusable = \"True\"\n x:Class = \"FVim.Editor\"\n Background = \"{Binding BackgroundBrush, Mode=OneWay}\"\n+ Design.Height=\"300\"\n+ Design.Width=\"400\"\n >\n-\n+ <Design.DataContext>\n+ <fvim:EditorSampleData />\n+ </Design.DataContext>\n <Image \n Name = \"FrameBuffer\"\n Source = \"{Binding FrameBuffer, Mode=OneWay}\"\n@@ -18,7 +22,6 @@\n VerticalAlignment = \"Top\"\n Focusable = \"False\"\n />\n-\n <fvim:Cursor\n DataContext = \"{Binding CursorInfo}\"\n Height = \"{Binding Height, Mode=OneWay}\"\ndiff --git a/Views/Editor.xaml.fs b/Views/Editor.xaml.fs\nindex 66fef39..317072f 100644\n--- a/Views/Editor.xaml.fs\n+++ b/Views/Editor.xaml.fs\n@@ -25,13 +25,9 @@ type Editor() as this =\n \n static let ViewModelProp = AvaloniaProperty.Register<Editor, EditorViewModel>(\"ViewModel\")\n \n- let mutable m_saved_size = Size(100.0,100.0)\n- let mutable m_saved_pos = PixelPoint(300, 300)\n- let mutable m_saved_state = WindowState.Normal\n let mutable grid_fb: RenderTargetBitmap = null\n let mutable grid_scale: float = 1.0\n let mutable grid_vm: EditorViewModel = Unchecked.defaultof<_>\n- let mutable (m_visualroot: IVisual) = this :> IVisual\n \n let mutable m_debug = false\n \n@@ -158,26 +154,6 @@ type Editor() as this =\n str <- mytext :: str\n drawBuffer ctx y x0 (x' + 1) (!prev).hlid str sym\n \n- let toggleFullscreen(v) =\n- let win = this.GetVisualRoot() :?> Window\n-\n- if not v then\n- win.WindowState <- m_saved_state\n- win.PlatformImpl.Resize(m_saved_size)\n- win.Position <- m_saved_pos\n- win.HasSystemDecorations <- true\n- else\n- m_saved_size <- win.ClientSize\n- m_saved_pos <- win.Position\n- m_saved_state <- win.WindowState\n- let screen = win.Screens.ScreenFromVisual(this)\n- let screenBounds = screen.Bounds\n- let sz = screenBounds.Size.ToSizeWithDpi(96.0 * this.GetVisualRoot().RenderScaling)\n- win.HasSystemDecorations <- false\n- win.WindowState <- WindowState.Normal\n- win.Position <- screenBounds.TopLeft\n- win.PlatformImpl.Resize(sz)\n-\n let doWithDataContext fn =\n match this.DataContext with\n | :? EditorViewModel as viewModel ->\n@@ -191,7 +167,6 @@ type Editor() as this =\n grid_vm <- vm\n trace \"viewmodel connected\"\n vm.Watch [\n- vm.ObservableForProperty(fun x -> x.Fullscreen).Subscribe(fun v -> toggleFullscreen <| v.GetValue())\n Observable.merge\n (vm.ObservableForProperty(fun x -> x.BufferWidth))\n (vm.ObservableForProperty(fun x -> x.BufferHeight))\n@@ -245,7 +220,6 @@ type Editor() as this =\n \n do\n this.Watch [\n- this.AttachedToVisualTree.Subscribe(fun e -> m_visualroot <- e.Root)\n this.GetObservable(Editor.DataContextProperty)\n |> Observable.ofType\n |> Observable.subscribe onViewModelConnected\n@@ -262,10 +236,10 @@ type Editor() as this =\n // Input handling\n this.TextInput |> subscribeAndHandleInput(fun e vm -> vm.OnTextInput e)\n this.KeyDown |> subscribeAndHandleInput(fun e vm -> vm.OnKey e)\n- this.PointerPressed |> subscribeAndHandleInput(fun e vm -> vm.OnMouseDown e m_visualroot)\n- this.PointerReleased |> subscribeAndHandleInput(fun e vm -> vm.OnMouseUp e m_visualroot)\n- this.PointerMoved |> subscribeAndHandleInput(fun e vm -> vm.OnMouseMove e m_visualroot)\n- this.PointerWheelChanged |> subscribeAndHandleInput(fun e vm -> vm.OnMouseWheel e m_visualroot)\n+ this.PointerPressed |> subscribeAndHandleInput(fun e vm -> vm.OnMouseDown e this)\n+ this.PointerReleased |> subscribeAndHandleInput(fun e vm -> vm.OnMouseUp e this)\n+ this.PointerMoved |> subscribeAndHandleInput(fun e vm -> vm.OnMouseMove e this)\n+ this.PointerWheelChanged |> subscribeAndHandleInput(fun e vm -> vm.OnMouseWheel e this)\n ]\n AvaloniaXamlLoader.Load(this)\n \ndiff --git a/Views/MainWindow.xaml b/Views/MainWindow.xaml\nindex a241cfe..e12c96f 100644\n--- a/Views/MainWindow.xaml\n+++ b/Views/MainWindow.xaml\n@@ -7,12 +7,31 @@\n x:Class=\"FVim.MainWindow\"\n CanResize=\"True\"\n Icon=\"..\\Assets\\fvim.png\"\n- Title=\"fvim\"\n+ Title=\"{Binding Title}\"\n Height=\"{Binding Height, Mode=TwoWay}\"\n Width=\"{Binding Width, Mode=TwoWay}\"\n WindowState=\"{Binding WindowState, Mode=TwoWay}\"\n HorizontalAlignment=\"Stretch\"\n VerticalAlignment=\"Stretch\"\n- Content=\"{Binding MainGrid}\"\n >\n+ <Design.DataContext>\n+ <fvim:MainWindowSampleData />\n+ </Design.DataContext>\n+ <Grid>\n+ <Grid.ColumnDefinitions>\n+ <ColumnDefinition Width=\"{Binding BorderSize}\"/>\n+ <ColumnDefinition Width=\"1*\"/>\n+ <ColumnDefinition Width=\"{Binding BorderSize}\"/>\n+ </Grid.ColumnDefinitions>\n+ <Grid.RowDefinitions>\n+ <RowDefinition Height=\"{Binding CustomTitleBarHeight}\" />\n+ <RowDefinition Height=\"*\" />\n+ <RowDefinition Height=\"{Binding BorderSize}\"/>\n+ </Grid.RowDefinitions>\n+ <fvim:TitleBar Grid.Row=\"0\" Grid.Column=\"1\" IsVisible=\"{Binding CustomTitleBar}\" HorizontalAlignment=\"Stretch\" Title=\"{Binding Title}\"/>\n+ <fvim:Editor Grid.Row=\"1\" Grid.Column=\"1\" DataContext=\"{Binding MainGrid}\" />\n+ <Panel Name=\"LeftBorder\" Grid.Row=\"0\" Grid.RowSpan=\"3\" Grid.Column=\"0\" IsVisible=\"{Binding CustomTitleBar}\" Background=\"{Binding NormalBackground}\" />\n+ <Panel Name=\"RightBorder\" Grid.Row=\"0\" Grid.RowSpan=\"3\" Grid.Column=\"2\" IsVisible=\"{Binding CustomTitleBar}\" Background=\"{Binding NormalBackground}\" />\n+ <Panel Name=\"BottomBorder\" Grid.Row=\"2\" Grid.Column=\"0\" Grid.ColumnSpan=\"3\" IsVisible=\"{Binding CustomTitleBar}\" Background=\"{Binding NormalBackground}\" />\n+ </Grid>\n </Window>\ndiff --git a/Views/MainWindow.xaml.fs b/Views/MainWindow.xaml.fs\nindex dcf71b2..1842aee 100644\n--- a/Views/MainWindow.xaml.fs\n+++ b/Views/MainWindow.xaml.fs\n@@ -9,11 +9,12 @@ open ReactiveUI\n open Avalonia.Markup.Xaml\n open Avalonia.Controls\n open Avalonia.Input\n-open Avalonia.Interactivity\n open Avalonia\n open Avalonia.Data\n open Avalonia.ReactiveUI\n open System.Runtime.InteropServices\n+open Avalonia.Rendering\n+open Avalonia.Interactivity\n \n #nowarn \"0025\"\n \n@@ -23,7 +24,72 @@ type MainWindow() as this =\n static let XProp = AvaloniaProperty.Register<MainWindow,int>(\"PosX\")\n static let YProp = AvaloniaProperty.Register<MainWindow,int>(\"PosY\")\n \n- let m_input_ev = Event<InputEvent>()\n+ let mutable m_saved_size = Size(100.0,100.0)\n+ let mutable m_saved_pos = PixelPoint(300, 300)\n+ let mutable m_saved_state = WindowState.Normal\n+ let mutable m_left_border:Panel = null\n+ let mutable m_right_border:Panel = null\n+ let mutable m_bottom_border:Panel = null\n+\n+ let m_cursor_ns = Cursor(StandardCursorType.SizeNorthSouth)\n+ let m_cursor_we = Cursor(StandardCursorType.SizeWestEast)\n+ let m_cursor_ne = Cursor(StandardCursorType.TopLeftCorner)\n+ let m_cursor_nw = Cursor(StandardCursorType.TopRightCorner)\n+ let m_cursor_se = Cursor(StandardCursorType.BottomLeftCorner)\n+ let m_cursor_sw = Cursor(StandardCursorType.BottomRightCorner)\n+\n+ let setCursor c =\n+ this.Cursor <- c\n+\n+ let toggleFullscreen(v) =\n+ if not v then\n+ this.WindowState <- m_saved_state\n+ this.PlatformImpl.Resize(m_saved_size)\n+ this.Position <- m_saved_pos\n+ this.HasSystemDecorations <- not this.ViewModel.CustomTitleBar\n+ else\n+ // The order of actions is very important.\n+ // 1. Remove decorations\n+ // 2. Save current states\n+ // 3. Turn window state to normal\n+ // 4. Position window to TopLeft, and resize\n+ let screen = this.Screens.ScreenFromVisual(this)\n+ let screenBounds = screen.Bounds\n+ let sz = screenBounds.Size.ToSizeWithDpi(96.0 * (this:>IRenderRoot).RenderScaling)\n+ this.HasSystemDecorations <- false\n+ m_saved_size <- this.ClientSize\n+ m_saved_pos <- this.Position\n+ m_saved_state <- this.WindowState\n+ this.WindowState <- WindowState.Normal\n+ this.Position <- screenBounds.TopLeft\n+ this.PlatformImpl.Resize(sz)\n+\n+ let toggleTitleBar(custom) =\n+ if custom then\n+ this.HasSystemDecorations <- false\n+ else \n+ this.HasSystemDecorations <- not this.ViewModel.Fullscreen\n+\n+ let dragThreshold = 5.0\n+\n+ let getDragEdge (pos: Point) =\n+ if this.ViewModel.CustomTitleBar then\n+ let l = pos.X <= dragThreshold\n+ let r = this.Width - pos.X <= dragThreshold\n+ let b = this.Height - pos.Y <= dragThreshold\n+ let t = pos.Y <= dragThreshold\n+ match l, r, b, t with\n+ | true, _, false, false -> Some WindowEdge.West\n+ | true, _, true, _ -> Some WindowEdge.SouthWest\n+ | true, _, _, true -> Some WindowEdge.NorthWest\n+ | _, true, false, false -> Some WindowEdge.East\n+ | _, true, true, _ -> Some WindowEdge.SouthEast\n+ | _, true, _, true -> Some WindowEdge.NorthWest\n+ | _, _, true, _ -> Some WindowEdge.South\n+ | _, _, _, true -> Some WindowEdge.North\n+ | _ -> None\n+ else None\n+\n \n do\n #if DEBUG\n@@ -62,10 +128,36 @@ type MainWindow() as this =\n this.AddHandler(DragDrop.DragOverEvent, (fun _ (e:DragEventArgs) ->\n e.DragEffects <- DragDropEffects.Move ||| DragDropEffects.Link ||| DragDropEffects.Copy\n ))\n+ this.AddHandler(MainWindow.PointerMovedEvent, (fun _ (ev: PointerEventArgs) ->\n+ match getDragEdge <| ev.GetPosition(this) with\n+ | Some (WindowEdge.NorthWest) -> setCursor m_cursor_nw\n+ | Some (WindowEdge.SouthEast) -> setCursor m_cursor_se\n+ | Some (WindowEdge.NorthEast) -> setCursor m_cursor_ne\n+ | Some (WindowEdge.SouthWest) -> setCursor m_cursor_sw\n+ | Some (WindowEdge.North | WindowEdge.South) -> setCursor m_cursor_ns\n+ | Some (WindowEdge.East | WindowEdge.West) -> setCursor m_cursor_we\n+ | _ -> setCursor Cursor.Default)\n+ , RoutingStrategies.Tunnel)\n+ this.AddHandler(MainWindow.PointerPressedEvent, (fun _ (ev: PointerPressedEventArgs) ->\n+ match getDragEdge <| ev.GetPosition(this) with\n+ | Some edge ->\n+ ev.Handled <- true\n+ this.BeginResizeDrag(edge)\n+ | _ -> ())\n+ , RoutingStrategies.Tunnel)\n \n ]\n AvaloniaXamlLoader.Load this\n \n+ override __.OnPointerReleased ev =\n+ setCursor Cursor.Default \n+ base.OnPointerReleased ev\n+\n+ override __.OnTemplateApplied _ =\n+ m_left_border <- this.FindControl<Panel>(\"LeftBorder\")\n+ m_right_border <- this.FindControl<Panel>(\"RightBorder\")\n+ m_bottom_border <- this.FindControl<Panel>(\"BottomBorder\")\n+\n member this.GetEditor() =\n this.LogicalChildren.[0] :?> Avalonia.VisualTree.IVisual\n \n@@ -75,6 +167,7 @@ type MainWindow() as this =\n let mutable firstPoschange = true\n let mutable deltaX = 0\n let mutable deltaY = 0\n+ this.ViewModel <- ctx\n \n trace \"mainwindow\" \"set position: %d, %d\" pos.X pos.Y\n this.Position <- pos\n@@ -90,4 +183,6 @@ type MainWindow() as this =\n this.SetValue(XProp, p.Point.X - deltaX)\n this.SetValue(YProp, p.Point.Y - deltaY)\n )\n+ ctx.ObservableForProperty((fun x -> x.Fullscreen), skipInitial=true).Subscribe(fun v -> toggleFullscreen <| v.GetValue())\n+ ctx.ObservableForProperty((fun x -> x.CustomTitleBar), skipInitial=true).Subscribe(fun v -> toggleTitleBar <| v.GetValue())\n ]\ndiff --git a/Views/TitleBar.xaml b/Views/TitleBar.xaml\nnew file mode 100644\nindex 0000000..32820b0\n--- /dev/null\n+++ b/Views/TitleBar.xaml\n@@ -0,0 +1,49 @@\n+<UserControl \n+ xmlns = \"https://github.com/avaloniaui\"\n+ xmlns:x = \"http://schemas.microsoft.com/winfx/2006/xaml\"\n+ xmlns:d = \"http://schemas.microsoft.com/expression/blend/2008\"\n+ xmlns:mc = \"http://schemas.openxmlformats.org/markup-compatibility/2006\"\n+ xmlns:fvim = \"clr-namespace:FVim;assembly=FVim\"\n+ Focusable = \"False\"\n+ Design.Width=\"400\"\n+ FontFamily=\"{Binding FontFamily}\" \n+ FontSize=\"{Binding FontSize}\" \n+ Foreground=\"{Binding NormalForeground}\"\n+ Background=\"{Binding NormalBackground}\"\n+ x:Class = \"FVim.TitleBar\">\n+ <Design.DataContext>\n+ <fvim:TitleBarSampleData />\n+ </Design.DataContext>\n+ <Grid>\n+ <Grid.RowDefinitions>\n+ <RowDefinition />\n+ </Grid.RowDefinitions>\n+ <Grid.ColumnDefinitions>\n+ <ColumnDefinition Width=\"32\" />\n+ <ColumnDefinition Width=\"1*\" />\n+ <ColumnDefinition Width=\"32\" />\n+ <ColumnDefinition Width=\"32\" />\n+ <ColumnDefinition Width=\"32\" />\n+ </Grid.ColumnDefinitions>\n+ <Grid.Styles>\n+ <Style Selector=\"Button\">\n+ <Setter Property=\"Background\" Value=\"{Binding NormalBackground}\" />\n+ <Setter Property=\"Foreground\" Value=\"{Binding NormalForeground}\" />\n+ <Setter Property=\"BorderBrush\" Value=\"Transparent\" />\n+ </Style>\n+ <Style Selector=\"Button[IsPointerOver=True]\">\n+ <Setter Property=\"Background\" Value=\"{Binding SelectBackground}\" />\n+ <Setter Property=\"Foreground\" Value=\"{Binding SelectForeground}\" />\n+ </Style>\n+ <Style Selector=\"Button[IsPressed=True]\">\n+ <Setter Property=\"Background\" Value=\"{Binding HoverBackground}\" />\n+ <Setter Property=\"Foreground\" Value=\"{Binding HoverForeground}\" />\n+ </Style>\n+ </Grid.Styles>\n+ <Image Source=\"/Assets/fvim.png\" Grid.Column=\"0\" Margin=\"3,3,3,3\" Stretch=\"Uniform\" Height=\"16\" />\n+ <TextBlock Text=\"{Binding $parent[fvim:TitleBar].Title}\" Grid.Column=\"1\" Name=\"Title\" VerticalAlignment=\"Center\" />\n+ <Button Name=\"MinimizeButton\" Content=\"_\" Grid.Column=\"2\" Focusable=\"False\" />\n+ <Button Name=\"MaximizeButton\" Content=\"O\" Grid.Column=\"3\" Focusable=\"False\" />\n+ <Button Name=\"CloseButton\" Content=\"X\" Grid.Column=\"4\" Focusable=\"False\" />\n+ </Grid>\n+</UserControl>\ndiff --git a/Views/TitleBar.xaml.fs b/Views/TitleBar.xaml.fs\nnew file mode 100644\nindex 0000000..91d4e2b\n--- /dev/null\n+++ b/Views/TitleBar.xaml.fs\n@@ -0,0 +1,54 @@\n+namespace FVim\n+\n+open Avalonia.Markup.Xaml\n+open Avalonia.VisualTree\n+open Avalonia.Controls\n+open Avalonia\n+open Avalonia.Rendering\n+\n+type TitleBar() as this =\n+ inherit ViewBase<TitleBarViewModel>()\n+\n+ static let TitleProperty = AvaloniaProperty.Register<TitleBar, string>(\"Title\")\n+\n+ let root() = (this:>IVisual).VisualRoot :?> MainWindow\n+\n+ let toggleMaximize() =\n+ let win = root()\n+ win.WindowState <-\n+ match win.WindowState with\n+ | WindowState.Normal -> WindowState.Maximized\n+ | WindowState.Maximized -> WindowState.Normal\n+ | x -> x\n+\n+ let mutable m_butmin:Button = null\n+ let mutable m_butmax:Button = null\n+ let mutable m_butclose:Button = null\n+\n+ do\n+ AvaloniaXamlLoader.Load(this)\n+ this.Watch [\n+ this.DoubleTapped.Subscribe(fun ev -> \n+ ev.Handled <- true\n+ toggleMaximize())\n+ this.PointerMoved.Subscribe(fun ev -> \n+ if this.IsPointerOver && ev.GetPointerPoint(null).Properties.IsLeftButtonPressed then\n+ ev.Handled <- true\n+ root().BeginMoveDrag())\n+ ]\n+\n+ override __.OnTemplateApplied _ =\n+ m_butmin <- this.FindControl(\"MinimizeButton\")\n+ m_butmax <- this.FindControl(\"MaximizeButton\")\n+ m_butclose <- this.FindControl(\"CloseButton\")\n+\n+ this.Watch [\n+ m_butmin.Click.Subscribe(fun _ -> root().WindowState <- WindowState.Minimized)\n+ m_butmax.Click.Subscribe(fun _ -> toggleMaximize())\n+ m_butclose.Click.Subscribe(fun _ -> root().Close())\n+ ]\n+\n+\n+ member __.Title\n+ with get() = this.GetValue(TitleProperty)\n+ and set(v) = this.SetValue(TitleProperty, v)\ndiff --git a/fvim.fsproj b/fvim.fsproj\nindex ab52b86..f9c3ef7 100644\n--- a/fvim.fsproj\n+++ b/fvim.fsproj\n@@ -25,7 +25,10 @@\n </PropertyGroup>\n \n <ItemGroup>\n+ <Compile Include=\"DesignTime\\TitleBarSampleData.fs\" />\n+ <Compile Include=\"DesignTime\\EditorSampleData.fs\" />\n <Compile Include=\"DesignTime\\CrashReportSampleData.fs\" />\n+ <Compile Include=\"DesignTime\\MainWindowSampleData.fs\" />\n <Compile Include=\"common.fs\" />\n <Compile Include=\"config.fs\" />\n <Compile Include=\"getopt.fs\" />\n@@ -39,6 +42,8 @@\n <Compile Include=\"neovim.fs\" />\n <Compile Include=\"model.fs\" />\n <Compile Include=\"ViewModels\\ViewModelBase.fs\" />\n+ <Compile Include=\"ViewModels\\ThemableViewModelBase.fs\" />\n+ <Compile Include=\"ViewModels\\TitleBarViewModel.fs\" />\n <Compile Include=\"ViewModels\\CursorViewModel.fs\" />\n <Compile Include=\"ViewModels\\CompletionItemViewModel.fs\" />\n <Compile Include=\"ViewModels\\PopupMenuViewModel.fs\" />\n@@ -52,6 +57,7 @@\n <Compile Include=\"Views\\Editor.xaml.fs\" />\n <Compile Include=\"Views\\Cursor.xaml.fs\" />\n <Compile Include=\"Views\\CrashReport.xaml.fs\" />\n+ <Compile Include=\"Views\\TitleBar.xaml.fs\" />\n <Compile Include=\"App.xaml.fs\" />\n <Compile Include=\"Program.fs\" />\n <ApplicationDefinition Include=\"fvim.config\" />\ndiff --git a/model.fs b/model.fs\nindex 8f12e25..4157ece 100644\n--- a/model.fs\n+++ b/model.fs\n@@ -33,6 +33,7 @@ module ModelImpl =\n let ev_flush = Event<unit>()\n let grids = hashmap[]\n let pending_msgs = hashmap[]\n+ let windows = hashmap[]\n \n let add_grid(grid: IGridUI) =\n let id = grid.Id\n@@ -44,6 +45,12 @@ module ModelImpl =\n ignore(Dispatcher.UIThread.InvokeAsync(fun () ->\n Seq.iter grid.Redraw nl))\n \n+ let add_window(win: IWindow) = \n+ let id = win.RootId\n+ windows.[id] <- win\n+\n+ let setTitle id title = windows.[id].Title <- title\n+\n let unicast id cmd = \n match grids.TryGetValue id with\n | true, grid -> grid.Redraw cmd\n@@ -81,7 +88,7 @@ module ModelImpl =\n // Global\n | UnknownCommand x -> trace \"unknown command %A\" x\n | GridDestroy id -> trace \"GridDestroy %d\" id //TODO\n- | SetTitle title -> States.SetTitle title\n+ | SetTitle title -> setTitle 1 title\n | SetIcon icon -> trace \"icon: %s\" icon // TODO\n | Bell -> bell true\n | VisualBell -> bell false\n@@ -601,7 +608,6 @@ let Start opts =\n \n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimCursorSmoothMove\" 1 (sprintf \"call rpcnotify(%d, 'cursor.smoothmove', <args>)\" myChannel))\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimCursorSmoothBlink\" 1 (sprintf \"call rpcnotify(%d, 'cursor.smoothblink', <args>)\" myChannel))\n- let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimDrawFPS\" 1 (sprintf \"call rpcnotify(%d, 'DrawFPS', <args>)\" myChannel))\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimFontLineHeight\" 1 (sprintf \"call rpcnotify(%d, 'font.lineheight', <args>)\" myChannel))\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimFontAutoSnap\" 1 (sprintf \"call rpcnotify(%d, 'font.autosnap', <args>)\" myChannel))\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimFontAntialias\" 1 (sprintf \"call rpcnotify(%d, 'font.antialias', <args>)\" myChannel))\n@@ -621,6 +627,8 @@ let Start opts =\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimUIMessages\" 1 (sprintf \"call rpcnotify(%d, 'ui.messages', <args>)\" myChannel))\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimUITermColors\" 1 (sprintf \"call rpcnotify(%d, 'ui.termcolors', <args>)\" myChannel))\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimUIHlState\" 1 (sprintf \"call rpcnotify(%d, 'ui.hlstate', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimDrawFPS\" 1 (sprintf \"call rpcnotify(%d, 'DrawFPS', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimCustomTitleBar\" 1 (sprintf \"call rpcnotify(%d, 'CustomTitleBar', <args>)\" myChannel))\n \n // trigger ginit upon VimEnter\n let! _ = Async.AwaitTask(nvim.command \"autocmd VimEnter * runtime! ginit.vim\")\n@@ -633,6 +641,9 @@ let Flush =\n |> flush_throttle\n |> Observable.observeOn Avalonia.Threading.AvaloniaScheduler.Instance\n \n+let OnWindowReady(win: IWindow) =\n+ add_window win\n+\n \n // connect the grid redraw commands and events\n let OnGridReady(gridui: IGridUI) =\ndiff --git a/states.fs b/states.fs\nindex 0596f90..aec7d03 100644\n--- a/states.fs\n+++ b/states.fs\n@@ -172,7 +172,6 @@ let parseLineHeightOption (v: obj) =\n | _ -> None\n \n let Shutdown code = _appLifetime.Shutdown code\n-let SetTitle title = _appLifetime.MainWindow.Title <- title\n \n let msg_dispatch =\n function\ndiff --git a/theme.fs b/theme.fs\nindex 809a0b2..60ce8d8 100644\n--- a/theme.fs\n+++ b/theme.fs\n@@ -22,10 +22,10 @@ let mutable default_fg = Colors.White\n let mutable default_bg = Colors.Black\n let mutable default_sp = Colors.Red\n \n-let hlchange_ev = Event<int>()\n-let fontconfig_ev = Event<unit>()\n-let cursoren_ev = Event<bool>()\n-let pumconfig_ev = Event<Color*Color*Color*Color*Color*Color*Color>()\n+let hlchange_ev = Event<int>()\n+let fontconfig_ev = Event<unit>()\n+let cursoren_ev = Event<bool>()\n+let themeconfig_ev = Event<Color*Color*Color*Color*Color*Color*Color>()\n \n let fontConfig() =\n fontsize <- max fontsize 1.0\n@@ -84,7 +84,7 @@ let setSemanticHighlightGroups grp =\n ] \n |> List.map (semhl.TryFind >> Option.defaultValue 1 >> GetDrawAttrs)\n \n- pumconfig_ev.Trigger(nfg, nbg, sfg, sbg, scfg, scbg, bbg)\n+ themeconfig_ev.Trigger(nfg, nbg, sfg, sbg, scfg, scbg, bbg)\n \n let setDefaultColors fg bg sp = \n \ndiff --git a/ui.fs b/ui.fs\nindex 7d19c7d..48ac606 100644\n--- a/ui.fs\n+++ b/ui.fs\n@@ -125,6 +125,10 @@ type IGridUI =\n abstract Redraw: RedrawCommand -> unit\n abstract AddChild: int -> int -> int -> IGridUI\n \n+type IWindow =\n+ abstract Title: string with get, set\n+ abstract RootId: int\n+\n open System.Runtime.InteropServices\n \n let DefaultFont =\n"},"changed_files":{"kind":"list like","value":["DesignTime/EditorSampleData.fs","DesignTime/MainWindowSampleData.fs","DesignTime/TitleBarSampleData.fs","ViewModels/EditorViewModel.fs","ViewModels/MainWindowViewModel.fs","ViewModels/PopupMenuViewModel.fs","ViewModels/ThemableViewModelBase.fs","ViewModels/TitleBarViewModel.fs","Views/Editor.xaml","Views/Editor.xaml.fs","Views/MainWindow.xaml","Views/MainWindow.xaml.fs","Views/TitleBar.xaml","Views/TitleBar.xaml.fs","fvim.fsproj","model.fs","states.fs","theme.fs","ui.fs"],"string":"[\n \"DesignTime/EditorSampleData.fs\",\n \"DesignTime/MainWindowSampleData.fs\",\n \"DesignTime/TitleBarSampleData.fs\",\n \"ViewModels/EditorViewModel.fs\",\n \"ViewModels/MainWindowViewModel.fs\",\n \"ViewModels/PopupMenuViewModel.fs\",\n \"ViewModels/ThemableViewModelBase.fs\",\n \"ViewModels/TitleBarViewModel.fs\",\n \"Views/Editor.xaml\",\n \"Views/Editor.xaml.fs\",\n \"Views/MainWindow.xaml\",\n \"Views/MainWindow.xaml.fs\",\n \"Views/TitleBar.xaml\",\n \"Views/TitleBar.xaml.fs\",\n \"fvim.fsproj\",\n \"model.fs\",\n \"states.fs\",\n \"theme.fs\",\n \"ui.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86274,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":79,"string":"79"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"multigrid"},"pr_body":{"kind":"string","value":""},"base_sha":{"kind":"string","value":"2fda01238fb3e97a3638a100e4b48bad9233d611"},"head_sha":{"kind":"string","value":"0dfe162d7e0e84f27c3f02ee3a8974e10580922a"},"gold_diff":{"kind":"string","value":"diff --git a/App.xaml.fs b/App.xaml.fs\nindex 61e908e..d1865c2 100644\n--- a/App.xaml.fs\n+++ b/App.xaml.fs\n@@ -1,7 +1,27 @@\n namespace FVim\n \n open Avalonia\n+open Avalonia.Controls\n+open Avalonia.Controls.Templates\n open Avalonia.Markup.Xaml\n+open System\n+\n+type IViewModelContainer =\n+ abstract Target: obj\n+\n+type ViewLocator() =\n+ interface IDataTemplate with\n+ member this.Build(data: obj): Avalonia.Controls.IControl = \n+ match data with\n+ | :? IViewModelContainer as container -> (this :> IDataTemplate).Build(container.Target)\n+ | _ ->\n+ let _name = data.GetType().FullName.Replace(\"ViewModel\", \"\");\n+ let _type = Type.GetType(_name);\n+ if _type <> null \n+ then Activator.CreateInstance(_type) :?> IControl;\n+ else TextBlock( Text = \"Not Found: \" + _name ) :> IControl\n+ member this.Match(data: obj): bool = data :? ViewModelBase || data :? IViewModelContainer\n+ member this.SupportsRecycling: bool = false\n \n type App() =\n inherit Application()\ndiff --git a/Program.fs b/Program.fs\nindex a7e83eb..a7d3ca8 100644\n--- a/Program.fs\n+++ b/Program.fs\n@@ -16,6 +16,7 @@ open System\n open System.IO\n open getopt\n open Shell\n+open MessagePack.Formatters\n \n // Avalonia configuration, don't remove; also used by visual designer.\n [<CompiledName \"BuildAvaloniaApp\">]\n@@ -30,6 +31,33 @@ let buildAvaloniaApp() =\n .With(new MacOSPlatformOptions(ShowInDock=true))\n .LogToDebug()\n \n+type MsgPackFormatter(resolver: IFormatterResolver) = \n+ let m_formatter = resolver.GetFormatter<obj>()\n+ interface IMessagePackFormatter<obj> with\n+ member this.Serialize(bytes: byref<byte []>, offset: int, value: obj, formatterResolver: IFormatterResolver): int = \n+ m_formatter.Serialize(&bytes, offset, value, formatterResolver)\n+ member x.Deserialize(bytes: byte[] , offset: int, formatterResolver: IFormatterResolver , readSize: byref<int>) =\n+ if MessagePackBinary.GetMessagePackType(bytes, offset) = MessagePackType.Extension then\n+ let result = MessagePackBinary.ReadExtensionFormat(bytes, offset, &readSize)\n+ if result.TypeCode = 1y then \n+ let mutable _size = 0\n+ m_formatter.Deserialize(result.Data, 0, formatterResolver, &_size)\n+ else \n+ m_formatter.Deserialize(bytes, offset, formatterResolver, &readSize)\n+ else\n+ m_formatter.Deserialize(bytes, offset, formatterResolver, &readSize)\n+\n+type MsgPackResolver() =\n+ static let s_formatter = box(MsgPackFormatter(MessagePack.Resolvers.StandardResolver.Instance))\n+ static let s_resolver = MessagePack.Resolvers.StandardResolver.Instance\n+ interface IFormatterResolver with\n+ member x.GetFormatter<'a>() =\n+ if typeof<'a> = typeof<obj> then\n+ s_formatter :?> IMessagePackFormatter<'a>\n+ else\n+ s_resolver.GetFormatter<'a>()\n+\n+\n [<EntryPoint>]\n [<CompiledName \"Main\">]\n let main(args: string[]) =\n@@ -37,10 +65,12 @@ let main(args: string[]) =\n let _ = Thread.CurrentThread.TrySetApartmentState(ApartmentState.STA)\n \n CompositeResolver.RegisterAndSetAsDefault(\n- ImmutableCollectionResolver.Instance,\n- FSharpResolver.Instance,\n- StandardResolver.Instance\n+ MsgPackResolver()\n+ // ImmutableCollectionResolver.Instance,\n+ // FSharpResolver.Instance,\n+ // StandardResolver.Instance\n )\n+\n AppDomain.CurrentDomain.UnhandledException.Add(fun exArgs -> \n let filename = Path.Combine(config.configdir, sprintf \"fvim-crash-%s.txt\" (DateTime.Now.ToString(\"yyyy-MM-dd-HH-mm-ss\")))\n use dumpfile = new StreamWriter(filename)\ndiff --git a/Properties/launchSettings.json b/Properties/launchSettings.json\nindex 557e9d5..a09ae13 100644\n--- a/Properties/launchSettings.json\n+++ b/Properties/launchSettings.json\n@@ -2,6 +2,10 @@\n \"profiles\": {\n \"fvim\": {\n \"commandName\": \"Project\"\n+ },\n+ \"norc\": {\n+ \"commandName\": \"Project\",\n+ \"commandLineArgs\": \"-u NORC\"\n }\n }\n }\n\\ No newline at end of file\ndiff --git a/ViewModels/CompletionItemViewModel.fs b/ViewModels/CompletionItemViewModel.fs\nindex 9e99959..82fd24f 100644\n--- a/ViewModels/CompletionItemViewModel.fs\n+++ b/ViewModels/CompletionItemViewModel.fs\n@@ -1,6 +1,6 @@\n namespace FVim\n \n-open neovim.def\n+open def\n open log\n open common\n open Avalonia.Media.Imaging\ndiff --git a/ViewModels/CursorViewModel.fs b/ViewModels/CursorViewModel.fs\nindex 8b35f04..b2ada91 100644\n--- a/ViewModels/CursorViewModel.fs\n+++ b/ViewModels/CursorViewModel.fs\n@@ -2,14 +2,14 @@\n \n open Avalonia.Media\n open ReactiveUI\n-open FVim.neovim.def\n+open FVim.def\n open FVim.common.helpers\n \n type CursorViewModel(cursorMode: int option) =\n inherit ViewModelBase(None, None, Some 1.0, Some 1.0)\n \n member val enabled: bool = true with get,set\n- member val ingrid: bool = true with get,set\n+ member val ingrid: bool = false with get,set\n member val row: int = 0 with get,set\n member val col: int = 0 with get,set\n member val modeidx: int = _d -1 cursorMode with get,set\ndiff --git a/ViewModels/EditorViewModel.fs b/ViewModels/EditorViewModel.fs\nindex a0b88be..5dfd8ca 100644\n--- a/ViewModels/EditorViewModel.fs\n+++ b/ViewModels/EditorViewModel.fs\n@@ -4,7 +4,7 @@ open common\n open log\n open ui\n open wcwidth\n-open neovim.def\n+open def\n \n open ReactiveUI\n open Avalonia\n@@ -23,8 +23,10 @@ open System.Reactive.Disposables\n open SkiaSharp\n open System.Runtime.InteropServices\n \n-type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize, ?_glyphsize: Size, ?_measuredsize: Size, ?_fontsize: float, ?_gridscale: float,\n- ?_hldefs: HighlightAttr[], ?_modedefs: ModeInfo[], ?_guifont: string, ?_guifontwide: string, ?_cursormode: int, ?_anchorX: float, ?_anchorY: float) as this =\n+#nowarn \"0025\"\n+\n+type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize, ?_measuredsize: Size, ?_gridscale: float,\n+ ?_cursormode: int, ?_anchorX: float, ?_anchorY: float) as this =\n inherit ViewModelBase(_anchorX, _anchorY, _measuredsize)\n \n let trace fmt = trace (sprintf \"editorvm #%d\" GridId) fmt\n@@ -33,42 +35,26 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n let m_popupmenu_vm = new PopupMenuViewModel()\n let m_child_grids = ObservableCollection<EditorViewModel>()\n let m_resize_ev = Event<IGridUI>()\n- let m_input_ev = Event<int*InputEvent>()\n- let m_hlchange_ev = Event<unit>()\n- let m_tick_ev = Event<unit>()\n+ let m_input_ev = Event<int * InputEvent>()\n \n let mutable m_busy = false\n-\n let mutable m_mouse_en = true\n let mutable m_mouse_pressed = MouseButton.None\n let mutable m_mouse_pos = 0,0\n \n- let mutable m_default_fg = Colors.White\n- let mutable m_default_bg = Colors.Black\n- let mutable m_default_sp = Colors.Red\n-\n- let mutable m_hi_defs = match _hldefs with\n- | None -> Array.create<HighlightAttr> 256 HighlightAttr.Default\n- | Some arr -> arr.Clone() :?> HighlightAttr[]\n- let mutable m_mode_defs = match _modedefs with\n- | None -> Array.empty<ModeInfo>\n- | Some arr -> arr.Clone() :?> ModeInfo[]\n- let mutable m_semhl = Map.empty\n-\n- let mutable m_guifont = _d DefaultFont _guifont\n- let mutable m_guifontwide = _d DefaultFontWide _guifontwide\n- let mutable m_fontsize = _d 16.0 _fontsize\n- let mutable m_glyphsize = _d (Size(10.0, 10.0)) _glyphsize\n-\n let mutable m_gridsize = _d { rows = 10; cols= 10 } _gridsize\n let mutable m_gridscale = _d 1.0 _gridscale\n let mutable m_gridfullscreen = false\n let mutable m_gridbuffer = Array2D.create m_gridsize.rows m_gridsize.cols GridBufferCell.empty\n let mutable m_griddirty = GridRegion()\n+ let mutable m_fontsize = theme.fontsize\n+ let mutable m_glyphsize = Size(10.0, 10.0)\n \n let mutable m_fb_h = 10.0\n let mutable m_fb_w = 10.0\n \n+ let raiseInputEvent e = m_input_ev.Trigger(GridId, e)\n+\n let toggleFullScreen(gridid: int) =\n if gridid = GridId then\n trace \"ToggleFullScreen\"\n@@ -83,77 +69,6 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n m_griddirty.Clear()\n m_griddirty.Union{ row = 0; col = 0; height = m_gridsize.rows; width = m_gridsize.cols }\n \n- let flush() = \n- trace \"flush.\"\n- this.RenderTick <- this.RenderTick + 1\n-\n- let fontConfig() =\n- m_fontsize <- max m_fontsize 1.0\n- // It turns out the space \" \" advances farest...\n- // So we measure it as the width.\n- let s, w, h = MeasureText(\" \", m_guifont, m_guifontwide, m_fontsize, m_gridscale)\n- m_glyphsize <- Size(w, h)\n- m_fontsize <- s\n-\n- trace \"fontConfig: guifont=%s guifontwide=%s size=%A\" m_guifont m_guifontwide m_glyphsize\n- // sync font to cursor vm\n- this.cursorConfig()\n- // sync font to popupmenu vm\n- m_popupmenu_vm.SetFont(m_guifont, m_fontsize)\n- markAllDirty()\n- m_resize_ev.Trigger(this)\n-\n- let setHighlight x =\n- if m_hi_defs.Length < x.id + 1 then\n- Array.Resize(&m_hi_defs, x.id + 100)\n- m_hi_defs.[x.id] <- x\n- if x.id = 0 then\n- m_default_fg <- x.rgb_attr.foreground.Value\n- m_default_bg <- x.rgb_attr.background.Value\n- m_default_sp <- x.rgb_attr.special.Value\n- this.RaisePropertyChanged(\"BackgroundBrush\")\n- m_hlchange_ev.Trigger()\n-\n- let setSemanticHighlightGroups grp =\n- m_semhl <- grp\n- // update popupmenu color\n- let [ nfg, nbg, _, _\n- sfg, sbg, _, _\n- scfg, scbg, _, _\n- _, bbg, _, _ ] = \n- [\n- SemanticHighlightGroup.Pmenu\n- SemanticHighlightGroup.PmenuSel\n- SemanticHighlightGroup.PmenuSbar\n- SemanticHighlightGroup.VertSplit\n- ] \n- |> List.map (m_semhl.TryFind >> Option.defaultValue 1 >> this.GetDrawAttrs)\n-\n- m_popupmenu_vm.SetColors(nfg, nbg, sfg, sbg, scfg, scbg, bbg)\n-\n- let setDefaultColors fg bg sp = \n-\n- let bg = \n- if fg = bg && bg = sp then GetReverseColor bg\n- else bg\n-\n- setHighlight {\n- id = 0\n- info = [||]\n- cterm_attr = RgbAttr.Empty\n- rgb_attr = { \n- foreground = Some fg\n- background = Some bg\n- special = Some sp\n- reverse = false\n- italic = false\n- bold = false\n- underline = false\n- undercurl = false\n- }\n- }\n- trace \"setDefaultColors: %A %A %A\" fg bg sp\n-\n let clearBuffer () =\n m_gridbuffer <- Array2D.create m_gridsize.rows m_gridsize.cols GridBufferCell.empty\n // notify buffer update and size change\n@@ -202,38 +117,29 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n hlid <- m_gridbuffer.[row, col].hlid\n col <- col - 1\n ligature <- isProgrammingSymbol m_gridbuffer.[row, col].text\n- italic <- m_hi_defs.[hlid].rgb_attr.italic \n+ italic <- theme.hi_defs.[hlid].rgb_attr.italic \n let dirty = {dirty with width = dirty.width + (dirty.col - col); col = col }\n \n \n markDirty dirty\n \n- let setModeInfo (cs_en: bool) (info: ModeInfo[]) =\n- m_mode_defs <- info\n- this.setCursorEnabled cs_en\n-\n let cursorGoto id row col =\n m_cursor_vm.ingrid <- (id = GridId)\n- m_cursor_vm.row <- row\n- m_cursor_vm.col <- col\n+ if id = GridId then\n+ m_cursor_vm.row <- row\n+ m_cursor_vm.col <- col\n this.cursorConfig()\n \n let changeMode (name: string) (index: int) = \n m_cursor_vm.modeidx <- index\n this.cursorConfig()\n \n- let bell (visual: bool) =\n- // TODO\n- trace \"neovim: bell: %A\" visual\n- ()\n-\n let setBusy (v: bool) =\n trace \"neovim: busy: %A\" v\n m_busy <- v\n this.setCursorEnabled <| not v\n //if v then this.Cursor <- Cursor(StandardCursorType.Wait)\n //else this.Cursor <- Cursor(StandardCursorType.Arrow)\n- //flush()\n \n let scrollBuffer (top: int) (bot: int) (left: int) (right: int) (rows: int) (cols: int) =\n // !NOTE top-bot are the bounds of the SCROLL-REGION, not SRC or DST.\n@@ -290,61 +196,22 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n then\n this.cursorConfig()\n \n- let setOption (opt: UiOption) = \n- trace \"setOption: %A\" opt\n-\n- let (|FN|_|) (x: string) =\n- // try to parse with 'font\\ name:hNN'\n- match x.Split(':') with\n- | [|name; size|] when size.Length > 0 && size.[0] = 'h' -> Some(name.Trim('\\'', '\"'), size.Substring(1).TrimEnd('\\'','\"') |> float)\n- | _ -> None\n-\n- let mutable config_font = true\n-\n- match opt with\n- | Guifont(FN(name, sz)) -> m_guifont <- name; m_fontsize <- sz\n- | GuifontWide(FN(name, sz)) -> m_guifontwide <- name; m_fontsize <- sz\n- | Guifont(\"+\") | GuifontWide(\"+\") -> m_fontsize <- m_fontsize + 1.0\n- | Guifont(\"-\") | GuifontWide(\"-\") -> m_fontsize <- m_fontsize - 1.0\n- | Guifont(\".+\") | GuifontWide(\".+\") -> m_fontsize <- m_fontsize + 0.1\n- | Guifont(\".-\") | GuifontWide(\".-\") -> m_fontsize <- m_fontsize - 0.1\n- | _ -> config_font <- false\n-\n- if config_font then fontConfig()\n-\n let setMouse (en:bool) =\n m_mouse_en <- en\n \n- let hiattrDefine (hls: HighlightAttr[]) =\n- Array.iter setHighlight hls\n-\n- let setWinPos grid win startrow startcol w h =\n- trace \"setWinPos: grid = %A, win = %A, startrow = %A, startcol = %A, w = %A, h = %A\" grid win startrow startcol w h\n- let existing = m_child_grids \n- |> Seq.indexed\n- |> Seq.tryPick (function | (i, a) when (a :> IGridUI).Id = grid -> Some(i, a)\n- | _ -> None)\n- let origin: Point = this.GetPoint startrow startcol\n- let child_size = this.GetPoint h w\n- trace \"setWinPos: child will be positioned at %A\" origin\n- match existing with\n- | Some(i, child) -> \n- (* manually resize and position the child grid as per neovim docs *)\n- trace \"setWinPos: update parameters: h = %d w = %d X = %f Y = %f\" h w origin.X origin.Y\n- child.initBuffer h w\n- child.X <- origin.X\n- child.Y <- origin.Y\n- | None -> \n- let child = new EditorViewModel(\n- grid, this, {rows=h; cols=w}, m_glyphsize, \n- Size(child_size.X, child_size.Y), m_fontsize, m_gridscale, m_hi_defs, m_mode_defs, \n- m_guifont, m_guifontwide, m_cursor_vm.modeidx, origin.X, origin.Y)\n- m_child_grids.Add child\n- //let wnd = Window()\n- //wnd.Height <- child_size.Y\n- //wnd.Width <- child_size.X\n- //wnd.Content <- anchor.child\n- //wnd.Show()\n+ let setWinPos startrow startcol r c =\n+ let parent = \n+ match parent with\n+ | Some p -> p\n+ | None -> failwith \"setWinPos: no parent\"\n+ let grid = GridId\n+ trace \"setWinPos: grid = %A, parent = %A, startrow = %A, startcol = %A, c = %A, r = %A\" grid parent.GridId startrow startcol c r\n+ (* manually resize and position the child grid as per neovim docs *)\n+ let origin: Point = parent.GetPoint startrow startcol\n+ trace \"setWinPos: update parameters: c = %d r = %d X = %f Y = %f\" c r origin.X origin.Y\n+ this.initBuffer r c\n+ this.X <- origin.X\n+ this.Y <- origin.Y\n \n let hidePopupMenu() =\n m_popupmenu_vm.Show <- false\n@@ -382,49 +249,50 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n m_popupmenu_vm.Show <- true\n \n let redraw(cmd: RedrawCommand) =\n+ //trace \"%A\" cmd\n match cmd with\n- | UnknownCommand x -> trace \"unknown command %A\" x\n- | HighlightAttrDefine hls -> hiattrDefine hls\n- | SemanticHighlightGroupSet groups -> setSemanticHighlightGroups groups\n- | DefaultColorsSet(fg,bg,sp,_,_) -> setDefaultColors fg bg sp\n- | ModeInfoSet(cs_en, info) -> setModeInfo cs_en info\n- | ModeChange(name, index) -> changeMode name index\n- | GridResize(id, w, h) when id = GridId -> this.initBuffer h w\n- | GridClear id when id = GridId -> clearBuffer()\n- | GridLine lines -> Array.iter (fun (line: GridLine) -> if line.grid = GridId then putBuffer line) lines\n+ | GridResize(_, c, r) -> this.initBuffer r c\n+ | GridClear _ -> clearBuffer()\n+ | GridLine lines -> Array.iter putBuffer lines\n | GridCursorGoto(id, row, col) -> cursorGoto id row col\n- | GridDestroy id when id = GridId -> ()\n- | GridScroll(id, top,bot,left,right,rows,cols) when id = GridId -> scrollBuffer top bot left right rows cols\n- | Flush -> m_tick_ev.Trigger()\n- | Bell -> bell false\n- | VisualBell -> bell true\n+ | GridScroll(_, top,bot,left,right,rows,cols) -> scrollBuffer top bot left right rows cols\n+ | ModeChange(name, index) -> changeMode name index\n | Busy is_busy -> setBusy is_busy\n- | SetTitle title -> States.SetTitle title\n- | SetIcon icon -> trace \"icon: %s\" icon // TODO\n- | SetOption opts -> Array.iter setOption opts\n | Mouse en -> setMouse en\n- | WinPos(grid, win, startrow, startcol, w, h) when GridId = 1 -> setWinPos grid win startrow startcol w h\n+ | WinPos(_, _, startrow, startcol, c, r) -> setWinPos startrow startcol r c\n+ | MsgSetPos(_, row, scrolled, sep_char) -> setWinPos row 0 1 m_gridsize.cols\n | PopupMenuShow(items, selected, row, col, grid) -> showPopupMenu grid items selected row col\n | PopupMenuSelect(selected) -> selectPopupMenuPassive selected\n | PopupMenuHide -> hidePopupMenu ()\n | x -> trace \"unimplemented command: %A\" x\n \n- let raiseInputEvent e =\n- m_input_ev.Trigger(GridId, e)\n+ let fontConfig() =\n+ // It turns out the space \" \" advances farest...\n+ // So we measure it as the width.\n+ let s, w, h = MeasureText(\" \", theme.guifont, theme.guifontwide, theme.fontsize, m_gridscale)\n+ m_glyphsize <- Size(w, h)\n+ m_fontsize <- s\n+ trace \"fontConfig: glyphsize=%A, measured font size=%A\" m_glyphsize m_fontsize\n \n+ // sync font to cursor vm\n+ this.cursorConfig()\n+ // sync font to popupmenu vm\n+ m_popupmenu_vm.SetFont(theme.guifont, theme.fontsize)\n+ markAllDirty()\n+ m_resize_ev.Trigger(this)\n+\n+ let hlConfig(id) =\n+ if id = 0 then\n+ this.RaisePropertyChanged(\"BackgroundBrush\")\n+ markAllDirty()\n+\n+ let pumConfig colors =\n+ m_popupmenu_vm.SetColors colors\n do\n- let fg,bg,sp,_ = this.GetDrawAttrs 0\n- m_default_bg <- bg\n- m_default_fg <- fg\n- m_default_sp <- sp\n fontConfig()\n-\n- let tick_throttle =\n- if RuntimeInformation.IsOSPlatform(OSPlatform.OSX) then id\n- else Observable.throttle(TimeSpan.FromMilliseconds 10.0)\n+ this.setCursorEnabled theme.cursor_enabled\n \n this.Watch [\n- Model.Redraw (Array.iter redraw)\n \n m_popupmenu_vm.ObservableForProperty(fun x -> x.Selection)\n |> Observable.subscribe (fun x -> selectPopupMenuActive <| x.GetValue())\n@@ -432,14 +300,19 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n m_popupmenu_vm.Commit\n |> Observable.subscribe commitPopupMenu\n \n- m_hlchange_ev.Publish \n- |> Observable.throttle(TimeSpan.FromMilliseconds 100.0) \n- |> Observable.subscribe markAllDirty\n+ theme.hlchange_ev.Publish \n+ |> Observable.subscribe hlConfig \n+\n+ theme.fontconfig_ev.Publish\n+ |> Observable.subscribe fontConfig\n+\n+ theme.cursoren_ev.Publish\n+ |> Observable.subscribe (fun en ->\n+ if m_cursor_vm.ingrid then \n+ this.setCursorEnabled en)\n \n- m_tick_ev.Publish\n- |> tick_throttle\n- |> Observable.observeOn Avalonia.Threading.AvaloniaScheduler.Instance\n- |> Observable.subscribe flush\n+ theme.pumconfig_ev.Publish\n+ |> Observable.subscribe pumConfig\n \n States.Register.Notify \"ToggleFullScreen\" (fun [| Integer32(gridid) |] -> toggleFullScreen gridid )\n States.Register.Watch \"font\" fontConfig\n@@ -457,21 +330,7 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n member __.MarkAllDirty() = markAllDirty()\n \n member __.GetFontAttrs() =\n- m_guifont, m_guifontwide, m_fontsize\n-\n- member __.GetDrawAttrs hlid = \n- let attrs = m_hi_defs.[hlid].rgb_attr\n-\n- let mutable fg = Option.defaultValue m_default_fg attrs.foreground\n- let mutable bg = Option.defaultValue m_default_bg attrs.background\n- let mutable sp = Option.defaultValue m_default_sp attrs.special\n-\n- if attrs.reverse then\n- fg <- GetReverseColor fg\n- bg <- GetReverseColor bg\n- sp <- GetReverseColor sp\n-\n- fg, bg, sp, attrs\n+ theme.guifont, theme.guifontwide, m_fontsize\n \n \n member private __.initBuffer nrow ncol =\n@@ -486,6 +345,12 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n member __.Resized = m_resize_ev.Publish\n member __.Input = m_input_ev.Publish\n member __.HasChildren = m_child_grids.Count <> 0\n+ member __.Redraw cmd = redraw cmd\n+ member __.AddChild id r c =\n+ let child_size = this.GetPoint r c\n+ let child = new EditorViewModel(id, this, {rows=r; cols=c}, Size(child_size.X, child_size.Y), m_gridscale, m_cursor_vm.modeidx)\n+ m_child_grids.Add child\n+ child :> IGridUI\n \n member __.markClean = m_griddirty.Clear\n \n@@ -494,13 +359,13 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n Point(double(col) * m_glyphsize.Width, double(row) * m_glyphsize.Height)\n \n member __.cursorConfig() =\n- if m_mode_defs.Length = 0 || m_cursor_vm.modeidx < 0 then ()\n+ if theme.mode_defs.Length = 0 || m_cursor_vm.modeidx < 0 then ()\n elif m_gridbuffer.GetLength(0) <= m_cursor_vm.row || m_gridbuffer.GetLength(1) <= m_cursor_vm.col then ()\n else\n- let mode = m_mode_defs.[m_cursor_vm.modeidx]\n+ let mode = theme.mode_defs.[m_cursor_vm.modeidx]\n let hlid = m_gridbuffer.[m_cursor_vm.row, m_cursor_vm.col].hlid\n let hlid = Option.defaultValue hlid mode.attr_id\n- let fg, bg, sp, attrs = this.GetDrawAttrs hlid\n+ let fg, bg, sp, attrs = theme.GetDrawAttrs hlid\n let origin = this.GetPoint m_cursor_vm.row m_cursor_vm.col\n let text = m_gridbuffer.[m_cursor_vm.row, m_cursor_vm.col].text\n let text_type = wswidth text\n@@ -515,8 +380,8 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n // do not use the default colors for cursor\n let colorf = if hlid = 0 then GetReverseColor else id\n let fg, bg, sp = colorf fg, colorf bg, colorf sp\n- m_cursor_vm.typeface <- m_guifont\n- m_cursor_vm.wtypeface <- m_guifontwide\n+ m_cursor_vm.typeface <- theme.guifont\n+ m_cursor_vm.wtypeface <- theme.guifontwide\n m_cursor_vm.fontSize <- m_fontsize\n m_cursor_vm.text <- text\n m_cursor_vm.fg <- fg\n@@ -561,7 +426,7 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n m_gridscale <- v\n \n member __.BackgroundBrush\n- with get(): SolidColorBrush = SolidColorBrush(m_default_bg)\n+ with get(): SolidColorBrush = SolidColorBrush(theme.default_bg)\n \n member __.BufferHeight with get(): float = m_fb_h\n member __.BufferWidth with get(): float = m_fb_w\n@@ -588,33 +453,32 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n (******************* Events ***********************)\n \n member __.OnKey (e: KeyEventArgs) = \n- raiseInputEvent <| InputEvent.Key(e.Modifiers, e.Key)\n+ raiseInputEvent <| InputEvent.Key(e.KeyModifiers, e.Key)\n \n member __.OnMouseDown (e: PointerPressedEventArgs) (root: Avalonia.VisualTree.IVisual) = \n if m_mouse_en then\n let x, y = e.GetPosition root |> getPos\n m_mouse_pressed <- e.MouseButton\n- raiseInputEvent <| InputEvent.MousePress(e.InputModifiers, y, x, e.MouseButton, e.ClickCount)\n+ raiseInputEvent <| InputEvent.MousePress(e.KeyModifiers, y, x, e.MouseButton, e.ClickCount)\n \n member __.OnMouseUp (e: PointerReleasedEventArgs) (root: Avalonia.VisualTree.IVisual) = \n if m_mouse_en then\n let x, y = e.GetPosition root |> getPos\n m_mouse_pressed <- MouseButton.None\n- raiseInputEvent <| InputEvent.MouseRelease(e.InputModifiers, y, x, e.MouseButton)\n+ raiseInputEvent <| InputEvent.MouseRelease(e.KeyModifiers, y, x, e.MouseButton)\n \n member __.OnMouseMove (e: PointerEventArgs) (root: Avalonia.VisualTree.IVisual) = \n if m_mouse_en && m_mouse_pressed <> MouseButton.None then\n let x, y = e.GetPosition root |> getPos\n if (x,y) <> m_mouse_pos then\n m_mouse_pos <- x,y\n- raiseInputEvent <| InputEvent.MouseDrag(e.InputModifiers, y, x, m_mouse_pressed)\n+ raiseInputEvent <| InputEvent.MouseDrag(e.KeyModifiers, y, x, m_mouse_pressed)\n \n member __.OnMouseWheel (e: PointerWheelEventArgs) (root: Avalonia.VisualTree.IVisual) = \n if m_mouse_en then\n let x, y = e.GetPosition root |> getPos\n let dx, dy = e.Delta.X, e.Delta.Y\n- raiseInputEvent <| InputEvent.MouseWheel(e.InputModifiers, y, x, dx, dy)\n+ raiseInputEvent <| InputEvent.MouseWheel(e.KeyModifiers, y, x, dx, dy)\n \n member __.OnTextInput (e: TextInputEventArgs) = \n raiseInputEvent <| InputEvent.TextInput(e.Text)\n-\ndiff --git a/ViewModels/MainWindowViewModel.fs b/ViewModels/MainWindowViewModel.fs\nindex 21897e4..f52ff77 100644\n--- a/ViewModels/MainWindowViewModel.fs\n+++ b/ViewModels/MainWindowViewModel.fs\n@@ -5,10 +5,17 @@ open Avalonia\n open Avalonia.Controls\n open System\n \n-type MainWindowViewModel(cfg: config.ConfigObject.Workspace option) as this =\n+/// <summary>\n+/// A MainWindow is a top-level container that holds a main grid as the root.\n+/// Other grids may be anchored to the main grid as children.\n+/// </summary>\n+type MainWindowViewModel(cfg: config.ConfigObject.Workspace option, ?_maingrid: EditorViewModel) as this =\n inherit ViewModelBase(Some 300.0, Some 300.0, Some 800.0, Some 600.0)\n \n- let mainGrid = EditorViewModel(1)\n+ let mainGrid = \n+ if _maingrid.IsNone then EditorViewModel(1)\n+ else _maingrid.Value\n+\n let mutable m_windowState = WindowState.Normal\n \n do\ndiff --git a/ViewModels/PopupMenuViewModel.fs b/ViewModels/PopupMenuViewModel.fs\nindex 2b49fc3..9b56301 100644\n--- a/ViewModels/PopupMenuViewModel.fs\n+++ b/ViewModels/PopupMenuViewModel.fs\n@@ -1,6 +1,6 @@\n namespace FVim\n \n-open neovim.def\n+open def\n open log\n \n open ReactiveUI\n@@ -10,6 +10,7 @@ open FVim.common.helpers\n open Avalonia\n open Avalonia.Media\n open Avalonia.Threading\n+#nowarn \"0025\"\n \n type PopupMenuViewModel() =\n inherit ViewModelBase()\ndiff --git a/ViewModels/ViewModelBase.fs b/ViewModels/ViewModelBase.fs\nnew file mode 100644\nindex 0000000..d78ce58\n--- /dev/null\n+++ b/ViewModels/ViewModelBase.fs\n@@ -0,0 +1,71 @@\n+namespace FVim\n+\n+open def\n+open common\n+open wcwidth\n+open log\n+\n+open ReactiveUI\n+open Avalonia\n+open System\n+open System.Reactive.Disposables\n+open System.Runtime.CompilerServices\n+\n+[<Extension>]\n+type ActivatableExt() =\n+ [<Extension>]\n+ static member inline Watch (this: IActivatable, xs: IDisposable seq) =\n+ this.WhenActivated(fun (disposables: CompositeDisposable) ->\n+ xs |> Seq.iter (fun x -> x.DisposeWith(disposables) |> ignore)) |> ignore\n+ [<Extension>]\n+ static member inline Watch (this: ISupportsActivation, xs: IDisposable seq) =\n+ this.WhenActivated(fun (disposables: CompositeDisposable) ->\n+ xs |> Seq.iter (fun x -> x.DisposeWith(disposables) |> ignore)) |> ignore\n+ [<Extension>]\n+ static member inline Do (this: IActivatable, fn: unit -> unit) =\n+ do fn()\n+ Disposable.Empty\n+ [<Extension>]\n+ static member inline Do (this: ISupportsActivation, fn: unit -> unit) =\n+ do fn()\n+ Disposable.Empty\n+\n+\n+type ViewModelBase(_x: float option, _y: float option, _w: float option, _h: float option) =\n+ inherit ReactiveObject()\n+\n+ let activator = new ViewModelActivator()\n+\n+ let mutable m_x = _d 0.0 _x\n+ let mutable m_y = _d 0.0 _y\n+ let mutable m_w = _d 0.0 _w\n+ let mutable m_h = _d 0.0 _h\n+ let mutable m_tick = 0\n+\n+ new() = ViewModelBase(None, None, None, None)\n+ new(_posX: float option, _posY: float option, _size: Size option) = ViewModelBase(_posX, _posY, Option.map(fun (s: Size) -> s.Width) _size, Option.map(fun (s: Size) -> s.Height) _size)\n+\n+ interface ISupportsActivation with\n+ member __.Activator = activator\n+\n+ member this.X\n+ with get() : float = m_x\n+ and set(v) = ignore <| this.RaiseAndSetIfChanged(&m_x, v, \"X\")\n+\n+ member this.Y\n+ with get() : float = m_y\n+ and set(v) = ignore <| this.RaiseAndSetIfChanged(&m_y, v, \"Y\")\n+\n+ member this.Height \n+ with get(): float = m_h \n+ and set(v) = ignore <| this.RaiseAndSetIfChanged(&m_h, v, \"Height\")\n+\n+ member this.Width \n+ with get(): float = m_w \n+ and set(v) = ignore <| this.RaiseAndSetIfChanged(&m_w, v, \"Width\")\n+\n+ member this.RenderTick\n+ with get() : int = m_tick\n+ and set(v) =\n+ ignore <| this.RaiseAndSetIfChanged(&m_tick, v, \"RenderTick\")\n+\ndiff --git a/Views/Cursor.xaml.fs b/Views/Cursor.xaml.fs\nindex 929e75b..465d7aa 100644\n--- a/Views/Cursor.xaml.fs\n+++ b/Views/Cursor.xaml.fs\n@@ -3,7 +3,7 @@\n open log\n open ui\n open common\n-open neovim.def\n+open def\n \n open Avalonia\n open Avalonia.Animation\ndiff --git a/Views/Editor.xaml.fs b/Views/Editor.xaml.fs\nindex 95dd0f2..66fef39 100644\n--- a/Views/Editor.xaml.fs\n+++ b/Views/Editor.xaml.fs\n@@ -25,7 +25,6 @@ type Editor() as this =\n \n static let ViewModelProp = AvaloniaProperty.Register<Editor, EditorViewModel>(\"ViewModel\")\n \n- let mutable m_render_queued = false\n let mutable m_saved_size = Size(100.0,100.0)\n let mutable m_saved_pos = PixelPoint(300, 300)\n let mutable m_saved_state = WindowState.Normal\n@@ -88,7 +87,7 @@ type Editor() as this =\n | _ -> \" \"\n \n let font, fontwide, fontsize = grid_vm.GetFontAttrs()\n- let fg, bg, sp, attrs = grid_vm.GetDrawAttrs hlid \n+ let fg, bg, sp, attrs = theme.GetDrawAttrs hlid \n let shaper, typeface = GetTypeface(x, attrs.italic, attrs.bold, font, fontwide)\n \n use fgpaint = new SKPaint()\n@@ -130,7 +129,7 @@ type Editor() as this =\n let mutable wc: CharType = wswidth (!prev).text\n let mutable sym: bool = isProgrammingSymbol (!prev).text\n let mutable bold = \n- let _,_,_,hl_attrs = grid_vm.GetDrawAttrs (!prev).hlid\n+ let _,_,_,hl_attrs = theme.GetDrawAttrs (!prev).hlid\n hl_attrs.bold\n // in each line we do backward rendering.\n // the benefit is that the italic fonts won't be covered by later drawings\n@@ -154,7 +153,7 @@ type Editor() as this =\n str <- []\n if hlidchange then\n prev <- current\n- bold <- let _,_,_,hl_attrs = grid_vm.GetDrawAttrs (!current).hlid\n+ bold <- let _,_,_,hl_attrs = theme.GetDrawAttrs (!current).hlid\n in hl_attrs.bold\n str <- mytext :: str\n drawBuffer ctx y x0 (x' + 1) (!prev).hlid str sym\n@@ -185,12 +184,6 @@ type Editor() as this =\n fn viewModel\n | _ -> Unchecked.defaultof<_>\n \n- let redraw tick =\n- if not m_render_queued then\n- trace \"render tick %d\" tick\n- m_render_queued <- true\n- this.InvalidateVisual()\n-\n let findChildEditor (vm: obj) =\n this.Children |> Seq.tryFind(fun x -> x.DataContext = vm)\n \n@@ -198,7 +191,6 @@ type Editor() as this =\n grid_vm <- vm\n trace \"viewmodel connected\"\n vm.Watch [\n- vm.ObservableForProperty(fun x -> x.RenderTick).Subscribe(fun tick -> redraw <| tick.GetValue())\n vm.ObservableForProperty(fun x -> x.Fullscreen).Subscribe(fun v -> toggleFullscreen <| v.GetValue())\n Observable.merge\n (vm.ObservableForProperty(fun x -> x.BufferWidth))\n@@ -302,7 +294,6 @@ type Editor() as this =\n (*trace \"image size: %A; fb size: %A\" (image().Bounds) (grid_fb.Size)*)\n (*trace \"base rendering\"*)\n base.Render ctx\n- m_render_queued <- false\n (*trace \"render end\"*)\n \n override this.MeasureOverride(size) =\ndiff --git a/Views/MainWindow.xaml.fs b/Views/MainWindow.xaml.fs\nindex 67ddaa0..dcf71b2 100644\n--- a/Views/MainWindow.xaml.fs\n+++ b/Views/MainWindow.xaml.fs\n@@ -1,8 +1,9 @@\n namespace FVim\n \n-open neovim.def\n+open def\n open log\n open common\n+open ui\n \n open ReactiveUI\n open Avalonia.Markup.Xaml\n@@ -12,6 +13,9 @@ open Avalonia.Interactivity\n open Avalonia\n open Avalonia.Data\n open Avalonia.ReactiveUI\n+open System.Runtime.InteropServices\n+\n+#nowarn \"0025\"\n \n type MainWindow() as this =\n inherit ReactiveWindow<MainWindowViewModel>()\n@@ -19,6 +23,8 @@ type MainWindow() as this =\n static let XProp = AvaloniaProperty.Register<MainWindow,int>(\"PosX\")\n static let YProp = AvaloniaProperty.Register<MainWindow,int>(\"PosY\")\n \n+ let m_input_ev = Event<InputEvent>()\n+\n do\n #if DEBUG\n this.Renderer.DrawFps <- true\n@@ -27,6 +33,13 @@ type MainWindow() as this =\n \n DragDrop.SetAllowDrop(this, true)\n \n+ let flushop = \n+ if RuntimeInformation.IsOSPlatform(OSPlatform.Linux) then\n+ fun () -> \n+ let editor: Avalonia.VisualTree.IVisual = this.GetEditor()\n+ editor.InvalidateVisual()\n+ else this.InvalidateVisual\n+\n this.Watch [\n this.Closing.Subscribe (fun e -> Model.OnTerminating e)\n this.Closed.Subscribe (fun _ -> Model.OnTerminated())\n@@ -37,6 +50,8 @@ type MainWindow() as this =\n trace \"mainwindow\" \"DrawFPS: %A\" v\n this.Renderer.DrawFps <- v)\n \n+ Model.Flush |> Observable.subscribe flushop\n+\n this.AddHandler(DragDrop.DropEvent, (fun _ (e: DragEventArgs) ->\n if e.Data.Contains(DataFormats.FileNames) then\n Model.EditFiles <| e.Data.GetFileNames()\n@@ -51,6 +66,9 @@ type MainWindow() as this =\n ]\n AvaloniaXamlLoader.Load this\n \n+ member this.GetEditor() =\n+ this.LogicalChildren.[0] :?> Avalonia.VisualTree.IVisual\n+\n override this.OnDataContextChanged _ =\n let ctx = this.DataContext :?> MainWindowViewModel\n let pos = PixelPoint(int ctx.X, int ctx.Y)\n@@ -73,4 +91,3 @@ type MainWindow() as this =\n this.SetValue(YProp, p.Point.Y - deltaY)\n )\n ]\n-\ndiff --git a/neovim/neovim.def.fs b/def.fs\nsimilarity index 96%\nrename from neovim/neovim.def.fs\nrename to def.fs\nindex 49fc855..d86ab17 100644\n--- a/neovim/neovim.def.fs\n+++ b/def.fs\n@@ -1,13 +1,12 @@\n-module FVim.neovim.def\n+module FVim.def\n \n open FVim.log\n open FVim.common\n-open FVim.States\n \n open Avalonia.Media\n open System.Collections.Generic\n \n-let inline private trace fmt = trace \"neovim.def\" fmt\n+let inline private trace fmt = trace \"def\" fmt\n \n [<Struct>]\n type CursorShape =\n@@ -276,6 +275,18 @@ type RedrawCommand =\n | WinScrollOverReset\n /// Close the window\n | WinClose of grid: int\n+/// Display messages on `grid`. The grid will be displayed at `row` on the\n+/// default grid (grid=1), covering the full column width. `scrolled`\n+/// indicates whether the message area has been scrolled to cover other\n+/// grids. It can be useful to draw a separator then ('display' msgsep\n+/// flag). The Builtin TUI draws a full line filled with `sep_char` and\n+/// |hl-MsgSeparator| highlight.\n+/// \n+/// When |ext_messages| is active, no message grid is used, and this event\n+/// will not be sent.\n+| MsgSetPos of grid: int * row: int * scrolled: bool * sep_char: string\n+\n+/// Set message position\n /// -- popupmenu events --\n /// Show |popupmenu-completion|. `items` is an array of completion items\n /// to show; each item is an array of the form [word, kind, menu, info] as\n@@ -547,6 +558,9 @@ let parse_redrawcmd (x: obj) =\n | C(\"win_scroll_over_start\", _) -> WinScrollOverStart\n | C(\"win_scroll_over_reset\", _) -> WinScrollOverReset\n | C1(\"win_close\", [| (Integer32 grid) |]) -> WinClose(grid)\n+ | C1(\"msg_set_pos\", [| \n+ (Integer32 grid); (Integer32 row)\n+ (Bool scrolled); (String sep_char) |]) -> MsgSetPos(grid, row,scrolled, sep_char)\n | C1(\"popupmenu_show\", [|\n P(parse_complete_item)items; (Integer32 selected); \n (Integer32 row); (Integer32 col); (Integer32 grid) |]) -> PopupMenuShow(items, selected, row, col, grid)\ndiff --git a/fvim.fsproj b/fvim.fsproj\nindex 63bc71d..edbbff1 100644\n--- a/fvim.fsproj\n+++ b/fvim.fsproj\n@@ -29,13 +29,15 @@\n <Compile Include=\"config.fs\" />\n <Compile Include=\"getopt.fs\" />\n <Compile Include=\"log.fs\" />\n+ <Compile Include=\"def.fs\" />\n <Compile Include=\"wcwidth.fs\" />\n <Compile Include=\"shell.fs\" />\n <Compile Include=\"states.fs\" />\n <Compile Include=\"ui.fs\" />\n- <Compile Include=\"neovim\\neovim.def.fs\" />\n- <Compile Include=\"neovim\\neovim.process.fs\" />\n+ <Compile Include=\"theme.fs\" />\n+ <Compile Include=\"neovim.fs\" />\n <Compile Include=\"model.fs\" />\n+ <Compile Include=\"ViewModels\\ViewModelBase.fs\" />\n <Compile Include=\"ViewModels\\CursorViewModel.fs\" />\n <Compile Include=\"ViewModels\\CompletionItemViewModel.fs\" />\n <Compile Include=\"ViewModels\\PopupMenuViewModel.fs\" />\n@@ -67,12 +69,12 @@\n </ItemGroup>\n \n <ItemGroup>\n- <PackageReference Include=\"Avalonia\" Version=\"0.8.999-cibuild0004079-beta\" />\n+ <PackageReference Include=\"Avalonia\" Version=\"0.8.999-cibuild0004313-beta\" />\n <PackageReference Include=\"Avalonia.Angle.Windows.Natives\" Version=\"2.1.0.2019013001\" />\n- <PackageReference Include=\"Avalonia.Desktop\" Version=\"0.8.999-cibuild0004079-beta\" />\n- <PackageReference Include=\"Avalonia.ReactiveUI\" Version=\"0.8.999-cibuild0004079-beta\" />\n+ <PackageReference Include=\"Avalonia.Desktop\" Version=\"0.8.999-cibuild0004313-beta\" />\n+ <PackageReference Include=\"Avalonia.ReactiveUI\" Version=\"0.8.999-cibuild0004313-beta\" />\n <PackageReference Include=\"FSharp.Control.Reactive\" Version=\"4.2.0\" />\n- <PackageReference Include=\"FSharp.Data\" Version=\"3.1.1\" />\n+ <PackageReference Include=\"FSharp.Data\" Version=\"3.3.2\" />\n <PackageReference Include=\"GitInfo\" Version=\"2.0.20\">\n <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n <PrivateAssets>all</PrivateAssets>\ndiff --git a/log.fs b/log.fs\nindex af7c4ae..1122b79 100644\n--- a/log.fs\n+++ b/log.fs\n@@ -13,7 +13,8 @@ let private _logsPub = _logsSource.Publish |> Observable.map (fun (a,b) -> s\n let private _logsESource = Event<string*string>()\n let private _logsEPub = _logsESource.Publish |> Observable.map (fun (a,b) -> sprintf \"error: %s: %s\" a b)\n \n-let private _logsSink = Observable.merge _logsPub _logsEPub |> Observable.filter(fun x -> _filter x) \n+let private _logsSink = Observable.merge _logsPub _logsEPub \n+ |> Observable.filter(fun x -> _filter x) \n \n let mutable private _n_logsSink = 0\n \ndiff --git a/model.fs b/model.fs\nindex ac6730d..2231770 100644\n--- a/model.fs\n+++ b/model.fs\n@@ -1,12 +1,10 @@\n module FVim.Model\n \n-open getopt\n-open log\n open ui\n open common\n open States\n-open neovim.def\n-open neovim.proc\n+open def\n+open neovim\n \n open Avalonia.Diagnostics.ViewModels\n open Avalonia.Media\n@@ -20,23 +18,102 @@ open System.ComponentModel\n open SkiaSharp\n \n #nowarn \"0058\"\n+#nowarn \"0025\"\n \n open FSharp.Control.Tasks.V2\n+open System.Runtime.InteropServices\n \n-let inline private trace x = trace \"neovim.model\" x\n+let inline private trace x = FVim.log.trace \"model\" x\n \n [<AutoOpen>]\n module ModelImpl =\n \n let nvim = Nvim()\n- let ev_redraw = Event<RedrawCommand[]>()\n+ let ev_uiopt = Event<unit>()\n+ let ev_flush = Event<unit>()\n let grids = hashmap[]\n+ let pending_msgs = hashmap[]\n \n let add_grid(grid: IGridUI) =\n- grids.[grid.Id] <- grid\n+ let id = grid.Id\n+ grids.[id] <- grid\n+ let mutable nl: ResizeArray<_> = null\n+ if pending_msgs.TryGetValue(id, &nl) then\n+ trace \"add_grid: flushing %d pending redraw events for grid #%d\" nl.Count id\n+ ignore(pending_msgs.Remove id)\n+ ignore(Dispatcher.UIThread.InvokeAsync(fun () ->\n+ Seq.iter grid.Redraw nl))\n+\n+ let unicast id cmd = \n+ match grids.TryGetValue id with\n+ | true, grid -> grid.Redraw cmd\n+ | _ ->\n+ trace \"unicast into non-existing grid #%d: %A\" id cmd\n+ let mutable nl = null\n+ if not(pending_msgs.TryGetValue(id, &nl)) then\n+ nl <- ResizeArray()\n+ pending_msgs.[id] <- nl\n+ nl.Add cmd\n+\n+ let broadcast cmd =\n+ for KeyValue(_,grid) in grids do\n+ grid.Redraw cmd\n+\n+ let broadcast_save id cmd =\n+ let mutable found = false\n+ for KeyValue(id',grid) in grids do\n+ if id = id' then found <- true\n+ grid.Redraw cmd\n+ if not found then\n+ unicast id cmd\n+\n+ let bell (visual: bool) =\n+ // TODO\n+ trace \"bell: %A\" visual\n+ ()\n+\n+ let flush_throttle =\n+ if RuntimeInformation.IsOSPlatform(OSPlatform.OSX) then id\n+ else Observable.throttle(TimeSpan.FromMilliseconds 10.0)\n \n let redraw cmd = \n- ev_redraw.Trigger cmd\n+ match cmd with\n+ // Global\n+ | UnknownCommand x -> trace \"unknown command %A\" x\n+ | GridDestroy id -> trace \"GridDestroy %d\" id //TODO\n+ | SetTitle title -> States.SetTitle title\n+ | SetIcon icon -> trace \"icon: %s\" icon // TODO\n+ | Bell -> bell true\n+ | VisualBell -> bell false\n+ | Flush -> ev_flush.Trigger()\n+ | HighlightAttrDefine hls -> theme.hiattrDefine hls\n+ | SemanticHighlightGroupSet groups -> theme.setSemanticHighlightGroups groups\n+ | DefaultColorsSet(fg,bg,sp,_,_) -> theme.setDefaultColors fg bg sp\n+ | SetOption opts -> Array.iter theme.setOption opts\n+ | ModeInfoSet(cs_en, info) -> theme.setModeInfo cs_en info\n+ // Broadcast\n+ | PopupMenuShow _ | PopupMenuSelect _ | PopupMenuHide _\n+ | Busy _ | Mouse _\n+ | ModeChange _ | Flush\n+ -> broadcast cmd\n+ | GridCursorGoto(id,_,_) \n+ -> broadcast_save id cmd\n+ // Unicast\n+ | GridClear id | GridScroll(id,_,_,_,_,_,_) | WinPos(id, _, _, _, _, _)\n+ | MsgSetPos(id, _, _, _)\n+ -> unicast id cmd\n+ | GridResize(id, c, r) \n+ -> if not(grids.ContainsKey id) then\n+ // by default add to grid #1\n+ grids.[1].AddChild id r c\n+ |> add_grid\n+ else\n+ unicast id cmd\n+ | GridLine lines -> \n+ lines \n+ |> Array.groupBy (fun (line: GridLine) -> line.grid)\n+ |> Array.iter (fun (id, lines) -> unicast id (GridLine lines))\n+ | x -> trace \"unimplemented command: %A\" x\n \n let onGridResize(gridui: IGridUI) =\n trace \"Grid #%d resized to %d %d\" gridui.Id gridui.GridWidth gridui.GridHeight\n@@ -97,34 +174,35 @@ module ModelImpl =\n // <A-...> same as <M-...> *<A-*\n // <D-...> command-key or \"super\" key *<D-*\n \n- let (|HasFlag|_|) (flag: InputModifiers) (x: InputModifiers) =\n+ let (|HasFlag|_|) (flag: KeyModifiers) (x: KeyModifiers) =\n if x.HasFlag flag then Some() else None\n- let (|NoFlag|_|) (flag: InputModifiers) (x: InputModifiers) =\n+ let (|NoFlag|_|) (flag: KeyModifiers) (x: KeyModifiers) =\n if x.HasFlag flag then None else Some()\n- let MB (x: MouseButton, c: int) = \n- let name = x.ToString()\n- if c = 1 then name\n- else sprintf \"%d-%s\" c name\n-\n- let mutable accumulatedX = 0.0\n- let mutable accumulatedY = 0.0\n-\n+ let MB (x: MouseButton) = \n+ match x with\n+ | MouseButton.Left -> \"left\"\n+ | MouseButton.Right -> \"right\"\n+ | MouseButton.Middle -> \"middle\"\n let DIR (dx: float, dy: float, horizontal: bool) =\n match sign dx, sign dy, horizontal with\n- | -1, _, true -> \"Right\"\n- | _, _, true -> \"Left\"\n- | _, -1, false -> \"Down\"\n- | _, _, false -> \"Up\"\n+ | -1, _, true -> \"right\"\n+ | _, _, true -> \"left\"\n+ | _, -1, false -> \"down\"\n+ | _, _, false -> \"up\"\n let suffix (suf: string, r: int, c: int) =\n sprintf \"%s><%d,%d\" suf r c\n- let (|Repeat|Special|Normal|ImeEvent|TextInput|Unrecognized|) (x: InputEvent) =\n+\n+ let mutable accumulatedX = 0.0\n+ let mutable accumulatedY = 0.0\n+\n+ let (|Mouse|Special|Normal|ImeEvent|TextInput|Unrecognized|) (x: InputEvent) =\n match x with\n- // | Key(HasFlag(InputModifiers.Control), Key.H) \n- // | Key(HasFlag(InputModifiers.Control), Key.I)\n- // | Key(HasFlag(InputModifiers.Control), Key.J)\n- // | Key(HasFlag(InputModifiers.Control), Key.M)\n- // | Key(HasFlag(InputModifiers.Control), Key.Oem4) // Oem4 is '['\n- // | Key(HasFlag(InputModifiers.Control), Key.L) // if ^L is sent as <FF> then neovim discards the key.\n+ // | Key(HasFlag(KeyModifiers.Control), Key.H) \n+ // | Key(HasFlag(KeyModifiers.Control), Key.I)\n+ // | Key(HasFlag(KeyModifiers.Control), Key.J)\n+ // | Key(HasFlag(KeyModifiers.Control), Key.M)\n+ // | Key(HasFlag(KeyModifiers.Control), Key.Oem4) // Oem4 is '['\n+ // | Key(HasFlag(KeyModifiers.Control), Key.L) // if ^L is sent as <FF> then neovim discards the key.\n | Key(_, Key.CapsLock) -> Unrecognized // avoid sending \"capslock\" key sequence\n | Key(_, Key.Back) -> Special \"BS\"\n | Key(_, Key.Tab) -> Special \"Tab\"\n@@ -132,14 +210,14 @@ module ModelImpl =\n | Key(_, Key.Return) -> Special \"CR\"\n | Key(_, Key.Escape) -> Special \"Esc\"\n | Key(_, Key.Space) -> Special \"Space\"\n- | Key(HasFlag(InputModifiers.Shift), Key.OemComma) -> Special \"LT\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.OemComma) -> Special \"LT\"\n // note, on Windows '\\' is recognized as OemPipe but on macOS it's OemBackslash\n- | Key(NoFlag(InputModifiers.Shift), \n+ | Key(NoFlag(KeyModifiers.Shift), \n (Key.OemPipe | Key.OemBackslash)) -> Special \"Bslash\"\n- | Key(HasFlag(InputModifiers.Shift), \n+ | Key(HasFlag(KeyModifiers.Shift), \n (Key.OemPipe | Key.OemBackslash)) -> Special \"Bar\"\n | Key(_, Key.Delete) -> Special \"Del\"\n- | Key(HasFlag(InputModifiers.Alt), Key.Escape) -> Special \"xCSI\"\n+ | Key(HasFlag(KeyModifiers.Alt), Key.Escape) -> Special \"xCSI\"\n | Key(_, Key.Up) -> Special \"Up\"\n | Key(_, Key.Down) -> Special \"Down\"\n | Key(_, Key.Left) -> Special \"Left\"\n@@ -154,7 +232,7 @@ module ModelImpl =\n (Key.F1 | Key.F2 | Key.F3 | Key.F4 \n | Key.F5 | Key.F6 | Key.F7 | Key.F8 \n | Key.F9 | Key.F10 | Key.F11 | Key.F12)) -> Special(x.ToString())\n- | Key(NoFlag(InputModifiers.Shift), x &\n+ | Key(NoFlag(KeyModifiers.Shift), x &\n (Key.D0 | Key.D1 | Key.D2 | Key.D3 \n | Key.D4 | Key.D5 | Key.D6 | Key.D7 \n | Key.D8 | Key.D9)) -> Normal(x.ToString().TrimStart('D'))\n@@ -162,44 +240,44 @@ module ModelImpl =\n (Key.NumPad0 | Key.NumPad1 | Key.NumPad2 | Key.NumPad3 \n | Key.NumPad4 | Key.NumPad5 | Key.NumPad6 | Key.NumPad7 \n | Key.NumPad8 | Key.NumPad9)) -> Special(\"k\" + string(x.ToString() |> Seq.last))\n- | Key(NoFlag(InputModifiers.Shift), Key.OemComma) -> Normal \",\"\n- | Key(NoFlag(InputModifiers.Shift), Key.OemPeriod) -> Normal \".\"\n- | Key(HasFlag(InputModifiers.Shift), Key.OemPeriod) -> Normal \">\"\n- | Key(NoFlag(InputModifiers.Shift), Key.Oem2) -> Normal \"/\"\n- | Key(HasFlag(InputModifiers.Shift), Key.Oem2) -> Normal \"?\"\n- | Key(NoFlag(InputModifiers.Shift), Key.OemSemicolon) -> Normal \";\"\n- | Key(HasFlag(InputModifiers.Shift), Key.OemSemicolon) -> Normal \":\"\n- | Key(NoFlag(InputModifiers.Shift), Key.OemQuotes) -> Normal \"'\"\n- | Key(HasFlag(InputModifiers.Shift), Key.OemQuotes) -> Normal \"\\\"\"\n- | Key(NoFlag(InputModifiers.Shift), Key.Oem4) -> Normal \"[\"\n- | Key(HasFlag(InputModifiers.Shift), Key.Oem4) -> Normal \"{\"\n- | Key(NoFlag(InputModifiers.Shift), Key.OemCloseBrackets) -> Normal \"]\"\n- | Key(HasFlag(InputModifiers.Shift), Key.OemCloseBrackets) -> Normal \"}\"\n- | Key(NoFlag(InputModifiers.Shift), Key.OemMinus) -> Normal \"-\"\n- | Key(HasFlag(InputModifiers.Shift), Key.OemMinus) -> Normal \"_\"\n- | Key(NoFlag(InputModifiers.Shift), Key.OemPlus) -> Normal \"=\"\n- | Key(HasFlag(InputModifiers.Shift), Key.OemPlus) -> Normal \"+\"\n- | Key(NoFlag(InputModifiers.Shift), Key.OemTilde) -> Normal \"`\"\n- | Key(HasFlag(InputModifiers.Shift), Key.OemTilde) -> Normal \"~\"\n- | Key(HasFlag(InputModifiers.Shift), Key.D1) -> Normal \"!\"\n- | Key(HasFlag(InputModifiers.Shift), Key.D2) -> Normal \"@\"\n- | Key(HasFlag(InputModifiers.Shift), Key.D3) -> Normal \"#\"\n- | Key(HasFlag(InputModifiers.Shift), Key.D4) -> Normal \"$\"\n- | Key(HasFlag(InputModifiers.Shift), Key.D5) -> Normal \"%\"\n- | Key(HasFlag(InputModifiers.Shift), Key.D6) -> Normal \"^\"\n- | Key(HasFlag(InputModifiers.Shift), Key.D7) -> Normal \"&\"\n- | Key(HasFlag(InputModifiers.Shift), Key.D8) -> Normal \"*\"\n- | Key(HasFlag(InputModifiers.Shift), Key.D9) -> Normal \"(\"\n- | Key(HasFlag(InputModifiers.Shift), Key.D0) -> Normal \")\"\n+ | Key(NoFlag(KeyModifiers.Shift), Key.OemComma) -> Normal \",\"\n+ | Key(NoFlag(KeyModifiers.Shift), Key.OemPeriod) -> Normal \".\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.OemPeriod) -> Normal \">\"\n+ | Key(NoFlag(KeyModifiers.Shift), Key.Oem2) -> Normal \"/\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.Oem2) -> Normal \"?\"\n+ | Key(NoFlag(KeyModifiers.Shift), Key.OemSemicolon) -> Normal \";\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.OemSemicolon) -> Normal \":\"\n+ | Key(NoFlag(KeyModifiers.Shift), Key.OemQuotes) -> Normal \"'\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.OemQuotes) -> Normal \"\\\"\"\n+ | Key(NoFlag(KeyModifiers.Shift), Key.Oem4) -> Normal \"[\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.Oem4) -> Normal \"{\"\n+ | Key(NoFlag(KeyModifiers.Shift), Key.OemCloseBrackets) -> Normal \"]\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.OemCloseBrackets) -> Normal \"}\"\n+ | Key(NoFlag(KeyModifiers.Shift), Key.OemMinus) -> Normal \"-\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.OemMinus) -> Normal \"_\"\n+ | Key(NoFlag(KeyModifiers.Shift), Key.OemPlus) -> Normal \"=\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.OemPlus) -> Normal \"+\"\n+ | Key(NoFlag(KeyModifiers.Shift), Key.OemTilde) -> Normal \"`\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.OemTilde) -> Normal \"~\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.D1) -> Normal \"!\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.D2) -> Normal \"@\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.D3) -> Normal \"#\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.D4) -> Normal \"$\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.D5) -> Normal \"%\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.D6) -> Normal \"^\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.D7) -> Normal \"&\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.D8) -> Normal \"*\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.D9) -> Normal \"(\"\n+ | Key(HasFlag(KeyModifiers.Shift), Key.D0) -> Normal \")\"\n | Key(_, (\n Key.ImeProcessed | Key.ImeAccept | Key.ImeConvert\n | Key.ImeNonConvert | Key.ImeModeChange)) -> ImeEvent\n- | Key(NoFlag(InputModifiers.Shift), x) -> Normal (x.ToString().ToLowerInvariant())\n+ | Key(NoFlag(KeyModifiers.Shift), x) -> Normal (x.ToString().ToLowerInvariant())\n | Key(_, Key.None) -> Unrecognized\n | Key(_, x) -> Normal (x.ToString())\n- | MousePress(_, r, c, but, cnt) -> Special(MB(but, cnt) + suffix(\"Mouse\", c, r))\n- | MouseRelease(_, r, c, but) -> Special(MB(but, 1) + suffix(\"Release\", c, r))\n- | MouseDrag(_, r, c, but ) -> Special(MB(but, 1) + suffix(\"Drag\", c, r))\n+ | MousePress(_, r, c, but, combo) -> Mouse(MB but, \"press\", r, c, combo)\n+ | MouseRelease(_, r, c, but) -> Mouse(MB but, \"release\", r, c, 1)\n+ | MouseDrag(_, r, c, but ) -> Mouse(MB but, \"drag\", r, c, 1)\n | MouseWheel(_, r, c, dx, dy) -> \n // duh! don't like this\n accumulatedX <- accumulatedX + dx\n@@ -212,7 +290,7 @@ module ModelImpl =\n accumulatedX <- accumulatedX - truncate accumulatedX\n else\n accumulatedY <- accumulatedY - truncate accumulatedY\n- Repeat(int rpt, \"ScrollWheel\" + suffix(dir, c, r))\n+ Mouse(\"wheel\", dir, r, c, int rpt)\n else\n Unrecognized\n | TextInput txt -> TextInput txt\n@@ -221,25 +299,25 @@ module ModelImpl =\n let rec (|ModifiersPrefix|_|) (x: InputEvent) =\n match x with\n // -------------- keys with special form do not carry shift modifiers\n- | Key(m & HasFlag(InputModifiers.Shift), x &\n+ | Key(m & HasFlag(KeyModifiers.Shift), x &\n (Key.OemComma | Key.OemPipe | Key.OemBackslash | Key.OemPeriod | Key.Oem2 | Key.OemSemicolon | Key.OemQuotes\n | Key.Oem4 | Key.OemCloseBrackets | Key.OemMinus | Key.OemPlus | Key.OemTilde\n | Key.D0 | Key.D1 | Key.D2 | Key.D3 \n | Key.D4 | Key.D5 | Key.D6 | Key.D7 \n | Key.D8 | Key.D9)) \n- -> (|ModifiersPrefix|_|) <| InputEvent.Key(m &&& (~~~InputModifiers.Shift), x)\n- | Key(m & HasFlag(InputModifiers.Shift), Key.Space) when States.key_disableShiftSpace\n- -> (|ModifiersPrefix|_|) <| InputEvent.Key(m &&& (~~~InputModifiers.Shift), Key.Space)\n+ -> (|ModifiersPrefix|_|) <| InputEvent.Key(m &&& (~~~KeyModifiers.Shift), x)\n+ | Key(m & HasFlag(KeyModifiers.Shift), Key.Space) when States.key_disableShiftSpace\n+ -> (|ModifiersPrefix|_|) <| InputEvent.Key(m &&& (~~~KeyModifiers.Shift), Key.Space)\n | Key(m, _)\n | MousePress(m, _, _, _, _) \n | MouseRelease(m, _, _, _) \n | MouseDrag(m, _, _, _) \n | MouseWheel(m, _, _, _, _) \n ->\n- let c = if m.HasFlag(InputModifiers.Control) then \"C-\" else \"\"\n- let a = if m.HasFlag(InputModifiers.Alt) then \"A-\" else \"\"\n- let d = if m.HasFlag(InputModifiers.Windows) then \"D-\" else \"\"\n- let s = if m.HasFlag(InputModifiers.Shift) then \"S-\" else \"\"\n+ let c = if m.HasFlag(KeyModifiers.Control) then \"C-\" else \"\"\n+ let a = if m.HasFlag(KeyModifiers.Alt) then \"A-\" else \"\"\n+ let d = if m.HasFlag(KeyModifiers.Meta) then \"D-\" else \"\"\n+ let s = if m.HasFlag(KeyModifiers.Shift) then \"S-\" else \"\"\n match (sprintf \"%s%s%s%s\" c a d s).TrimEnd('-') with\n | \"\" -> None\n | x -> Some x\n@@ -248,42 +326,52 @@ module ModelImpl =\n \n let mutable _imeArmed = false\n \n- let onInput: (IObservable<int*InputEvent> -> IDisposable) =\n- // filter out pure modifiers\n- Observable.filter (fun (_, x) -> \n- match x with\n- | InputEvent.Key(_, (Key.LeftCtrl | Key.LeftShift | Key.LeftAlt | Key.RightCtrl | Key.RightShift | Key.RightAlt | Key.LWin | Key.RWin))\n- -> false\n- | _ -> true) >>\n- // translate to nvim keycode\n- Observable.map(fun (gridid, x) ->\n- trace \"grid #%d: OnInput: %A\" gridid x\n-\n- match x with\n- | ImeEvent -> _imeArmed <- true\n- | TextInput _ -> ()\n- | _ -> _imeArmed <- false\n- // TODO anything that cancels ime input state?\n-\n- match x with\n- | (Repeat(n, sp)) & (ModifiersPrefix pref) -> List.replicate n (sprintf \"<%s-%s>\" pref sp)\n- | (Special sp) & (ModifiersPrefix pref) -> [ sprintf \"<%s-%s>\" pref sp ]\n- | (Special sp) -> [ sprintf \"<%s>\" sp ]\n- | (Repeat(n, sp)) -> List.replicate n (sprintf \"<%s>\" sp)\n- | (Normal n) & (ModifiersPrefix pref) -> [ sprintf \"<%s-%s>\" pref n ]\n- | (Normal n) -> [ n ]\n- | ImeEvent -> []\n- | TextInput txt when _imeArmed -> [ txt ]\n- | x -> trace \"rejected: %A\" x; []\n- ) >>\n- // hook up nvim_input\n- // TODO dispose the subscription when nvim is stopped\n- Observable.subscribe (fun keys ->\n- for k in keys do\n- ignore <| nvim.input [|k|]\n- )\n-\n-let Redraw (fn: RedrawCommand[] -> unit) = ev_redraw.Publish |> Observable.subscribe(fn)\n+ let onInput (input: IObservable<int*InputEvent>) =\n+ let inputClassifier = \n+ input\n+ // filter out pure modifiers\n+ |> Observable.filter (fun (_, x) -> \n+ match x with\n+ | InputEvent.Key(_, (Key.LeftCtrl | Key.LeftShift | Key.LeftAlt | Key.RightCtrl | Key.RightShift | Key.RightAlt | Key.LWin | Key.RWin)) \n+ -> false\n+ | _ -> true)\n+ // translate to nvim input sequence\n+ |> Observable.map(fun (gridid, x) ->\n+ trace \"grid #%d: OnInput: %A\" gridid x\n+\n+ match x with\n+ | ImeEvent -> _imeArmed <- true\n+ | TextInput _ -> ()\n+ | _ -> _imeArmed <- false\n+ // TODO anything that cancels ime input state?\n+\n+ match x with\n+ | (Special sp) & (ModifiersPrefix pref) -> Choice1Of3(sprintf \"<%s-%s>\" pref sp)\n+ | (Special sp) -> Choice1Of3(sprintf \"<%s>\" sp)\n+ | (Normal n) & (ModifiersPrefix pref) -> Choice1Of3(sprintf \"<%s-%s>\" pref n)\n+ | (Normal n) -> Choice1Of3 n \n+ | (Mouse m) -> Choice2Of3(gridid, m, (|ModifiersPrefix|_|)x)\n+ | ImeEvent -> Choice3Of3 ()\n+ | TextInput txt when _imeArmed -> Choice1Of3 txt\n+ | x -> trace \"rejected: %A\" x; Choice3Of3 ()\n+ )\n+ let key = inputClassifier |> Observable.choose (function | Choice1Of3 x -> Some x | _ -> None)\n+ let mouse = inputClassifier |> Observable.choose (function | Choice2Of3 x -> Some x | _ -> None)\n+ Disposables.compose [\n+ key |> Observable.subscribe(fun x -> \n+ nvim.input x\n+ |> ignore\n+ )\n+ mouse |> Observable.subscribe(fun (grid, (but, act, r, c, rep), mods) -> \n+ let mods = match mods with Some mods -> mods | _ -> \"\"\n+ async {\n+ for _ in 1..rep do\n+ let! _ = Async.AwaitTask(nvim.input_mouse but act mods grid r c)\n+ ()\n+ } \n+ |> Async.RunSynchronously\n+ )\n+ ]\n \n let Detach() =\n nvim.stop(0)\n@@ -310,8 +398,6 @@ let Start opts =\n (AvaloniaSynchronizationContext.Current) \n (States.msg_dispatch)\n \n- ignore(States.Register.Notify \"redraw\" (fun cmds -> ev_redraw.Trigger (Array.map parse_redrawcmd cmds)))\n-\n // rpc handlers\n States.Register.Bool \"font.autosnap\"\n States.Register.Bool \"font.antialias\"\n@@ -335,8 +421,14 @@ let Start opts =\n States.Register.Bool \"ui.termcolors\"\n States.Register.Bool \"ui.hlstate\"\n \n- States.Register.Notify \"remote.detach\" (fun _ -> Detach())\n- States.Register.Watch \"ui\" UpdateUICapabilities\n+ List.iter ignore [\n+ ev_uiopt.Publish\n+ |> Observable.throttle(TimeSpan.FromMilliseconds 20.0)\n+ |> Observable.subscribe(UpdateUICapabilities)\n+ States.Register.Notify \"redraw\" (Array.map parse_redrawcmd >> Array.iter redraw)\n+ States.Register.Notify \"remote.detach\" (fun _ -> Detach())\n+ States.Register.Watch \"ui\" ev_uiopt.Trigger\n+ ]\n \n States.Register.Request \"set-clipboard\" (fun [| P(|String|_|)lines; String regtype |] -> async {\n States.clipboard_lines <- lines\n@@ -479,12 +571,21 @@ let Start opts =\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimUITermColors\" 1 (sprintf \"call rpcnotify(%d, 'ui.termcolors', <args>)\" myChannel))\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimUIHlState\" 1 (sprintf \"call rpcnotify(%d, 'ui.hlstate', <args>)\" myChannel))\n \n+ // trigger ginit upon VimEnter\n+ let! _ = Async.AwaitTask(nvim.command \"autocmd VimEnter * runtime! ginit.vim\")\n ()\n } \n |> Async.RunSynchronously\n \n+let Flush =\n+ ev_flush.Publish\n+ |> flush_throttle\n+ |> Observable.observeOn Avalonia.Threading.AvaloniaScheduler.Instance\n+\n+\n+// connect the grid redraw commands and events\n let OnGridReady(gridui: IGridUI) =\n- // connect the redraw commands\n+\n gridui.Resized \n |> Observable.throttle (TimeSpan.FromMilliseconds 20.0)\n |> Observable.add onGridResize\n@@ -492,7 +593,6 @@ let OnGridReady(gridui: IGridUI) =\n add_grid gridui\n \n gridui.Input \n- |> Observable.filter (fun _ -> not gridui.HasChildren)\n |> onInput\n |> nvim.pushSubscription\n \n@@ -505,10 +605,7 @@ let OnGridReady(gridui: IGridUI) =\n gridui.GridWidth gridui.GridHeight\n task {\n let! _ = nvim.ui_attach gridui.GridWidth gridui.GridHeight\n- // TODO ideally this should be triggered in `nvim_command(\"autocmd VimEnter * call rpcrequest(1, 'vimenter')\")`\n- // as per :help ui-start\n- let! _ = nvim.command \"runtime! ginit.vim\"\n- in ()\n+ ()\n } |> ignore\n \n let SelectPopupMenuItem (index: int) (insert: bool) (finish: bool) =\ndiff --git a/neovim/neovim.process.fs b/neovim.fs\nsimilarity index 93%\nrename from neovim/neovim.process.fs\nrename to neovim.fs\nindex 43d0971..865a009 100644\n--- a/neovim/neovim.process.fs\n+++ b/neovim.fs\n@@ -1,10 +1,10 @@\n-module FVim.neovim.proc\n+module FVim.neovim\n \n open def\n-open FVim.getopt\n-open FVim.log\n-open FVim.common\n-open FVim.States\n+open getopt\n+open log\n+open common\n+open States\n \n open MessagePack\n \n@@ -121,7 +121,9 @@ type Nvim() =\n | :? System.IO.IOException\n | :? System.Net.Sockets.SocketException\n | :? ObjectDisposedException\n- -> ex <- true\n+ as _ex -> \n+ ex <- true\n+ trace \"exception: %O\" _ex\n \n let ec = serverExitCode()\n if ec.IsSome then\n@@ -252,17 +254,22 @@ type Nvim() =\n this.events\n |> Observable.observeOnContext ctx\n |> Observable.synchronize\n- |> Observable.subscribe fn\n+ |> Observable.subscribe fn\n |> this.pushSubscription\n \n // ========================== NeoVim API ===============================\n \n- member __.input (keys: string[]) =\n- let keys = Array.map (fun x -> box x) keys\n- m_call { method = \"nvim_input\"; parameters = keys }\n+ member __.input (key: string) =\n+ m_call { method = \"nvim_input\"; parameters = [| box key |] }\n+\n+ member __.input_mouse (button: string) (action: string) (mods: string) (grid: int) (row: int) (col: int) =\n+ m_call { method = \"nvim_input_mouse\"; parameters = [| box button; box action; box mods; box grid; box row; box col |] }\n \n member __.grid_resize (id: int) (w: int) (h: int) =\n- m_call { method = \"nvim_ui_try_resize\"; parameters = mkparams2 w h }\n+ if ui_multigrid then\n+ m_call { method = \"nvim_ui_try_resize_grid\"; parameters = mkparams3 id w h }\n+ else\n+ m_call { method = \"nvim_ui_try_resize\"; parameters = mkparams2 w h }\n \n member __.ui_attach (w:int) (h:int) =\n let opts = hashmap [\ndiff --git a/states.fs b/states.fs\nindex 4bd1823..0596f90 100644\n--- a/states.fs\n+++ b/states.fs\n@@ -3,7 +3,9 @@ module FVim.States\n open common\n open SkiaSharp\n open log\n+open def\n open System.Reflection\n+open Avalonia.Threading\n \n [<Struct>]\n type Request = \n@@ -77,7 +79,7 @@ let mutable font_lineheight = LineHeightOption.Default\n // ui\n let mutable ui_available_opts = Set.empty<string>\n let mutable ui_multigrid = false\n-let mutable ui_popupmenu = false\n+let mutable ui_popupmenu = true\n let mutable ui_tabline = false\n let mutable ui_cmdline = false\n let mutable ui_wildmenu = false\n@@ -194,6 +196,7 @@ let msg_dispatch =\n | Crash code ->\n trace \"model\" \"neovim crashed with code %d\" code\n _appLifetime.Shutdown()\n+ | Error err -> error \"model\" \"neovim: %s\" err\n | _ -> ()\n \n module Register =\ndiff --git a/theme.fs b/theme.fs\nnew file mode 100644\nindex 0000000..397a939\n--- /dev/null\n+++ b/theme.fs\n@@ -0,0 +1,137 @@\n+module FVim.theme\n+open ui\n+open def\n+open log\n+\n+open Avalonia\n+open Avalonia.Media\n+\n+#nowarn \"0025\"\n+\n+let private trace fmt = trace \"theme\" fmt\n+\n+// global theme configuration about colors, fonts, cursor, etc.\n+let mutable hi_defs = Array.create<HighlightAttr> 256 HighlightAttr.Default\n+let mutable mode_defs = Array.empty<ModeInfo>\n+let mutable semhl = Map.empty\n+let mutable guifont = DefaultFont\n+let mutable guifontwide = DefaultFontWide\n+let mutable fontsize = 16.0\n+let mutable cursor_enabled = true\n+let mutable default_fg = Colors.White\n+let mutable default_bg = Colors.Black\n+let mutable default_sp = Colors.Red\n+\n+let hlchange_ev = Event<int>()\n+let fontconfig_ev = Event<unit>()\n+let cursoren_ev = Event<bool>()\n+let pumconfig_ev = Event<Color*Color*Color*Color*Color*Color*Color>()\n+\n+let fontConfig() =\n+ fontsize <- max fontsize 1.0\n+ trace \"fontConfig: guifont=%s guifontwide=%s\" guifont guifontwide\n+ fontconfig_ev.Trigger()\n+\n+let _ = States.Register.Watch \"font\" fontConfig\n+\n+let setHighlight x =\n+ if hi_defs.Length < x.id + 1 then\n+ System.Array.Resize(&hi_defs, x.id + 100)\n+ hi_defs.[x.id] <- x\n+ if x.id = 0 then\n+ default_fg <- x.rgb_attr.foreground.Value\n+ default_bg <- x.rgb_attr.background.Value\n+ default_sp <- x.rgb_attr.special.Value\n+ hlchange_ev.Trigger(x.id)\n+\n+let setModeInfo (cs_en: bool) (info: ModeInfo[]) =\n+ mode_defs <- info\n+ cursoren_ev.Trigger cs_en\n+\n+let GetDrawAttrs hlid = \n+ let attrs = hi_defs.[hlid].rgb_attr\n+\n+ let mutable fg = Option.defaultValue default_fg attrs.foreground\n+ let mutable bg = Option.defaultValue default_bg attrs.background\n+ let mutable sp = Option.defaultValue default_sp attrs.special\n+\n+ if attrs.reverse then\n+ fg <- GetReverseColor fg\n+ bg <- GetReverseColor bg\n+ sp <- GetReverseColor sp\n+\n+ fg, bg, sp, attrs\n+\n+do\n+ let fg,bg,sp,_ = GetDrawAttrs 0\n+ default_bg <- bg\n+ default_fg <- fg\n+ default_sp <- sp\n+\n+\n+let setSemanticHighlightGroups grp =\n+ semhl <- grp\n+ // update popupmenu color\n+ let [ nfg, nbg, _, _\n+ sfg, sbg, _, _\n+ scfg, scbg, _, _\n+ _, bbg, _, _ ] = \n+ [\n+ SemanticHighlightGroup.Pmenu\n+ SemanticHighlightGroup.PmenuSel\n+ SemanticHighlightGroup.PmenuSbar\n+ SemanticHighlightGroup.VertSplit\n+ ] \n+ |> List.map (semhl.TryFind >> Option.defaultValue 1 >> GetDrawAttrs)\n+\n+ pumconfig_ev.Trigger(nfg, nbg, sfg, sbg, scfg, scbg, bbg)\n+\n+let setDefaultColors fg bg sp = \n+\n+ let bg = \n+ if fg = bg && bg = sp then GetReverseColor bg\n+ else bg\n+\n+ setHighlight {\n+ id = 0\n+ info = [||]\n+ cterm_attr = RgbAttr.Empty\n+ rgb_attr = { \n+ foreground = Some fg\n+ background = Some bg\n+ special = Some sp\n+ reverse = false\n+ italic = false\n+ bold = false\n+ underline = false\n+ undercurl = false\n+ }\n+ }\n+ trace \"setDefaultColors: %A %A %A\" fg bg sp\n+\n+\n+let setOption (opt: UiOption) = \n+ trace \"setOption: %A\" opt\n+\n+ let (|FN|_|) (x: string) =\n+ // try to parse with 'font\\ name:hNN'\n+ match x.Split(':') with\n+ | [|name; size|] when size.Length > 0 && size.[0] = 'h' -> Some(name.Trim('\\'', '\"'), size.Substring(1).TrimEnd('\\'','\"') |> float)\n+ | _ -> None\n+\n+ let mutable config_font = true\n+\n+ match opt with\n+ | Guifont(FN(name, sz)) -> guifont <- name; fontsize <- sz\n+ | GuifontWide(FN(name, sz)) -> guifontwide <- name; fontsize <- sz\n+ | Guifont(\"+\") | GuifontWide(\"+\") -> fontsize <- fontsize + 1.0\n+ | Guifont(\"-\") | GuifontWide(\"-\") -> fontsize <- fontsize - 1.0\n+ | Guifont(\".+\") | GuifontWide(\".+\") -> fontsize <- fontsize + 0.1\n+ | Guifont(\".-\") | GuifontWide(\".-\") -> fontsize <- fontsize - 0.1\n+ | _ -> config_font <- false\n+\n+ if config_font then fontConfig()\n+\n+let hiattrDefine (hls: HighlightAttr[]) =\n+ Array.iter setHighlight hls\n+\ndiff --git a/ui.fs b/ui.fs\nindex bc8e888..63304a0 100644\n--- a/ui.fs\n+++ b/ui.fs\n@@ -1,13 +1,12 @@\n-namespace FVim\n+module FVim.ui\n \n+open def\n open common\n open wcwidth\n open log\n \n open ReactiveUI\n open Avalonia\n-open Avalonia.Controls\n-open Avalonia.Controls.Templates\n open Avalonia.Input\n open Avalonia.Media\n open Avalonia.Media.Imaging\n@@ -16,403 +15,328 @@ open Avalonia.Skia\n open SkiaSharp\n open SkiaSharp.HarfBuzz\n open System\n-open System.Reactive.Disposables\n open System.Reflection\n-open System.Runtime.CompilerServices\n-\n-[<Extension>]\n-type ActivatableExt() =\n- [<Extension>]\n- static member inline Watch (this: IActivatable, xs: IDisposable seq) =\n- this.WhenActivated(fun (disposables: CompositeDisposable) ->\n- xs |> Seq.iter (fun x -> x.DisposeWith(disposables) |> ignore)) |> ignore\n- [<Extension>]\n- static member inline Watch (this: ISupportsActivation, xs: IDisposable seq) =\n- this.WhenActivated(fun (disposables: CompositeDisposable) ->\n- xs |> Seq.iter (fun x -> x.DisposeWith(disposables) |> ignore)) |> ignore\n- [<Extension>]\n- static member inline Do (this: IActivatable, fn: unit -> unit) =\n- do fn()\n- Disposable.Empty\n- [<Extension>]\n- static member inline Do (this: ISupportsActivation, fn: unit -> unit) =\n- do fn()\n- Disposable.Empty\n-\n-type ViewModelBase(_x: float option, _y: float option, _w: float option, _h: float option) =\n- inherit ReactiveObject()\n-\n- let activator = new ViewModelActivator()\n-\n- let mutable m_x = _d 0.0 _x\n- let mutable m_y = _d 0.0 _y\n- let mutable m_w = _d 0.0 _w\n- let mutable m_h = _d 0.0 _h\n- let mutable m_tick = 0\n-\n- new() = ViewModelBase(None, None, None, None)\n- new(_posX: float option, _posY: float option, _size: Size option) = ViewModelBase(_posX, _posY, Option.map(fun (s: Size) -> s.Width) _size, Option.map(fun (s: Size) -> s.Height) _size)\n-\n- interface ISupportsActivation with\n- member __.Activator = activator\n-\n- member this.X\n- with get() : float = m_x\n- and set(v) = ignore <| this.RaiseAndSetIfChanged(&m_x, v, \"X\")\n-\n- member this.Y\n- with get() : float = m_y\n- and set(v) = ignore <| this.RaiseAndSetIfChanged(&m_y, v, \"Y\")\n-\n- member this.Height \n- with get(): float = m_h \n- and set(v) = ignore <| this.RaiseAndSetIfChanged(&m_h, v, \"Height\")\n-\n- member this.Width \n- with get(): float = m_w \n- and set(v) = ignore <| this.RaiseAndSetIfChanged(&m_w, v, \"Width\")\n-\n- member this.RenderTick\n- with get() : int = m_tick\n- and set(v) =\n- ignore <| this.RaiseAndSetIfChanged(&m_tick, v, \"RenderTick\")\n-\n-\n-type IViewModelContainer =\n- abstract Target: obj\n-\n-type ViewLocator() =\n- interface IDataTemplate with\n- member this.Build(data: obj): Avalonia.Controls.IControl = \n- match data with\n- | :? IViewModelContainer as container -> (this :> IDataTemplate).Build(container.Target)\n- | _ ->\n- let _name = data.GetType().FullName.Replace(\"ViewModel\", \"\");\n- let _type = Type.GetType(_name);\n- if _type <> null \n- then Activator.CreateInstance(_type) :?> IControl;\n- else TextBlock( Text = \"Not Found: \" + _name ) :> IControl\n- member this.Match(data: obj): bool = data :? ViewModelBase || data :? IViewModelContainer\n- member this.SupportsRecycling: bool = false\n-\n-\n-module ui =\n-\n- type InputEvent = \n- | Key of mods: InputModifiers * key: Key\n- | MousePress of mods: InputModifiers * row: int * col: int * button: MouseButton * combo: int\n- | MouseRelease of mods: InputModifiers * row: int * col: int * button: MouseButton\n- | MouseDrag of mods: InputModifiers * row: int * col: int * button: MouseButton\n- | MouseWheel of mods: InputModifiers * row: int * col: int * dx: float * dy: float\n- | TextInput of text: string\n-\n-\n- [<Struct>]\n- type GridBufferCell =\n- {\n- mutable text: string\n- mutable hlid: int32\n- } \n- with static member empty = { text = \" \"; hlid = 0 }\n-\n- [<Struct>]\n- type GridSize =\n- {\n- rows: int32\n- cols: int32\n- }\n-\n- let inline private (<<->) a b = fun x -> a <= x && x < b\n- let inline private (<->>) a b = fun x -> a < x && x <= b\n-\n- [<Struct>]\n- type GridRect =\n- {\n- row: int32\n- col: int32\n- // exclusive\n- height: int32\n- // exclusive\n- width: int32\n- }\n- with \n- member x.row_end = x.row + x.height\n- member x.col_end = x.col + x.width\n- member x.Contains (y: GridRect) =\n- y.row |> (x.row <<-> x.row_end) &&\n- y.col |> (x.col <<-> x.col_end) &&\n- y.row_end |> (x.row <->> x.row_end) &&\n- y.col_end |> (x.col <->> x.col_end)\n-\n-\n- static member Compare (x: GridRect) (y: GridRect) =\n- let row = x.row - y.row\n- if row <> 0 then row\n- else\n-\n- let col = x.col - y.col\n- if col <> 0 then col\n- else\n-\n- let height = x.height - y.height\n- if height <> 0 then height\n- else\n-\n- x.width - y.width\n-\n- type GridRegion() =\n- let rects = ResizeArray<GridRect>()\n- member x.Empty() = rects.Count = 0\n- member x.Clear = rects.Clear\n- member x.Union = rects.Add\n- member x.Regions() = \n- let region = ResizeArray()\n- let rects = ResizeArray<_>(rects)\n- for x in rects do\n- region\n- |> Seq.indexed\n- |> Seq.tryPick (fun (i, y) ->\n- // case 1: containment\n- if x.Contains y then Some(i, x)\n- elif y.Contains x then Some(i, y)\n- elif x.row = y.row && \n- x.height = y.height &&\n- (x.col = y.col_end || x.col_end = y.col) then\n- Some(i, { x with col = min x.col y.col\n- width = x.width + y.width })\n- elif x.col = y.col && \n- x.width = y.width &&\n- (x.row = y.row_end || x.row_end = y.row) then\n- Some(i, { x with row = min x.row y.row\n- height = x.height + y.height })\n- else None\n- )\n- |> function\n- | Some(i, x) -> region.[i] <- x\n- | None -> region.Add x\n- region\n-\n \n- /// Represents a grid in neovim\n- type IGridUI =\n- abstract Id: int\n- /// Number of rows\n- abstract GridHeight: int\n- /// Number of columns\n- abstract GridWidth: int\n- abstract Resized: IEvent<IGridUI>\n- abstract Input: IEvent<int*InputEvent>\n- abstract HasChildren: bool\n-\n- open System.Runtime.InteropServices\n-\n- let DefaultFont =\n- if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then \"Consolas\"\n- elif RuntimeInformation.IsOSPlatform(OSPlatform.Linux) then \"Monospace\"\n- elif RuntimeInformation.IsOSPlatform(OSPlatform.OSX) then \"Menlo\"\n- else \"Monospace\"\n-\n- let DefaultFontWide = \n- if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then \"DengXian\"\n- elif RuntimeInformation.IsOSPlatform(OSPlatform.Linux) then \"Noto Sans CJK SC\"\n- elif RuntimeInformation.IsOSPlatform(OSPlatform.OSX) then \"Heiti SC\"\n- else \"Simsun\"\n-\n- let DefaultFontEmoji =\n- if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then \"Segoe UI Emoji\"\n- elif RuntimeInformation.IsOSPlatform(OSPlatform.Linux) then \"Noto Color Emoji\" // ?\n- elif RuntimeInformation.IsOSPlatform(OSPlatform.OSX) then \"Apple Color Emoji\"\n- else \"Noto Color Emoji\"\n-\n- let private nerd_typeface = SKTypeface.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(\"fvim.nerd.ttf\"))\n- let private nerd_shaper = new SKShaper(nerd_typeface)\n- let private emoji_typeface = SKTypeface.FromFamilyName(DefaultFontEmoji)\n- let private emoji_shaper = new SKShaper(emoji_typeface)\n- let private fontcache = System.Collections.Generic.Dictionary<string*bool*bool, SKShaper*SKTypeface>()\n-\n- let private InvalidateFontCache () =\n- List.ofSeq fontcache.Keys\n- |> List.iter (fun k ->\n- let (shaper,font) = fontcache.[k]\n- shaper.Dispose()\n- font.Dispose()\n- ignore(fontcache.Remove k)\n- )\n-\n- ignore(States.Register.Watch \"font\" InvalidateFontCache)\n-\n- let GetReverseColor (c: Color) =\n- let inv = UInt32.MaxValue - c.ToUint32()\n- Color.FromUInt32(inv ||| 0xFF000000u)\n-\n- let GetTypeface(txt, italic, bold, font, wfont) =\n- let w = wswidth txt\n-\n- let _get fname =\n- match fontcache.TryGetValue((fname, italic, bold)) with\n- | true, (shaper, typeface) -> (shaper, typeface)\n- | _ ->\n- trace \"ui\" \"GetTypeface: allocating new typeface %s:%b:%b\" fname italic bold\n- let weight = if bold then States.font_weight_bold else States.font_weight_normal\n- let width = SKFontStyleWidth.Normal\n- let slang = if italic then SKFontStyleSlant.Italic else SKFontStyleSlant.Upright\n- let typeface = SKTypeface.FromFamilyName(fname, weight, width, slang)\n- let shaper = new SKShaper(typeface)\n- fontcache.[(fname, italic, bold)] <- (shaper, typeface)\n- (shaper, typeface)\n-\n- let wfont = if String.IsNullOrEmpty wfont then font else wfont\n-\n- match w with\n- | CharType.Wide -> _get wfont\n- | CharType.Powerline\n- | CharType.Nerd -> (nerd_shaper, nerd_typeface)\n- | CharType.Emoji -> (emoji_shaper, emoji_typeface)\n- | _ -> _get font\n-\n- let MeasureText (str: string, font: string, wfont: string, fontSize: float, scaling: float) =\n- use paint = new SKPaint()\n- paint.Typeface <- snd <| GetTypeface(str, false, false, font, wfont)\n- paint.TextSize <- single fontSize\n- paint.IsAntialias <- States.font_antialias\n- paint.IsAutohinted <- States.font_autohint\n- paint.IsLinearText <- false\n- paint.HintingLevel <- States.font_hintLevel\n- paint.LcdRenderText <- States.font_lcdrender\n- paint.SubpixelText <- States.font_subpixel\n- paint.TextAlign <- SKTextAlign.Left\n- paint.DeviceKerningEnabled <- false\n- paint.TextEncoding <- SKTextEncoding.Utf16\n-\n- let mutable score = 999999999999.0\n- let mutable s = fontSize\n- let mutable w = 0.0\n- let mutable h = 0.0\n-\n- let search (sizeStep: int) =\n- let s' = fontSize + float(sizeStep) * 0.01\n- paint.TextSize <- single s'\n-\n- let w' = float(paint.MeasureText str)\n- let h'' = \n- match States.font_lineheight with\n- | States.Absolute h' -> h'\n- | States.Default -> float paint.FontSpacing\n- | States.Add h' -> (float paint.FontSpacing) + h'\n- let h' = round(h'' * scaling) / scaling\n- let h' = max h' 1.0\n-\n- // calculate score\n- let score' = \n- abs(w' * scaling - round(w' * scaling)) +\n- abs(h' * scaling - round(h'' * scaling))\n-\n- if score' < score then\n- score <- score'\n- w <- w'\n- h <- h'\n- s <- s'\n-\n- if States.font_autosnap then [-50 .. 50] else [0] \n- |> List.iter search\n-\n- s, w, h\n- \n- let AllocateFramebuffer w h scale =\n- let pxsize = PixelSize(int <| (w * scale), int <| (h * scale))\n- new RenderTargetBitmap(pxsize, Vector(96.0 * scale, 96.0 * scale))\n-\n- let SetOpacity (paint: SKPaint) (opacity: float) =\n- paint.Color <- paint.Color.WithAlpha(byte <| opacity * 255.0)\n-\n- let SetForegroundBrush(fgpaint: SKPaint, c: Color, fontFace: SKTypeface, fontSize: float) =\n- fgpaint.Color <- c.ToSKColor()\n- fgpaint.Typeface <- fontFace\n- fgpaint.TextSize <- single fontSize\n- fgpaint.IsAntialias <- States.font_antialias\n- fgpaint.IsAutohinted <- States.font_autohint\n- fgpaint.IsLinearText <- false\n- fgpaint.HintingLevel <- States.font_hintLevel\n- fgpaint.LcdRenderText <- States.font_lcdrender\n- fgpaint.SubpixelText <- States.font_subpixel\n- fgpaint.TextAlign <- SKTextAlign.Left\n- fgpaint.DeviceKerningEnabled <- false\n- fgpaint.TextEncoding <- SKTextEncoding.Utf16\n- ()\n-\n- let RenderText (ctx: IDrawingContextImpl, region: Rect, scale: float, fg: SKPaint, bg: SKPaint, sp: SKPaint, underline: bool, undercurl: bool, text: string, shaper: SKShaper ValueOption) =\n-\n- // don't clip. see #60\n- // ctx.PushClip(region)\n-\n- // DrawText accepts the coordinate of the baseline.\n- // h = [padding space 1] + above baseline | below baseline + [padding space 2]\n- let h = region.Bottom - region.Y\n- // total_padding = padding space 1 + padding space 2\n- let total_padding = h - ((float fg.FontMetrics.Bottom - float fg.FontMetrics.Top) )\n- let baseline = region.Y + ceil((total_padding / 2.0) - (float fg.FontMetrics.Top))\n- let region = region.WithY(region.Y + baseline - baseline)\n- (*printfn \"scale=%A pad=%A base=%A region=%A\" scale total_padding baseline region*)\n- let fontPos = Point(region.X, baseline)\n-\n- let skia = ctx :?> ISkiaDrawingContextImpl\n-\n- //lol wat??\n- //fg.Shader <- SKShader.CreateCompose(SKShader.CreateColor(fg.Color), SKShader.CreatePerlinNoiseFractalNoise(0.1F, 0.1F, 1, 6.41613F))\n-\n- skia.SkCanvas.DrawRect(region.ToSKRect(), bg)\n- if not <| String.IsNullOrWhiteSpace text then\n- if shaper.IsSome then\n- skia.SkCanvas.DrawShapedText(shaper.Value, text.TrimEnd(), single fontPos.X, single fontPos.Y, fg)\n- else \n- skia.SkCanvas.DrawText(text.TrimEnd(), fontPos.ToSKPoint(), fg)\n-\n-\n- // Text bounding box drawing:\n- // --------------------------------------------------\n- if States.font_drawBounds then\n- let mutable bounds = SKRect()\n- let text = if String.IsNullOrEmpty text then \" \" else text\n- ignore <| fg.MeasureText(text, &bounds)\n- bounds.Left <- bounds.Left + single (fontPos.X)\n- bounds.Top <- bounds.Top + single (fontPos.Y)\n- bounds.Right <- bounds.Right + single (fontPos.X)\n- bounds.Bottom <- bounds.Bottom + single (fontPos.Y)\n- fg.Style <- SKPaintStyle.Stroke\n- skia.SkCanvas.DrawRect(bounds, fg)\n- // --------------------------------------------------\n-\n- let sp_thickness = fg.FontMetrics.UnderlineThickness.GetValueOrDefault(1.0F)\n-\n- if underline then\n- let underline_pos = fg.FontMetrics.UnderlinePosition.GetValueOrDefault()\n- let p1 = fontPos + Point(0.0, float <| underline_pos)\n- let p2 = p1 + Point(region.Width, 0.0)\n- sp.Style <- SKPaintStyle.Stroke\n- //sppaint.StrokeWidth <- sp_thickness\n- skia.SkCanvas.DrawLine(p1.ToSKPoint(), p2.ToSKPoint(), sp)\n-\n- if undercurl then\n- let underline_pos = fg.FontMetrics.UnderlinePosition.GetValueOrDefault()\n- let mutable px, py = single fontPos.X, single fontPos.Y \n- py <- py + underline_pos\n- let qf = 1.5F\n- let hf = qf * 2.0F\n- let q3f = qf * 3.0F\n- let ff = qf * 4.0F\n- let r = single region.Right\n- let py1 = py - 2.0f\n- let py2 = py + 2.0f\n- sp.Style <- SKPaintStyle.Stroke\n- sp.StrokeWidth <- sp_thickness\n- use path = new SKPath()\n- path.MoveTo(px, py)\n- while px < r do\n- path.LineTo(px, py)\n- path.LineTo(px + qf, py1)\n- path.LineTo(px + hf, py)\n- path.LineTo(px + q3f, py2)\n- px <- px + ff\n- skia.SkCanvas.DrawPath(path , sp)\n-\n- ctx.PopClip()\n+type InputEvent = \n+| Key of mods: KeyModifiers * key: Key\n+| MousePress of mods: KeyModifiers * row: int * col: int * button: MouseButton * combo: int\n+| MouseRelease of mods: KeyModifiers * row: int * col: int * button: MouseButton\n+| MouseDrag of mods: KeyModifiers * row: int * col: int * button: MouseButton\n+| MouseWheel of mods: KeyModifiers * row: int * col: int * dx: float * dy: float\n+| TextInput of text: string\n+\n+\n+[<Struct>]\n+type GridBufferCell =\n+ {\n+ mutable text: string\n+ mutable hlid: int32\n+ } \n+ with static member empty = { text = \" \"; hlid = 0 }\n+\n+[<Struct>]\n+type GridSize =\n+ {\n+ rows: int32\n+ cols: int32\n+ }\n+\n+let inline private (<<->) a b = fun x -> a <= x && x < b\n+let inline private (<->>) a b = fun x -> a < x && x <= b\n+\n+[<Struct>]\n+type GridRect =\n+ {\n+ row: int32\n+ col: int32\n+ // exclusive\n+ height: int32\n+ // exclusive\n+ width: int32\n+ }\n+ with \n+ member x.row_end = x.row + x.height\n+ member x.col_end = x.col + x.width\n+ member x.Contains (y: GridRect) =\n+ y.row |> (x.row <<-> x.row_end) &&\n+ y.col |> (x.col <<-> x.col_end) &&\n+ y.row_end |> (x.row <->> x.row_end) &&\n+ y.col_end |> (x.col <->> x.col_end)\n+\n+\n+ static member Compare (x: GridRect) (y: GridRect) =\n+ let row = x.row - y.row\n+ if row <> 0 then row\n+ else\n+\n+ let col = x.col - y.col\n+ if col <> 0 then col\n+ else\n+\n+ let height = x.height - y.height\n+ if height <> 0 then height\n+ else\n+\n+ x.width - y.width\n+\n+type GridRegion() =\n+ let rects = ResizeArray<GridRect>()\n+ member x.Empty() = rects.Count = 0\n+ member x.Clear = rects.Clear\n+ member x.Union = rects.Add\n+ member x.Regions() = \n+ let region = ResizeArray()\n+ let rects = ResizeArray<_>(rects)\n+ for x in rects do\n+ region\n+ |> Seq.indexed\n+ |> Seq.tryPick (fun (i, y) ->\n+ // case 1: containment\n+ if x.Contains y then Some(i, x)\n+ elif y.Contains x then Some(i, y)\n+ elif x.row = y.row && \n+ x.height = y.height &&\n+ (x.col = y.col_end || x.col_end = y.col) then\n+ Some(i, { x with col = min x.col y.col\n+ width = x.width + y.width })\n+ elif x.col = y.col && \n+ x.width = y.width &&\n+ (x.row = y.row_end || x.row_end = y.row) then\n+ Some(i, { x with row = min x.row y.row\n+ height = x.height + y.height })\n+ else None\n+ )\n+ |> function\n+ | Some(i, x) -> region.[i] <- x\n+ | None -> region.Add x\n+ region\n+\n+\n+/// Represents a grid in neovim\n+type IGridUI =\n+ abstract Id: int\n+ /// Number of rows\n+ abstract GridHeight: int\n+ /// Number of columns\n+ abstract GridWidth: int\n+ abstract Resized: IEvent<IGridUI>\n+ abstract Input: IEvent<int*InputEvent>\n+ abstract HasChildren: bool\n+ abstract Redraw: RedrawCommand -> unit\n+ abstract AddChild: int -> int -> int -> IGridUI\n+\n+open System.Runtime.InteropServices\n+\n+let DefaultFont =\n+ if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then \"Consolas\"\n+ elif RuntimeInformation.IsOSPlatform(OSPlatform.Linux) then \"Monospace\"\n+ elif RuntimeInformation.IsOSPlatform(OSPlatform.OSX) then \"Menlo\"\n+ else \"Monospace\"\n+\n+let DefaultFontWide = \n+ if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then \"DengXian\"\n+ elif RuntimeInformation.IsOSPlatform(OSPlatform.Linux) then \"Noto Sans CJK SC\"\n+ elif RuntimeInformation.IsOSPlatform(OSPlatform.OSX) then \"Heiti SC\"\n+ else \"Simsun\"\n+\n+let DefaultFontEmoji =\n+ if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then \"Segoe UI Emoji\"\n+ elif RuntimeInformation.IsOSPlatform(OSPlatform.Linux) then \"Noto Color Emoji\" // ?\n+ elif RuntimeInformation.IsOSPlatform(OSPlatform.OSX) then \"Apple Color Emoji\"\n+ else \"Noto Color Emoji\"\n+\n+let private nerd_typeface = SKTypeface.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(\"fvim.nerd.ttf\"))\n+let private nerd_shaper = new SKShaper(nerd_typeface)\n+let private emoji_typeface = SKTypeface.FromFamilyName(DefaultFontEmoji)\n+let private emoji_shaper = new SKShaper(emoji_typeface)\n+let private fontcache = System.Collections.Generic.Dictionary<string*bool*bool, SKShaper*SKTypeface>()\n+\n+let private InvalidateFontCache () =\n+ List.ofSeq fontcache.Keys\n+ |> List.iter (fun k ->\n+ let (shaper,font) = fontcache.[k]\n+ shaper.Dispose()\n+ font.Dispose()\n+ ignore(fontcache.Remove k)\n+ )\n+\n+ignore(States.Register.Watch \"font\" InvalidateFontCache)\n+\n+let GetReverseColor (c: Color) =\n+ let inv = UInt32.MaxValue - c.ToUint32()\n+ Color.FromUInt32(inv ||| 0xFF000000u)\n+\n+let GetTypeface(txt, italic, bold, font, wfont) =\n+ let w = wswidth txt\n+\n+ let _get fname =\n+ match fontcache.TryGetValue((fname, italic, bold)) with\n+ | true, (shaper, typeface) -> (shaper, typeface)\n+ | _ ->\n+ trace \"ui\" \"GetTypeface: allocating new typeface %s:%b:%b\" fname italic bold\n+ let weight = if bold then States.font_weight_bold else States.font_weight_normal\n+ let width = SKFontStyleWidth.Normal\n+ let slang = if italic then SKFontStyleSlant.Italic else SKFontStyleSlant.Upright\n+ let typeface = SKTypeface.FromFamilyName(fname, weight, width, slang)\n+ let shaper = new SKShaper(typeface)\n+ fontcache.[(fname, italic, bold)] <- (shaper, typeface)\n+ (shaper, typeface)\n+\n+ let wfont = if String.IsNullOrEmpty wfont then font else wfont\n+\n+ match w with\n+ | CharType.Wide -> _get wfont\n+ | CharType.Powerline\n+ | CharType.Nerd -> (nerd_shaper, nerd_typeface)\n+ | CharType.Emoji -> (emoji_shaper, emoji_typeface)\n+ | _ -> _get font\n+\n+let MeasureText (str: string, font: string, wfont: string, fontSize: float, scaling: float) =\n+ use paint = new SKPaint()\n+ paint.Typeface <- snd <| GetTypeface(str, false, false, font, wfont)\n+ paint.TextSize <- single fontSize\n+ paint.IsAntialias <- States.font_antialias\n+ paint.IsAutohinted <- States.font_autohint\n+ paint.IsLinearText <- false\n+ paint.HintingLevel <- States.font_hintLevel\n+ paint.LcdRenderText <- States.font_lcdrender\n+ paint.SubpixelText <- States.font_subpixel\n+ paint.TextAlign <- SKTextAlign.Left\n+ paint.DeviceKerningEnabled <- false\n+ paint.TextEncoding <- SKTextEncoding.Utf16\n+\n+ let mutable score = 999999999999.0\n+ let mutable s = fontSize\n+ let mutable w = 0.0\n+ let mutable h = 0.0\n+\n+ let search (sizeStep: int) =\n+ let s' = fontSize + float(sizeStep) * 0.01\n+ paint.TextSize <- single s'\n+\n+ let w' = float(paint.MeasureText str)\n+ let h'' = \n+ match States.font_lineheight with\n+ | States.Absolute h' -> h'\n+ | States.Default -> float paint.FontSpacing\n+ | States.Add h' -> (float paint.FontSpacing) + h'\n+ let h' = round(h'' * scaling) / scaling\n+ let h' = max h' 1.0\n+\n+ // calculate score\n+ let score' = \n+ abs(w' * scaling - round(w' * scaling)) +\n+ abs(h' * scaling - round(h'' * scaling))\n+\n+ if score' < score then\n+ score <- score'\n+ w <- w'\n+ h <- h'\n+ s <- s'\n+\n+ if States.font_autosnap then [-50 .. 50] else [0] \n+ |> List.iter search\n+\n+ s, w, h\n+ \n+let AllocateFramebuffer w h scale =\n+ let pxsize = PixelSize(int <| (w * scale), int <| (h * scale))\n+ new RenderTargetBitmap(pxsize, Vector(96.0 * scale, 96.0 * scale))\n+\n+let SetOpacity (paint: SKPaint) (opacity: float) =\n+ paint.Color <- paint.Color.WithAlpha(byte <| opacity * 255.0)\n+\n+let SetForegroundBrush(fgpaint: SKPaint, c: Color, fontFace: SKTypeface, fontSize: float) =\n+ fgpaint.Color <- c.ToSKColor()\n+ fgpaint.Typeface <- fontFace\n+ fgpaint.TextSize <- single fontSize\n+ fgpaint.IsAntialias <- States.font_antialias\n+ fgpaint.IsAutohinted <- States.font_autohint\n+ fgpaint.IsLinearText <- false\n+ fgpaint.HintingLevel <- States.font_hintLevel\n+ fgpaint.LcdRenderText <- States.font_lcdrender\n+ fgpaint.SubpixelText <- States.font_subpixel\n+ fgpaint.TextAlign <- SKTextAlign.Left\n+ fgpaint.DeviceKerningEnabled <- false\n+ fgpaint.TextEncoding <- SKTextEncoding.Utf16\n+ ()\n+\n+let RenderText (ctx: IDrawingContextImpl, region: Rect, scale: float, fg: SKPaint, bg: SKPaint, sp: SKPaint, underline: bool, undercurl: bool, text: string, shaper: SKShaper ValueOption) =\n+\n+ // don't clip. see #60\n+ // ctx.PushClip(region)\n+\n+ // DrawText accepts the coordinate of the baseline.\n+\n+ let region = region.ToSKRect()\n+\n+ let h = region.Bottom - region.Top\n+ let h' = fg.FontMetrics.Bottom - fg.FontMetrics.Top\n+ let total_padding = h - h'\n+ let prop = h / h'\n+ let baseline = region.Top + ceil((total_padding / 2.0f) - (fg.FontMetrics.Top))\n+ (*let baseline = ceil( region.Bottom - (fg.FontMetrics.Bottom * prop))*)\n+ (*printfn \"scale=%A pad=%A base=%A region=%A\" scale total_padding baseline region*)\n+ let fontPos = SKPoint(region.Left, baseline)\n+\n+ let skia = ctx :?> ISkiaDrawingContextImpl\n+\n+ //lol wat??\n+ //fg.Shader <- SKShader.CreateCompose(SKShader.CreateColor(fg.Color), SKShader.CreatePerlinNoiseFractalNoise(0.1F, 0.1F, 1, 6.41613F))\n+\n+ skia.SkCanvas.DrawRect(region, bg)\n+ if not <| String.IsNullOrWhiteSpace text then\n+ if shaper.IsSome then\n+ skia.SkCanvas.DrawShapedText(shaper.Value, text.TrimEnd(), single fontPos.X, single fontPos.Y, fg)\n+ else \n+ skia.SkCanvas.DrawText(text.TrimEnd(), fontPos, fg)\n+\n+\n+ // Text bounding box drawing:\n+ // --------------------------------------------------\n+ if States.font_drawBounds then\n+ let mutable bounds = SKRect()\n+ let text = if String.IsNullOrEmpty text then \" \" else text\n+ ignore <| fg.MeasureText(text, &bounds)\n+ bounds.Left <- bounds.Left + single (fontPos.X)\n+ bounds.Top <- bounds.Top + single (fontPos.Y)\n+ bounds.Right <- bounds.Right + single (fontPos.X)\n+ bounds.Bottom <- bounds.Bottom + single (fontPos.Y)\n+ fg.Style <- SKPaintStyle.Stroke\n+ skia.SkCanvas.DrawRect(bounds, fg)\n+ // --------------------------------------------------\n+\n+ let sp_thickness = fg.FontMetrics.UnderlineThickness.GetValueOrDefault(1.0F)\n+\n+ if underline then\n+ let underline_pos = fg.FontMetrics.UnderlinePosition.GetValueOrDefault()\n+ let p1 = fontPos + SKPoint(0.0f, underline_pos)\n+ let p2 = p1 + SKPoint(region.Width, 0.0f)\n+ sp.Style <- SKPaintStyle.Stroke\n+ //sppaint.StrokeWidth <- sp_thickness\n+ skia.SkCanvas.DrawLine(p1, p2, sp)\n+\n+ if undercurl then\n+ let underline_pos = fg.FontMetrics.UnderlinePosition.GetValueOrDefault()\n+ let mutable px, py = single fontPos.X, single fontPos.Y \n+ py <- py + underline_pos\n+ let qf = 1.5F\n+ let hf = qf * 2.0F\n+ let q3f = qf * 3.0F\n+ let ff = qf * 4.0F\n+ let r = single region.Right\n+ let py1 = py - 2.0f\n+ let py2 = py + 2.0f\n+ sp.Style <- SKPaintStyle.Stroke\n+ sp.StrokeWidth <- sp_thickness\n+ use path = new SKPath()\n+ path.MoveTo(px, py)\n+ while px < r do\n+ path.LineTo(px, py)\n+ path.LineTo(px + qf, py1)\n+ path.LineTo(px + hf, py)\n+ path.LineTo(px + q3f, py2)\n+ px <- px + ff\n+ skia.SkCanvas.DrawPath(path , sp)\n+\n+ ctx.PopClip()\n"},"changed_files":{"kind":"list like","value":["App.xaml.fs","Program.fs","Properties/launchSettings.json","ViewModels/CompletionItemViewModel.fs","ViewModels/CursorViewModel.fs","ViewModels/EditorViewModel.fs","ViewModels/MainWindowViewModel.fs","ViewModels/PopupMenuViewModel.fs","ViewModels/ViewModelBase.fs","Views/Cursor.xaml.fs","Views/Editor.xaml.fs","Views/MainWindow.xaml.fs","def.fs","fvim.fsproj","log.fs","model.fs","neovim.fs","states.fs","theme.fs","ui.fs"],"string":"[\n \"App.xaml.fs\",\n \"Program.fs\",\n \"Properties/launchSettings.json\",\n \"ViewModels/CompletionItemViewModel.fs\",\n \"ViewModels/CursorViewModel.fs\",\n \"ViewModels/EditorViewModel.fs\",\n \"ViewModels/MainWindowViewModel.fs\",\n \"ViewModels/PopupMenuViewModel.fs\",\n \"ViewModels/ViewModelBase.fs\",\n \"Views/Cursor.xaml.fs\",\n \"Views/Editor.xaml.fs\",\n \"Views/MainWindow.xaml.fs\",\n \"def.fs\",\n \"fvim.fsproj\",\n \"log.fs\",\n \"model.fs\",\n \"neovim.fs\",\n \"states.fs\",\n \"theme.fs\",\n \"ui.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86275,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":78,"string":"78"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Crash report"},"pr_body":{"kind":"string","value":""},"base_sha":{"kind":"string","value":"2fda01238fb3e97a3638a100e4b48bad9233d611"},"head_sha":{"kind":"string","value":"68066787e0cd40a40a094456e8b0be4c40cda297"},"gold_diff":{"kind":"string","value":"diff --git a/Assets/error.png b/Assets/error.png\nnew file mode 100644\nindex 0000000..9d4f19c\nBinary files /dev/null and b/Assets/error.png differ\ndiff --git a/Assets/error.xcf b/Assets/error.xcf\nnew file mode 100644\nindex 0000000..a5a8635\nBinary files /dev/null and b/Assets/error.xcf differ\ndiff --git a/DesignTime/CrashReportSampleData.fs b/DesignTime/CrashReportSampleData.fs\nnew file mode 100644\nindex 0000000..e1e2e94\n--- /dev/null\n+++ b/DesignTime/CrashReportSampleData.fs\n@@ -0,0 +1,11 @@\n+namespace FVim\n+\n+type CrashReportSampleData() =\n+ member __.MainMessage = \"Some error: some detailed error message.\\nThis error is so bad that we have to bail out.\"\n+ member __.TipMessage = \"\\n\\nIn case of fire,\\n 1. git commit\\n 2. git push\\n 3. run\\nThank you for your cooperation.\"\n+ member __.StackTrace = System.Collections.Generic.List [\n+ \"foo\"\n+ \"bar\"\n+ \"baz\"\n+ ] \n+\ndiff --git a/Program.fs b/Program.fs\nindex a7e83eb..dc6ec90 100644\n--- a/Program.fs\n+++ b/Program.fs\n@@ -64,15 +64,25 @@ let main(args: string[]) =\n let _ = builder.SetupWithoutStarting()\n // Avalonia is initialized. SynchronizationContext-reliant code should be working by now;\n \n- try\n- Model.Start opts\n- with ex -> ()\n- let cfg = config.load()\n- let cwd = Environment.CurrentDirectory |> Path.GetFullPath\n- let workspace = cfg.Workspace |> Array.tryFind(fun w -> w.Path = cwd)\n- let mainwin = new MainWindowViewModel(workspace)\n- lifetime.MainWindow <- MainWindow(DataContext = mainwin)\n- let ret = lifetime.Start(args)\n+ let model_start = \n+ try \n+ Model.Start opts\n+ Ok()\n+ with ex -> Error ex\n \n- config.save cfg (int mainwin.X) (int mainwin.Y) mainwin.Width mainwin.Height mainwin.WindowState\n- ret\n+ match model_start with\n+ | Ok() ->\n+ let cfg = config.load()\n+ let cwd = Environment.CurrentDirectory |> Path.GetFullPath\n+ let workspace = cfg.Workspace |> Array.tryFind(fun w -> w.Path = cwd)\n+ let mainwin = new MainWindowViewModel(workspace)\n+ lifetime.MainWindow <- MainWindow(DataContext = mainwin)\n+ let ret = lifetime.Start(args)\n+\n+ config.save cfg (int mainwin.X) (int mainwin.Y) mainwin.Width mainwin.Height mainwin.WindowState\n+ ret\n+ | Error ex ->\n+ let crash = new CrashReportViewModel(ex)\n+ lifetime.MainWindow <- new CrashReport(DataContext = crash)\n+ ignore <| lifetime.Start(args)\n+ -1\ndiff --git a/ViewModels/CrashReportViewModel.fs b/ViewModels/CrashReportViewModel.fs\nnew file mode 100644\nindex 0000000..d06f4f2\n--- /dev/null\n+++ b/ViewModels/CrashReportViewModel.fs\n@@ -0,0 +1,23 @@\n+namespace FVim\n+\n+open ui\n+open log\n+open common\n+\n+type CrashReportViewModel(ex: exn) =\n+ inherit ViewModelBase()\n+ member __.MainMessage =\n+ ex.Message\n+ member __.StackTrace =\n+ ex.StackTrace.Split(\"\\n\")\n+ member __.TipMessage = \n+ let tip = \n+ match ex.Message with\n+ | \"The system cannot find the file specified.\" -> \"Tip: check your neovim installation. `nvim` is not in your $PATH.\\n\"\n+ | _ -> \"\"\n+ let generic_message = \n+ \"You can go to https://github.com/yatli/fvim/issues, and search\\n\" + \n+ \"for relevant issues with the exception message, or the stack trace.\\n\" +\n+ \"Feel free to create new issues, and I'll help to triage and fix the problem.\"\n+ tip + generic_message\n+\ndiff --git a/Views/CrashReport.xaml b/Views/CrashReport.xaml\nnew file mode 100644\nindex 0000000..b2fe505\n--- /dev/null\n+++ b/Views/CrashReport.xaml\n@@ -0,0 +1,34 @@\n+<Window xmlns=\"https://github.com/avaloniaui\"\n+ xmlns:x=\"http://schemas.microsoft.com/winfx/2006/xaml\"\n+ xmlns:d=\"http://schemas.microsoft.com/expression/blend/2008\"\n+ xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\"\n+ xmlns:fvim=\"clr-namespace:FVim;assembly=FVim\"\n+ Focusable=\"True\"\n+ MinHeight=\"240\"\n+ MinWidth=\"600\"\n+ Icon=\"..\\Assets\\fvim.png\"\n+ x:Class=\"FVim.CrashReport\">\n+ <Design.DataContext>\n+ <fvim:CrashReportSampleData />\n+ </Design.DataContext>\n+ <Grid>\n+ <Grid.RowDefinitions>\n+ <RowDefinition Height=\"20\" />\n+ <RowDefinition Height=\"40\" />\n+ <RowDefinition Height=\"*\" />\n+ <RowDefinition Height=\"50\" />\n+ </Grid.RowDefinitions>\n+ <Grid.ColumnDefinitions>\n+ <ColumnDefinition Width=\"120\" />\n+ <ColumnDefinition Width=\"400\" />\n+ <ColumnDefinition Width=\"*\"/>\n+ </Grid.ColumnDefinitions>\n+ <TextBlock Text=\"FVim exited unexpectedly.\" Grid.Row=\"0\" Grid.Column=\"1\" Margin=\"0,10,0,0\" FontWeight=\"Bold\"/>\n+ <TextBlock Text=\"Close this window to exit FVim.\" Grid.Row=\"3\" Grid.Column=\"1\" Margin=\"0,10,0,0\" FontWeight=\"Bold\"/>\n+ <Image Source=\"/Assets/error.png\" Grid.Row=\"0\" Grid.RowSpan=\"4\" Grid.Column=\"0\" Height=\"64\" Margin=\"0,0,0,50\" />\n+ <TextBlock Text=\"{Binding MainMessage}\" Grid.Row=\"1\" Grid.Column=\"1\" Margin=\"0,20,0,0\" />\n+ <TextBlock Text=\"{Binding TipMessage}\" Grid.Row=\"2\" Grid.Column=\"1\" Margin=\"0,20,0,0\" />\n+ <TextBlock Text=\"Stack trace:\" Grid.Row=\"0\" Grid.Column=\"2\" Margin=\"0,10,0,0\"/>\n+ <ListBox Items=\"{Binding StackTrace}\" Grid.Row=\"1\" Grid.RowSpan=\"2\" Grid.Column=\"2\" Margin=\"10,10,10,10\"/>\n+ </Grid>\n+</Window>\ndiff --git a/Views/CrashReport.xaml.fs b/Views/CrashReport.xaml.fs\nnew file mode 100644\nindex 0000000..a78096a\n--- /dev/null\n+++ b/Views/CrashReport.xaml.fs\n@@ -0,0 +1,13 @@\n+namespace FVim\n+\n+open ui\n+open log\n+open common\n+open Avalonia.Markup.Xaml\n+open Avalonia.Controls\n+\n+type CrashReport() as this =\n+ inherit Window()\n+\n+ do\n+ AvaloniaXamlLoader.Load(this)\ndiff --git a/fvim.fsproj b/fvim.fsproj\nindex 63bc71d..39da925 100644\n--- a/fvim.fsproj\n+++ b/fvim.fsproj\n@@ -25,6 +25,7 @@\n </PropertyGroup>\n \n <ItemGroup>\n+ <Compile Include=\"DesignTime\\CrashReportSampleData.fs\" />\n <Compile Include=\"common.fs\" />\n <Compile Include=\"config.fs\" />\n <Compile Include=\"getopt.fs\" />\n@@ -41,12 +42,14 @@\n <Compile Include=\"ViewModels\\PopupMenuViewModel.fs\" />\n <Compile Include=\"ViewModels\\EditorViewModel.fs\" />\n <Compile Include=\"ViewModels\\MainWindowViewModel.fs\" />\n+ <Compile Include=\"ViewModels\\CrashReportViewModel.fs\" />\n <Compile Include=\"Views\\ViewBase.fs\" />\n <Compile Include=\"Views\\MainWindow.xaml.fs\" />\n <Compile Include=\"Views\\CompletionItem.xaml.fs\" />\n <Compile Include=\"Views\\PopupMenu.xaml.fs\" />\n <Compile Include=\"Views\\Editor.xaml.fs\" />\n <Compile Include=\"Views\\Cursor.xaml.fs\" />\n+ <Compile Include=\"Views\\CrashReport.xaml.fs\" />\n <Compile Include=\"App.xaml.fs\" />\n <Compile Include=\"Program.fs\" />\n <ApplicationDefinition Include=\"fvim.config\" />\n"},"changed_files":{"kind":"list like","value":["Assets/error.png","Assets/error.xcf","DesignTime/CrashReportSampleData.fs","Program.fs","ViewModels/CrashReportViewModel.fs","Views/CrashReport.xaml","Views/CrashReport.xaml.fs","fvim.fsproj"],"string":"[\n \"Assets/error.png\",\n \"Assets/error.xcf\",\n \"DesignTime/CrashReportSampleData.fs\",\n \"Program.fs\",\n \"ViewModels/CrashReportViewModel.fs\",\n \"Views/CrashReport.xaml\",\n \"Views/CrashReport.xaml.fs\",\n \"fvim.fsproj\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86276,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":56,"string":"56"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Implement rpm packaging"},"pr_body":{"kind":"string","value":"Should generate an rpm package alongside the deb linux package. Currently the rpm generation has been tested, but not the resulting rpm itself."},"base_sha":{"kind":"string","value":"a3265a7bdbd1389453252d8bb91a8e5e1c3f6e3b"},"head_sha":{"kind":"string","value":"757329232caf6895fb79fc7b6098548f0f03b37f"},"gold_diff":{"kind":"string","value":"diff --git a/azure-pipelines.yml b/azure-pipelines.yml\nindex e0a644f..295e765 100644\n--- a/azure-pipelines.yml\n+++ b/azure-pipelines.yml\n@@ -44,7 +44,7 @@ jobs:\n inputs:\n targetType: 'inline'\n script: |\n- sudo apt-get install ruby ruby-dev rubygems build-essential\n+ sudo apt-get install ruby ruby-dev rubygems build-essential rpm\n sudo gem install --no-ri --no-rdoc fpm\n - task: Bash@3\n inputs:\ndiff --git a/pack.sh b/pack.sh\nindex 0629a3e..5c2bcc2 100755\n--- a/pack.sh\n+++ b/pack.sh\n@@ -1,5 +1,5 @@\n #!/bin/bash\n-# usage: \n+# usage:\n # pack.sh linux-x64\n # pack.sh osx-x64\n \n@@ -15,7 +15,7 @@ dotnet publish -f netcoreapp3.0 -c Release --self-contained -r $PKG_TFM\n \n function pack-linux-x64()\n {\n- rm -f ./*.deb\n+ rm -f ./{*.deb,*.rpm}\n \n pushd $PKG_ROOT\n cd ..\n@@ -33,8 +33,9 @@ function pack-linux-x64()\n chmod +x $PKG_ROOT/usr/share/fvim/FVim\n chmod +x $PKG_ROOT/usr/bin/fvim\n fpm -s dir -t deb -n fvim -v $VERSION -C $PKG_ROOT\n+ fpm -s dir -t rpm -n fvim -v $VERSION -C $PKG_ROOT\n \n- mv *.deb publish/\n+ mv {*.deb,*.rpm} publish/\n }\n \n function pack-osx-x64()\n"},"changed_files":{"kind":"list like","value":["azure-pipelines.yml","pack.sh"],"string":"[\n \"azure-pipelines.yml\",\n \"pack.sh\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86277,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":55,"string":"55"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Improve linux installation instructions #52"},"pr_body":{"kind":"string","value":"Added a couple options in the Linux install instructions section to hopefully cover more cases."},"base_sha":{"kind":"string","value":"17b59dd4bfcdcd1466db083cdfef96724bd5ae79"},"head_sha":{"kind":"string","value":"d49d3b715e52ae1fb903401d7b823b69a9c09137"},"gold_diff":{"kind":"string","value":"diff --git a/README.md b/README.md\nindex cdf89eb..c6e39bb 100644\n--- a/README.md\n+++ b/README.md\n@@ -12,8 +12,13 @@ Cross platform Neovim front-end UI, built with [F#](https://fsharp.org/) + [Aval\n - For Windows 7, use the `win7-x64` package.\n - For Windows 10, use the `win-x64` package -- this version has faster startup.\n - For macOS, it's packaged as an app bundle -- unzip and drag it to your applications folder.\n-- For Linux, you can either unpack manually, or run `dpkg -i fvim_package_name.deb` to install it with the package manager.\n-\n+- For Linux:\n+ - Debian based distributions: `dpkg -i fvim_package_name.deb`\n+ - Arch Linux: [Install via AUR](https://aur.archlinux.org/packages/fvim/)\n+ - Compile from Source (having dotnet-sdk-3+ installed):\n+ ```\n+ git clone https://github.com/yatli/fvim && cd fvim && dotnet publish -f netcoreapp3.0 -c Release -r linux-x64 --self-contained\n+ ```\n \n ### Features\n \n@@ -57,7 +62,7 @@ We're now targeting `netcoreapp3.0` so make sure to install the latest preview S\n We're also actively tracking the head of `Avalonia`, so please add their myget feed (https://www.myget.org/F/avalonia-ci/api/v2) to your nuget package manager:\n ```\n # Windows:\n-nuget sources add -Name \"Avalonia Nightly\" -Source \"https://www.myget.org/F/avalonia-ci/api/v2\" -NonInteractive \n+nuget sources add -Name \"Avalonia Nightly\" -Source \"https://www.myget.org/F/avalonia-ci/api/v2\" -NonInteractive\n # Others:\n Edit ~/.nuget/NuGet/config.xml and insert the feed.\n ```\n@@ -94,7 +99,7 @@ FVimFontLineHeight '+1.0' \" can be 'default', '14.0', '-1.0' etc.\n \n \" Try to snap the fonts to the pixels, reduces blur\n \" in some situations (e.g. 100% DPI).\n-FVimFontAutoSnap v:true \n+FVimFontAutoSnap v:true\n \n \" Font weight tuning, possible valuaes are 100..900\n FVimFontNormalWeight 400\n@@ -132,13 +137,13 @@ FVim-args:\n --wsl Start NeoVim in WSL\n --nvim path-to-program Use an alternative nvim program\n \n- --connect target Connect to a remote NeoVim backend. The target \n- can be an IP endpoint (127.0.0.1:9527), or a \n+ --connect target Connect to a remote NeoVim backend. The target\n+ can be an IP endpoint (127.0.0.1:9527), or a\n Unix socket address (/tmp/path/to/socket), or a\n Windows named pipe (PipeName).\n \n- --setup Registers FVim as a text editor, and updates \n- file association and icons. Requires UAC \n+ --setup Registers FVim as a text editor, and updates\n+ file association and icons. Requires UAC\n elevation on Windows.\n \n =========================== Daemon options ===================================\n@@ -152,10 +157,10 @@ FVim-args:\n disabled.\n \n --daemonPipe Override the named pipe address of the daemon.\n- When this option is not given, defaults to \n+ When this option is not given, defaults to\n '/tmp/FVimServer'\n \n- --tryDaemon First try to connect to a local daemon. If not \n+ --tryDaemon First try to connect to a local daemon. If not\n found, start an embedded NeoVim instance.\n \n =========================== Debug options ====================================\n"},"changed_files":{"kind":"list like","value":["README.md"],"string":"[\n \"README.md\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86278,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":53,"string":"53"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Popupmenu"},"pr_body":{"kind":"string","value":""},"base_sha":{"kind":"string","value":"5bc307001d3d4dd497e4066ffbd61fc3fb8b7c0b"},"head_sha":{"kind":"string","value":"de6246110c0b3084fc49550f9df37dad9ab1b7d0"},"gold_diff":{"kind":"string","value":"diff --git a/Assets/intellisense/Class_16x.png b/Assets/intellisense/Class_16x.png\nnew file mode 100644\nindex 0000000..5ea87b3\nBinary files /dev/null and b/Assets/intellisense/Class_16x.png differ\ndiff --git a/Assets/intellisense/ColorPalette_16x.png b/Assets/intellisense/ColorPalette_16x.png\nnew file mode 100644\nindex 0000000..ed01a7d\nBinary files /dev/null and b/Assets/intellisense/ColorPalette_16x.png differ\ndiff --git a/Assets/intellisense/Constant_16x.png b/Assets/intellisense/Constant_16x.png\nnew file mode 100644\nindex 0000000..64c829d\nBinary files /dev/null and b/Assets/intellisense/Constant_16x.png differ\ndiff --git a/Assets/intellisense/Dimension_16x.png b/Assets/intellisense/Dimension_16x.png\nnew file mode 100644\nindex 0000000..574b493\nBinary files /dev/null and b/Assets/intellisense/Dimension_16x.png differ\ndiff --git a/Assets/intellisense/EnumItem_16x.png b/Assets/intellisense/EnumItem_16x.png\nnew file mode 100644\nindex 0000000..1dd6b76\nBinary files /dev/null and b/Assets/intellisense/EnumItem_16x.png differ\ndiff --git a/Assets/intellisense/Enumerator_16x.png b/Assets/intellisense/Enumerator_16x.png\nnew file mode 100644\nindex 0000000..269bb67\nBinary files /dev/null and b/Assets/intellisense/Enumerator_16x.png differ\ndiff --git a/Assets/intellisense/Event_16x.png b/Assets/intellisense/Event_16x.png\nnew file mode 100644\nindex 0000000..d0fce6a\nBinary files /dev/null and b/Assets/intellisense/Event_16x.png differ\ndiff --git a/Assets/intellisense/Field_16x.png b/Assets/intellisense/Field_16x.png\nnew file mode 100644\nindex 0000000..3770231\nBinary files /dev/null and b/Assets/intellisense/Field_16x.png differ\ndiff --git a/Assets/intellisense/Folder_16x.png b/Assets/intellisense/Folder_16x.png\nnew file mode 100644\nindex 0000000..96e73d4\nBinary files /dev/null and b/Assets/intellisense/Folder_16x.png differ\ndiff --git a/Assets/intellisense/IntelliSenseKeyword_16x.png b/Assets/intellisense/IntelliSenseKeyword_16x.png\nnew file mode 100644\nindex 0000000..5370247\nBinary files /dev/null and b/Assets/intellisense/IntelliSenseKeyword_16x.png differ\ndiff --git a/Assets/intellisense/Interface_16x.png b/Assets/intellisense/Interface_16x.png\nnew file mode 100644\nindex 0000000..f60f961\nBinary files /dev/null and b/Assets/intellisense/Interface_16x.png differ\ndiff --git a/Assets/intellisense/Literal_16x.png b/Assets/intellisense/Literal_16x.png\nnew file mode 100644\nindex 0000000..35fdc16\nBinary files /dev/null and b/Assets/intellisense/Literal_16x.png differ\ndiff --git a/Assets/intellisense/LocalVariable_16x.png b/Assets/intellisense/LocalVariable_16x.png\nnew file mode 100644\nindex 0000000..dad99f8\nBinary files /dev/null and b/Assets/intellisense/LocalVariable_16x.png differ\ndiff --git a/Assets/intellisense/Method_16x.png b/Assets/intellisense/Method_16x.png\nnew file mode 100644\nindex 0000000..fcdef89\nBinary files /dev/null and b/Assets/intellisense/Method_16x.png differ\ndiff --git a/Assets/intellisense/Module_16x.png b/Assets/intellisense/Module_16x.png\nnew file mode 100644\nindex 0000000..6ffc139\nBinary files /dev/null and b/Assets/intellisense/Module_16x.png differ\ndiff --git a/Assets/intellisense/NewClass_16x.png b/Assets/intellisense/NewClass_16x.png\nnew file mode 100644\nindex 0000000..70d535b\nBinary files /dev/null and b/Assets/intellisense/NewClass_16x.png differ\ndiff --git a/Assets/intellisense/Operator_16x.png b/Assets/intellisense/Operator_16x.png\nnew file mode 100644\nindex 0000000..2bd3d92\nBinary files /dev/null and b/Assets/intellisense/Operator_16x.png differ\ndiff --git a/Assets/intellisense/Property_16x.png b/Assets/intellisense/Property_16x.png\nnew file mode 100644\nindex 0000000..8d48ed4\nBinary files /dev/null and b/Assets/intellisense/Property_16x.png differ\ndiff --git a/Assets/intellisense/Reference_16x.png b/Assets/intellisense/Reference_16x.png\nnew file mode 100644\nindex 0000000..1975cd6\nBinary files /dev/null and b/Assets/intellisense/Reference_16x.png differ\ndiff --git a/Assets/intellisense/Snippet_16x.png b/Assets/intellisense/Snippet_16x.png\nnew file mode 100644\nindex 0000000..c1a9f19\nBinary files /dev/null and b/Assets/intellisense/Snippet_16x.png differ\ndiff --git a/Assets/intellisense/Structure_16x.png b/Assets/intellisense/Structure_16x.png\nnew file mode 100644\nindex 0000000..a488e54\nBinary files /dev/null and b/Assets/intellisense/Structure_16x.png differ\ndiff --git a/Assets/intellisense/TextFile_16x.png b/Assets/intellisense/TextFile_16x.png\nnew file mode 100644\nindex 0000000..5ecd51b\nBinary files /dev/null and b/Assets/intellisense/TextFile_16x.png differ\ndiff --git a/Assets/intellisense/Text_16x.png b/Assets/intellisense/Text_16x.png\nnew file mode 100644\nindex 0000000..606f949\nBinary files /dev/null and b/Assets/intellisense/Text_16x.png differ\ndiff --git a/Assets/intellisense/Type_16x.png b/Assets/intellisense/Type_16x.png\nnew file mode 100644\nindex 0000000..d269469\nBinary files /dev/null and b/Assets/intellisense/Type_16x.png differ\ndiff --git a/README.md b/README.md\nindex 27ab170..cdf89eb 100644\n--- a/README.md\n+++ b/README.md\n@@ -103,6 +103,16 @@ FVimFontBoldWeight 700\n \" Font debugging -- draw bounds around each glyph\n FVimFontDrawBounds v:true\n \n+\" UI options (all default to v:false)\n+FVimUIMultiGrid v:false \" per-window grid system -- work in progress\n+FVimUIPopupMenu v:true \" external popup menu\n+FVimUITabLine v:false \" external tabline -- not implemented\n+FVimUICmdLine v:false \" external cmdline -- not implemented\n+FVimUIWildMenu v:false \" external wildmenu -- not implemented\n+FVimUIMessages v:false \" external messages -- not implemented\n+FVimUITermColors v:false \" not implemented\n+FVimUIHlState v:false \" not implemented\n+\n \" Detach from a remote session without killing the server\n \" If this command is executed on a standalone instance,\n \" the embedded process will be terminated anyway.\ndiff --git a/ViewModels/CompletionItemViewModel.fs b/ViewModels/CompletionItemViewModel.fs\nnew file mode 100644\nindex 0000000..a271b33\n--- /dev/null\n+++ b/ViewModels/CompletionItemViewModel.fs\n@@ -0,0 +1,121 @@\n+namespace FVim\n+\n+open neovim.def\n+open log\n+open common\n+open Avalonia.Media.Imaging\n+open Avalonia.Platform\n+open Avalonia\n+\n+module CompletionItemHelper =\n+ // Taken from coc.nvim/src/languages.ts\n+ type CompletionItemKind =\n+ | Text //'v'],\n+ | Method //'f'],\n+ | Function //'f'],\n+ | Constructor //'function' ? 'f' : labels['con' + 'structor']],\n+ | Field //'m'],\n+ | Variable //'v'],\n+ | Class //'C'],\n+ | Interface //'I'],\n+ | Module //'M'],\n+ | Property //'m'],\n+ | Unit //'U'],\n+ | Value //'v'],\n+ | Enum //'E'],\n+ | Keyword //'k'],\n+ | Snippet //'S'],\n+ | Color //'v'],\n+ | File //'F'],\n+ | Reference //'r'],\n+ | Folder //'F'],\n+ | EnumMember //'m'],\n+ | Constant //'v'],\n+ | Struct //'S'],\n+ | Event //'E'],\n+ | Operator //'O'],\n+ | TypeParameter //'T'],\n+ | Unknown\n+ let CompletionItemKindIconNames = Map [\n+ Text, \"Text\"\n+ Method, \"Method\"\n+ Function, \"Method\"\n+ Constructor, \"NewClass\"\n+ Field, \"Field\"\n+ Variable, \"LocalVariable\"\n+ Class, \"Class\"\n+ Interface, \"Interface\"\n+ Module, \"Module\"\n+ Property, \"Property\"\n+ Unit, \"Dimension\"\n+ Value, \"Literal\"\n+ Enum, \"Enumerator\"\n+ Keyword, \"IntelliSenseKeyword\"\n+ Snippet, \"Snippet\"\n+ Color, \"ColorPalette\"\n+ File, \"TextFile\"\n+ Reference, \"Reference\"\n+ Folder, \"Folder\"\n+ EnumMember, \"EnumItem\"\n+ Constant, \"Constant\"\n+ Struct, \"Structure\"\n+ Event, \"Event\"\n+ Operator, \"Operator\"\n+ TypeParameter, \"Type\"\n+ Unknown, \"Unknown\"\n+ ]\n+\n+ let ParseCompletionItemKind abbr = \n+ match _d \"\" abbr with\n+ | \"t\" -> Text\n+ | \":\" -> Method\n+ | \"f\" -> Function\n+ | \"c\" -> Constructor\n+ | \".\" -> Field\n+ | \"v\" -> Variable\n+ | \"C\" -> Class\n+ | \"I\" -> Interface\n+ | \"M\" -> Module\n+ | \"p\" -> Property\n+ | \"U\" -> Unit\n+ | \"l\" -> Value\n+ | \"E\" -> Enum\n+ | \"k\" -> Keyword\n+ | \"s\" -> Snippet\n+ | \"K\" -> Color\n+ | \"F\" -> File\n+ | \"r\" -> Reference\n+ | \"d\" -> Folder\n+ | \"m\" -> EnumMember\n+ | \"0\" -> Constant\n+ | \"S\" -> Struct\n+ | \"e\" -> Event\n+ | \"o\" -> Operator\n+ | \"T\" -> TypeParameter\n+ | _ -> Unknown\n+\n+ let assets = AvaloniaLocator.Current.GetService<IAssetLoader>()\n+ \n+\n+ let CompletionItemKindIcons = \n+ CompletionItemKindIconNames |>\n+ Map.map (fun k name -> \n+ if name = \"Unknown\" then null\n+ else\n+ let fname = sprintf \"avares://FVim/Assets/intellisense/%s_16x.png\" name\n+ (*trace \"CompleteItem\" \"loading intellisense icon %s\" fname*)\n+ new Bitmap(assets.Open(new System.Uri(fname)))) \n+\n+open CompletionItemHelper\n+\n+type CompletionItemViewModel(item: CompleteItem) =\n+ inherit ViewModelBase()\n+ let kind = ParseCompletionItemKind item.abbr\n+ (*do*)\n+ (*trace \"CompletionItemViewModel\" \"item = %A\" item*)\n+ member __.Text = item.word\n+ member __.Menu = _d \"\" item.menu\n+ member __.Info = _d \"\" item.info\n+ member __.Kind = kind\n+ member __.Icon = CompletionItemKindIcons.[kind]\n+\ndiff --git a/ViewModels/EditorViewModel.fs b/ViewModels/EditorViewModel.fs\nindex 71173a2..5fa4fcc 100644\n--- a/ViewModels/EditorViewModel.fs\n+++ b/ViewModels/EditorViewModel.fs\n@@ -28,44 +28,45 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n \n let trace fmt = trace (sprintf \"editorvm #%d\" GridId) fmt\n \n- let mutable _busy = false\n- let cursor_vm = new CursorViewModel(_cursormode)\n-\n- let mutable mouse_en = true\n- let mutable mouse_pressed = MouseButton.None\n- let mutable mouse_pos = 0,0\n-\n- let popupmenu_vm = new PopupMenuViewModel()\n-\n- let mutable default_fg = Colors.White\n- let mutable default_bg = Colors.Black\n- let mutable default_sp = Colors.Red\n-\n- let mutable hi_defs = match _hldefs with \n- | None -> Array.create<HighlightAttr> 256 HighlightAttr.Default\n- | Some arr -> arr.Clone() :?> HighlightAttr[]\n- let mutable mode_defs = match _modedefs with\n- | None -> Array.empty<ModeInfo>\n- | Some arr -> arr.Clone() :?> ModeInfo[]\n-\n- let mutable _guifont = _d DefaultFont _guifont\n- let mutable _guifontwide = _d DefaultFontWide _guifontwide\n-\n- let mutable font_size = _d 16.0 _fontsize\n- let mutable glyph_size = _d (Size(10.0, 10.0)) _glyphsize\n-\n- let mutable grid_size = _d { rows = 10; cols= 10 } _gridsize\n- let mutable grid_scale = _d 1.0 _gridscale\n- let mutable grid_fullscreen = false\n- let mutable grid_buffer = Array2D.create grid_size.rows grid_size.cols GridBufferCell.empty\n- let mutable grid_dirty = GridRegion()\n- let mutable _fb_h = 10.0\n- let mutable _fb_w = 10.0\n-\n- let child_grids = ObservableCollection<EditorViewModel>()\n- let resizeEvent = Event<IGridUI>()\n- let inputEvent = Event<int*InputEvent>()\n- let hlchangeEvent = Event<unit>()\n+ let m_cursor_vm = new CursorViewModel(_cursormode)\n+ let m_popupmenu_vm = new PopupMenuViewModel()\n+ let m_child_grids = ObservableCollection<EditorViewModel>()\n+ let m_resize_ev = Event<IGridUI>()\n+ let m_input_ev = Event<int*InputEvent>()\n+ let m_hlchange_ev = Event<unit>()\n+ let m_tick_ev = Event<unit>()\n+\n+ let mutable m_busy = false\n+\n+ let mutable m_mouse_en = true\n+ let mutable m_mouse_pressed = MouseButton.None\n+ let mutable m_mouse_pos = 0,0\n+\n+ let mutable m_default_fg = Colors.White\n+ let mutable m_default_bg = Colors.Black\n+ let mutable m_default_sp = Colors.Red\n+\n+ let mutable m_hi_defs = match _hldefs with\n+ | None -> Array.create<HighlightAttr> 256 HighlightAttr.Default\n+ | Some arr -> arr.Clone() :?> HighlightAttr[]\n+ let mutable m_mode_defs = match _modedefs with\n+ | None -> Array.empty<ModeInfo>\n+ | Some arr -> arr.Clone() :?> ModeInfo[]\n+ let mutable m_semhl = Map.empty\n+\n+ let mutable m_guifont = _d DefaultFont _guifont\n+ let mutable m_guifontwide = _d DefaultFontWide _guifontwide\n+ let mutable m_fontsize = _d 16.0 _fontsize\n+ let mutable m_glyphsize = _d (Size(10.0, 10.0)) _glyphsize\n+\n+ let mutable m_gridsize = _d { rows = 10; cols= 10 } _gridsize\n+ let mutable m_gridscale = _d 1.0 _gridscale\n+ let mutable m_gridfullscreen = false\n+ let mutable m_gridbuffer = Array2D.create m_gridsize.rows m_gridsize.cols GridBufferCell.empty\n+ let mutable m_griddirty = GridRegion()\n+\n+ let mutable m_fb_h = 10.0\n+ let mutable m_fb_w = 10.0\n \n let toggleFullScreen(gridid: int) =\n if gridid = GridId then\n@@ -73,41 +74,61 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n this.Fullscreen <- not this.Fullscreen\n \n let getPos (p: Point) =\n- int(p.X / glyph_size.Width), int(p.Y / glyph_size.Height)\n+ int(p.X / m_glyphsize.Width), int(p.Y / m_glyphsize.Height)\n \n- let markDirty = grid_dirty.Union\n+ let markDirty = m_griddirty.Union\n \n let markAllDirty () =\n- grid_dirty.Clear()\n- grid_dirty.Union{ row = 0; col = 0; height = grid_size.rows; width = grid_size.cols }\n+ m_griddirty.Clear()\n+ m_griddirty.Union{ row = 0; col = 0; height = m_gridsize.rows; width = m_gridsize.cols }\n \n let flush() = \n trace \"flush.\"\n this.RenderTick <- this.RenderTick + 1\n \n let fontConfig() =\n- font_size <- max font_size 1.0\n+ m_fontsize <- max m_fontsize 1.0\n // It turns out the space \" \" advances farest...\n // So we measure it as the width.\n- let s, w, h = MeasureText(\" \", _guifont, _guifontwide, font_size, grid_scale)\n- glyph_size <- Size(w, h)\n- font_size <- s\n+ let s, w, h = MeasureText(\" \", m_guifont, m_guifontwide, m_fontsize, m_gridscale)\n+ m_glyphsize <- Size(w, h)\n+ m_fontsize <- s\n \n- trace \"fontConfig: guifont=%s guifontwide=%s size=%A\" _guifont _guifontwide glyph_size\n+ trace \"fontConfig: guifont=%s guifontwide=%s size=%A\" m_guifont m_guifontwide m_glyphsize\n+ // sync font to cursor vm\n this.cursorConfig()\n+ // sync font to popupmenu vm\n+ m_popupmenu_vm.SetFont(m_guifont, m_fontsize)\n markAllDirty()\n- resizeEvent.Trigger(this)\n+ m_resize_ev.Trigger(this)\n \n let setHighlight x =\n- if hi_defs.Length < x.id + 1 then\n- Array.Resize(&hi_defs, x.id + 100)\n- hi_defs.[x.id] <- x\n+ if m_hi_defs.Length < x.id + 1 then\n+ Array.Resize(&m_hi_defs, x.id + 100)\n+ m_hi_defs.[x.id] <- x\n if x.id = 0 then\n- default_fg <- x.rgb_attr.foreground.Value\n- default_bg <- x.rgb_attr.background.Value\n- default_sp <- x.rgb_attr.special.Value\n+ m_default_fg <- x.rgb_attr.foreground.Value\n+ m_default_bg <- x.rgb_attr.background.Value\n+ m_default_sp <- x.rgb_attr.special.Value\n this.RaisePropertyChanged(\"BackgroundBrush\")\n- hlchangeEvent.Trigger()\n+ m_hlchange_ev.Trigger()\n+\n+ let setSemanticHighlightGroups grp =\n+ m_semhl <- grp\n+ // update popupmenu color\n+ let [ nfg, nbg, _, _\n+ sfg, sbg, _, _\n+ scfg, scbg, _, _\n+ _, bbg, _, _ ] = \n+ [\n+ SemanticHighlightGroup.Pmenu\n+ SemanticHighlightGroup.PmenuSel\n+ SemanticHighlightGroup.PmenuSbar\n+ SemanticHighlightGroup.VertSplit\n+ ] \n+ |> List.map (m_semhl.TryFind >> Option.defaultValue 1 >> this.GetDrawAttrs)\n+\n+ m_popupmenu_vm.SetColors(nfg, nbg, sfg, sbg, scfg, scbg, bbg)\n \n let setDefaultColors fg bg sp = \n \n@@ -133,11 +154,11 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n trace \"setDefaultColors: %A %A %A\" fg bg sp\n \n let clearBuffer () =\n- grid_buffer <- Array2D.create grid_size.rows grid_size.cols GridBufferCell.empty\n+ m_gridbuffer <- Array2D.create m_gridsize.rows m_gridsize.cols GridBufferCell.empty\n // notify buffer update and size change\n- let size: Point = this.GetPoint grid_size.rows grid_size.cols\n- _fb_w <- size.X\n- _fb_h <- size.Y\n+ let size: Point = this.GetPoint m_gridsize.rows m_gridsize.cols\n+ m_fb_w <- size.X\n+ m_fb_h <- size.Y\n this.RaisePropertyChanged(\"BufferHeight\")\n this.RaisePropertyChanged(\"BufferWidth\")\n \n@@ -150,12 +171,12 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n hlid <- Option.defaultValue hlid cell.hl_id\n rep <- Option.defaultValue 1 cell.repeat\n for _i = 1 to rep do\n- grid_buffer.[row, col].hlid <- hlid\n- grid_buffer.[row, col].text <- cell.text\n+ m_gridbuffer.[row, col].hlid <- hlid\n+ m_gridbuffer.[row, col].text <- cell.text\n col <- col + 1\n let dirty = { row = row; col = line.col_start; height = 1; width = col - line.col_start } \n // if the buffer under cursor is updated, also notify the cursor view model\n- if row = cursor_vm.row && line.col_start <= cursor_vm.col && cursor_vm.col < col\n+ if row = m_cursor_vm.row && line.col_start <= m_cursor_vm.col && m_cursor_vm.col < col\n then this.cursorConfig()\n //trace \"redraw\" \"putBuffer: writing to %A\" dirty\n // italic font artifacts I: remainders after scrolling and redrawing the dirty part\n@@ -171,33 +192,33 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n // workaround: like italic, case II.\n \n // apply workaround I:\n- let dirty = {dirty with width = min (dirty.width + 1) grid_size.cols }\n+ let dirty = {dirty with width = min (dirty.width + 1) m_gridsize.cols }\n // apply workaround II:\n col <- dirty.col - 1\n let mutable italic = true\n let mutable ligature = true\n while col > 0 && (italic || ligature) do\n- hlid <- grid_buffer.[row, col].hlid\n+ hlid <- m_gridbuffer.[row, col].hlid\n col <- col - 1\n- ligature <- isProgrammingSymbol grid_buffer.[row, col].text\n- italic <- hi_defs.[hlid].rgb_attr.italic \n+ ligature <- isProgrammingSymbol m_gridbuffer.[row, col].text\n+ italic <- m_hi_defs.[hlid].rgb_attr.italic \n let dirty = {dirty with width = dirty.width + (dirty.col - col); col = col }\n \n \n markDirty dirty\n \n let setModeInfo (cs_en: bool) (info: ModeInfo[]) =\n- mode_defs <- info\n+ m_mode_defs <- info\n this.setCursorEnabled cs_en\n \n let cursorGoto id row col =\n- cursor_vm.ingrid <- (id = GridId)\n- cursor_vm.row <- row\n- cursor_vm.col <- col\n+ m_cursor_vm.ingrid <- (id = GridId)\n+ m_cursor_vm.row <- row\n+ m_cursor_vm.col <- col\n this.cursorConfig()\n \n let changeMode (name: string) (index: int) = \n- cursor_vm.modeidx <- index\n+ m_cursor_vm.modeidx <- index\n this.cursorConfig()\n \n let bell (visual: bool) =\n@@ -207,7 +228,7 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n \n let setBusy (v: bool) =\n trace \"neovim: busy: %A\" v\n- _busy <- v\n+ m_busy <- v\n this.setCursorEnabled <| not v\n //if v then this.Cursor <- Cursor(StandardCursorType.Wait)\n //else this.Cursor <- Cursor(StandardCursorType.Arrow)\n@@ -250,8 +271,8 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n trace \"scroll: %A %A %A %A %A %A\" top bot left right rows cols\n \n let copy src dst =\n- if src >= 0 && src < grid_size.rows && dst >= 0 && dst < grid_size.rows then\n- Array.Copy(grid_buffer, src * grid_size.cols + left, grid_buffer, dst * grid_size.cols + left, right - left)\n+ if src >= 0 && src < m_gridsize.rows && dst >= 0 && dst < m_gridsize.rows then\n+ Array.Copy(m_gridbuffer, src * m_gridsize.cols + left, m_gridbuffer, dst * m_gridsize.cols + left, right - left)\n markDirty {row = dst; height = 1; col = left; width = right - left }\n \n if rows > 0 then\n@@ -261,10 +282,10 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n for i = bot + rows - 1 downto top do\n copy i (i-rows)\n \n- if top <= cursor_vm.row \n- && cursor_vm.row <= bot \n- && left <= cursor_vm.col \n- && cursor_vm.col <= right\n+ if top <= m_cursor_vm.row \n+ && m_cursor_vm.row <= bot \n+ && left <= m_cursor_vm.col \n+ && m_cursor_vm.col <= right\n then\n this.cursorConfig()\n \n@@ -280,25 +301,25 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n let mutable config_font = true\n \n match opt with\n- | Guifont(FN(name, sz)) -> _guifont <- name; font_size <- sz\n- | GuifontWide(FN(name, sz)) -> _guifontwide <- name; font_size <- sz\n- | Guifont(\"+\") | GuifontWide(\"+\") -> font_size <- font_size + 1.0\n- | Guifont(\"-\") | GuifontWide(\"-\") -> font_size <- font_size - 1.0\n- | Guifont(\".+\") | GuifontWide(\".+\") -> font_size <- font_size + 0.1\n- | Guifont(\".-\") | GuifontWide(\".-\") -> font_size <- font_size - 0.1\n+ | Guifont(FN(name, sz)) -> m_guifont <- name; m_fontsize <- sz\n+ | GuifontWide(FN(name, sz)) -> m_guifontwide <- name; m_fontsize <- sz\n+ | Guifont(\"+\") | GuifontWide(\"+\") -> m_fontsize <- m_fontsize + 1.0\n+ | Guifont(\"-\") | GuifontWide(\"-\") -> m_fontsize <- m_fontsize - 1.0\n+ | Guifont(\".+\") | GuifontWide(\".+\") -> m_fontsize <- m_fontsize + 0.1\n+ | Guifont(\".-\") | GuifontWide(\".-\") -> m_fontsize <- m_fontsize - 0.1\n | _ -> config_font <- false\n \n if config_font then fontConfig()\n \n let setMouse (en:bool) =\n- mouse_en <- en\n+ m_mouse_en <- en\n \n let hiattrDefine (hls: HighlightAttr[]) =\n Array.iter setHighlight hls\n \n let setWinPos grid win startrow startcol w h =\n trace \"setWinPos: grid = %A, win = %A, startrow = %A, startcol = %A, w = %A, h = %A\" grid win startrow startcol w h\n- let existing = child_grids \n+ let existing = m_child_grids \n |> Seq.indexed\n |> Seq.tryPick (function | (i, a) when (a :> IGridUI).Id = grid -> Some(i, a)\n | _ -> None)\n@@ -314,10 +335,10 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n child.Y <- origin.Y\n | None -> \n let child = new EditorViewModel(\n- grid, this, {rows=h; cols=w}, glyph_size, \n- Size(child_size.X, child_size.Y), font_size, grid_scale, hi_defs, mode_defs, \n- _guifont, _guifontwide, cursor_vm.modeidx, origin.X, origin.Y)\n- child_grids.Add child\n+ grid, this, {rows=h; cols=w}, m_glyphsize, \n+ Size(child_size.X, child_size.Y), m_fontsize, m_gridscale, m_hi_defs, m_mode_defs, \n+ m_guifont, m_guifontwide, m_cursor_vm.modeidx, origin.X, origin.Y)\n+ m_child_grids.Add child\n //let wnd = Window()\n //wnd.Height <- child_size.Y\n //wnd.Width <- child_size.X\n@@ -325,17 +346,23 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n //wnd.Show()\n \n let hidePopupMenu() =\n- popupmenu_vm.Show <- false\n+ m_popupmenu_vm.Show <- false\n+\n+ let selectPopupMenuPassive i =\n+ m_popupmenu_vm.Selection <- i\n \n- let selectPopupMenu i =\n- popupmenu_vm.Selection <- i\n+ let selectPopupMenuActive i =\n+ Model.SelectPopupMenuItem i true false\n+\n+ let commitPopupMenu i =\n+ Model.SelectPopupMenuItem i true true\n \n let showPopupMenu grid (items: CompleteItem[]) selected row col =\n if grid <> GridId then\n hidePopupMenu()\n else\n let startPos = this.GetPoint row col\n- let cursorPos = this.GetPoint (cursor_vm.row + 1) cursor_vm.col\n+ let cursorPos = this.GetPoint (m_cursor_vm.row + 1) m_cursor_vm.col\n \n trace \"show popup menu at [%O, %O]\" startPos cursorPos\n \n@@ -347,16 +374,17 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n |> Array.max\n \n let bounds = this.GetPoint menuLines menuCols\n- let editorSize = this.GetPoint grid_size.rows grid_size.cols\n+ let editorSize = this.GetPoint m_gridsize.rows m_gridsize.cols\n \n- popupmenu_vm.Selection <- selected\n- popupmenu_vm.SetItems(items, Rect(startPos, cursorPos), glyph_size.Height, bounds, editorSize)\n- popupmenu_vm.Show <- true\n+ m_popupmenu_vm.Selection <- selected\n+ m_popupmenu_vm.SetItems(items, Rect(startPos, cursorPos), m_glyphsize.Height, bounds, editorSize)\n+ m_popupmenu_vm.Show <- true\n \n let redraw(cmd: RedrawCommand) =\n match cmd with\n | UnknownCommand x -> trace \"unknown command %A\" x\n | HighlightAttrDefine hls -> hiattrDefine hls\n+ | SemanticHighlightGroupSet groups -> setSemanticHighlightGroups groups\n | DefaultColorsSet(fg,bg,sp,_,_) -> setDefaultColors fg bg sp\n | ModeInfoSet(cs_en, info) -> setModeInfo cs_en info\n | ModeChange(name, index) -> changeMode name index\n@@ -366,7 +394,7 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n | GridCursorGoto(id, row, col) -> cursorGoto id row col\n | GridDestroy id when id = GridId -> ()\n | GridScroll(id, top,bot,left,right,rows,cols) when id = GridId -> scrollBuffer top bot left right rows cols\n- | Flush -> flush() \n+ | Flush -> m_tick_ev.Trigger()\n | Bell -> bell false\n | VisualBell -> bell true\n | Busy is_busy -> setBusy is_busy\n@@ -376,50 +404,58 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n | Mouse en -> setMouse en\n | WinPos(grid, win, startrow, startcol, w, h) when GridId = 1 -> setWinPos grid win startrow startcol w h\n | PopupMenuShow(items, selected, row, col, grid) -> showPopupMenu grid items selected row col\n- | PopupMenuSelect(selected) -> selectPopupMenu selected\n+ | PopupMenuSelect(selected) -> selectPopupMenuPassive selected\n | PopupMenuHide -> hidePopupMenu ()\n | x -> trace \"unimplemented command: %A\" x\n \n let raiseInputEvent e =\n- inputEvent.Trigger(GridId, e)\n+ m_input_ev.Trigger(GridId, e)\n \n do\n let fg,bg,sp,_ = this.GetDrawAttrs 0\n- default_bg <- bg\n- default_fg <- fg\n- default_sp <- sp\n+ m_default_bg <- bg\n+ m_default_fg <- fg\n+ m_default_sp <- sp\n fontConfig()\n this.Watch [\n Model.Redraw (Array.iter redraw)\n \n- hlchangeEvent.Publish \n+ m_popupmenu_vm.ObservableForProperty(fun x -> x.Selection)\n+ |> Observable.subscribe (fun x -> selectPopupMenuActive <| x.GetValue())\n+\n+ m_hlchange_ev.Publish \n |> Observable.throttle(TimeSpan.FromMilliseconds 100.0) \n |> Observable.subscribe markAllDirty\n \n+ m_tick_ev.Publish\n+ |> Observable.throttle(TimeSpan.FromMilliseconds 10.0)\n+ |> Observable.observeOn Avalonia.Threading.AvaloniaScheduler.Instance\n+ |> Observable.subscribe flush\n+\n States.Register.Notify \"ToggleFullScreen\" (fun [| Integer32(gridid) |] -> toggleFullScreen gridid )\n States.Register.Watch \"font\" fontConfig\n \n ] \n \n- member __.Item with get(row, col) = grid_buffer.[row, col]\n+ member __.Item with get(row, col) = m_gridbuffer.[row, col]\n \n- member __.Cols with get() = grid_size.cols\n+ member __.Cols with get() = m_gridsize.cols\n \n- member __.Rows with get() = grid_size.rows\n+ member __.Rows with get() = m_gridsize.rows\n \n- member __.Dirty with get() = grid_dirty\n+ member __.Dirty with get() = m_griddirty\n \n member __.MarkAllDirty() = markAllDirty()\n \n member __.GetFontAttrs() =\n- _guifont, _guifontwide, font_size\n+ m_guifont, m_guifontwide, m_fontsize\n \n member __.GetDrawAttrs hlid = \n- let attrs = hi_defs.[hlid].rgb_attr\n+ let attrs = m_hi_defs.[hlid].rgb_attr\n \n- let mutable fg = Option.defaultValue default_fg attrs.foreground\n- let mutable bg = Option.defaultValue default_bg attrs.background\n- let mutable sp = Option.defaultValue default_sp attrs.special\n+ let mutable fg = Option.defaultValue m_default_fg attrs.foreground\n+ let mutable bg = Option.defaultValue m_default_bg attrs.background\n+ let mutable sp = Option.defaultValue m_default_sp attrs.special\n \n if attrs.reverse then\n fg <- GetReverseColor fg\n@@ -430,36 +466,36 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n \n \n member private __.initBuffer nrow ncol =\n- grid_size <- { rows = nrow; cols = ncol }\n- trace \"buffer resize = %A\" grid_size\n+ m_gridsize <- { rows = nrow; cols = ncol }\n+ trace \"buffer resize = %A\" m_gridsize\n clearBuffer()\n \n interface IGridUI with\n member __.Id = GridId\n- member __.GridHeight = int( this.Height / glyph_size.Height )\n- member __.GridWidth = int( this.Width / glyph_size.Width )\n- member __.Resized = resizeEvent.Publish\n- member __.Input = inputEvent.Publish\n- member __.HasChildren = child_grids.Count <> 0\n+ member __.GridHeight = int( this.Height / m_glyphsize.Height )\n+ member __.GridWidth = int( this.Width / m_glyphsize.Width )\n+ member __.Resized = m_resize_ev.Publish\n+ member __.Input = m_input_ev.Publish\n+ member __.HasChildren = m_child_grids.Count <> 0\n \n- member __.markClean = grid_dirty.Clear\n+ member __.markClean = m_griddirty.Clear\n \n // converts grid position to UI Point\n member __.GetPoint row col =\n- Point(double(col) * glyph_size.Width, double(row) * glyph_size.Height)\n+ Point(double(col) * m_glyphsize.Width, double(row) * m_glyphsize.Height)\n \n member __.cursorConfig() =\n- if mode_defs.Length = 0 || cursor_vm.modeidx < 0 then ()\n- elif grid_buffer.GetLength(0) <= cursor_vm.row || grid_buffer.GetLength(1) <= cursor_vm.col then ()\n+ if m_mode_defs.Length = 0 || m_cursor_vm.modeidx < 0 then ()\n+ elif m_gridbuffer.GetLength(0) <= m_cursor_vm.row || m_gridbuffer.GetLength(1) <= m_cursor_vm.col then ()\n else\n- let mode = mode_defs.[cursor_vm.modeidx]\n- let hlid = grid_buffer.[cursor_vm.row, cursor_vm.col].hlid\n+ let mode = m_mode_defs.[m_cursor_vm.modeidx]\n+ let hlid = m_gridbuffer.[m_cursor_vm.row, m_cursor_vm.col].hlid\n let hlid = Option.defaultValue hlid mode.attr_id\n let fg, bg, sp, attrs = this.GetDrawAttrs hlid\n- let origin = this.GetPoint cursor_vm.row cursor_vm.col\n- let text = grid_buffer.[cursor_vm.row, cursor_vm.col].text\n+ let origin = this.GetPoint m_cursor_vm.row m_cursor_vm.col\n+ let text = m_gridbuffer.[m_cursor_vm.row, m_cursor_vm.col].text\n let text_type = wswidth text\n- let width = float(max <| 1 <| CharTypeWidth text_type) * glyph_size.Width\n+ let width = float(max <| 1 <| CharTypeWidth text_type) * m_glyphsize.Width\n \n let on, off, wait =\n match mode with\n@@ -470,64 +506,64 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n // do not use the default colors for cursor\n let colorf = if hlid = 0 then GetReverseColor else id\n let fg, bg, sp = colorf fg, colorf bg, colorf sp\n- cursor_vm.typeface <- _guifont\n- cursor_vm.wtypeface <- _guifontwide\n- cursor_vm.fontSize <- font_size\n- cursor_vm.text <- text\n- cursor_vm.fg <- fg\n- cursor_vm.bg <- bg\n- cursor_vm.sp <- sp\n- cursor_vm.underline <- attrs.underline\n- cursor_vm.undercurl <- attrs.undercurl\n- cursor_vm.bold <- attrs.bold\n- cursor_vm.italic <- attrs.italic\n- cursor_vm.cellPercentage <- Option.defaultValue 100 mode.cell_percentage\n- cursor_vm.blinkon <- on\n- cursor_vm.blinkoff <- off\n- cursor_vm.blinkwait <- wait\n- cursor_vm.shape <- Option.defaultValue CursorShape.Block mode.cursor_shape\n- cursor_vm.X <- origin.X\n- cursor_vm.Y <- origin.Y\n- cursor_vm.Width <- width\n- cursor_vm.Height <- glyph_size.Height\n- cursor_vm.RenderTick <- cursor_vm.RenderTick + 1\n+ m_cursor_vm.typeface <- m_guifont\n+ m_cursor_vm.wtypeface <- m_guifontwide\n+ m_cursor_vm.fontSize <- m_fontsize\n+ m_cursor_vm.text <- text\n+ m_cursor_vm.fg <- fg\n+ m_cursor_vm.bg <- bg\n+ m_cursor_vm.sp <- sp\n+ m_cursor_vm.underline <- attrs.underline\n+ m_cursor_vm.undercurl <- attrs.undercurl\n+ m_cursor_vm.bold <- attrs.bold\n+ m_cursor_vm.italic <- attrs.italic\n+ m_cursor_vm.cellPercentage <- Option.defaultValue 100 mode.cell_percentage\n+ m_cursor_vm.blinkon <- on\n+ m_cursor_vm.blinkoff <- off\n+ m_cursor_vm.blinkwait <- wait\n+ m_cursor_vm.shape <- Option.defaultValue CursorShape.Block mode.cursor_shape\n+ m_cursor_vm.X <- origin.X\n+ m_cursor_vm.Y <- origin.Y\n+ m_cursor_vm.Width <- width\n+ m_cursor_vm.Height <- m_glyphsize.Height\n+ m_cursor_vm.RenderTick <- m_cursor_vm.RenderTick + 1\n trace \"set cursor info, color = %A %A %A\" fg bg sp\n \n member this.setCursorEnabled v =\n- cursor_vm.enabled <- v\n- cursor_vm.RenderTick <- cursor_vm.RenderTick + 1\n+ m_cursor_vm.enabled <- v\n+ m_cursor_vm.RenderTick <- m_cursor_vm.RenderTick + 1\n \n (******************* Exposed properties ***********************)\n \n member this.Fullscreen\n- with get() : bool = grid_fullscreen\n+ with get() : bool = m_gridfullscreen\n and set(v) =\n- ignore <| this.RaiseAndSetIfChanged(&grid_fullscreen, v)\n+ ignore <| this.RaiseAndSetIfChanged(&m_gridfullscreen, v)\n \n member this.CursorInfo\n- with get() : CursorViewModel = cursor_vm\n+ with get() : CursorViewModel = m_cursor_vm\n \n member this.PopupMenu\n- with get(): PopupMenuViewModel = popupmenu_vm\n+ with get(): PopupMenuViewModel = m_popupmenu_vm\n \n member __.RenderScale\n- with get() : float = grid_scale\n+ with get() : float = m_gridscale\n and set(v) =\n- grid_scale <- v\n+ m_gridscale <- v\n \n member __.BackgroundBrush\n- with get(): SolidColorBrush = SolidColorBrush(default_bg)\n+ with get(): SolidColorBrush = SolidColorBrush(m_default_bg)\n \n- member __.BufferHeight with get(): float = _fb_h\n- member __.BufferWidth with get(): float = _fb_w\n- member __.GlyphHeight with get(): float = glyph_size.Height\n- member __.GlyphWidth with get(): float = glyph_size.Width\n- member __.TopLevel with get(): bool = parent.IsNone\n+ member __.BufferHeight with get(): float = m_fb_h\n+ member __.BufferWidth with get(): float = m_fb_w\n+ member __.GlyphHeight with get(): float = m_glyphsize.Height\n+ member __.GlyphWidth with get(): float = m_glyphsize.Width\n+ member __.TopLevel with get(): bool = parent.IsNone\n \n member __.GridId\n with get() = GridId\n \n- member __.ChildGrids = child_grids\n+ member __.ChildGrids = m_child_grids\n \n member this.SetMeasuredSize (v: Size) =\n trace \"set measured size: %A\" v\n@@ -538,7 +574,7 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n let gw', gh' = gridui.GridWidth, gridui.GridHeight\n if gw <> gw' || gh <> gh' then \n if this.TopLevel then\n- resizeEvent.Trigger(this)\n+ m_resize_ev.Trigger(this)\n \n (******************* Events ***********************)\n \n@@ -546,26 +582,26 @@ type EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize\n raiseInputEvent <| InputEvent.Key(e.Modifiers, e.Key)\n \n member __.OnMouseDown (e: PointerPressedEventArgs) (root: Avalonia.VisualTree.IVisual) = \n- if mouse_en then\n+ if m_mouse_en then\n let x, y = e.GetPosition root |> getPos\n- mouse_pressed <- e.MouseButton\n+ m_mouse_pressed <- e.MouseButton\n raiseInputEvent <| InputEvent.MousePress(e.InputModifiers, y, x, e.MouseButton, e.ClickCount)\n \n member __.OnMouseUp (e: PointerReleasedEventArgs) (root: Avalonia.VisualTree.IVisual) = \n- if mouse_en then\n+ if m_mouse_en then\n let x, y = e.GetPosition root |> getPos\n- mouse_pressed <- MouseButton.None\n+ m_mouse_pressed <- MouseButton.None\n raiseInputEvent <| InputEvent.MouseRelease(e.InputModifiers, y, x, e.MouseButton)\n \n member __.OnMouseMove (e: PointerEventArgs) (root: Avalonia.VisualTree.IVisual) = \n- if mouse_en && mouse_pressed <> MouseButton.None then\n+ if m_mouse_en && m_mouse_pressed <> MouseButton.None then\n let x, y = e.GetPosition root |> getPos\n- if (x,y) <> mouse_pos then\n- mouse_pos <- x,y\n- raiseInputEvent <| InputEvent.MouseDrag(e.InputModifiers, y, x, mouse_pressed)\n+ if (x,y) <> m_mouse_pos then\n+ m_mouse_pos <- x,y\n+ raiseInputEvent <| InputEvent.MouseDrag(e.InputModifiers, y, x, m_mouse_pressed)\n \n member __.OnMouseWheel (e: PointerWheelEventArgs) (root: Avalonia.VisualTree.IVisual) = \n- if mouse_en then\n+ if m_mouse_en then\n let x, y = e.GetPosition root |> getPos\n let dx, dy = e.Delta.X, e.Delta.Y\n raiseInputEvent <| InputEvent.MouseWheel(e.InputModifiers, y, x, dx, dy)\ndiff --git a/ViewModels/PopupMenuViewModel.fs b/ViewModels/PopupMenuViewModel.fs\nindex 6288387..1110de1 100644\n--- a/ViewModels/PopupMenuViewModel.fs\n+++ b/ViewModels/PopupMenuViewModel.fs\n@@ -7,23 +7,30 @@ open ReactiveUI\n open System.Collections.ObjectModel\n open FVim.common.helpers\n open Avalonia\n-\n-type CompletionItemViewModel(item: CompleteItem) =\n- inherit ViewModelBase()\n- do\n- trace \"CompletionItemViewModel\" \"item = %A\" item\n- member __.Text = item.word\n- member __.Menu = _d \"\" item.menu\n- member __.Info = _d \"\" item.info\n- member __.ShowIcon = false\n+open Avalonia.Media\n \n type PopupMenuViewModel() =\n inherit ViewModelBase()\n \n let mutable m_show = false\n let mutable m_selection = -1\n+ let mutable m_fontFamily = Avalonia.Media.FontFamily(\"\")\n+ let mutable m_fontSize = 12.0\n+\n+ // Colors\n+ let mutable m_normalFg: IBrush = Brushes.Black :> IBrush\n+ let mutable m_normalBg: IBrush = Brushes.White :> IBrush\n+ let mutable m_selectFg: IBrush = Brushes.Black :> IBrush\n+ let mutable m_selectBg: IBrush = Brushes.AliceBlue :> IBrush\n+ let mutable m_hoverBg: IBrush = Brushes.AliceBlue :> IBrush\n+ let mutable m_scrollbarFg: IBrush = Brushes.DimGray :> IBrush\n+ let mutable m_scrollbarBg: IBrush = Brushes.Gray :> IBrush\n+ let mutable m_border: IBrush = Brushes.DarkGray :> IBrush\n+\n let m_items = ObservableCollection<CompletionItemViewModel>()\n \n+ let trace x = FVim.log.trace \"CompletionItem\" x\n+\n member this.Show\n with get(): bool = m_show\n and set(v) = ignore <| this.RaiseAndSetIfChanged(&m_show, v, \"Show\")\n@@ -32,8 +39,45 @@ type PopupMenuViewModel() =\n with get(): int = m_selection\n and set(v) = ignore <| this.RaiseAndSetIfChanged(&m_selection, v, \"Selection\")\n \n- member this.Items\n- with get() = m_items\n+ member this.Items with get() = m_items\n+ member this.FontFamily with get() = m_fontFamily\n+ member this.FontSize with get() = m_fontSize\n+ member this.NormalForeground with get() = m_normalFg\n+ member this.NormalBackground with get() = m_normalBg\n+ member this.SelectForeground with get() = m_selectFg\n+ member this.SelectBackground with get() = m_selectBg\n+ member this.HoverBackground with get() = m_hoverBg\n+ member this.ScrollbarForeground with get() = m_scrollbarFg\n+ member this.ScrollbarBackground with get() = m_scrollbarBg\n+ member this.BorderColor with get() = m_border\n+ \n+\n+ member this.SetFont(fontfamily, fontsize) =\n+ ignore <| this.RaiseAndSetIfChanged(&m_fontFamily, Avalonia.Media.FontFamily(fontfamily), \"FontFamily\")\n+ ignore <| this.RaiseAndSetIfChanged(&m_fontSize, fontsize, \"FontSize\")\n+\n+ member this.SetColors(nfg: Color, nbg: Color, sfg: Color, sbg: Color, scfg: Color, scbg: Color, bbg: Color) =\n+ let tobrush (x: Color) = SolidColorBrush(x) :> IBrush\n+ let (/) (x: Color) (y: float) = \n+ Color(\n+ byte(float x.A / y), \n+ byte(float x.R / y), \n+ byte(float x.G / y), \n+ byte(float x.B / y))\n+ let (+) (x: Color) (y: Color) = Color(x.A + y.A, x.R + y.R, x.G + y.G, x.B + y.B)\n+ let hbg = sbg / 2.0 + nbg / 2.0\n+ let [nfg; nbg; sfg; sbg; hbg; scfg; scbg; bbg] = List.map tobrush [ nfg; nbg; sfg; sbg; hbg; scfg; scbg; bbg ]\n+\n+ [\n+ this.RaiseAndSetIfChanged(&m_normalFg, nfg, \"NormalForeground\")\n+ this.RaiseAndSetIfChanged(&m_normalBg, nbg, \"NormalBackground\")\n+ this.RaiseAndSetIfChanged(&m_selectFg, sfg, \"SelectForeground\")\n+ this.RaiseAndSetIfChanged(&m_selectBg, sbg, \"SelectBackground\")\n+ this.RaiseAndSetIfChanged(&m_hoverBg, hbg, \"HoverBackground\")\n+ this.RaiseAndSetIfChanged(&m_scrollbarFg, scfg, \"ScrollbarForeground\")\n+ this.RaiseAndSetIfChanged(&m_scrollbarBg, scbg, \"ScrollbarBackground\")\n+ this.RaiseAndSetIfChanged(&m_border, bbg, \"BorderColor\")\n+ ] |> ignore\n \n member this.SetItems(items: CompleteItem[], textArea: Rect, lineHeight: float, desiredSizeVec: Point, editorSizeVec: Point) =\n m_items.Clear()\n@@ -46,7 +90,7 @@ type PopupMenuViewModel() =\n let y = min editorSizeVec.Y (max 0.0 vec.Y)\n Point(x, y)\n \n- let padding = Point(5.0, 10.0)\n+ let padding = Point(16.0 + 36.0, 16.0) // extra 36 for icons etc\n \n let se_topleft = textArea.BottomLeft\n let se_bottomright = _cap(se_topleft + desiredSizeVec + padding)\n@@ -58,9 +102,11 @@ type PopupMenuViewModel() =\n let r_ne = Rect(ne_topleft, ne_bottomright)\n \n let region = \n- if r_se.Width > desiredSizeVec.X / 3.0 || r_se.Width > r_ne.Width then\n+ if r_se.Height > desiredSizeVec.Y / 3.0 || r_se.Height > r_ne.Height then\n+ trace \"choose region SE: %A\" r_se\n r_se\n else\n+ trace \"choose region NE: %A\" r_ne\n r_ne\n \n this.X <- region.X\ndiff --git a/Views/CompletionItem.xaml b/Views/CompletionItem.xaml\nindex 7cebd15..fb0ea6a 100644\n--- a/Views/CompletionItem.xaml\n+++ b/Views/CompletionItem.xaml\n@@ -5,9 +5,27 @@\n xmlns:mc = \"http://schemas.openxmlformats.org/markup-compatibility/2006\"\n xmlns:fvim = \"clr-namespace:FVim;assembly=FVim\"\n Focusable = \"True\"\n+ Height = \"{Binding Height}\"\n x:Class = \"FVim.CompletionItem\">\n- <TextBlock \n- Text=\"{Binding Text}\" \n- VerticalAlignment=\"Stretch\"\n- />\n+ <Grid Margin=\"0\">\n+ <Grid.ColumnDefinitions>\n+ <!--The icon column has Width === Height-->\n+ <ColumnDefinition Width=\"{Binding Height}\" />\n+ <!--A fixed small spacer-->\n+ <ColumnDefinition Width=\"10\" />\n+ <ColumnDefinition Width=\"80*\" />\n+ <!--A fixed small spacer-->\n+ <ColumnDefinition Width=\"10\" />\n+ <ColumnDefinition Width=\"Auto\" />\n+ </Grid.ColumnDefinitions>\n+ <Grid.RowDefinitions>\n+ <RowDefinition Height=\"Auto\" />\n+ </Grid.RowDefinitions>\n+ <Image Source=\"{Binding Icon}\" Grid.Row=\"0\" Grid.Column=\"0\" \n+ Width=\"16\" Height=\"16\" HorizontalAlignment=\"Left\" Margin=\"0\"/>\n+ <TextBlock Text=\"{Binding Text}\" Grid.Row=\"0\" Grid.Column=\"2\" \n+ HorizontalAlignment=\"Stretch\" VerticalAlignment=\"Stretch\" />\n+ <TextBlock Text=\"{Binding Menu}\" Grid.Row=\"0\" Grid.Column=\"4\" \n+ HorizontalAlignment=\"Right\" VerticalAlignment=\"Stretch\" />\n+ </Grid>\n </UserControl>\ndiff --git a/Views/CompletionItem.xaml.fs b/Views/CompletionItem.xaml.fs\nindex fe4c9c1..0a82908 100644\n--- a/Views/CompletionItem.xaml.fs\n+++ b/Views/CompletionItem.xaml.fs\n@@ -6,7 +6,4 @@ open Avalonia\n type CompletionItem() as this =\n inherit ViewBase<CompletionItemViewModel>()\n do\n- this.Watch [\n- this.Bind(UserControl.MaxHeightProperty, Avalonia.Data.Binding(\"Height\"))\n- ]\n AvaloniaXamlLoader.Load(this)\ndiff --git a/Views/Editor.xaml b/Views/Editor.xaml\nindex 8377ce2..c0509fe 100644\n--- a/Views/Editor.xaml\n+++ b/Views/Editor.xaml\n@@ -9,39 +9,6 @@\n Background = \"{Binding BackgroundBrush, Mode=OneWay}\"\n >\n \n- <!--<Canvas.Styles>-->\n- <!--<Style Selector=\"ItemsControl > ContentPresenter\">-->\n- <!--</Style>-->\n- <!--</Canvas.Styles>-->\n-\n- <ItemsControl \n- Items = \"{Binding ChildGrids, Mode=OneWay}\"\n- Width = \"{Binding BufferWidth, Mode=OneWay}\"\n- Height = \"{Binding BufferHeight, Mode=OneWay}\"\n- HorizontalAlignment = \"Left\"\n- VerticalAlignment = \"Top\"\n- ZIndex = \"3\"\n- >\n- <ItemsControl.ItemsPanel>\n- <ItemsPanelTemplate>\n- <Canvas \n- Width = \"{Binding $parent[1].Width, Mode=OneWay}\"\n- Height = \"{Binding $parent[1].Height, Mode=OneWay}\"\n- />\n- </ItemsPanelTemplate>\n- </ItemsControl.ItemsPanel>\n-\n- <ItemsControl.ItemTemplate>\n- <DataTemplate>\n- <fvim:Editor \n- HorizontalAlignment=\"Stretch\" \n- VerticalAlignment=\"Stretch\"\n- ZIndex=\"1\"\n- />\n- </DataTemplate>\n- </ItemsControl.ItemTemplate>\n- </ItemsControl>\n-\n <Image \n Name = \"FrameBuffer\"\n Source = \"{Binding FrameBuffer, Mode=OneWay}\"\n@@ -67,7 +34,6 @@\n DataContext = \"{Binding PopupMenu}\"\n ZIndex = \"10\"\n Focusable = \"True\"\n- HorizontalAlignment = \"Stretch\"\n- VerticalAlignment = \"Stretch\"\n- MaxHeight = \"600\" />\n+ HorizontalAlignment = \"Left\"\n+ VerticalAlignment = \"Top\"/>\n </Canvas>\ndiff --git a/Views/Editor.xaml.fs b/Views/Editor.xaml.fs\nindex ad1338c..95dd0f2 100644\n--- a/Views/Editor.xaml.fs\n+++ b/Views/Editor.xaml.fs\n@@ -16,14 +16,14 @@ open Avalonia.Skia\n open Avalonia.Media.Imaging\n open Avalonia.VisualTree\n open System\n+open System.Collections.Specialized\n open FSharp.Control.Reactive\n+open Avalonia.Data\n \n type Editor() as this =\n inherit Canvas()\n \n static let ViewModelProp = AvaloniaProperty.Register<Editor, EditorViewModel>(\"ViewModel\")\n- static let AnchorXProp = AvaloniaProperty.Register<Editor, float>(\"AnchorX\")\n- static let AnchorYProp = AvaloniaProperty.Register<Editor, float>(\"AnchorY\")\n \n let mutable m_render_queued = false\n let mutable m_saved_size = Size(100.0,100.0)\n@@ -191,6 +191,9 @@ type Editor() as this =\n m_render_queued <- true\n this.InvalidateVisual()\n \n+ let findChildEditor (vm: obj) =\n+ this.Children |> Seq.tryFind(fun x -> x.DataContext = vm)\n+\n let onViewModelConnected (vm:EditorViewModel) =\n grid_vm <- vm\n trace \"viewmodel connected\"\n@@ -210,8 +213,21 @@ type Editor() as this =\n ignore <| Dispatcher.UIThread.InvokeAsync(this.Focus)\n )\n \n- vm.ObservableForProperty(fun x -> x.X).Subscribe(fun x -> this.AnchorX <- x.GetValue())\n- vm.ObservableForProperty(fun x -> x.Y).Subscribe(fun y -> this.AnchorY <- y.GetValue())\n+ vm.ChildGrids.CollectionChanged.Subscribe(fun changes ->\n+ match changes.Action with\n+ | NotifyCollectionChangedAction.Add ->\n+ for vm in changes.NewItems do\n+ let view = Editor()\n+ view.DataContext <- vm\n+ view.ZIndex <- 3\n+ this.Children.Add(view)\n+ | NotifyCollectionChangedAction.Remove ->\n+ for vm in changes.OldItems do\n+ match findChildEditor vm with\n+ | Some view -> ignore(this.Children.Remove view)\n+ | _ -> ()\n+ | _ -> failwith \"not supported\"\n+ )\n ]\n \n let subscribeAndHandleInput fn (ob: IObservable< #Avalonia.Interactivity.RoutedEventArgs>) =\n@@ -242,6 +258,9 @@ type Editor() as this =\n |> Observable.ofType\n |> Observable.subscribe onViewModelConnected\n \n+ this.Bind(Canvas.LeftProperty, Binding(\"X\"))\n+ this.Bind(Canvas.TopProperty, Binding(\"Y\"))\n+\n States.Register.Watch \"font\" (fun () -> \n if grid_vm <> Unchecked.defaultof<_> then\n grid_vm.MarkAllDirty()\n@@ -308,10 +327,3 @@ type Editor() as this =\n with get (): obj = this.GetValue(ViewModelProp) :> obj\n and set (v: obj): unit = this.SetValue(ViewModelProp, v)\n \n- member this.AnchorX\n- with get(): float = this.GetValue(AnchorXProp)\n- and set(v: float) = this.SetValue(AnchorXProp, v)\n-\n- member this.AnchorY\n- with get(): float = this.GetValue(AnchorYProp)\n- and set(v: float) = this.SetValue(AnchorYProp, v)\ndiff --git a/Views/PopupMenu.xaml b/Views/PopupMenu.xaml\nindex cc998e5..1c4996d 100644\n--- a/Views/PopupMenu.xaml\n+++ b/Views/PopupMenu.xaml\n@@ -5,18 +5,52 @@\n xmlns:mc = \"http://schemas.openxmlformats.org/markup-compatibility/2006\"\n xmlns:fvim = \"clr-namespace:FVim;assembly=FVim\"\n Focusable = \"True\"\n+ IsVisible = \"{Binding Show}\"\n+ Height = \"{Binding Height}\"\n+ Width = \"{Binding Width}\"\n+ HorizontalAlignment = \"Left\"\n+ VerticalAlignment = \"Top\"\n+ HorizontalContentAlignment = \"Stretch\"\n+ FontFamily=\"{Binding FontFamily}\" \n+ FontSize=\"{Binding FontSize}\" \n+ Foreground=\"{Binding NormalForeground}\"\n+ Background=\"{Binding NormalBackground}\"\n x:Class = \"FVim.PopupMenu\">\n <ListBox \n- Name = \"List\"\n- Items = \"{Binding Items}\"\n- SelectedIndex = \"{Binding Selection, Mode=TwoWay}\"\n- HorizontalAlignment = \"Stretch\"\n- VerticalAlignment = \"Top\"\n- Focusable = \"True\">\n+ Name = \"List\"\n+ Items = \"{Binding Items}\"\n+ Background = \"{Binding NormalBackground}\"\n+ BorderBrush = \"{Binding BorderColor}\"\n+ SelectedIndex = \"{Binding Selection, Mode=TwoWay}\"\n+ HorizontalAlignment = \"Stretch\"\n+ VerticalAlignment = \"Stretch\"\n+ Focusable = \"True\">\n <ListBox.ItemTemplate>\n <DataTemplate>\n- <fvim:CompletionItem/>\n+ <fvim:CompletionItem Background = \"{Binding $parent.Background}\" />\n </DataTemplate>\n </ListBox.ItemTemplate>\n+ <ListBox.Styles>\n+ <Style Selector=\"ListBoxItem[IsSelected=true]\">\n+ <Setter Property=\"FontWeight\" Value=\"Bold\" />\n+ <Setter Property=\"Background\" Value=\"{Binding $parent[fvim:PopupMenu].DataContext.SelectBackground}\" />\n+ <Setter Property=\"Foreground\" Value=\"{Binding $parent[fvim:PopupMenu].DataContext.SelectForeground}\" />\n+ </Style> \n+ <Style Selector=\"ListBoxItem[IsPointerOver=true]\">\n+ <Setter Property=\"FontWeight\" Value=\"Bold\" />\n+ <Setter Property=\"Background\" Value=\"{Binding $parent[fvim:PopupMenu].DataContext.HoverBackground}\" />\n+ <Setter Property=\"Foreground\" Value=\"{Binding $parent[fvim:PopupMenu].DataContext.SelectForeground}\" />\n+ </Style> \n+ <Style Selector=\"ScrollBar\">\n+ <Setter Property=\"Foreground\" Value=\"{Binding $parent[fvim:PopupMenu].DataContext.ScrollbarForeground}\" />\n+ <Setter Property=\"Background\" Value=\"{Binding $parent[fvim:PopupMenu].DataContext.ScrollbarBackground}\" />\n+ </Style>\n+ <Style Selector=\"ScrollBar:vertical\">\n+ <Setter Property=\"Width\" Value=\"6\" />\n+ </Style>\n+ <Style Selector=\"ScrollBar:horizontal\">\n+ <Setter Property=\"Height\" Value=\"6\" />\n+ </Style>\n+ </ListBox.Styles>\n </ListBox>\n </UserControl>\ndiff --git a/Views/PopupMenu.xaml.fs b/Views/PopupMenu.xaml.fs\nindex 7bcb347..167a727 100644\n--- a/Views/PopupMenu.xaml.fs\n+++ b/Views/PopupMenu.xaml.fs\n@@ -1,5 +1,6 @@\n namespace FVim\n \n+open ReactiveUI\n open Avalonia\n open Avalonia.Markup.Xaml\n open Avalonia.Controls\n@@ -8,6 +9,8 @@ open Avalonia.Data\n open System.Linq\n open FVim.log\n \n+open FSharp.Control.Reactive\n+\n type PopupMenu() as this =\n inherit ViewBase<PopupMenuViewModel>()\n \n@@ -17,13 +20,15 @@ type PopupMenu() as this =\n this.Parent.Focus()\n \n do\n+ AvaloniaXamlLoader.Load(this)\n+ let lst = this.FindControl<ListBox>(\"List\")\n this.Watch [\n- this.Bind(UserControl.IsVisibleProperty, Binding(\"Show\"))\n- this.Bind(UserControl.HeightProperty, Binding(\"Height\"))\n- this.Bind(UserControl.WidthProperty, Binding(\"Width\"))\n+ lst.SelectionChanged.Subscribe(fun x -> for item in x.AddedItems do lst.ScrollIntoView item)\n+ this.ViewModelConnected.Subscribe(fun vm -> vm.Watch [\n+ vm.ObservableForProperty(fun x -> x.SelectBackground)\n+ |> Observable.subscribe(fun selectBg -> lst.Resources.[\"HighlightBrush\"] <- selectBg.Value)\n+ ])\n ]\n- this.Height <- System.Double.NaN\n- AvaloniaXamlLoader.Load(this)\n \n override this.OnKeyDown(e) =\n relayToParent e\ndiff --git a/Views/ViewBase.fs b/Views/ViewBase.fs\nindex f37570b..82e04d1 100644\n--- a/Views/ViewBase.fs\n+++ b/Views/ViewBase.fs\n@@ -4,6 +4,7 @@ open ReactiveUI\n open Avalonia\n open Avalonia.Controls\n open Avalonia.Data\n+open FSharp.Control.Reactive\n \n type ViewBase< 'TViewModel when 'TViewModel :> ViewModelBase and 'TViewModel: not struct>() as this =\n inherit UserControl()\n@@ -11,17 +12,25 @@ type ViewBase< 'TViewModel when 'TViewModel :> ViewModelBase and 'TViewModel: no\n static let RenderTickProperty = AvaloniaProperty.Register<ViewBase< 'TViewModel >, int>(\"RenderTick\")\n static let ViewModelProp = AvaloniaProperty.Register<ViewBase< 'TViewModel >, 'TViewModel>(\"ViewModel\")\n \n+ let m_vm_connected = Event<'TViewModel>()\n+\n do\n this.Watch [\n this.Bind(RenderTickProperty, Binding(\"RenderTick\"))\n this.Bind(Canvas.LeftProperty, Binding(\"X\"))\n this.Bind(Canvas.TopProperty, Binding(\"Y\"))\n+ this.GetObservable(ViewBase.DataContextProperty)\n+ |> Observable.filter (fun x -> not <| obj.ReferenceEquals(x, null))\n+ |> Observable.ofType\n+ |> Observable.subscribe m_vm_connected.Trigger\n ]\n \n member this.ViewModel: 'TViewModel = \n let ctx = this.DataContext \n if ctx = null then Unchecked.defaultof<_> else ctx :?> 'TViewModel\n \n+ member this.ViewModelConnected = m_vm_connected.Publish\n+\n member this.RenderTick\n with get() = this.GetValue(RenderTickProperty)\n and set(v) = this.SetValue(RenderTickProperty, v)\ndiff --git a/common.fs b/common.fs\nindex d81d4dc..ef99dc3 100644\n--- a/common.fs\n+++ b/common.fs\n@@ -100,6 +100,11 @@ let inline (>>=) (x: 'a option) (f: 'a -> 'b option) =\n | Some x -> f x\n | _ -> None\n \n+let inline (>?=) (x: Result<'a, 'e>) (f: 'a -> Result<'b, 'e>) =\n+ match x with\n+ | Ok result -> f result\n+ | Error err -> Error err\n+\n [<AutoOpen>]\n module internal helpers =\n let _d x = Option.defaultValue x\ndiff --git a/convert-vsicons.ps1 b/convert-vsicons.ps1\nnew file mode 100644\nindex 0000000..12646ab\n--- /dev/null\n+++ b/convert-vsicons.ps1\n@@ -0,0 +1,5 @@\n+$icons = Get-ChildItem ./icons-intellisense\n+foreach($icon in $icons) {\n+ Write-Host \"Converting $icon\"\n+ & 'C:/Program Files/Inkscape/inkscape.com' --export-png=\".\\Assets\\intellisense\\$([System.IO.Path]::GetFileNameWithoutExtension($icon.Name)).png\" -w 64 -h 64 $icon.FullName\n+}\ndiff --git a/fvim.fsproj b/fvim.fsproj\nindex 03b5b9d..5651994 100644\n--- a/fvim.fsproj\n+++ b/fvim.fsproj\n@@ -37,6 +37,7 @@\n <Compile Include=\"neovim\\neovim.process.fs\" />\n <Compile Include=\"neovim\\neovim.model.fs\" />\n <Compile Include=\"ViewModels\\CursorViewModel.fs\" />\n+ <Compile Include=\"ViewModels\\CompletionItemViewModel.fs\" />\n <Compile Include=\"ViewModels\\PopupMenuViewModel.fs\" />\n <Compile Include=\"ViewModels\\EditorViewModel.fs\" />\n <Compile Include=\"ViewModels\\MainWindowViewModel.fs\" />\n@@ -55,7 +56,7 @@\n <Compile Update=\"**\\*.xaml.fs\">\n <DependentUpon>%(Filename)</DependentUpon>\n </Compile>\n- <AvaloniaResource Include=\"Assets\\*\" />\n+ <AvaloniaResource Include=\"Assets\\**\\*\" />\n <Content Include=\"**\\*.xaml\" />\n <AvaloniaResource Include=\"**\\*.xaml\">\n <SubType>Designer</SubType>\ndiff --git a/icons-intellisense/Class_16x.svg b/icons-intellisense/Class_16x.svg\nnew file mode 100644\nindex 0000000..e553c36\n--- /dev/null\n+++ b/icons-intellisense/Class_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-action-orange{fill:#c27d1a}</style><g id=\"canvas\"><path id=\"XMLID_1_\" class=\"icon-canvas-transparent\" d=\"M16 16H0V0h16v16z\"/></g><path class=\"icon-vs-out\" d=\"M16 6.586l-3-3L11.586 5H9.414l1-1-4-4h-.828L0 5.586v.828l4 4L6.414 8H7v5h1.586l3 3h.828L16 12.414v-.828L13.914 9.5 16 7.414v-.828z\" id=\"outline\"/><g id=\"iconBg\"><path class=\"icon-vs-action-orange\" d=\"M13 10l2 2-3 3-2-2 1-1H8V7H6L4 9 1 6l5-5 3 3-2 2h5l1-1 2 2-3 3-2-2 1-1H9v4l2.999.002L13 10z\"/></g></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/ColorPalette_16x.svg b/icons-intellisense/ColorPalette_16x.svg\nnew file mode 100644\nindex 0000000..2af5cc6\n--- /dev/null\n+++ b/icons-intellisense/ColorPalette_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}.icon-vs-red{fill:#e51400}.icon-vs-yellow{fill:#ffcc00}.icon-vs-green{fill:#339933}.icon-vs-blue{fill:#1ba1e2}.icon-vs-action-purple{fill:#652d90}.icon-white{fill:#ffffff}</style><path class=\"icon-canvas-transparent\" d=\"M16 16H0V0h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M16 8c0 4.411-3.589 8-8 8a2.803 2.803 0 0 1-2.8-2.8c0-.833.272-1.629.766-2.241a.596.596 0 0 0 .101-.359.667.667 0 0 0-.667-.666.58.58 0 0 0-.358.102A3.584 3.584 0 0 1 2.8 10.8 2.803 2.803 0 0 1 0 8c0-4.411 3.589-8 8-8s8 3.589 8 8z\" id=\"outline\"/><path class=\"icon-white\" d=\"M5.4 7.933a2.67 2.67 0 0 1 2.667 2.666c0 .606-.193 1.179-.544 1.614a1.599 1.599 0 0 0-.323.987.8.8 0 0 0 .8.8c3.309 0 6-2.691 6-6s-2.691-6-6-6-6 2.691-6 6c0 .441.359.8.8.8.378 0 .729-.114.986-.322A2.568 2.568 0 0 1 5.4 7.933z\" id=\"iconFg\"/><g id=\"iconBg\"><path class=\"icon-vs-bg\" d=\"M8 15c-.992 0-1.8-.808-1.8-1.8 0-.606.193-1.179.544-1.613.208-.259.323-.609.323-.987 0-.919-.748-1.666-1.667-1.666-.377 0-.728.115-.986.323A2.58 2.58 0 0 1 2.8 9.8C1.808 9.8 1 8.992 1 8c0-3.86 3.14-7 7-7 3.859 0 7 3.14 7 7 0 3.859-3.141 7-7 7zM5.4 7.933a2.67 2.67 0 0 1 2.667 2.666c0 .606-.193 1.179-.544 1.614a1.599 1.599 0 0 0-.323.987.8.8 0 0 0 .8.8c3.309 0 6-2.691 6-6s-2.691-6-6-6-6 2.691-6 6c0 .441.359.8.8.8.378 0 .729-.114.986-.322A2.568 2.568 0 0 1 5.4 7.933z\"/><path class=\"icon-vs-action-purple\" d=\"M4.5 5.375a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z\"/><path class=\"icon-vs-blue\" d=\"M7.125 3.625a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z\"/><path class=\"icon-vs-green\" d=\"M10.625 4.5a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z\"/><path class=\"icon-vs-yellow\" d=\"M11.5 8a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z\"/><path class=\"icon-vs-red\" d=\"M9.75 10.625a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z\"/></g></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Constant_16x.svg b/icons-intellisense/Constant_16x.svg\nnew file mode 100644\nindex 0000000..ed2a175\n--- /dev/null\n+++ b/icons-intellisense/Constant_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}.icon-vs-fg{fill:#f0eff1}.icon-vs-action-blue{fill:#00539c}</style><path class=\"icon-canvas-transparent\" d=\"M16 16H0V0h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M2.879 14L1 12.121V3.879L2.879 2h10.242L15 3.879v8.242L13.121 14H2.879z\" id=\"outline\"/><path class=\"icon-vs-fg\" d=\"M12.293 4H3.707L3 4.707v6.586l.707.707h8.586l.707-.707V4.707L12.293 4zM11 10H5V9h6v1zm0-3H5V6h6v1z\" id=\"iconFg\"/><g id=\"iconBg\"><path class=\"icon-vs-bg\" d=\"M12.707 13H3.293L2 11.707V4.293L3.293 3h9.414L14 4.293v7.414L12.707 13zm-9-1h8.586l.707-.707V4.707L12.293 4H3.707L3 4.707v6.586l.707.707z\"/><path class=\"icon-vs-action-blue\" d=\"M11 7H5V6h6v1zm0 2H5v1h6V9z\"/></g></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Dimension_16x.svg b/icons-intellisense/Dimension_16x.svg\nnew file mode 100644\nindex 0000000..c1e6683\n--- /dev/null\n+++ b/icons-intellisense/Dimension_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}</style><path class=\"icon-canvas-transparent\" d=\"M16 0v16H0V0h16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M16 12.254v.492L12.746 16h-1.035l-1.604-1.604.397-.396H2V5.496l-.396.397L0 4.289V3.254L3.254 0h.492L7 3.254v1.035L5.396 5.893 5 5.496v3.383L9.879 4H9V1h6v6h-3v-.879L7.121 11h3.383l-.396-.396L11.711 9h1.035L16 12.254z\" id=\"outline\"/><path class=\"icon-vs-bg\" d=\"M14.832 12.5l-2.603 2.604-.707-.707L12.918 13H3V3.082L1.604 4.479l-.708-.708L3.5 1.168l2.604 2.604-.708.707L4 3.082v8.211L12.293 3H10V2h4v4h-1V3.707L4.707 12h8.211l-1.397-1.396.707-.707 2.604 2.603z\" id=\"iconBg\"/></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/EnumItem_16x.svg b/icons-intellisense/EnumItem_16x.svg\nnew file mode 100644\nindex 0000000..aa901ec\n--- /dev/null\n+++ b/icons-intellisense/EnumItem_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-fg{fill:#f0eff1}.icon-vs-action-blue{fill:#00539c}</style><path class=\"icon-canvas-transparent\" d=\"M16 16H0V0h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M0 15V6h6V2.586L7.585 1h6.829L16 2.586v5.829L14.414 10H10v5H0zm3-6z\" id=\"outline\"/><path class=\"icon-vs-fg\" d=\"M8 3v3h5v1h-3v1h4V3H8zm5 2H9V4h4v1zM2 8v5h6V8H2zm5 3H3v-1h4v1z\" id=\"iconFg\"/><path class=\"icon-vs-action-blue\" d=\"M10 6h3v1h-3V6zM9 4v1h4V4H9zm5-2H8L7 3v3h1V3h6v5h-4v1h4l1-1V3l-1-1zm-7 8H3v1h4v-1zm2-3v7H1V7h8zM8 8H2v5h6V8z\" id=\"iconBg\"/></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Enumerator_16x.svg b/icons-intellisense/Enumerator_16x.svg\nnew file mode 100644\nindex 0000000..010d59d\n--- /dev/null\n+++ b/icons-intellisense/Enumerator_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-fg{fill:#f0eff1}.icon-vs-action-orange{fill:#c27d1a}</style><path class=\"icon-canvas-transparent\" d=\"M16 16H0V0h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M14.414 1L16 2.586v5.828L14.414 10H10v3.416L8.414 15H1.586L0 13.416v-5.83L1.586 6H6V2.586L7.586 1h6.828z\" id=\"outline\"/><path class=\"icon-vs-fg\" d=\"M2 13h6V8H2v5zm1-4h4v1H3V9zm0 2h4v1H3v-1zm11-5V3H8v3h.414L9 6.586V6h4v1H9.414l.586.586V8h4V6zm-1-1H9V4h4v1z\" id=\"iconFg\"/><g id=\"iconBg\"><path class=\"icon-vs-action-orange\" d=\"M3 11h4.001v1H3v-1zm0-1h4.001V9H3v1zm6-2v5l-1 1H2l-1-1V8l1-1h6l1 1zM8 8H2v5h6V8zm1-2l1 1h3V6H9zm0-1h4V4H9v1zm5-3H8L7 3v3h1V3h6v5h-4v1h4l1-1V3l-1-1z\"/></g></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Event_16x.svg b/icons-intellisense/Event_16x.svg\nnew file mode 100644\nindex 0000000..e874ec2\n--- /dev/null\n+++ b/icons-intellisense/Event_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-action-orange{fill:#c27d1a}</style><path class=\"icon-canvas-transparent\" d=\"M16 16H0V0h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M14 1.414L9.414 6H14v1.414L5.414 16H3v-1.234L5.371 10H2V8.764L6.382 0H14v1.414z\" id=\"outline\"/><path class=\"icon-vs-action-orange\" d=\"M7 7h6l-8 8H4l2.985-6H3l4-8h6L7 7z\" id=\"iconBg\"/></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Field_16x.svg b/icons-intellisense/Field_16x.svg\nnew file mode 100644\nindex 0000000..e1b5aa5\n--- /dev/null\n+++ b/icons-intellisense/Field_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\" enable-background=\"new 0 0 16 16\"><style type=\"text/css\">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-fg{fill:#F0EFF1;} .icon-vs-action-blue{fill:#00539C;}</style><path class=\"icon-canvas-transparent\" d=\"M16 16h-16v-16h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M0 10.736v-6.236l9-4.5 7 3.5v6.236l-9 4.5-7-3.5z\" id=\"outline\"/><path class=\"icon-vs-action-blue\" d=\"M9 1l-8 4v5l6 3 8-4v-5l-6-3zm-2 5.882l-3.764-1.882 5.764-2.882 3.764 1.882-5.764 2.882z\" id=\"iconBg\"/><path class=\"icon-vs-fg\" d=\"M9 2.118l3.764 1.882-5.764 2.882-3.764-1.882 5.764-2.882z\" id=\"iconFg\"/></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Folder_16x.svg b/icons-intellisense/Folder_16x.svg\nnew file mode 100644\nindex 0000000..481bb01\n--- /dev/null\n+++ b/icons-intellisense/Folder_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-folder{fill:#dcb67a}.icon-vs-fg{fill:#f0eff1}</style><path class=\"icon-canvas-transparent\" d=\"M0 0h16v16H0V0z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M1.5 1h8.11l1 2h2.886c.827 0 1.5.673 1.5 1.5v8c0 .827-.673 1.5-1.5 1.5H1.5C.673 14 0 13.327 0 12.5v-10C0 1.673.673 1 1.5 1z\" id=\"outline\"/><path class=\"icon-folder\" d=\"M13.496 4H9.992l-1-2H1.5a.5.5 0 0 0-.5.5v10a.5.5 0 0 0 .5.5h11.996a.5.5 0 0 0 .5-.5v-8a.5.5 0 0 0-.5-.5zM2 3h6.374l.5 1H2V3z\" id=\"iconBg\"/><path class=\"icon-vs-fg\" d=\"M2 3h6.374l.5 1H2V3z\" id=\"iconFg\"/></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/IntelliSenseKeyword_16x.svg b/icons-intellisense/IntelliSenseKeyword_16x.svg\nnew file mode 100644\nindex 0000000..7a80c7f\n--- /dev/null\n+++ b/icons-intellisense/IntelliSenseKeyword_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}.icon-vs-fg{fill:#f0eff1}</style><path class=\"icon-canvas-transparent\" d=\"M16 16H0V0h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M16 5V2H9V1H0v14h13v-3h3V9h-1V6H9V5h7zm-8 7V9h1v3H8z\" id=\"outline\"/><path class=\"icon-vs-fg\" d=\"M2 3h5v1H2V3z\" id=\"iconFg\"/><g id=\"iconBg\"><path class=\"icon-vs-bg\" d=\"M15 4h-5V3h5v1zm-1 3h-2v1h2V7zm-4 0H1v1h9V7zm2 6H1v1h11v-1zm-5-3H1v1h6v-1zm8 0h-5v1h5v-1zM8 2v3H1V2h7zM7 3H2v1h5V3z\"/></g></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Interface_16x.svg b/icons-intellisense/Interface_16x.svg\nnew file mode 100644\nindex 0000000..0c08c8d\n--- /dev/null\n+++ b/icons-intellisense/Interface_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\" enable-background=\"new 0 0 16 16\"><style type=\"text/css\">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-fg{fill:#F0EFF1;} .icon-vs-action-blue{fill:#00539C;}</style><path class=\"icon-canvas-transparent\" d=\"M16 16h-16v-16h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M11.5 12c-1.915 0-3.602-1.241-4.228-3h-1.41c-.536.985-1.572 1.625-2.737 1.625-1.723 0-3.125-1.402-3.125-3.125s1.402-3.125 3.125-3.125c1.165 0 2.201.639 2.737 1.625h1.41c.626-1.759 2.313-3 4.228-3 2.481 0 4.5 2.019 4.5 4.5s-2.019 4.5-4.5 4.5z\" id=\"outline\"/><path class=\"icon-vs-fg\" d=\"M11.5 9c-.827 0-1.5-.674-1.5-1.5 0-.828.673-1.5 1.5-1.5s1.5.672 1.5 1.5c0 .826-.673 1.5-1.5 1.5z\" id=\"iconFg\"/><path class=\"icon-vs-action-blue\" d=\"M11.5 4c-1.762 0-3.205 1.306-3.45 3h-2.865c-.226-.931-1.059-1.625-2.06-1.625-1.174 0-2.125.951-2.125 2.125s.951 2.125 2.125 2.125c1 0 1.834-.694 2.06-1.625h2.865c.245 1.694 1.688 3 3.45 3 1.933 0 3.5-1.567 3.5-3.5s-1.567-3.5-3.5-3.5zm0 5c-.827 0-1.5-.673-1.5-1.5s.673-1.5 1.5-1.5 1.5.673 1.5 1.5-.673 1.5-1.5 1.5z\" id=\"iconBg\"/></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Literal_16x.svg b/icons-intellisense/Literal_16x.svg\nnew file mode 100644\nindex 0000000..45c0171\n--- /dev/null\n+++ b/icons-intellisense/Literal_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.st0{opacity:0}.st0,.st1{fill:#f6f6f6}.st2{fill:#424242}.st3{fill:#f0eff1}</style><g id=\"outline\"><path class=\"st0\" d=\"M0 0h16v16H0z\"/><path class=\"st1\" d=\"M16 0H1v6H0v10h9v-2h7z\"/></g><g id=\"icon_x5F_bg\"><path class=\"st2\" d=\"M2 1v6H1v8h7v-2h7V1H2zm5 13H2V8h5v6zm7-2H8V7H3V2h11v10z\"/><path class=\"st2\" d=\"M5.527 9.379a1.073 1.073 0 0 0-.423-.295 1.649 1.649 0 0 0-.609-.102c-.119 0-.241.012-.368.033a3.194 3.194 0 0 0-.672.196 1.375 1.375 0 0 0-.213.113v.768c.158-.131.341-.235.544-.313.204-.078.413-.117.627-.117.213 0 .377.063.494.186.116.125.174.324.174.6l-1.03.154a1.631 1.631 0 0 0-.525.152 1.08 1.08 0 0 0-.562.66 1.557 1.557 0 0 0-.065.461c0 .17.025.322.074.463s.121.26.216.361c.093.1.21.178.352.234.14.057.298.084.479.084.229 0 .431-.053.604-.16a1.3 1.3 0 0 0 .439-.463l-.054.067v.529l.85.01v-2.514c0-.238-.027-.451-.083-.637a1.26 1.26 0 0 0-.249-.47zm-.925 2.879c-.089.067-.213.072-.337.072a.682.682 0 0 1-.242-.041.489.489 0 0 1-.302-.285.588.588 0 0 1-.041-.219c0-.086.01-.164.027-.233a.435.435 0 0 1 .098-.18A.553.553 0 0 1 4 11.24c.083-.033.189-.061.32-.078l.698-.109v.346c.001-.001-.096.617-.416.859z\"/></g><path class=\"st3\" d=\"M3 2v5h5v5h6V2z\" id=\"icon_x5F_fg\"/></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/LocalVariable_16x.svg b/icons-intellisense/LocalVariable_16x.svg\nnew file mode 100644\nindex 0000000..185efa0\n--- /dev/null\n+++ b/icons-intellisense/LocalVariable_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\" enable-background=\"new 0 0 16 16\"><style type=\"text/css\">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-bg{fill:#424242;} .icon-vs-fg{fill:#F0EFF1;} .icon-vs-action-blue{fill:#00539C;}</style><path class=\"icon-canvas-transparent\" d=\"M16 16h-16v-16h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M11 3v1.015l-2.267-1.133-3.733 1.867v-1.749h-5v10h5v-1.859l2.156 1.077 3.844-1.923v2.705h5v-10h-5z\" id=\"outline\"/><path class=\"icon-vs-bg\" d=\"M2 5v6h2v1h-3v-8h3v1h-2zm10 6v1h3v-8h-3v1h2v6h-2z\" id=\"iconBg\"/><path class=\"icon-vs-fg\" d=\"M7.156 7.156l-1.578-.789 3.156-1.578 1.578.789-3.156 1.578z\" id=\"iconFg\"/><path class=\"icon-vs-action-blue\" d=\"M8.733 4l-4.733 2.367v3.156l3.156 1.577 4.733-2.367v-3.155l-3.156-1.578zm-1.577 3.156l-1.578-.789 3.156-1.578 1.578.789-3.156 1.578z\" id=\"colorImportance\"/></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Method_16x.svg b/icons-intellisense/Method_16x.svg\nnew file mode 100644\nindex 0000000..9706fa4\n--- /dev/null\n+++ b/icons-intellisense/Method_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\" enable-background=\"new 0 0 16 16\"><style type=\"text/css\">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-fg{fill:#F0EFF1;} .icon-vs-action-purple{fill:#652D90;}</style><path class=\"icon-canvas-transparent\" d=\"M16 16h-16v-16h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M15 3.349v8.403l-6.025 4.248h-.905l-7.07-4.418v-8.255l6.595-3.327h1.118l6.287 3.349z\" id=\"outline\"/><path class=\"icon-vs-fg\" d=\"M12.715 4.398l-4.228 2.622-4.922-2.748 4.578-2.309 4.572 2.435zm-9.715.704l5 2.792v5.705l-5-3.125v-5.372zm6 8.434v-5.658l4-2.48v5.317l-4 2.821z\" id=\"iconFg\"/><path class=\"icon-vs-action-purple\" d=\"M8.156.837l-6.156 3.105v7.085l6.517 4.073 5.483-3.867v-7.283l-5.844-3.113zm4.559 3.561l-4.228 2.622-4.922-2.748 4.578-2.309 4.572 2.435zm-9.715.704l5 2.792v5.705l-5-3.125v-5.372zm6 8.434v-5.658l4-2.48v5.317l-4 2.821z\" id=\"iconBg\"/></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Module_16x.svg b/icons-intellisense/Module_16x.svg\nnew file mode 100644\nindex 0000000..eebb975\n--- /dev/null\n+++ b/icons-intellisense/Module_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-action-purple{fill:#652d90}</style><path class=\"icon-canvas-transparent\" d=\"M16 16H0V0h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M1 16V1h14v15H1z\" id=\"outline\"/><g id=\"iconBg\"><path class=\"icon-vs-action-purple\" d=\"M14 15H2V9h12v6zM7 7H2V2h5v5zm7 0H9V2h5v5z\"/></g></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/NewClass_16x.svg b/icons-intellisense/NewClass_16x.svg\nnew file mode 100644\nindex 0000000..734c1f3\n--- /dev/null\n+++ b/icons-intellisense/NewClass_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.st0{opacity:0}.st0,.st1{fill:#f6f6f6}.st2{fill:#424242}.st3{fill:#c27d1a}</style><g id=\"outline\"><path class=\"st0\" d=\"M0 0h16v16H0z\"/><path class=\"st1\" d=\"M13.432 10.034l1.5-1.5-2.914-2.914-1.414 1.414h-.172L9 5.603V3h-.879l.621-.621L6.621.257 6 .878V0H3v.878L2.379.257.257 2.379.878 3H0v3h.878l-.621.621 5.261 5.327 1.5-1.5v3.586h2.586L11.568 16h.897l3.467-3.466z\"/></g><path class=\"st2\" d=\"M13.018 11.034l-1 1h-3v-3h1l-.5.5 1.5 1.5 2.5-2.5-1.5-1.5-1 1h-3l1-1-2-2-3.5 3.5 2 2 1.5-1.5h1v4h3l-.5.5 1.5 1.5 2.5-2.5z\" id=\"icon_x5F_bg\"/><g id=\"color_x5F_action\"><path class=\"st3\" d=\"M8 4.603V4h-.603zM2.379 7.328L4 5.707v.931L6.638 4h-.931l1.621-1.621-.707-.708L5 3.292V1H4v2.292L2.379 1.671l-.708.708L3.292 4H1v1h2.292L1.671 6.621l.708.707zM4 4h1v1H4V4z\"/></g></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Operator_16x.svg b/icons-intellisense/Operator_16x.svg\nnew file mode 100644\nindex 0000000..806381c\n--- /dev/null\n+++ b/icons-intellisense/Operator_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-fg{fill:#f0eff1}.icon-vs-action-blue{fill:#00539c}</style><path class=\"icon-canvas-transparent\" d=\"M16 16H0V0h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M16 16H0V0h16v16z\" id=\"outline\"/><path class=\"icon-vs-action-blue\" d=\"M1 1v14h14V1H1zm6 12H3v-1h4v1zm0-3H3V9h4v1zm0-5H5v2H4V5H2V4h2V2h1v2h2v1zm3.281 8H8.719l3-4h1.563l-3.001 4zM14 5H9V4h5v1z\" id=\"iconBg\"/><g id=\"iconFg\"><path class=\"icon-vs-fg\" d=\"M7 5H5v2H4V5H2V4h2V2h1v2h2v1zm7-1H9v1h5V4zM7 9H3v1h4V9zm0 3H3v1h4v-1zm3.281 1l3-4h-1.563l-3 4h1.563z\"/></g></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Property_16x.svg b/icons-intellisense/Property_16x.svg\nnew file mode 100644\nindex 0000000..6b5b18a\n--- /dev/null\n+++ b/icons-intellisense/Property_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}</style><path class=\"icon-canvas-transparent\" d=\"M16 16H0V0h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M16 5.5a5.5 5.5 0 0 1-5.5 5.5c-.275 0-.543-.027-.807-.066l-.079-.012a5.429 5.429 0 0 1-.81-.192l-4.537 4.537c-.472.473-1.1.733-1.767.733s-1.295-.26-1.768-.732a2.502 2.502 0 0 1 0-3.535l4.537-4.537a5.452 5.452 0 0 1-.191-.812c-.005-.025-.008-.051-.012-.077A5.503 5.503 0 0 1 5 5.5a5.5 5.5 0 1 1 11 0z\" id=\"outline\"/><path class=\"icon-vs-bg\" d=\"M15 5.5a4.5 4.5 0 0 1-4.5 4.5c-.693 0-1.342-.17-1.929-.45l-5.01 5.01c-.293.294-.677.44-1.061.44s-.768-.146-1.061-.439a1.5 1.5 0 0 1 0-2.121l5.01-5.011A4.475 4.475 0 0 1 6 5.5 4.5 4.5 0 0 1 10.5 1c.693 0 1.342.17 1.929.45L9.636 4.243l2.121 2.121 2.793-2.793c.28.587.45 1.236.45 1.929z\" id=\"iconBg\"/></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Reference_16x.svg b/icons-intellisense/Reference_16x.svg\nnew file mode 100644\nindex 0000000..f07e9ec\n--- /dev/null\n+++ b/icons-intellisense/Reference_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.st0{opacity:0}.st0,.st1{fill:#f6f6f6}.st2{fill:#424242}</style><g id=\"outline\"><path class=\"st0\" d=\"M0 0h16v16H0z\"/><path class=\"st1\" d=\"M16 3v9H8V9H6v2H0V4h6v2h2V3h8z\"/></g><g id=\"icon_x5F_bg\"><path class=\"st2\" d=\"M1 5h4v5H1zM9 4h6v7H9zM6 7h2v1H6z\"/></g></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Snippet_16x.svg b/icons-intellisense/Snippet_16x.svg\nnew file mode 100644\nindex 0000000..640c247\n--- /dev/null\n+++ b/icons-intellisense/Snippet_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.st0{opacity:0}.st0,.st1{fill:#f6f6f6}.st2{fill:#424242}.st3{fill:none}.st4{fill:#f0eff1}</style><g id=\"outline\"><path class=\"st0\" d=\"M0 0h16v16H0z\"/><path class=\"st1\" d=\"M2 0h13v15H2z\"/></g><g id=\"icon_x5F_bg\"><path class=\"st2\" d=\"M7 13h1v1H7zM5 13h1v1H5zM3 13h1v1H3zM9 13h1v1H9zM11 13h1v1h-1zM13 13h1v1h-1zM3 1v11h1V2h9v10h1V1z\"/></g><g id=\"icon_x5F_fg\"><path class=\"st3\" d=\"M13 2H4h9z\"/><path class=\"st4\" d=\"M4 2h9v10H4z\"/></g></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Structure_16x.svg b/icons-intellisense/Structure_16x.svg\nnew file mode 100644\nindex 0000000..811f389\n--- /dev/null\n+++ b/icons-intellisense/Structure_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-action-blue{fill:#00539c}</style><path class=\"icon-canvas-transparent\" d=\"M16 16H0V0h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M9 14V8H7v6H1V2h14v12H9z\" id=\"outline\"/><g id=\"iconBg\"><path class=\"icon-vs-action-blue\" d=\"M10 9h4v4h-4V9zm-8 4h4V9H2v4zM2 3v4h12V3H2z\"/></g></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/TextFile_16x.svg b/icons-intellisense/TextFile_16x.svg\nnew file mode 100644\nindex 0000000..d25e855\n--- /dev/null\n+++ b/icons-intellisense/TextFile_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\" enable-background=\"new 0 0 16 16\"><style type=\"text/css\">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-fg{fill:#F0EFF1;} .icon-vs-bg{fill:#424242;}</style><path class=\"icon-canvas-transparent\" d=\"M16 16h-16v-16h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M15 16h-13v-16h8.621l4.379 4.379v11.621z\" id=\"outline\"/><path class=\"icon-vs-bg\" d=\"M3 1v14h11v-10.207l-3.793-3.793h-7.207zm10 13h-9v-12h5v4h4v8zm-3-9v-2.793l2.793 2.793h-2.793zm-2 1h-3v-1h3v1zm4 2h-7v1h7v-1zm0 3h-7v1h7v-1z\" id=\"iconBg\"/><path class=\"icon-vs-fg\" d=\"M9 6v-4h-5v12h9v-8h-4zm-4-1h3v1h-3v-1zm7 7h-7v-1h7v1zm0-3h-7v-1h7v1zm.793-4h-2.793v-2.793l2.793 2.793z\" id=\"iconFg\"/></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Text_16x.svg b/icons-intellisense/Text_16x.svg\nnew file mode 100644\nindex 0000000..8840f37\n--- /dev/null\n+++ b/icons-intellisense/Text_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.st0{fill:#f6f6f6}.st1{fill:#424242}.st2{fill:#f0eff1}</style><path class=\"st0\" d=\"M14 15H2V0h12v15z\" id=\"outline\"/><path class=\"st1\" d=\"M11 5H7V4h4v1zm0 1H5v1h6V6zm0 2H5v1h6V8zm-1 2H5v1h5v-1zm3-9v13H3V1h10zm-1 1H4v11h8V2z\" id=\"icon_x5F_bg\"/><path class=\"st2\" d=\"M4 2v11h8V2H4zm6 9H5v-1h5v1zm1-2H5V8h6v1zm0-2H5V6h6v1zm0-2H7V4h4v1z\" id=\"icon_x5F_fg\"/></svg>\n\\ No newline at end of file\ndiff --git a/icons-intellisense/Type_16x.svg b/icons-intellisense/Type_16x.svg\nnew file mode 100644\nindex 0000000..24baa49\n--- /dev/null\n+++ b/icons-intellisense/Type_16x.svg\n@@ -0,0 +1,1 @@\n+<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-fg{fill:#f0eff1}.icon-vs-action-blue{fill:#00539c}</style><path class=\"icon-canvas-transparent\" d=\"M16 16H0V0h16v16z\" id=\"canvas\"/><path class=\"icon-vs-out\" d=\"M0 16V5h4V0h12v11h-4v5H0z\" id=\"outline\"/><path class=\"icon-vs-fg\" d=\"M10 14H2V7h8v7zm4-5h-3V6H6V2h8v7z\" id=\"iconFg\"/><g id=\"iconBg\"><path class=\"icon-vs-action-blue\" d=\"M5 1v5H1v9h10v-5h4V1H5zm5 13H2V7h8v7zm4-5h-3V6H6V2h8v7z\"/></g></svg>\n\\ No newline at end of file\ndiff --git a/neovim/neovim.def.fs b/neovim/neovim.def.fs\nindex 6367132..49fc855 100644\n--- a/neovim/neovim.def.fs\n+++ b/neovim/neovim.def.fs\n@@ -154,7 +154,7 @@ type Anchor =\n /// d #define or macro\n /// </summary>\n [<Struct>]\n-type CompleteKind =\n+type VimCompleteKind =\n | Variable\n | Function\n | Member\n@@ -168,14 +168,64 @@ type CompleteItem =\n abbr: string option\n menu: string option\n info: string option\n- kind: CompleteKind option\n }\n with \n- static member empty = { word = \"\"; abbr = None; menu = None; info = None; kind = None }\n+ static member empty = { word = \"\"; abbr = None; menu = None; info = None }\n static member GetLength (x: CompleteItem) =\n let _len (x: string option) = (_d \"\" x).Length\n x.word.Length + _len x.abbr + _len x.menu + _len x.info\n \n+type SemanticHighlightGroup =\n+ | SpecialKey = 0\n+ | EndOfBuffer = 1\n+ | TermCursor = 2\n+ | TermCursorNC = 3\n+ | NonText = 4\n+ | Directory = 5\n+ | ErrorMsg = 6\n+ | IncSearch = 7\n+ | Search = 8\n+ | MoreMsg = 9\n+ | ModeMsg = 10\n+ | LineNr = 11\n+ | CursorLineNr = 12\n+ | Question = 13\n+ | StatusLine = 14\n+ | StatusLineNC = 15\n+ | VertSplit = 16\n+ | Title = 17\n+ | Visual = 18\n+ | VisualNC = 19\n+ | WarningMsg = 20\n+ | WildMenu = 21\n+ | Folded = 22\n+ | FoldColumn = 23\n+ | DiffAdd = 24\n+ | DiffChange = 25\n+ | DiffDelete = 26\n+ | DiffText = 27\n+ | SignColumn = 28\n+ | Conceal = 29\n+ | SpellBad = 30\n+ | SpellCap = 31\n+ | SpellRare = 32\n+ | SpellLocal = 33\n+ | Pmenu = 34\n+ | PmenuSel = 35\n+ | PmenuSbar = 36\n+ | PmenuThumb = 37\n+ | TabLine = 38\n+ | TabLineSel = 39\n+ | TabLineFill = 40\n+ | CursorColumn = 41\n+ | CursorLine = 42\n+ | ColorColumn = 43\n+ | QuickFixLine = 44\n+ | Whitespace = 45\n+ | NormalNC = 46\n+ | MsgSeparator = 47\n+ | NormalFloat = 48\n+\n type RedrawCommand =\n /// -- global --\n | SetOption of UiOption[]\n@@ -244,23 +294,13 @@ type RedrawCommand =\n | PopupMenuSelect of selected: int\n /// Hide the popupmenu.\n | PopupMenuHide\n+| SemanticHighlightGroupSet of groups: Map<SemanticHighlightGroup, int>\n /// -- legacy events --\n //| UpdateFg of Color\n //| UpdateBg of Color\n //| UpdateSp of Color\n | UnknownCommand of data: obj\n \n-let uiopt_rgb = \"rgb\"\n-let uiopt_ext_linegrid = \"ext_linegrid\"\n-let uiopt_ext_multigrid = \"ext_multigrid\"\n-let uiopt_ext_popupmenu = \"ext_popupmenu\"\n-let uiopt_ext_tabline = \"ext_tabline\"\n-let uiopt_ext_cmdline = \"ext_cmdline\"\n-let uiopt_ext_wildmenu = \"ext_wildmenu\"\n-let uiopt_ext_messages = \"ext_messages\"\n-let uiopt_ext_hlstate = \"ext_hlstate\"\n-let uiopt_ext_termcolors = \"ext_termcolors\"\n-\n type EventParseException(data: obj) =\n inherit exn()\n member __.Input = data\n@@ -453,12 +493,19 @@ let parse_complete_item =\n abbr = Some abbr\n menu = Some menu\n info = Some info\n- kind = None\n }\n | x -> \n trace \"parse_complete_item: unrecognized: %A\" x\n None\n \n+let parse_semantic_hlgroup =\n+ function\n+ | ObjArray [| (String key); (Integer32 id) |] ->\n+ match SemanticHighlightGroup.TryParse key with\n+ | true, key -> Some(key, id)\n+ | _ -> None\n+ | _ -> None\n+\n let parse_redrawcmd (x: obj) =\n match x with\n | C(\"option_set\", P(parse_uioption)options) -> SetOption options\n@@ -505,6 +552,7 @@ let parse_redrawcmd (x: obj) =\n (Integer32 row); (Integer32 col); (Integer32 grid) |]) -> PopupMenuShow(items, selected, row, col, grid)\n | C1(\"popupmenu_select\", [| Integer32 selected |]) -> PopupMenuSelect(selected)\n | C(\"popupmenu_hide\", _) -> PopupMenuHide\n+ | C(\"hl_group_set\", P(parse_semantic_hlgroup)gs) -> SemanticHighlightGroupSet(Map.ofArray gs)\n | _ -> UnknownCommand x\n //| C(\"suspend\", _) -> \n //| C(\"update_menu\", _) -> \ndiff --git a/neovim/neovim.model.fs b/neovim/neovim.model.fs\nindex 1b3e271..0df9b3f 100644\n--- a/neovim/neovim.model.fs\n+++ b/neovim/neovim.model.fs\n@@ -288,6 +288,16 @@ let Detach() =\n nvim.stop(0)\n States.Shutdown(0)\n \n+let UpdateUICapabilities() =\n+ let opts = hashmap[]\n+ States.PopulateUIOptions opts\n+ trace \"UpdateUICapabilities: %A\" <| String.Join(\", \", Seq.map (fun (KeyValue(k, v)) -> sprintf \"%s=%b\" k v) opts)\n+ async {\n+ for KeyValue(k, v) in opts do\n+ let! _ = Async.AwaitTask <| nvim.call { method=\"nvim_ui_set_option\"; parameters = mkparams2 k v }\n+ in ()\n+ } |> Async.RunSynchronously\n+\n /// <summary>\n /// Call this once at initialization.\n /// </summary>\n@@ -315,8 +325,17 @@ let Start opts =\n States.Register.Bool \"cursor.smoothblink\"\n States.Register.Bool \"cursor.smoothmove\"\n States.Register.Bool \"key.disableShiftSpace\"\n-\n- ignore(States.Register.Notify \"remote.detach\" (fun _ -> Detach()))\n+ States.Register.Bool \"ui.multigrid\"\n+ States.Register.Bool \"ui.popupmenu\"\n+ States.Register.Bool \"ui.tabline\"\n+ States.Register.Bool \"ui.cmdline\"\n+ States.Register.Bool \"ui.wildmenu\"\n+ States.Register.Bool \"ui.messages\"\n+ States.Register.Bool \"ui.termcolors\"\n+ States.Register.Bool \"ui.hlstate\"\n+\n+ States.Register.Notify \"remote.detach\" (fun _ -> Detach())\n+ States.Register.Watch \"ui\" UpdateUICapabilities\n \n States.Register.Request \"set-clipboard\" (fun [| P(|String|_|)lines; String regtype |] -> async {\n States.clipboard_lines <- lines\n@@ -389,6 +408,8 @@ let Start opts =\n trace \"FVim connected clients: %A\" fvimChannels\n trace \"FVim client channel is: %d\" myChannel\n \n+ FVim.States.channel_id <- myChannel\n+\n // Another instance is already up\n if fvimChannels.Length > 1 then\n Environment.Exit(0)\n@@ -426,11 +447,18 @@ let Start opts =\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimFontNormalWeight\" 1 (sprintf \"call rpcnotify(%d, 'font.weight.normal', <args>)\" myChannel))\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimFontBoldWeight\" 1 (sprintf \"call rpcnotify(%d, 'font.weight.bold', <args>)\" myChannel))\n let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimKeyDisableShiftSpace\" 1 (sprintf \"call rpcnotify(%d, 'key.disableShiftSpace', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimUIMultiGrid\" 1 (sprintf \"call rpcnotify(%d, 'ui.multigrid', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimUIPopupMenu\" 1 (sprintf \"call rpcnotify(%d, 'ui.popupmenu', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimUITabLine\" 1 (sprintf \"call rpcnotify(%d, 'ui.tabline', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimUICmdLine\" 1 (sprintf \"call rpcnotify(%d, 'ui.cmdline', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimUIWildMenu\" 1 (sprintf \"call rpcnotify(%d, 'ui.wildmenu', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimUIMessages\" 1 (sprintf \"call rpcnotify(%d, 'ui.messages', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimUITermColors\" 1 (sprintf \"call rpcnotify(%d, 'ui.termcolors', <args>)\" myChannel))\n+ let! _ = Async.AwaitTask(nvim.``command!`` \"-complete=expression FVimUIHlState\" 1 (sprintf \"call rpcnotify(%d, 'ui.hlstate', <args>)\" myChannel))\n \n ()\n }\n \n- \n let OnGridReady(gridui: IGridUI) =\n // connect the redraw commands\n gridui.Resized \n@@ -459,6 +487,15 @@ let OnGridReady(gridui: IGridUI) =\n in ()\n } |> ignore\n \n+let SelectPopupMenuItem (index: int) (insert: bool) (finish: bool) =\n+ trace \"SelectPopupMenuItem: index=%d insert=%b finish=%b\" index insert finish\n+ task {\n+ let insert = if insert then \"v:true\" else \"v:false\"\n+ let finish = if finish then \"v:true\" else \"v:false\"\n+ let! _ = nvim.command (sprintf \"call nvim_select_popupmenu_item(%d, %s, %s, {})\" index insert finish)\n+ in ()\n+ } |> ignore\n+\n let OnTerminated (args) =\n trace \"terminating nvim...\"\n nvim.stop 1\ndiff --git a/neovim/neovim.process.fs b/neovim/neovim.process.fs\nindex 4c8aa65..0d808a0 100644\n--- a/neovim/neovim.process.fs\n+++ b/neovim/neovim.process.fs\n@@ -264,13 +264,30 @@ type Nvim() =\n m_call { method = \"nvim_ui_try_resize\"; parameters = mkparams2 w h }\n \n member __.ui_attach (w:int) (h:int) =\n- let opts = hashmap[]\n- opts.[uiopt_rgb] <- true\n- opts.[uiopt_ext_linegrid] <- true\n- (*opts.[uiopt_ext_popupmenu] <- true*)\n- (*opts.[uiopt_ext_multigrid] <- true*)\n-\n- m_call { method = \"nvim_ui_attach\"; parameters = mkparams3 w h opts }\n+ task {\n+ let! api_info = m_call { method = \"nvim_get_api_info\"; parameters = [||] }\n+ let opts = hashmap[]\n+ let result = \n+ match api_info.result with\n+ | Ok(ObjArray [| Integer32 chid; metadata |]) -> Ok metadata\n+ | _ -> Result.Error(\"nvim_get_api_info\")\n+ >?= fun metadata ->\n+ opts.[uiopt_rgb] <- true\n+ opts.[uiopt_ext_linegrid] <- true\n+ match metadata with\n+ | FindKV \"ui_options\" (P (|String|_|) ui_options) -> Ok(Set.ofArray ui_options)\n+ | _ -> Result.Error(\"find ui_options\")\n+ >?= fun ui_options ->\n+ trace \"available ui options: %A\" ui_options\n+ ui_available_opts <- ui_options\n+ PopulateUIOptions opts\n+ Ok()\n+ match result with\n+ | Result.Ok() -> return! m_call { method = \"nvim_ui_attach\"; parameters = mkparams3 w h opts }\n+ | Result.Error msg -> \n+ trace \"ui_attach error: %s\" msg\n+ return { result = Result.Error(box msg) }\n+ }\n \n member __.exists (var: string) =\n task {\n@@ -300,6 +317,8 @@ type Nvim() =\n member nvim.edit (file: string) =\n nvim.command (\"edit \" + file)\n \n+ member nvim.call = m_call\n+\n member nvim.quitall () =\n nvim.command \"confirm quitall\"\n \ndiff --git a/states.fs b/states.fs\nindex 206f12c..55596ec 100644\n--- a/states.fs\n+++ b/states.fs\n@@ -48,6 +48,9 @@ type LineHeightOption =\n | Add of float\n | Default\n \n+// channel\n+let mutable channel_id = 1\n+\n // keyboard mapping\n let mutable key_disableShiftSpace = false\n \n@@ -71,18 +74,62 @@ let mutable font_weight_normal = SKFontStyleWeight.Normal\n let mutable font_weight_bold = SKFontStyleWeight.Bold\n let mutable font_lineheight = LineHeightOption.Default\n \n+// ui\n+let mutable ui_available_opts = Set.empty<string>\n+let mutable ui_multigrid = false\n+let mutable ui_popupmenu = false\n+let mutable ui_tabline = false\n+let mutable ui_cmdline = false\n+let mutable ui_wildmenu = false\n+let mutable ui_messages = false\n+let mutable ui_termcolors = false\n+let mutable ui_hlstate = false\n+\n+[<Literal>]\n+let uiopt_rgb = \"rgb\"\n+[<Literal>]\n+let uiopt_ext_linegrid = \"ext_linegrid\"\n+[<Literal>]\n+let uiopt_ext_multigrid = \"ext_multigrid\"\n+[<Literal>]\n+let uiopt_ext_popupmenu = \"ext_popupmenu\"\n+[<Literal>]\n+let uiopt_ext_tabline = \"ext_tabline\"\n+[<Literal>]\n+let uiopt_ext_cmdline = \"ext_cmdline\"\n+[<Literal>]\n+let uiopt_ext_wildmenu = \"ext_wildmenu\"\n+[<Literal>]\n+let uiopt_ext_messages = \"ext_messages\"\n+[<Literal>]\n+let uiopt_ext_hlstate = \"ext_hlstate\"\n+[<Literal>]\n+let uiopt_ext_termcolors = \"ext_termcolors\"\n+\n+/// !Note does not include rgb and ext_linegrid\n+let PopulateUIOptions (opts: hashmap<_,_>) =\n+ let c k v = \n+ if ui_available_opts.Contains k then\n+ opts.[k] <- v\n+ c uiopt_ext_popupmenu ui_popupmenu\n+ c uiopt_ext_multigrid ui_multigrid\n+ c uiopt_ext_tabline ui_tabline\n+ c uiopt_ext_cmdline ui_cmdline\n+ c uiopt_ext_wildmenu ui_wildmenu\n+ c uiopt_ext_messages ui_messages\n+ c uiopt_ext_hlstate ui_hlstate\n+ c uiopt_ext_termcolors ui_termcolors\n+\n module private Helper =\n type Foo = A\n let _StatesModuleType = typeof<Foo>.DeclaringType.DeclaringType\n let SetProp name v =\n- trace \"states\" \"module name = %s\" _StatesModuleType.FullName\n let propDesc = _StatesModuleType.GetProperty(name, BindingFlags.Static ||| BindingFlags.Public ||| BindingFlags.NonPublic)\n if propDesc <> null then\n propDesc.SetValue(null, v)\n else\n error \"states\" \"The property %s is not found\" name\n let GetProp name =\n- trace \"states\" \"module name = %s\" _StatesModuleType.FullName\n let propDesc = _StatesModuleType.GetProperty(name, BindingFlags.Static ||| BindingFlags.Public ||| BindingFlags.NonPublic)\n if propDesc <> null then\n Some <| propDesc.GetValue(null)\n@@ -160,9 +207,9 @@ module Register =\n try fn objs\n with x -> error \"Notify\" \"exception thrown: %A\" <| x.ToString())\n \n- let Watch name fn =\n+ let Watch (name: string) fn =\n _stateChangeEvent.Publish\n- |> Observable.filter (fun x -> x = name)\n+ |> Observable.filter (fun x -> x.StartsWith(name))\n |> Observable.subscribe (fun _ -> fn())\n \n let Prop<'T> (parser: obj -> 'T option) (fullname: string) =\n@@ -174,7 +221,7 @@ module Register =\n match parser(v) with\n | Some v -> \n Helper.SetProp fieldName v\n- _stateChangeEvent.Trigger section\n+ _stateChangeEvent.Trigger fullname\n | None -> ()\n | _ -> ())\n |> ignore\n"},"changed_files":{"kind":"list like","value":["Assets/intellisense/Class_16x.png","Assets/intellisense/ColorPalette_16x.png","Assets/intellisense/Constant_16x.png","Assets/intellisense/Dimension_16x.png","Assets/intellisense/EnumItem_16x.png","Assets/intellisense/Enumerator_16x.png","Assets/intellisense/Event_16x.png","Assets/intellisense/Field_16x.png","Assets/intellisense/Folder_16x.png","Assets/intellisense/IntelliSenseKeyword_16x.png","Assets/intellisense/Interface_16x.png","Assets/intellisense/Literal_16x.png","Assets/intellisense/LocalVariable_16x.png","Assets/intellisense/Method_16x.png","Assets/intellisense/Module_16x.png","Assets/intellisense/NewClass_16x.png","Assets/intellisense/Operator_16x.png","Assets/intellisense/Property_16x.png","Assets/intellisense/Reference_16x.png","Assets/intellisense/Snippet_16x.png","Assets/intellisense/Structure_16x.png","Assets/intellisense/TextFile_16x.png","Assets/intellisense/Text_16x.png","Assets/intellisense/Type_16x.png","README.md","ViewModels/CompletionItemViewModel.fs","ViewModels/EditorViewModel.fs","ViewModels/PopupMenuViewModel.fs","Views/CompletionItem.xaml","Views/CompletionItem.xaml.fs","Views/Editor.xaml","Views/Editor.xaml.fs","Views/PopupMenu.xaml","Views/PopupMenu.xaml.fs","Views/ViewBase.fs","common.fs","convert-vsicons.ps1","fvim.fsproj","icons-intellisense/Class_16x.svg","icons-intellisense/ColorPalette_16x.svg","icons-intellisense/Constant_16x.svg","icons-intellisense/Dimension_16x.svg","icons-intellisense/EnumItem_16x.svg","icons-intellisense/Enumerator_16x.svg","icons-intellisense/Event_16x.svg","icons-intellisense/Field_16x.svg","icons-intellisense/Folder_16x.svg","icons-intellisense/IntelliSenseKeyword_16x.svg","icons-intellisense/Interface_16x.svg","icons-intellisense/Literal_16x.svg","icons-intellisense/LocalVariable_16x.svg","icons-intellisense/Method_16x.svg","icons-intellisense/Module_16x.svg","icons-intellisense/NewClass_16x.svg","icons-intellisense/Operator_16x.svg","icons-intellisense/Property_16x.svg","icons-intellisense/Reference_16x.svg","icons-intellisense/Snippet_16x.svg","icons-intellisense/Structure_16x.svg","icons-intellisense/TextFile_16x.svg","icons-intellisense/Text_16x.svg","icons-intellisense/Type_16x.svg","neovim/neovim.def.fs","neovim/neovim.model.fs","neovim/neovim.process.fs","states.fs"],"string":"[\n \"Assets/intellisense/Class_16x.png\",\n \"Assets/intellisense/ColorPalette_16x.png\",\n \"Assets/intellisense/Constant_16x.png\",\n \"Assets/intellisense/Dimension_16x.png\",\n \"Assets/intellisense/EnumItem_16x.png\",\n \"Assets/intellisense/Enumerator_16x.png\",\n \"Assets/intellisense/Event_16x.png\",\n \"Assets/intellisense/Field_16x.png\",\n \"Assets/intellisense/Folder_16x.png\",\n \"Assets/intellisense/IntelliSenseKeyword_16x.png\",\n \"Assets/intellisense/Interface_16x.png\",\n \"Assets/intellisense/Literal_16x.png\",\n \"Assets/intellisense/LocalVariable_16x.png\",\n \"Assets/intellisense/Method_16x.png\",\n \"Assets/intellisense/Module_16x.png\",\n \"Assets/intellisense/NewClass_16x.png\",\n \"Assets/intellisense/Operator_16x.png\",\n \"Assets/intellisense/Property_16x.png\",\n \"Assets/intellisense/Reference_16x.png\",\n \"Assets/intellisense/Snippet_16x.png\",\n \"Assets/intellisense/Structure_16x.png\",\n \"Assets/intellisense/TextFile_16x.png\",\n \"Assets/intellisense/Text_16x.png\",\n \"Assets/intellisense/Type_16x.png\",\n \"README.md\",\n \"ViewModels/CompletionItemViewModel.fs\",\n \"ViewModels/EditorViewModel.fs\",\n \"ViewModels/PopupMenuViewModel.fs\",\n \"Views/CompletionItem.xaml\",\n \"Views/CompletionItem.xaml.fs\",\n \"Views/Editor.xaml\",\n \"Views/Editor.xaml.fs\",\n \"Views/PopupMenu.xaml\",\n \"Views/PopupMenu.xaml.fs\",\n \"Views/ViewBase.fs\",\n \"common.fs\",\n \"convert-vsicons.ps1\",\n \"fvim.fsproj\",\n \"icons-intellisense/Class_16x.svg\",\n \"icons-intellisense/ColorPalette_16x.svg\",\n \"icons-intellisense/Constant_16x.svg\",\n \"icons-intellisense/Dimension_16x.svg\",\n \"icons-intellisense/EnumItem_16x.svg\",\n \"icons-intellisense/Enumerator_16x.svg\",\n \"icons-intellisense/Event_16x.svg\",\n \"icons-intellisense/Field_16x.svg\",\n \"icons-intellisense/Folder_16x.svg\",\n \"icons-intellisense/IntelliSenseKeyword_16x.svg\",\n \"icons-intellisense/Interface_16x.svg\",\n \"icons-intellisense/Literal_16x.svg\",\n \"icons-intellisense/LocalVariable_16x.svg\",\n \"icons-intellisense/Method_16x.svg\",\n \"icons-intellisense/Module_16x.svg\",\n \"icons-intellisense/NewClass_16x.svg\",\n \"icons-intellisense/Operator_16x.svg\",\n \"icons-intellisense/Property_16x.svg\",\n \"icons-intellisense/Reference_16x.svg\",\n \"icons-intellisense/Snippet_16x.svg\",\n \"icons-intellisense/Structure_16x.svg\",\n \"icons-intellisense/TextFile_16x.svg\",\n \"icons-intellisense/Text_16x.svg\",\n \"icons-intellisense/Type_16x.svg\",\n \"neovim/neovim.def.fs\",\n \"neovim/neovim.model.fs\",\n \"neovim/neovim.process.fs\",\n \"states.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86279,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":49,"string":"49"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"workaround #48"},"pr_body":{"kind":"string","value":""},"base_sha":{"kind":"string","value":"0324dec7a72bf4f44723cdfd306cde42d0a5da09"},"head_sha":{"kind":"string","value":"e465da6d6d98883712e248788184666cee5b07ef"},"gold_diff":{"kind":"string","value":"diff --git a/neovim/neovim.model.fs b/neovim/neovim.model.fs\nindex 00b769d..9aa06d7 100644\n--- a/neovim/neovim.model.fs\n+++ b/neovim/neovim.model.fs\n@@ -258,6 +258,7 @@ module ModelImpl =\n match x with\n | ImeEvent -> _imeArmed <- true\n | TextInput _ -> ()\n+ | Unrecognized -> _imeArmed <- true\n | _ -> _imeArmed <- false\n // TODO anything that cancels ime input state?\n \n"},"changed_files":{"kind":"list like","value":["neovim/neovim.model.fs"],"string":"[\n \"neovim/neovim.model.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86280,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":17,"string":"17"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Avalonia nightly"},"pr_body":{"kind":"string","value":""},"base_sha":{"kind":"string","value":"f322303fe1300e88c08c4ce63ecc1cad7f7d8d85"},"head_sha":{"kind":"string","value":"fbaa0699d7a20f007ba2bd0343cd541a7bddd6e9"},"gold_diff":{"kind":"string","value":"diff --git a/Program.fs b/Program.fs\nindex 4a86e39..f54683f 100644\n--- a/Program.fs\n+++ b/Program.fs\n@@ -4,6 +4,7 @@ open Avalonia\n open Avalonia.Logging.Serilog\n open System.Reflection\n open FSharp.Data\n+open Avalonia.ReactiveUI\n \n module Program =\n \n@@ -18,12 +19,11 @@ module Program =\n AppBuilder\n .Configure<App>()\n .UsePlatformDetect()\n- .UseSkia()\n+ .UseReactiveUI()\n .With(new Win32PlatformOptions(UseDeferredRendering=false, AllowEglInitialization=true))\n .With(new AvaloniaNativePlatformOptions(UseDeferredRendering=false, UseGpu=true))\n .With(new X11PlatformOptions(UseEGL=true, UseGpu=true))\n .With(new MacOSPlatformOptions(ShowInDock=true))\n- .UseReactiveUI()\n .LogToDebug()\n \n // Your application's entry point.\n@@ -37,7 +37,7 @@ module Program =\n let cwd = Environment.CurrentDirectory |> Path.GetFullPath\n let workspace = cfg.Workspace |> Array.tryFind(fun w -> w.Path = cwd)\n let mainwin = new MainWindowViewModel(workspace)\n- app.Run(MainWindow(DataContext = mainwin))\n+ app.Run(MainWindow(DataContext = mainwin)) |> ignore\n config.save cfg mainwin.WindowX mainwin.WindowY mainwin.WindowWidth mainwin.WindowHeight mainwin.WindowState\n \n \ndiff --git a/ViewModels/EditorViewModel.fs b/ViewModels/EditorViewModel.fs\nindex e974774..8b70fcb 100644\n--- a/ViewModels/EditorViewModel.fs\n+++ b/ViewModels/EditorViewModel.fs\n@@ -6,6 +6,7 @@ open wcwidth\n open neovim.def\n open neovim.rpc\n \n+open ReactiveUI\n open Avalonia\n open Avalonia.Input\n open Avalonia.Media\n@@ -14,7 +15,6 @@ open Avalonia.Platform\n open Avalonia.Threading\n open Avalonia.Skia\n open FSharp.Control.Reactive\n-open ReactiveUI\n \n open System\n open System.Collections.ObjectModel\ndiff --git a/Views/Cursor.xaml b/Views/Cursor.xaml\nindex dd6d30c..2f349ef 100644\n--- a/Views/Cursor.xaml\n+++ b/Views/Cursor.xaml\n@@ -1,8 +1,8 @@\n-<Control xmlns=\"https://github.com/avaloniaui\"\n+<UserControl xmlns=\"https://github.com/avaloniaui\"\n xmlns:x=\"http://schemas.microsoft.com/winfx/2006/xaml\"\n xmlns:d=\"http://schemas.microsoft.com/expression/blend/2008\"\n xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\"\n xmlns:fvim=\"clr-namespace:FVim;assembly=FVim\"\n Focusable=\"False\"\n x:Class=\"FVim.Cursor\">\n-</Control>\n+</UserControl>\ndiff --git a/Views/Cursor.xaml.fs b/Views/Cursor.xaml.fs\nindex 72f72e6..d7446c9 100644\n--- a/Views/Cursor.xaml.fs\n+++ b/Views/Cursor.xaml.fs\n@@ -4,6 +4,7 @@ open neovim.def\n open neovim.rpc\n open log\n \n+open ReactiveUI\n open Avalonia\n open Avalonia.Animation\n open Avalonia.Controls\n@@ -14,7 +15,6 @@ open Avalonia.Media.Imaging\n open Avalonia.Skia\n open Avalonia.Threading\n open Avalonia.VisualTree\n-open ReactiveUI\n open SkiaSharp\n open System\n open System.Collections.Generic\n@@ -25,13 +25,12 @@ open Avalonia.Visuals.Media.Imaging\n open System.Runtime.InteropServices\n \n type Cursor() as this =\n- inherit Control()\n-\n+ inherit UserControl()\n // workaround: binding directly to Canvas.Left/Top won't work.\n // so we introduce a proxy DP for x and y.\n- static let PosXProp = AvaloniaProperty.Register<Cursor, float>(\"PosX\")\n- static let PosYProp = AvaloniaProperty.Register<Cursor, float>(\"PosY\")\n- static let RenderTickProp = AvaloniaProperty.Register<Cursor, int>(\"RenderTick\")\n+ static let PosXProperty = AvaloniaProperty.Register<Cursor, float>(\"PosX\")\n+ static let PosYProperty = AvaloniaProperty.Register<Cursor, float>(\"PosY\")\n+ static let RenderTickProperty = AvaloniaProperty.Register<Cursor, int>(\"RenderTick\")\n static let ViewModelProp = AvaloniaProperty.Register<Cursor, CursorViewModel>(\"ViewModel\")\n \n let mutable cursor_timer: IDisposable = null\n@@ -104,11 +103,11 @@ type Cursor() as this =\n transitions.Add(blink_transition)\n if move_en then\n let x_transition = DoubleTransition()\n- x_transition.Property <- PosXProp\n+ x_transition.Property <- PosXProperty\n x_transition.Duration <- TimeSpan.FromMilliseconds(80.0)\n x_transition.Easing <- Easings.CubicEaseOut()\n let y_transition = DoubleTransition()\n- y_transition.Property <- PosYProp\n+ y_transition.Property <- PosYProperty\n y_transition.Duration <- TimeSpan.FromMilliseconds(80.0)\n y_transition.Easing <- Easings.CubicEaseOut()\n transitions.Add(x_transition)\n@@ -123,16 +122,12 @@ type Cursor() as this =\n | [| Bool(blink); Bool(move) |] -> setCursorAnimation blink move\n | _ -> setCursorAnimation false false) \n \n- this.GetObservable(PosXProp).Subscribe(fun x -> this.SetValue(Canvas.LeftProperty, x, BindingPriority.Style))\n- this.GetObservable(PosYProp).Subscribe(fun y -> this.SetValue(Canvas.TopProperty, y, BindingPriority.Style))\n- this.GetObservable(RenderTickProp).Subscribe(cursorConfig)\n+ this.GetObservable(PosXProperty).Subscribe(fun x -> this.SetValue(Canvas.LeftProperty, x, BindingPriority.Style))\n+ this.GetObservable(PosYProperty).Subscribe(fun y -> this.SetValue(Canvas.TopProperty, y, BindingPriority.Style))\n+ this.GetObservable(RenderTickProperty).Subscribe(cursorConfig)\n ] \n AvaloniaXamlLoader.Load(this)\n \n- member this.ViewModel: CursorViewModel = \n- let ctx = this.DataContext \n- if ctx = null then Unchecked.defaultof<_> else ctx :?> CursorViewModel\n-\n override this.Render(ctx) =\n //trace \"cursor\" \"render begin\"\n \n@@ -148,13 +143,14 @@ type Cursor() as this =\n let bounds = Rect(this.Bounds.Size)\n \n try\n- // immediate\n- if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then\n+ match ctx.PlatformImpl with\n+ | :? ISkiaDrawingContextImpl ->\n+ // immediate\n SetOpacity fgpaint this.Opacity\n SetOpacity bgpaint this.Opacity\n SetOpacity sppaint this.Opacity\n RenderText(ctx.PlatformImpl, bounds, fgpaint, bgpaint, sppaint, this.ViewModel.underline, this.ViewModel.undercurl, this.ViewModel.text)\n- else\n+ | _ ->\n // deferred\n let s = this.GetVisualRoot().RenderScaling\n let redraw = ensure_fb()\n@@ -175,7 +171,21 @@ type Cursor() as this =\n let region = Rect(0.0, 0.0, cellw p, this.Height)\n ctx.FillRectangle(SolidColorBrush(this.ViewModel.bg), region)\n \n- //trace \"cursor\" \"render end\"\n+ member this.ViewModel: CursorViewModel = \n+ let ctx = this.DataContext \n+ if ctx = null then Unchecked.defaultof<_> else ctx :?> CursorViewModel\n+\n+ member this.PosX\n+ with get() = this.GetValue(PosXProperty)\n+ and set(v) = this.SetValue(PosXProperty, v)\n+\n+ member this.PosY\n+ with get() = this.GetValue(PosYProperty)\n+ and set(v) = this.SetValue(PosYProperty, v)\n+\n+ member this.RenderTick\n+ with get() = this.GetValue(RenderTickProperty)\n+ and set(v) = this.SetValue(RenderTickProperty, v)\n \n interface IViewFor<CursorViewModel> with\n member this.ViewModel\ndiff --git a/Views/Editor.xaml.fs b/Views/Editor.xaml.fs\nindex 810476b..cb5421a 100644\n--- a/Views/Editor.xaml.fs\n+++ b/Views/Editor.xaml.fs\n@@ -4,6 +4,7 @@ open FVim.ui\n open FVim.log\n open FVim.wcwidth\n \n+open ReactiveUI\n open SkiaSharp\n open Avalonia\n open Avalonia.Controls\n@@ -12,7 +13,6 @@ open Avalonia.Threading\n open Avalonia.Platform\n open Avalonia.Skia\n open Avalonia.Media.Imaging\n-open ReactiveUI\n open Avalonia.VisualTree\n open System.Reactive.Linq\n open System\ndiff --git a/Views/MainWindow.xaml.fs b/Views/MainWindow.xaml.fs\nindex d2b23fa..b7b7b7b 100644\n--- a/Views/MainWindow.xaml.fs\n+++ b/Views/MainWindow.xaml.fs\n@@ -3,13 +3,14 @@\n open neovim.rpc\n open log\n \n+open ReactiveUI\n open Avalonia.Markup.Xaml\n open Avalonia.Controls\n open Avalonia.Input\n open Avalonia.Interactivity\n-open ReactiveUI\n open Avalonia\n open Avalonia.Data\n+open Avalonia.ReactiveUI\n \n type MainWindow() as this =\n inherit ReactiveWindow<MainWindowViewModel>()\ndiff --git a/fvim.fsproj b/fvim.fsproj\nindex b3b4ea2..4942ef4 100644\n--- a/fvim.fsproj\n+++ b/fvim.fsproj\n@@ -5,6 +5,7 @@\n <TargetFramework>netcoreapp2.2</TargetFramework>\n <AssemblyName>FVim</AssemblyName>\n <DefineConstants>TRACE</DefineConstants>\n+ <Prefer32Bit>false</Prefer32Bit>\n </PropertyGroup>\n \n <PropertyGroup>\n@@ -48,21 +49,22 @@\n </ItemGroup>\n \n <ItemGroup>\n- <PackageReference Include=\"Avalonia\" Version=\"0.8.0\" />\n+ <PackageReference Include=\"Avalonia\" Version=\"0.8.1-cibuild0002788-beta\" />\n <PackageReference Include=\"Avalonia.Angle.Windows.Natives\" Version=\"2.1.0.2019013001\" />\n- <PackageReference Include=\"Avalonia.Desktop\" Version=\"0.8.0\" />\n- <PackageReference Include=\"Avalonia.ReactiveUI\" Version=\"0.8.0\" />\n+ <PackageReference Include=\"Avalonia.Desktop\" Version=\"0.8.1-cibuild0002788-beta\" />\n+ <PackageReference Include=\"Avalonia.ReactiveUI\" Version=\"0.8.1-cibuild0002788-beta\" />\n <PackageReference Include=\"FSharp.Control.Reactive\" Version=\"4.2.0\" />\n <PackageReference Include=\"FSharp.Data\" Version=\"3.1.1\" />\n <PackageReference Include=\"GitInfo\" Version=\"2.0.20\">\n <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n <PrivateAssets>all</PrivateAssets>\n </PackageReference>\n- <PackageReference Include=\"MessagePack\" Version=\"1.7.3.4\" />\n+ <PackageReference Include=\"MessagePack\" Version=\"1.7.3.7\" />\n <PackageReference Include=\"NSubsys\" Version=\"1.0.0\">\n <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n <PrivateAssets>all</PrivateAssets>\n </PackageReference>\n+ <PackageReference Include=\"ReactiveUI\" Version=\"9.16.6\" />\n <PackageReference Include=\"TaskBuilder.fs\" Version=\"2.1.0\" />\n <PackageReference Update=\"FSharp.Core\" Version=\"4.6.2\" />\n </ItemGroup>\ndiff --git a/neovim/neovim.model.fs b/neovim/neovim.model.fs\nindex 148703f..17bf68a 100644\n--- a/neovim/neovim.model.fs\n+++ b/neovim/neovim.model.fs\n@@ -65,7 +65,7 @@ module ModelImpl =\n try event.Trigger req.parameters\n with | Failure msg -> error \"rpc\" \"notification trigger [%s] failed: %s\" req.method msg\n | Redraw cmd -> redraw cmd \n- | Exit -> Avalonia.Application.Current.Exit()\n+ | Exit -> Avalonia.Application.Current.Shutdown()\n | _ -> ()\n \n let onGridResize(gridui: IGridUI) =\ndiff --git a/pack.ps1 b/pack.ps1\nindex a7cc8c0..f8f7595 100644\n--- a/pack.ps1\n+++ b/pack.ps1\n@@ -2,6 +2,10 @@ $plat = \"win7-x64\",\"win-x64\",\"linux-x64\",\"osx-x64\"\n \n New-Item -ItemType Directory -Force -Name publish\n Remove-Item publish\\*\n+Invoke-Command { \n+ nuget sources remove -Name \"Avalonia Nightly\"\n+ nuget sources add -Name \"Avalonia Nightly\" -Source \"https://www.myget.org/F/avalonia-ci/api/v2\" -NonInteractive \n+} -ErrorAction SilentlyContinue\n \n foreach($i in $plat) {\n dotnet publish -f netcoreapp2.2 -c Release --self-contained -r $i\ndiff --git a/ui.fs b/ui.fs\nindex db1782d..35218ca 100644\n--- a/ui.fs\n+++ b/ui.fs\n@@ -2,6 +2,7 @@\n \n open wcwidth\n \n+open ReactiveUI\n open Avalonia\n open Avalonia.Controls\n open Avalonia.Controls.Templates\n@@ -10,7 +11,6 @@ open Avalonia.Media\n open Avalonia.Media.Imaging\n open Avalonia.Platform\n open Avalonia.Skia\n-open ReactiveUI\n open SkiaSharp\n open System\n open System.Reactive.Disposables\n@@ -38,7 +38,7 @@ type ActivatableExt() =\n \n type ViewModelBase() =\n inherit ReactiveObject()\n- let activator = ViewModelActivator()\n+ let activator = new ViewModelActivator()\n interface ISupportsActivation with\n member __.Activator = activator\n \n@@ -226,14 +226,14 @@ module ui =\n let baseline = region.Y - float fg.FontMetrics.Top + (total_padding / 2.8)\n let fontPos = Point(region.X, floor baseline)\n \n- let skia = ctx :?> DrawingContextImpl\n+ let skia = ctx :?> ISkiaDrawingContextImpl\n \n //lol wat??\n //fg.Shader <- SKShader.CreateCompose(SKShader.CreateColor(fg.Color), SKShader.CreatePerlinNoiseFractalNoise(0.1F, 0.1F, 1, 6.41613F))\n \n- skia.Canvas.DrawRect(region.ToSKRect(), bg)\n+ skia.SkCanvas.DrawRect(region.ToSKRect(), bg)\n if not <| String.IsNullOrWhiteSpace text then\n- skia.Canvas.DrawText(text.TrimEnd(), fontPos.ToSKPoint(), fg)\n+ skia.SkCanvas.DrawText(text.TrimEnd(), fontPos.ToSKPoint(), fg)\n \n // Text bounding box drawing:\n // --------------------------------------------------\n@@ -246,7 +246,7 @@ module ui =\n bounds.Right <- bounds.Right + single (fontPos.X)\n bounds.Bottom <- bounds.Bottom + single (fontPos.Y)\n fg.Style <- SKPaintStyle.Stroke\n- skia.Canvas.DrawRect(bounds, fg)\n+ skia.SkCanvas.DrawRect(bounds, fg)\n // --------------------------------------------------\n \n let sp_thickness = fg.FontMetrics.UnderlineThickness.GetValueOrDefault(1.0F)\n@@ -257,7 +257,7 @@ module ui =\n let p2 = p1 + Point(region.Width, 0.0)\n sp.Style <- SKPaintStyle.Stroke\n //sppaint.StrokeWidth <- sp_thickness\n- skia.Canvas.DrawLine(p1.ToSKPoint(), p2.ToSKPoint(), sp)\n+ skia.SkCanvas.DrawLine(p1.ToSKPoint(), p2.ToSKPoint(), sp)\n \n if undercurl then\n let underline_pos = fg.FontMetrics.UnderlinePosition.GetValueOrDefault()\n@@ -280,4 +280,4 @@ module ui =\n path.LineTo(px + hf, py)\n path.LineTo(px + q3f, py2)\n px <- px + ff\n- skia.Canvas.DrawPath(path , sp)\n+ skia.SkCanvas.DrawPath(path , sp)\n"},"changed_files":{"kind":"list like","value":["Program.fs","ViewModels/EditorViewModel.fs","Views/Cursor.xaml","Views/Cursor.xaml.fs","Views/Editor.xaml.fs","Views/MainWindow.xaml.fs","fvim.fsproj","neovim/neovim.model.fs","pack.ps1","ui.fs"],"string":"[\n \"Program.fs\",\n \"ViewModels/EditorViewModel.fs\",\n \"Views/Cursor.xaml\",\n \"Views/Cursor.xaml.fs\",\n \"Views/Editor.xaml.fs\",\n \"Views/MainWindow.xaml.fs\",\n \"fvim.fsproj\",\n \"neovim/neovim.model.fs\",\n \"pack.ps1\",\n \"ui.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86281,"cells":{"repo":{"kind":"string","value":"yatli/fvim"},"pr_number":{"kind":"number","value":13,"string":"13"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Changed default font weight to Normal, and made <C-l> not special"},"pr_body":{"kind":"string","value":"The way that <C-l> is handled is kinda brute, I guess a better solution could be send the key combinations through after they were handled as special inputs."},"base_sha":{"kind":"string","value":"03c43af3da2095f5477484facae2e50aa1df3821"},"head_sha":{"kind":"string","value":"9872196d07887a7f68696f8737733cca10178117"},"gold_diff":{"kind":"string","value":"diff --git a/ViewModels/EditorViewModel.fs b/ViewModels/EditorViewModel.fs\nindex a698f2f..3a54def 100644\n--- a/ViewModels/EditorViewModel.fs\n+++ b/ViewModels/EditorViewModel.fs\n@@ -98,7 +98,7 @@ and EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize,\n | None -> Array.empty<ModeInfo>\n | Some arr -> arr.Clone() :?> ModeInfo[]\n \n- let mutable _guifont = _d \"Iosevka Slab\" _guifont\n+ let mutable _guifont = _d \"IosevkaCC\" _guifont\n let mutable _guifontwide = _d \"DengXian\" _guifontwide\n \n let mutable font_size = _d 16.0 _fontsize\ndiff --git a/fvim.fsproj.user b/fvim.fsproj.user\nindex fe8d580..d930741 100644\n--- a/fvim.fsproj.user\n+++ b/fvim.fsproj.user\n@@ -1,6 +1,6 @@\n <?xml version=\"1.0\" encoding=\"utf-8\"?>\n <Project ToolsVersion=\"15.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n <PropertyGroup>\n- <_LastSelectedProfileId>C:\\Users\\Yatao\\git\\fvim\\Properties\\PublishProfiles\\FolderProfile.pubxml</_LastSelectedProfileId>\n+ <_LastSelectedProfileId>C:\\Users\\sean.shang\\Programmes\\fvim\\Properties\\PublishProfiles\\FolderProfile.pubxml</_LastSelectedProfileId>\n </PropertyGroup>\n </Project>\n\\ No newline at end of file\ndiff --git a/neovim/neovim.model.fs b/neovim/neovim.model.fs\nindex a1cedad..19f2f26 100644\n--- a/neovim/neovim.model.fs\n+++ b/neovim/neovim.model.fs\n@@ -154,7 +154,7 @@ module ModelImpl =\n | Key(HasFlag(InputModifiers.Control), Key.I) -> Special \"Tab\"\n | Key(_, Key.LineFeed)\n | Key(HasFlag(InputModifiers.Control), Key.J) -> Special \"NL\"\n- | Key(HasFlag(InputModifiers.Control), Key.L) -> Special \"FF\"\n+ //| Key(HasFlag(InputModifiers.Control), Key.L) -> Special \"FF\"\n | Key(_, Key.Return)\n | Key(HasFlag(InputModifiers.Control), Key.M) -> Special \"CR\"\n | Key(_, Key.Escape)\n@@ -239,7 +239,7 @@ module ModelImpl =\n | Key.D4 | Key.D5 | Key.D6 | Key.D7 \n | Key.D8 | Key.D9)) -> \n (|ModifiersPrefix|_|) <| InputEvent.Key(m &&& (~~~InputModifiers.Shift), x)\n- | Key(m & HasFlag(InputModifiers.Control), x & (Key.H | Key.I | Key.J | Key.L | Key.M)) ->\n+ | Key(m & HasFlag(InputModifiers.Control), x & (Key.H | Key.I | Key.J | Key.M)) ->\n (|ModifiersPrefix|_|) <| InputEvent.Key(m &&& (~~~InputModifiers.Control), x)\n | Key(m, _)\n | MousePress(m, _, _, _, _) \ndiff --git a/ui.fs b/ui.fs\nindex 966c518..aad6c3d 100644\n--- a/ui.fs\n+++ b/ui.fs\n@@ -91,7 +91,7 @@ module ui =\n match fontcache.TryGetValue((fname, italic, bold)) with\n | true, typeface -> typeface\n | _ ->\n- let weight = if bold then SKFontStyleWeight.Medium else SKFontStyleWeight.Thin\n+ let weight = if bold then SKFontStyleWeight.Medium else SKFontStyleWeight.Normal\n let width = SKFontStyleWidth.Normal\n let slang = if italic then SKFontStyleSlant.Italic else SKFontStyleSlant.Upright\n let typeface = SKTypeface.FromFamilyName(fname, weight, width, slang)\n"},"changed_files":{"kind":"list like","value":["ViewModels/EditorViewModel.fs","fvim.fsproj.user","neovim/neovim.model.fs","ui.fs"],"string":"[\n \"ViewModels/EditorViewModel.fs\",\n \"fvim.fsproj.user\",\n \"neovim/neovim.model.fs\",\n \"ui.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86282,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4167,"string":"4,167"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":"kill version-sensitive URL/version maintenance with a build-time placeholder plugin\n\n## Problem\n\nThe getting-started and tutorial pages (and other docs) hard-code the **yew version** in\nseveral spots that must be hand-updated on every release and are easy to miss:\n\n1. **docs.rs API links** pinned to a version. e.g. `https://docs.rs/yew/0.23.0/yew/suspense/fn.use_future.html`,\n `https://docs.rs/yew/0.20.0/yew/functional/index.html`. Recently added by #4141 \n2. **Cargo.toml dependency versions**. e.g. `yew = { version = \"0.23\", features = [\"csr\"] }`.\n Patch usage is already inconsistent across snapshots (`0.20.0` vs `0.22` vs `0.23`).\n3. **Divergent URL schemes** between `next` and released docs.`next` links to the preview API\n site `https://yew-rs-api.web.app/next/yew/functional/`, releases link to `docs.rs/yew/<version>/`.\n\nWhy this is a recurring burden: docs are **versioned** (`docs/` = next, `versioned_docs/version-X/` =\nfrozen snapshots) **and translated** (ja, zh-Hans, zh-Hant). When `docusaurus docs:version 0.24`\nsnapshots `docs/`, whatever version strings/URLs are in `next` freeze into the new snapshot. So\nhard-coded values:\n\n- in `next` go stale the moment a newer version becomes \"latest\";\n- in a snapshot are right only if someone remembered to fix them just before cutting it;\n- multiply across 4 locales.\n\nThe result, when overlooked, is docs that tell users to depend on an old version or that link to the\nwrong version's API reference.\n\n## Proposed solution: a remark plugin with version placeholders\n\nAdd a small **build-time remark plugin** that expands placeholder tokens to the version the page\ndocuments, **derived from the page's own file path**. Authors write the placeholder once; every\ncurrent and future snapshot (and its translations) resolves it correctly with no manual edits.\n\nTokens:\n\n- `{{yew_version}}` → version for Cargo.toml/prose (`0.23` on the 0.23 docs; latest release on `next`).\n- `{{yew_docs_version}}` → docs.rs path segment (`latest` on `next`, the version on snapshots).\n\nUsage:\n\n````md\n```toml title=\"Cargo.toml\"\nyew = { version = \"{{yew_version}}\", features = [\"csr\"] }\n```\n\n[Yew API docs](https://docs.rs/yew/{{yew_docs_version}}/yew/suspense/fn.use_future.html)\n````\n\nWhy a remark plugin (vs MDX/React components or `siteConfig.customFields`):\n\n- **Works inside fenced code blocks** (```toml) where most version pins live and which\n MDX/`<CodeBlock>` interpolation can't touch cleanly.\n- **Per-version**: derived from the path, so the 0.22 and 0.23 snapshots resolve differently;\n `customFields` is global and can't.\n- **Build-time**, no client JS / runtime hooks.\n- **Survives `docusaurus docs:version`**: the token is copied verbatim into the snapshot and resolves\n from the snapshot's path — this is the actual maintenance win.\n- **Incremental & safe**: only explicit `{{…}}` tokens are rewritten; existing content is untouched,\n so pages convert over time."},"pr_title":{"kind":"string","value":"chore(website): version-aware docs URLs via remark plugin"},"pr_body":{"kind":"string","value":"Resolves #4166 \r\n"},"base_sha":{"kind":"string","value":"47d4082d301d495c3c97fc9ed5cb18ffffaa3198"},"head_sha":{"kind":"string","value":"e9287308554c11e1615c3ce650da1f8d3294b10b"},"gold_diff":{"kind":"string","value":"diff --git a/website/docs/concepts/function-components/hooks/introduction.mdx b/website/docs/concepts/function-components/hooks/introduction.mdx\nindex 240dd02b8c8..636e7073f3a 100644\n--- a/website/docs/concepts/function-components/hooks/introduction.mdx\n+++ b/website/docs/concepts/function-components/hooks/introduction.mdx\n@@ -39,7 +39,7 @@ Yew comes with the following predefined Hooks:\n - `use_context`\n - `use_force_update`\n \n-The documentation for these hooks can be found in the [Yew API docs](https://yew-rs-api.web.app/next/yew/functional/)\n+The documentation for these hooks can be found in the [Yew API docs]({{yew_api}}functional/)\n \n ### Custom Hooks\n \ndiff --git a/website/docs/getting-started/build-a-sample-app.mdx b/website/docs/getting-started/build-a-sample-app.mdx\nindex 6fd85fe640c..5efc3389736 100644\n--- a/website/docs/getting-started/build-a-sample-app.mdx\n+++ b/website/docs/getting-started/build-a-sample-app.mdx\n@@ -69,7 +69,7 @@ version = \"0.1.0\"\n edition = \"2021\"\n \n [dependencies]\n-yew = { git = \"https://github.com/yewstack/yew/\", features = [\"csr\"] }\n+yew = { {{yew_dependency}}, features = [\"csr\"] }\n ```\n \n :::info\ndiff --git a/website/docusaurus.config.js b/website/docusaurus.config.js\nindex 04028b130f8..b9176b3dac2 100644\n--- a/website/docusaurus.config.js\n+++ b/website/docusaurus.config.js\n@@ -1,5 +1,6 @@\n const { API_BUTTON } = require('./src/constants')\n const rustDocHiddenLines = require('./src/remark/rustDocHiddenLines')\n+const yewVersionUrls = require('./src/remark/yewVersionUrls')\n \n const editUrl = 'https://github.com/yewstack/yew/blob/master/website/'\n \n@@ -170,7 +171,7 @@ module.exports = {\n sidebarPath: require.resolve('./sidebars/docs.js'),\n editUrl,\n routeBasePath: '/docs',\n- remarkPlugins: [rustDocHiddenLines],\n+ remarkPlugins: [rustDocHiddenLines, yewVersionUrls],\n },\n blog: {\n path: 'blog',\ndiff --git a/website/src/remark/yewVersionUrls.core.js b/website/src/remark/yewVersionUrls.core.js\nnew file mode 100644\nindex 00000000000..6472be8ee23\n--- /dev/null\n+++ b/website/src/remark/yewVersionUrls.core.js\n@@ -0,0 +1,82 @@\n+// Pure, dependency-free helpers for the `yewVersionUrls` remark plugin.\n+//\n+// Kept separate from the remark wrapper so the interesting logic (deriving the\n+// documented version from a file path and expanding tokens) can be unit-tested\n+// with plain `node`, without pulling in the unified/unist toolchain.\n+\n+// The `next` docs document the unreleased API, so they get the git dependency\n+// and the preview rustdoc host instead of a released version on docs.rs.\n+const GIT_DEPENDENCY = 'git = \"https://github.com/yewstack/yew/\"'\n+const PREVIEW_API_BASE = 'https://yew-rs-api.web.app/next/yew/'\n+\n+/**\n+ * Determine what a docs source file documents, based on its path.\n+ *\n+ * - `website/docs/**` -> \"next\" (unreleased)\n+ * - `website/versioned_docs/version-X/**` -> X\n+ * - `website/i18n/<l>/...content-docs/current/**` -> \"next\"\n+ * - `website/i18n/<l>/...content-docs/version-X/**` -> X\n+ *\n+ * @param {string} filePath absolute or relative path to the .md(x) source\n+ * @param {string[]} versions contents of versions.json, newest first\n+ * @returns {{ version: string, isNext: boolean, display: string, dependency: string, api: string }}\n+ * - `display` : version string for prose (e.g. \"0.23\"; latest release on next)\n+ * - `dependency`: Cargo.toml specifier (`git = \"…\"` on next, else `version = \"X\"`)\n+ * - `api` : rustdoc base URL for the `yew` crate, ending in `/yew/`\n+ * (preview host on next, `docs.rs/yew/X/yew/` on snapshots)\n+ */\n+function versionContextFromPath(filePath, versions) {\n+ const latest = versions[0]\n+ const norm = String(filePath).replace(/\\\\/g, '/')\n+ // Matches both `versioned_docs/version-0.23/…` and the i18n equivalent\n+ // `…/docusaurus-plugin-content-docs/version-0.23/…`.\n+ const m = norm.match(/(?:^|\\/)version-(\\d+\\.\\d+(?:\\.\\d+)?)(?:\\/|$)/)\n+ if (m) {\n+ const v = m[1]\n+ return {\n+ version: v,\n+ isNext: false,\n+ display: v,\n+ dependency: `version = \"${v}\"`,\n+ api: `https://docs.rs/yew/${v}/yew/`,\n+ }\n+ }\n+ // `docs/…` (next) or the i18n `…/current/…` mirror.\n+ return {\n+ version: latest,\n+ isNext: true,\n+ display: latest,\n+ dependency: GIT_DEPENDENCY,\n+ api: PREVIEW_API_BASE,\n+ }\n+}\n+\n+// Tokens authors write in the docs. Each resolves from the page's version ctx.\n+const TOKENS = {\n+ // Cargo.toml: `yew = { {{yew_dependency}}, features = [\"csr\"] }`\n+ '{{yew_dependency}}': (ctx) => ctx.dependency,\n+ // Links: `[use_future]({{yew_api}}suspense/fn.use_future.html)`\n+ '{{yew_api}}': (ctx) => ctx.api,\n+ // Prose: `targets Yew {{yew_version}}`\n+ '{{yew_version}}': (ctx) => ctx.display,\n+}\n+\n+/** Replace every known yew token in `value` using `ctx`. */\n+function applyTokens(value, ctx) {\n+ if (typeof value !== 'string' || value.indexOf('{{yew') === -1) return value\n+ let out = value\n+ for (const token of Object.keys(TOKENS)) {\n+ if (out.indexOf(token) !== -1) {\n+ out = out.split(token).join(TOKENS[token](ctx))\n+ }\n+ }\n+ return out\n+}\n+\n+module.exports = {\n+ versionContextFromPath,\n+ applyTokens,\n+ TOKENS,\n+ GIT_DEPENDENCY,\n+ PREVIEW_API_BASE,\n+}\ndiff --git a/website/src/remark/yewVersionUrls.js b/website/src/remark/yewVersionUrls.js\nnew file mode 100644\nindex 00000000000..e0689f08111\n--- /dev/null\n+++ b/website/src/remark/yewVersionUrls.js\n@@ -0,0 +1,40 @@\n+const { visit } = require('unist-util-visit')\n+const { versionContextFromPath, applyTokens } = require('./yewVersionUrls.core')\n+\n+// versions.json lives at the website root (../../ relative to src/remark).\n+const versions = require('../../versions.json')\n+\n+/**\n+ * Remark plugin: expand `{{yew_dependency}}`, `{{yew_api}}` and `{{yew_version}}`\n+ * placeholders to what the current docs page documents.\n+ *\n+ * `next` resolves to the git dependency and the preview rustdoc host (it documents\n+ * the unreleased API); a `version-X` snapshot resolves to `version = \"X\"` and\n+ * `docs.rs/yew/X`. Because each token is resolved from the page's own path at\n+ * build time, the snapshots created by `docusaurus docs:version` (and their\n+ * translations) keep resolving correctly with no manual edits — which is exactly\n+ * the maintenance burden this removes.\n+ *\n+ * Substitution is applied to text, inline code, fenced code blocks and link /\n+ * image URLs, so it works inside ```toml blocks (untouched by MDX interpolation)\n+ * as well as in prose links.\n+ */\n+function yewVersionUrls() {\n+ return (tree, file) => {\n+ const ctx = versionContextFromPath(\n+ file.path || (file.history && file.history[0]) || '',\n+ versions\n+ )\n+\n+ visit(tree, (node) => {\n+ if (typeof node.value === 'string') {\n+ node.value = applyTokens(node.value, ctx) // text, code, inlineCode\n+ }\n+ if (typeof node.url === 'string') {\n+ node.url = applyTokens(node.url, ctx) // link, image, definition\n+ }\n+ })\n+ }\n+}\n+\n+module.exports = yewVersionUrls\ndiff --git a/website/versioned_docs/version-0.20/concepts/function-components/hooks/introduction.mdx b/website/versioned_docs/version-0.20/concepts/function-components/hooks/introduction.mdx\nindex e10416f639c..11555e474d8 100644\n--- a/website/versioned_docs/version-0.20/concepts/function-components/hooks/introduction.mdx\n+++ b/website/versioned_docs/version-0.20/concepts/function-components/hooks/introduction.mdx\n@@ -38,7 +38,7 @@ Yew comes with the following predefined Hooks:\n - `use_context`\n - `use_force_update`\n \n-The documentation for these hooks can be found in the [Yew API docs](https://docs.rs/yew/0.20.0/yew/functional/index.html)\n+The documentation for these hooks can be found in the [Yew API docs]({{yew_api}}functional/)\n \n ### Custom Hooks\n \ndiff --git a/website/versioned_docs/version-0.20/getting-started/build-a-sample-app.mdx b/website/versioned_docs/version-0.20/getting-started/build-a-sample-app.mdx\nindex a43768c1990..ceb0c3691de 100644\n--- a/website/versioned_docs/version-0.20/getting-started/build-a-sample-app.mdx\n+++ b/website/versioned_docs/version-0.20/getting-started/build-a-sample-app.mdx\n@@ -61,7 +61,7 @@ version = \"0.1.0\"\n edition = \"2021\"\n \n [dependencies]\n-yew = { version = \"0.20.0\", features = [\"csr\"] }\n+yew = { {{yew_dependency}}, features = [\"csr\"] }\n ```\n \n or using `cargo add yew -F csr`.\ndiff --git a/website/versioned_docs/version-0.21/concepts/function-components/hooks/introduction.mdx b/website/versioned_docs/version-0.21/concepts/function-components/hooks/introduction.mdx\nindex 7202a09bf5b..f098bc454f6 100644\n--- a/website/versioned_docs/version-0.21/concepts/function-components/hooks/introduction.mdx\n+++ b/website/versioned_docs/version-0.21/concepts/function-components/hooks/introduction.mdx\n@@ -38,7 +38,7 @@ Yew comes with the following predefined Hooks:\n - `use_context`\n - `use_force_update`\n \n-The documentation for these hooks can be found in the [Yew API docs](https://yew-rs-api.web.app/next/yew/functional/)\n+The documentation for these hooks can be found in the [Yew API docs]({{yew_api}}functional/)\n \n ### Custom Hooks\n \ndiff --git a/website/versioned_docs/version-0.21/getting-started/build-a-sample-app.mdx b/website/versioned_docs/version-0.21/getting-started/build-a-sample-app.mdx\nindex a47365427dc..1926fcdd2f8 100644\n--- a/website/versioned_docs/version-0.21/getting-started/build-a-sample-app.mdx\n+++ b/website/versioned_docs/version-0.21/getting-started/build-a-sample-app.mdx\n@@ -69,7 +69,7 @@ version = \"0.1.0\"\n edition = \"2021\"\n \n [dependencies]\n-yew = { version = \"0.21\", features = [\"csr\"] }\n+yew = { {{yew_dependency}}, features = [\"csr\"] }\n ```\n \n or using `cargo add yew@0.21 -F csr`.\ndiff --git a/website/versioned_docs/version-0.22/concepts/function-components/hooks/introduction.mdx b/website/versioned_docs/version-0.22/concepts/function-components/hooks/introduction.mdx\nindex 240dd02b8c8..636e7073f3a 100644\n--- a/website/versioned_docs/version-0.22/concepts/function-components/hooks/introduction.mdx\n+++ b/website/versioned_docs/version-0.22/concepts/function-components/hooks/introduction.mdx\n@@ -39,7 +39,7 @@ Yew comes with the following predefined Hooks:\n - `use_context`\n - `use_force_update`\n \n-The documentation for these hooks can be found in the [Yew API docs](https://yew-rs-api.web.app/next/yew/functional/)\n+The documentation for these hooks can be found in the [Yew API docs]({{yew_api}}functional/)\n \n ### Custom Hooks\n \ndiff --git a/website/versioned_docs/version-0.22/getting-started/build-a-sample-app.mdx b/website/versioned_docs/version-0.22/getting-started/build-a-sample-app.mdx\nindex 2d2c1cb35ef..236b53f4db8 100644\n--- a/website/versioned_docs/version-0.22/getting-started/build-a-sample-app.mdx\n+++ b/website/versioned_docs/version-0.22/getting-started/build-a-sample-app.mdx\n@@ -69,7 +69,7 @@ version = \"0.1.0\"\n edition = \"2021\"\n \n [dependencies]\n-yew = { version = \"0.22\", features = [\"csr\"] }\n+yew = { {{yew_dependency}}, features = [\"csr\"] }\n ```\n \n :::info\ndiff --git a/website/versioned_docs/version-0.23/concepts/function-components/hooks/introduction.mdx b/website/versioned_docs/version-0.23/concepts/function-components/hooks/introduction.mdx\nindex 240dd02b8c8..636e7073f3a 100644\n--- a/website/versioned_docs/version-0.23/concepts/function-components/hooks/introduction.mdx\n+++ b/website/versioned_docs/version-0.23/concepts/function-components/hooks/introduction.mdx\n@@ -39,7 +39,7 @@ Yew comes with the following predefined Hooks:\n - `use_context`\n - `use_force_update`\n \n-The documentation for these hooks can be found in the [Yew API docs](https://yew-rs-api.web.app/next/yew/functional/)\n+The documentation for these hooks can be found in the [Yew API docs]({{yew_api}}functional/)\n \n ### Custom Hooks\n \ndiff --git a/website/versioned_docs/version-0.23/getting-started/build-a-sample-app.mdx b/website/versioned_docs/version-0.23/getting-started/build-a-sample-app.mdx\nindex b9e14086586..a0ce2041991 100644\n--- a/website/versioned_docs/version-0.23/getting-started/build-a-sample-app.mdx\n+++ b/website/versioned_docs/version-0.23/getting-started/build-a-sample-app.mdx\n@@ -69,7 +69,7 @@ version = \"0.1.0\"\n edition = \"2021\"\n \n [dependencies]\n-yew = { version = \"0.23\", features = [\"csr\"] }\n+yew = { {{yew_dependency}}, features = [\"csr\"] }\n ```\n \n :::info\n"},"changed_files":{"kind":"list like","value":["website/docs/concepts/function-components/hooks/introduction.mdx","website/docs/getting-started/build-a-sample-app.mdx","website/docusaurus.config.js","website/src/remark/yewVersionUrls.core.js","website/src/remark/yewVersionUrls.js","website/src/remark/yewVersionUrls.test.js","website/versioned_docs/version-0.20/concepts/function-components/hooks/introduction.mdx","website/versioned_docs/version-0.20/getting-started/build-a-sample-app.mdx","website/versioned_docs/version-0.21/concepts/function-components/hooks/introduction.mdx","website/versioned_docs/version-0.21/getting-started/build-a-sample-app.mdx","website/versioned_docs/version-0.22/concepts/function-components/hooks/introduction.mdx","website/versioned_docs/version-0.22/getting-started/build-a-sample-app.mdx","website/versioned_docs/version-0.23/concepts/function-components/hooks/introduction.mdx","website/versioned_docs/version-0.23/getting-started/build-a-sample-app.mdx"],"string":"[\n \"website/docs/concepts/function-components/hooks/introduction.mdx\",\n \"website/docs/getting-started/build-a-sample-app.mdx\",\n \"website/docusaurus.config.js\",\n \"website/src/remark/yewVersionUrls.core.js\",\n \"website/src/remark/yewVersionUrls.js\",\n \"website/src/remark/yewVersionUrls.test.js\",\n \"website/versioned_docs/version-0.20/concepts/function-components/hooks/introduction.mdx\",\n \"website/versioned_docs/version-0.20/getting-started/build-a-sample-app.mdx\",\n \"website/versioned_docs/version-0.21/concepts/function-components/hooks/introduction.mdx\",\n \"website/versioned_docs/version-0.21/getting-started/build-a-sample-app.mdx\",\n \"website/versioned_docs/version-0.22/concepts/function-components/hooks/introduction.mdx\",\n \"website/versioned_docs/version-0.22/getting-started/build-a-sample-app.mdx\",\n \"website/versioned_docs/version-0.23/concepts/function-components/hooks/introduction.mdx\",\n \"website/versioned_docs/version-0.23/getting-started/build-a-sample-app.mdx\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":"diff --git a/website/src/remark/yewVersionUrls.test.js b/website/src/remark/yewVersionUrls.test.js\nnew file mode 100644\nindex 00000000000..1c077be209a\n--- /dev/null\n+++ b/website/src/remark/yewVersionUrls.test.js\n@@ -0,0 +1,105 @@\n+// Standalone unit test for the yew-version remark logic.\n+// Run with: `node src/remark/yewVersionUrls.test.js` (no build / node_modules needed).\n+const assert = require('assert')\n+const { versionContextFromPath, applyTokens } = require('./yewVersionUrls.core')\n+\n+const VERSIONS = ['0.23', '0.22', '0.21', '0.20']\n+let passed = 0\n+const check = (name, got, want) => {\n+ assert.deepStrictEqual(\n+ got,\n+ want,\n+ `${name}\\n got: ${JSON.stringify(got)}\\n want: ${JSON.stringify(want)}`\n+ )\n+ passed++\n+}\n+\n+const NEXT = {\n+ version: '0.23',\n+ isNext: true,\n+ display: '0.23',\n+ dependency: 'git = \"https://github.com/yewstack/yew/\"',\n+ api: 'https://yew-rs-api.web.app/next/yew/',\n+}\n+const V22 = {\n+ version: '0.22',\n+ isNext: false,\n+ display: '0.22',\n+ dependency: 'version = \"0.22\"',\n+ api: 'https://docs.rs/yew/0.22/yew/',\n+}\n+\n+// --- version derivation from path (next / snapshot / i18n) ---\n+check(\n+ 'next (docs/)',\n+ versionContextFromPath(\n+ '/repo/website/docs/getting-started/x.mdx',\n+ VERSIONS\n+ ),\n+ NEXT\n+)\n+check(\n+ 'versioned 0.22',\n+ versionContextFromPath(\n+ '/repo/website/versioned_docs/version-0.22/tutorial/index.mdx',\n+ VERSIONS\n+ ),\n+ V22\n+)\n+check(\n+ 'i18n next (current/)',\n+ versionContextFromPath(\n+ '/repo/website/i18n/ja/docusaurus-plugin-content-docs/current/x.mdx',\n+ VERSIONS\n+ ),\n+ NEXT\n+)\n+check(\n+ 'i18n versioned 0.22',\n+ versionContextFromPath(\n+ '/repo/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-0.22/x.mdx',\n+ VERSIONS\n+ ),\n+ V22\n+)\n+\n+// --- token substitution: next uses git dep + preview host; snapshots use version + docs.rs ---\n+const next = versionContextFromPath('/w/website/docs/x.mdx', VERSIONS)\n+const v22 = versionContextFromPath(\n+ '/w/website/versioned_docs/version-0.22/x.mdx',\n+ VERSIONS\n+)\n+\n+check(\n+ 'dependency (next -> git)',\n+ applyTokens('yew = { {{yew_dependency}}, features = [\"csr\"] }', next),\n+ 'yew = { git = \"https://github.com/yewstack/yew/\", features = [\"csr\"] }'\n+)\n+check(\n+ 'dependency (0.22 -> version)',\n+ applyTokens('yew = { {{yew_dependency}}, features = [\"csr\"] }', v22),\n+ 'yew = { version = \"0.22\", features = [\"csr\"] }'\n+)\n+check(\n+ 'api link (next -> preview host)',\n+ applyTokens('[use_future]({{yew_api}}suspense/fn.use_future.html)', next),\n+ '[use_future](https://yew-rs-api.web.app/next/yew/suspense/fn.use_future.html)'\n+)\n+check(\n+ 'api link (0.22 -> docs.rs)',\n+ applyTokens('[use_future]({{yew_api}}suspense/fn.use_future.html)', v22),\n+ '[use_future](https://docs.rs/yew/0.22/yew/suspense/fn.use_future.html)'\n+)\n+check(\n+ 'version token (next)',\n+ applyTokens('targets Yew {{yew_version}}', next),\n+ 'targets Yew 0.23'\n+)\n+check(\n+ 'version token (0.22)',\n+ applyTokens('targets Yew {{yew_version}}', v22),\n+ 'targets Yew 0.22'\n+)\n+check('passthrough (no token)', applyTokens('plain text', next), 'plain text')\n+\n+console.log(`ok — ${passed} assertions passed`)\n"},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86283,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4141,"string":"4,141"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":"Yew.rs tutorial has outdated wasm-bindgen-futures pattern\n\nThis is about:\n- [ ] A typo \n- [ ] Inaccurate/misleading documentation (e.g. technically incorrect advice)\n- [ ] Undocumented code\n- [x] Outdated documentation\n- [ ] Other\n\n**Problem**\n\nThis is an excerpt from the tutorial, after tellinng new users to add `wasm-bindgen-futures` into the Cargo.toml, the problem is it should instead use `yew_platform::spawn_local` and `use_future`:\n\n```rs\n#[component]\nfn App() -> Html {\n let videos = use_state(|| vec![]);\n {\n let videos = videos.clone();\n use_effect_with((), move |_| {\n let videos = videos.clone();\n wasm_bindgen_futures::spawn_local(async move {\n let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n .send()\n .await\n .unwrap()\n .json()\n .await\n .unwrap();\n videos.set(fetched_videos);\n });\n || ()\n });\n }\n\n // ...\n\n html! {\n <>\n <h1>{ \"RustConf Explorer\" }</h1>\n <div>\n <h3>{ \"Videos to watch\" }</h3>\n <VideosList videos={(*videos).clone()} on_click={on_video_select} />\n </div>\n // ...\n </>\n }\n}\n```\n\n**Details about the solution you'd like** _(Optional)_\n\nUse up to date Yew API\n\n\n**Questionaire** _(Optional)_\n- [ ] I'd like to write this documentation\n- [ ] I'd like to write this documentation but I'm not sure what's needed\n- [x] I don't have time to add this right now, but maybe later"},"pr_title":{"kind":"string","value":"docs: tutorial: update outdated fetching data section"},"pr_body":{"kind":"string","value":"#### Description\r\nFetching data section of the tutorial page still mentioned using `wasm-bindgen-futures::spawn_local`. Updated the docs and examples to use `yew::platform::spawn_local` and the `use_future` hook instead.\r\n\r\n**note: for translation purpose I did used LLM (Codex | GPT-5.4)**\r\n\r\n<!-- Please include a summary of the change. -->\r\n\r\nFixes #4083 <!-- replace with issue number or remove if not applicable -->\r\n\r\n#### Checklist\r\n\r\n- [x] update next version docs. \r\n- [x] update 0.22 version docs. \r\n- [x] update 0.23 version docs.\r\n- [x] final cleanup.\r\n- [x] update translations.\r\n\r\n<!-- For further details, please read CONTRIBUTING.md -->\r\n\r\n- [x] I have reviewed my own code\r\n- [ ] I have added tests\r\n <!-- If this is a bug fix, these tests will fail if the bug is present (to stop it from cropping up again) -->\r\n <!-- If this is a feature, my tests prove that the feature works -->\r\n"},"base_sha":{"kind":"string","value":"a259eae6821621ba6afe88512e231fc7eb079ec7"},"head_sha":{"kind":"string","value":"174cb75692750a4f1f9315b441199abdcd569188"},"gold_diff":{"kind":"string","value":"diff --git a/website/docs/tutorial/index.mdx b/website/docs/tutorial/index.mdx\nindex 5cefaf1b9d1..9387781c78c 100644\n--- a/website/docs/tutorial/index.mdx\n+++ b/website/docs/tutorial/index.mdx\n@@ -459,18 +459,15 @@ videos list from an external source. For this we will need to add the following\n For making the fetch call.\n - [`serde`](https://serde.rs) with derive features\n For de-serializing the JSON response\n-- [`wasm-bindgen-futures`](https://crates.io/crates/wasm-bindgen-futures)\n- For executing Rust Future as a Promise\n \n Let's update the dependencies in `Cargo.toml` file:\n \n-```toml title=\"Cargo.toml\" {2-6}\n+```toml title=\"Cargo.toml\" {2-5}\n [dependencies]\n -yew = { git = \"https://github.com/yewstack/yew/\", features = [\"csr\"] }\n +yew = { git = \"https://github.com/yewstack/yew/\", features = [\"csr\", \"serde\"] }\n-+gloo-net = \"0.6\"\n++gloo-net = \"0.7\"\n +serde = { version = \"1.0\", features = [\"derive\"] }\n-+wasm-bindgen-futures = \"0.4\"\n ```\n \n Yew's `serde` feature enables integration with the `serde` crate, the important point for us is that\n@@ -481,12 +478,16 @@ When choosing dependencies make sure they are `wasm32` compatible!\n Otherwise you won't be able to run your application.\n :::\n \n-Update the `Video` struct to derive the `Deserialize` trait:\n+Update the imports:\n \n-```rust {2,4-5}\n+```rust {2}\n use yew::prelude::*;\n +use serde::Deserialize;\n-// ...\n+```\n+\n+Update the `Video` struct to derive the `Deserialize` trait:\n+\n+```rust {1-2}\n -#[derive(Clone, PartialEq)]\n +#[derive(Clone, PartialEq, Deserialize)]\n struct Video {\n@@ -497,12 +498,71 @@ struct Video {\n }\n ```\n \n-Now as the last step, we need to update our `App` component to make the fetch request instead of using hardcoded data\n+Now we need to update our `App` component to fetch data. The modern yew way to do this is with [`use_future`](https://docs.rs/yew/latest/yew/suspense/fn.use_future.html) and [`<Suspense>`](https://yew.rs/docs/concepts/suspense).\n+\n+Alternatively, you can use [`yew::platform::spawn_local`](https://docs.rs/yew/latest/yew/platform/fn.spawn_local.html)\n+if hooks are unavailable, such as within struct components or standard functions.\n+\n+`use_future` suspends the component until the async operation completes, and `<Suspense>` shows a\n+fallback UI (e.g. a loading indicator) in the meantime.\n+\n+Update the imports:\n \n-```rust {2,6-50,59-60}\n+```rust {3-4}\n use yew::prelude::*;\n+use serde::Deserialize;\n +use gloo_net::http::Request;\n++use yew::suspense::use_future;\n+```\n+\n+We split the data fetching logic into a child component (`VideosFetcher`) that returns `HtmlResult`,\n+while the parent `App` wraps it in `<Suspense>`:\n+\n+```rust {2-6,8-39}\n+use yew::suspense::use_future;\n++#[derive(Properties, PartialEq)]\n++struct VideosFetchProps {\n++ on_click: Callback<Video>,\n++ selected_video: Option<Video>,\n++}\n+\n++#[component]\n++fn VideosFetcher(\n++ VideosFetchProps {\n++ on_click,\n++ selected_video,\n++ }: &VideosFetchProps,\n++) -> HtmlResult {\n++ let videos = use_future(|| async {\n++ Request::get(\"https://yew.rs/tutorial/data.json\")\n++ .send()\n++ .await?\n++ .json::<Vec<Video>>()\n++ .await\n++ })?;\n++\n++ match &*videos {\n++ Ok(videos) => Ok(html! {\n++ <>\n++ <div>\n++ <h3>{ \"Videos to watch\" }</h3>\n++ <VideosList videos={videos.clone()} on_click={on_click.clone()} />\n++ </div>\n++ if let Some(video) = selected_video {\n++ <VideoDetails video={video.clone()} />\n++ }\n++ </>\n++ }),\n++ Err(err) => Ok(html! {\n++ <p>{format!(\"Error fetching videos: {err}\")}</p>\n++ }),\n++ }\n++}\n+```\n \n+Now we will use the new component inside the App component.\n+\n+```rust {3-28,33-47}\n #[component]\n fn App() -> Html {\n - let videos = vec![\n@@ -531,43 +591,33 @@ fn App() -> Html {\n - url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n - },\n - ];\n--\n-+ let videos = use_state(|| vec![]);\n-+ {\n-+ let videos = videos.clone();\n-+ use_effect_with((), move |_| {\n-+ let videos = videos.clone();\n-+ wasm_bindgen_futures::spawn_local(async move {\n-+ let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ .send()\n-+ .await\n-+ .unwrap()\n-+ .json()\n-+ .await\n-+ .unwrap();\n-+ videos.set(fetched_videos);\n-+ });\n-+ || ()\n-+ });\n-+ }\n \n // ...\n \n html! {\n- <h1>{ \"RustConf Explorer\" }</h1>\n- <div>\n- <h3>{ \"Videos to watch\" }</h3>\n+- <h1>{ \"RustConf Explorer\" }</h1>\n+- <div>\n+- <h3>{ \"Videos to watch\" }</h3>\n - <VideosList {videos} on_click={on_video_select} />\n-+ <VideosList videos={(*videos).clone()} on_click={on_video_select} />\n- </div>\n- // ...\n+- </div>\n+- if let Some(video) = &*selected_video {\n+- <VideoDetails video={video.clone()} />\n+- }\n++ <h1>{ \"RustConf Explorer\" }</h1>\n++ <Suspense fallback={html! {<p> {\"Loading...\"} </p>}} >\n++ <VideosFetcher\n++ on_click={on_video_select}\n++ selected_video={(*selected_video).clone()}\n++ />\n++ </Suspense>\n }\n }\n ```\n \n :::note\n-We are using `unwrap`s here because this is a demo application. In a real-world app, you would likely want to have\n-[proper error handling](https://doc.rust-lang.org/book/ch09-02-recoverable-errors-with-result.html).\n+We use `?` on the `use_future` call to propagate the suspension. The component returns `HtmlResult`\n+instead of `Html` when using suspense hooks. The parent wraps it in `<Suspense fallback=...>` to show\n+a loading indicator while the data is being fetched.\n :::\n \n Now, look at the browser to see everything working as expected... which would have been the case if it were not for CORS.\n@@ -575,9 +625,9 @@ To fix that, we need a proxy server. Luckily trunk provides that.\n \n Update the following line:\n \n-```rust {2-3}\n-- let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ let fetched_videos: Vec<Video> = Request::get(\"/tutorial/data.json\")\n+```rust {1-2}\n+- Request::get(\"https://yew.rs/tutorial/data.json\")\n++ Request::get(\"/tutorial/data.json\")\n ```\n \n Now, rerun the server with the following command:\n@@ -588,6 +638,26 @@ trunk serve --proxy-backend=https://yew.rs/tutorial\n \n Refresh the tab and everything should work as expected.\n \n+The loading text may not be visible because the data loads very quickly. If you'd like to see it, you can add an\n+artificial delay inside the `use_future` hook using `TimeoutFuture`. First, add `gloo-timers` to your `Cargo.toml`:\n+\n+```toml\n+gloo-timers = { version = \"0.3\", features = [\"futures\"] }\n+```\n+\n+Then add the delay inside the hook:\n+\n+```\n+let videos = use_future(|| async {\n++ gloo_timers::future::TimeoutFuture::new(3_000).await; // 3 second delay\n+ Request::get(\"/tutorial/data.json\")\n+ .send()\n+ .await?\n+ .json::<Vec<Video>>()\n+ .await\n+})?;\n+```\n+\n ## Wrapping up\n \n Congratulations! You’ve created a web application that fetches data from an external API and displays a list of videos.\ndiff --git a/website/i18n/ja/docusaurus-plugin-content-docs/current/tutorial/index.mdx b/website/i18n/ja/docusaurus-plugin-content-docs/current/tutorial/index.mdx\nindex becd86a285e..7c5b97d97c5 100644\n--- a/website/i18n/ja/docusaurus-plugin-content-docs/current/tutorial/index.mdx\n+++ b/website/i18n/ja/docusaurus-plugin-content-docs/current/tutorial/index.mdx\n@@ -456,85 +456,163 @@ fn app() -> Html {\n fetch 呼び出しを行うために使用します。\n - [`serde`](https://serde.rs) とその派生特性\n JSON 応答をデシリアライズするために使用します。\n-- [`wasm-bindgen-futures`](https://crates.io/crates/wasm-bindgen-futures)\n- Rust の Future を Promise として実行するために使用します。\n \n `Cargo.toml` ファイルの依存関係を更新しましょう：\n \n-```toml title=\"Cargo.toml\"\n+```toml title=\"Cargo.toml\" {2-5}\n [dependencies]\n-gloo-net = \"0.6\"\n-serde = { version = \"1.0\", features = [\"derive\"] }\n-wasm-bindgen-futures = \"0.4\"\n+-yew = { git = \"https://github.com/yewstack/yew/\", features = [\"csr\"] }\n++yew = { git = \"https://github.com/yewstack/yew/\", features = [\"csr\", \"serde\"] }\n++gloo-net = \"0.7\"\n++serde = { version = \"1.0\", features = [\"derive\"] }\n ```\n \n+Yew の `serde` 機能は `serde` クレートとの統合を有効にします。ここで重要なのは、`AttrValue` に対する `serde::Deserialize` の実装が追加される点です。\n+\n :::note\n 依存関係を選択する際には、それらが `wasm32` と互換性があることを確認してください！そうでない場合、アプリケーションを実行することはできません。\n :::\n \n-`Deserialize` 特性を派生するように `Video` 構造体を更新します：\n+インポートを更新します:\n+\n+```rust {2}\n+use yew::prelude::*;\n++use serde::Deserialize;\n+```\n \n-```rust ,ignore {1, 3-4}\n-+ use serde::Deserialize;\n+`Video` 構造体が `Deserialize` トレイトを derive するように更新します:\n \n-- #[derive(Clone, PartialEq)]\n-+ #[derive(Clone, PartialEq, Deserialize)]\n+```rust {1-2}\n+-#[derive(Clone, PartialEq)]\n++#[derive(Clone, PartialEq, Deserialize)]\n struct Video {\n id: usize,\n- title: String,\n- speaker: String,\n- url: String,\n+ title: AttrValue,\n+ speaker: AttrValue,\n+ url: AttrValue,\n }\n ```\n \n-最後のステップとして、ハードコーディングされたデータを使用するのではなく、fetch リクエストを行うように `App` コンポーネントを更新する必要があります。\n+次に、データを取得できるように `App` コンポーネントを更新する必要があります。これを行う現代的な Yew の方法は、[`use_future`](https://docs.rs/yew/latest/yew/suspense/fn.use_future.html) と [`<Suspense>`](https://yew.rs/docs/concepts/suspense) を使うことです。\n \n-```rust ,ignore {1,5-25,34-35}\n-+ use gloo_net::http::Request;\n+また、フックが使えない場合、たとえば struct コンポーネントや通常の関数内では、代わりに [`yew::platform::spawn_local`](https://docs.rs/yew/latest/yew/platform/fn.spawn_local.html) を使うこともできます。\n \n-#[component(App)]\n-fn app() -> Html {\n-- let videos = vec![\n-- // ...\n-- ]\n-+ let videos = use_state(|| vec![]);\n-+ {\n-+ let videos = videos.clone();\n-+ use_effect_with((), move |_| {\n-+ let videos = videos.clone();\n-+ wasm_bindgen_futures::spawn_local(async move {\n-+ let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ .send()\n-+ .await\n-+ .unwrap()\n-+ .json()\n-+ .await\n-+ .unwrap();\n-+ videos.set(fetched_videos);\n-+ });\n-+ || ()\n-+ });\n+`use_future` は非同期処理が完了するまでコンポーネントをサスペンドし、その間 `<Suspense>` はフォールバック UI（たとえばローディングインジケーター）を表示します。\n+\n+インポートを更新します:\n+\n+```rust {3-4}\n+use yew::prelude::*;\n+use serde::Deserialize;\n++use gloo_net::http::Request;\n++use yew::suspense::use_future;\n+```\n+\n+データ取得ロジックは、`HtmlResult` を返す子コンポーネント (`VideosFetcher`) に分割し、親の `App` はそれを `<Suspense>` で包みます:\n+\n+```rust {2-6,8-39}\n+use yew::suspense::use_future;\n++#[derive(Properties, PartialEq)]\n++struct VideosFetchProps {\n++ on_click: Callback<Video>,\n++ selected_video: Option<Video>,\n++}\n+\n++#[component]\n++fn VideosFetcher(\n++ VideosFetchProps {\n++ on_click,\n++ selected_video,\n++ }: &VideosFetchProps,\n++) -> HtmlResult {\n++ let videos = use_future(|| async {\n++ Request::get(\"https://yew.rs/tutorial/data.json\")\n++ .send()\n++ .await?\n++ .json::<Vec<Video>>()\n++ .await\n++ })?;\n++\n++ match &*videos {\n++ Ok(videos) => Ok(html! {\n++ <>\n++ <div>\n++ <h3>{ \"Videos to watch\" }</h3>\n++ <VideosList videos={videos.clone()} on_click={on_click.clone()} />\n++ </div>\n++ if let Some(video) = selected_video {\n++ <VideoDetails video={video.clone()} />\n++ }\n++ </>\n++ }),\n++ Err(err) => Ok(html! {\n++ <p>{format!(\"Error fetching videos: {err}\")}</p>\n++ }),\n + }\n++}\n+```\n+\n+次に、この新しいコンポーネントを `App` コンポーネント内で使用します\n+\n+```rust {3-28,33-47}\n+#[component]\n+fn App() -> Html {\n+- let videos = vec![\n+- Video {\n+- id: 1,\n+- title: \"Building and breaking things\".into(),\n+- speaker: \"John Doe\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 2,\n+- title: \"The development process\".into(),\n+- speaker: \"Jane Smith\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 3,\n+- title: \"The Web 7.0\".into(),\n+- speaker: \"Matt Miller\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 4,\n+- title: \"Mouseless development\".into(),\n+- speaker: \"Tom Jerry\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- ];\n \n // ...\n \n html! {\n- <h1>{ \"RustConf Explorer\" }</h1>\n- <div>\n- <h3>{\"Videos to watch\"}</h3>\n-- <VideosList videos={videos} on_click={on_video_select.clone()} />\n-+ <VideosList videos={(*videos).clone()} on_click={on_video_select.clone()} />\n- </div>\n- { for details }\n+- <h1>{ \"RustConf Explorer\" }</h1>\n+- <div>\n+- <h3>{ \"Videos to watch\" }</h3>\n+- <VideosList {videos} on_click={on_video_select} />\n+- </div>\n+- if let Some(video) = &*selected_video {\n+- <VideoDetails video={video.clone()} />\n+- }\n++ <h1>{ \"RustConf Explorer\" }</h1>\n++ <Suspense fallback={html! {<p> {\"Loading...\"} </p>}} >\n++ <VideosFetcher\n++ on_click={on_video_select}\n++ selected_video={(*selected_video).clone()}\n++ />\n++ </Suspense>\n }\n }\n ```\n \n :::note\n-ここでは `unwrap` を使用していますが、これはデモアプリケーションのためです。実際のアプリケーションでは、[適切なエラーハンドリング](https://doc.rust-lang.org/book/ch09-02-recoverable-errors-with-result.html)を行うことをお勧めします。\n+`use_future` の呼び出しでは、サスペンド状態を伝播させるために `?` を使っています。サスペンス対応のフックを使う場合、コンポーネントは `Html` ではなく `HtmlResult` を返します。親コンポーネントはこれを `<Suspense fallback=...>` で包み、データ取得中にローディングインジケーターを表示します。\n :::\n \n-さて、ブラウザを確認して、すべてが期待通りに動作しているかを確認しましょう……CORS の問題がなければ。これを解決するために、プロキシサーバーが必要です。幸いなことに、trunk はこの機能を提供しています。\n+では、ブラウザを見て、すべてが期待どおりに動作していることを確認しましょう……と言いたいところですが、CORS のせいでそうはいきません。\n+\n+これを解決するには、プロキシサーバーが必要です。幸い、Trunk にはその機能が用意されています。\n \n これらの行を更新します：\n \n@@ -553,6 +631,25 @@ trunk serve --proxy-backend=https://yew.rs/tutorial\n \n ページをリフレッシュすると、すべてが期待通りに動作するはずです。\n \n+データの読み込みが非常に速いため、ローディングテキストが見えない場合があります。確認したい場合は、`TimeoutFuture` を使って `use_future` フック内に人工的な遅延を追加できます。まず、`Cargo.toml` に `gloo-timers` を追加します。\n+\n+```toml\n+gloo-timers = { version = \"0.3\", features = [\"futures\"] }\n+```\n+\n+次に、フック内に遅延を追加します\n+\n+```\n+let videos = use_future(|| async {\n++ gloo_timers::future::TimeoutFuture::new(3_000).await; // 3 second delay\n+ Request::get(\"/tutorial/data.json\")\n+ .send()\n+ .await?\n+ .json::<Vec<Video>>()\n+ .await\n+})?;\n+```\n+\n ## まとめ\n \n おめでとうございます！外部 API からデータを取得し、ビデオリストを表示する Web アプリケーションを作成しました。\ndiff --git a/website/i18n/ja/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx b/website/i18n/ja/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx\nindex 403467e9ff9..01ffabdc8c1 100644\n--- a/website/i18n/ja/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx\n+++ b/website/i18n/ja/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx\n@@ -464,87 +464,163 @@ fn app() -> Html {\n fetch 呼び出しを行うために使用します。\n - [`serde`](https://serde.rs) とその派生特性\n JSON 応答をデシリアライズするために使用します。\n-- [`wasm-bindgen-futures`](https://crates.io/crates/wasm-bindgen-futures)\n- Rust の Future を Promise として実行するために使用します。\n \n `Cargo.toml` ファイルの依存関係を更新しましょう：\n \n-```toml title=\"Cargo.toml\"\n+```toml title=\"Cargo.toml\" {2-5}\n [dependencies]\n-gloo-net = \"0.6\"\n-serde = { version = \"1.0\", features = [\"derive\"] }\n-wasm-bindgen-futures = \"0.4\"\n+-yew = { version = \"0.22\", features = [\"csr\"] }\n++yew = { version = \"0.22\", features = [\"csr\", \"serde\"] }\n++gloo-net = \"0.7\"\n++serde = { version = \"1.0\", features = [\"derive\"] }\n ```\n \n+Yew の `serde` 機能は `serde` クレートとの統合を有効にします。ここで重要なのは、`AttrValue` に対する `serde::Deserialize` の実装が追加される点です。\n+\n :::note\n 依存関係を選択する際には、それらが `wasm32` と互換性があることを確認してください！そうでない場合、アプリケーションを実行することはできません。\n :::\n \n-`Deserialize` 特性を派生するように `Video` 構造体を更新します：\n+インポートを更新します:\n+\n+```rust {2}\n+use yew::prelude::*;\n++use serde::Deserialize;\n+```\n \n-```rust ,ignore {1, 3-4}\n-+ use serde::Deserialize;\n+`Video` 構造体が `Deserialize` トレイトを derive するように更新します:\n \n-- #[derive(Clone, PartialEq)]\n-+ #[derive(Clone, PartialEq, Deserialize)]\n+```rust {1-2}\n+-#[derive(Clone, PartialEq)]\n++#[derive(Clone, PartialEq, Deserialize)]\n struct Video {\n id: usize,\n- title: String,\n- speaker: String,\n- url: String,\n+ title: AttrValue,\n+ speaker: AttrValue,\n+ url: AttrValue,\n }\n ```\n \n-最後のステップとして、ハードコーディングされたデータを使用するのではなく、fetch リクエストを行うように `App` コンポーネントを更新する必要があります。\n+次に、データを取得できるように `App` コンポーネントを更新する必要があります。これを行う現代的な Yew の方法は、[`use_future`](https://docs.rs/yew/0.22.0/yew/suspense/fn.use_future.html) と [`<Suspense>`](https://yew.rs/docs/concepts/suspense) を使うことです。\n \n-```rust ,ignore {1,5-25,34-35}\n-+ use gloo_net::http::Request;\n+また、フックが使えない場合、たとえば struct コンポーネントや通常の関数内では、代わりに [`yew::platform::spawn_local`](https://docs.rs/yew/0.22.0/yew/platform/fn.spawn_local.html) を使うこともできます。\n \n-#[component(App)]\n-fn app() -> Html {\n-- let videos = vec![\n-- // ...\n-- ]\n-+ let videos = use_state(|| vec![]);\n-+ {\n-+ let videos = videos.clone();\n-+ use_effect_with((), move |_| {\n-+ let videos = videos.clone();\n-+ wasm_bindgen_futures::spawn_local(async move {\n-+ let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ .send()\n-+ .await\n-+ .unwrap()\n-+ .json()\n-+ .await\n-+ .unwrap();\n-+ videos.set(fetched_videos);\n-+ });\n-+ || ()\n-+ });\n+`use_future` は非同期処理が完了するまでコンポーネントをサスペンドし、その間 `<Suspense>` はフォールバック UI（たとえばローディングインジケーター）を表示します。\n+\n+インポートを更新します:\n+\n+```rust {3-4}\n+use yew::prelude::*;\n+use serde::Deserialize;\n++use gloo_net::http::Request;\n++use yew::suspense::use_future;\n+```\n+\n+データ取得ロジックは、`HtmlResult` を返す子コンポーネント (`VideosFetcher`) に分割し、親の `App` はそれを `<Suspense>` で包みます:\n+\n+```rust {2-6,8-39}\n+use yew::suspense::use_future;\n++#[derive(Properties, PartialEq)]\n++struct VideosFetchProps {\n++ on_click: Callback<Video>,\n++ selected_video: Option<Video>,\n++}\n+\n++#[component]\n++fn VideosFetcher(\n++ VideosFetchProps {\n++ on_click,\n++ selected_video,\n++ }: &VideosFetchProps,\n++) -> HtmlResult {\n++ let videos = use_future(|| async {\n++ Request::get(\"https://yew.rs/tutorial/data.json\")\n++ .send()\n++ .await?\n++ .json::<Vec<Video>>()\n++ .await\n++ })?;\n++\n++ match &*videos {\n++ Ok(videos) => Ok(html! {\n++ <>\n++ <div>\n++ <h3>{ \"Videos to watch\" }</h3>\n++ <VideosList videos={videos.clone()} on_click={on_click.clone()} />\n++ </div>\n++ if let Some(video) = selected_video {\n++ <VideoDetails video={video.clone()} />\n++ }\n++ </>\n++ }),\n++ Err(err) => Ok(html! {\n++ <p>{format!(\"Error fetching videos: {err}\")}</p>\n++ }),\n + }\n++}\n+```\n+\n+次に、この新しいコンポーネントを `App` コンポーネント内で使用します\n+\n+```rust {3-28,33-47}\n+#[component]\n+fn App() -> Html {\n+- let videos = vec![\n+- Video {\n+- id: 1,\n+- title: \"Building and breaking things\".into(),\n+- speaker: \"John Doe\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 2,\n+- title: \"The development process\".into(),\n+- speaker: \"Jane Smith\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 3,\n+- title: \"The Web 7.0\".into(),\n+- speaker: \"Matt Miller\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 4,\n+- title: \"Mouseless development\".into(),\n+- speaker: \"Tom Jerry\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- ];\n \n // ...\n \n html! {\n- <>\n- <h1>{ \"RustConf Explorer\" }</h1>\n- <div>\n- <h3>{\"Videos to watch\"}</h3>\n-- <VideosList videos={videos} on_click={on_video_select.clone()} />\n-+ <VideosList videos={(*videos).clone()} on_click={on_video_select.clone()} />\n- </div>\n- { for details }\n- </>\n+- <h1>{ \"RustConf Explorer\" }</h1>\n+- <div>\n+- <h3>{ \"Videos to watch\" }</h3>\n+- <VideosList {videos} on_click={on_video_select} />\n+- </div>\n+- if let Some(video) = &*selected_video {\n+- <VideoDetails video={video.clone()} />\n+- }\n++ <h1>{ \"RustConf Explorer\" }</h1>\n++ <Suspense fallback={html! {<p> {\"Loading...\"} </p>}} >\n++ <VideosFetcher\n++ on_click={on_video_select}\n++ selected_video={(*selected_video).clone()}\n++ />\n++ </Suspense>\n }\n }\n ```\n \n :::note\n-ここでは `unwrap` を使用していますが、これはデモアプリケーションのためです。実際のアプリケーションでは、[適切なエラーハンドリング](https://doc.rust-lang.org/book/ch09-02-recoverable-errors-with-result.html)を行うことをお勧めします。\n+`use_future` の呼び出しでは、サスペンド状態を伝播させるために `?` を使っています。サスペンス対応のフックを使う場合、コンポーネントは `Html` ではなく `HtmlResult` を返します。親コンポーネントはこれを `<Suspense fallback=...>` で包み、データ取得中にローディングインジケーターを表示します。\n :::\n \n-さて、ブラウザを確認して、すべてが期待通りに動作しているかを確認しましょう……CORS の問題がなければ。これを解決するために、プロキシサーバーが必要です。幸いなことに、trunk はこの機能を提供しています。\n+では、ブラウザを見て、すべてが期待どおりに動作していることを確認しましょう……と言いたいところですが、CORS のせいでそうはいきません。\n+\n+これを解決するには、プロキシサーバーが必要です。幸い、Trunk にはその機能が用意されています。\n \n これらの行を更新します：\n \n@@ -563,6 +639,25 @@ trunk serve --proxy-backend=https://yew.rs/tutorial\n \n ページをリフレッシュすると、すべてが期待通りに動作するはずです。\n \n+データの読み込みが非常に速いため、ローディングテキストが見えない場合があります。確認したい場合は、`TimeoutFuture` を使って `use_future` フック内に人工的な遅延を追加できます。まず、`Cargo.toml` に `gloo-timers` を追加します。\n+\n+```toml\n+gloo-timers = { version = \"0.3\", features = [\"futures\"] }\n+```\n+\n+次に、フック内に遅延を追加します\n+\n+```\n+let videos = use_future(|| async {\n++ gloo_timers::future::TimeoutFuture::new(3_000).await; // 3 second delay\n+ Request::get(\"/tutorial/data.json\")\n+ .send()\n+ .await?\n+ .json::<Vec<Video>>()\n+ .await\n+})?;\n+```\n+\n ## まとめ\n \n おめでとうございます！外部 API からデータを取得し、ビデオリストを表示する Web アプリケーションを作成しました。\ndiff --git a/website/i18n/ja/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx b/website/i18n/ja/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx\nindex d6154add6bd..c6752531da7 100644\n--- a/website/i18n/ja/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx\n+++ b/website/i18n/ja/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx\n@@ -464,87 +464,163 @@ fn app() -> Html {\n fetch 呼び出しを行うために使用します。\n - [`serde`](https://serde.rs) とその派生特性\n JSON 応答をデシリアライズするために使用します。\n-- [`wasm-bindgen-futures`](https://crates.io/crates/wasm-bindgen-futures)\n- Rust の Future を Promise として実行するために使用します。\n \n `Cargo.toml` ファイルの依存関係を更新しましょう：\n \n-```toml title=\"Cargo.toml\"\n+```toml title=\"Cargo.toml\" {2-5}\n [dependencies]\n-gloo-net = \"0.6\"\n-serde = { version = \"1.0\", features = [\"derive\"] }\n-wasm-bindgen-futures = \"0.4\"\n+-yew = { version = \"0.23\", features = [\"csr\"] }\n++yew = { version = \"0.23\", features = [\"csr\", \"serde\"] }\n++gloo-net = \"0.7\"\n++serde = { version = \"1.0\", features = [\"derive\"] }\n ```\n \n+Yew の `serde` 機能は `serde` クレートとの統合を有効にします。ここで重要なのは、`AttrValue` に対する `serde::Deserialize` の実装が追加される点です。\n+\n :::note\n 依存関係を選択する際には、それらが `wasm32` と互換性があることを確認してください！そうでない場合、アプリケーションを実行することはできません。\n :::\n \n-`Deserialize` 特性を派生するように `Video` 構造体を更新します：\n+インポートを更新します:\n+\n+```rust {2}\n+use yew::prelude::*;\n++use serde::Deserialize;\n+```\n \n-```rust ,ignore {1, 3-4}\n-+ use serde::Deserialize;\n+`Video` 構造体が `Deserialize` トレイトを derive するように更新します:\n \n-- #[derive(Clone, PartialEq)]\n-+ #[derive(Clone, PartialEq, Deserialize)]\n+```rust {1-2}\n+-#[derive(Clone, PartialEq)]\n++#[derive(Clone, PartialEq, Deserialize)]\n struct Video {\n id: usize,\n- title: String,\n- speaker: String,\n- url: String,\n+ title: AttrValue,\n+ speaker: AttrValue,\n+ url: AttrValue,\n }\n ```\n \n-最後のステップとして、ハードコーディングされたデータを使用するのではなく、fetch リクエストを行うように `App` コンポーネントを更新する必要があります。\n+次に、データを取得できるように `App` コンポーネントを更新する必要があります。これを行う現代的な Yew の方法は、[`use_future`](https://docs.rs/yew/0.23.0/yew/suspense/fn.use_future.html) と [`<Suspense>`](https://yew.rs/docs/concepts/suspense) を使うことです。\n \n-```rust ,ignore {1,5-25,34-35}\n-+ use gloo_net::http::Request;\n+また、フックが使えない場合、たとえば struct コンポーネントや通常の関数内では、代わりに [`yew::platform::spawn_local`](https://docs.rs/yew/0.23.0/yew/platform/fn.spawn_local.html) を使うこともできます。\n \n-#[component(App)]\n-fn app() -> Html {\n-- let videos = vec![\n-- // ...\n-- ]\n-+ let videos = use_state(|| vec![]);\n-+ {\n-+ let videos = videos.clone();\n-+ use_effect_with((), move |_| {\n-+ let videos = videos.clone();\n-+ wasm_bindgen_futures::spawn_local(async move {\n-+ let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ .send()\n-+ .await\n-+ .unwrap()\n-+ .json()\n-+ .await\n-+ .unwrap();\n-+ videos.set(fetched_videos);\n-+ });\n-+ || ()\n-+ });\n+`use_future` は非同期処理が完了するまでコンポーネントをサスペンドし、その間 `<Suspense>` はフォールバック UI（たとえばローディングインジケーター）を表示します。\n+\n+インポートを更新します:\n+\n+```rust {3-4}\n+use yew::prelude::*;\n+use serde::Deserialize;\n++use gloo_net::http::Request;\n++use yew::suspense::use_future;\n+```\n+\n+データ取得ロジックは、`HtmlResult` を返す子コンポーネント (`VideosFetcher`) に分割し、親の `App` はそれを `<Suspense>` で包みます:\n+\n+```rust {2-6,8-39}\n+use yew::suspense::use_future;\n++#[derive(Properties, PartialEq)]\n++struct VideosFetchProps {\n++ on_click: Callback<Video>,\n++ selected_video: Option<Video>,\n++}\n+\n++#[component]\n++fn VideosFetcher(\n++ VideosFetchProps {\n++ on_click,\n++ selected_video,\n++ }: &VideosFetchProps,\n++) -> HtmlResult {\n++ let videos = use_future(|| async {\n++ Request::get(\"https://yew.rs/tutorial/data.json\")\n++ .send()\n++ .await?\n++ .json::<Vec<Video>>()\n++ .await\n++ })?;\n++\n++ match &*videos {\n++ Ok(videos) => Ok(html! {\n++ <>\n++ <div>\n++ <h3>{ \"Videos to watch\" }</h3>\n++ <VideosList videos={videos.clone()} on_click={on_click.clone()} />\n++ </div>\n++ if let Some(video) = selected_video {\n++ <VideoDetails video={video.clone()} />\n++ }\n++ </>\n++ }),\n++ Err(err) => Ok(html! {\n++ <p>{format!(\"Error fetching videos: {err}\")}</p>\n++ }),\n + }\n++}\n+```\n+\n+次に、この新しいコンポーネントを `App` コンポーネント内で使用します\n+\n+```rust {3-28,33-47}\n+#[component]\n+fn App() -> Html {\n+- let videos = vec![\n+- Video {\n+- id: 1,\n+- title: \"Building and breaking things\".into(),\n+- speaker: \"John Doe\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 2,\n+- title: \"The development process\".into(),\n+- speaker: \"Jane Smith\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 3,\n+- title: \"The Web 7.0\".into(),\n+- speaker: \"Matt Miller\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 4,\n+- title: \"Mouseless development\".into(),\n+- speaker: \"Tom Jerry\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- ];\n \n // ...\n \n html! {\n- <>\n- <h1>{ \"RustConf Explorer\" }</h1>\n- <div>\n- <h3>{\"Videos to watch\"}</h3>\n-- <VideosList videos={videos} on_click={on_video_select.clone()} />\n-+ <VideosList videos={(*videos).clone()} on_click={on_video_select.clone()} />\n- </div>\n- { for details }\n- </>\n+- <h1>{ \"RustConf Explorer\" }</h1>\n+- <div>\n+- <h3>{ \"Videos to watch\" }</h3>\n+- <VideosList {videos} on_click={on_video_select} />\n+- </div>\n+- if let Some(video) = &*selected_video {\n+- <VideoDetails video={video.clone()} />\n+- }\n++ <h1>{ \"RustConf Explorer\" }</h1>\n++ <Suspense fallback={html! {<p> {\"Loading...\"} </p>}} >\n++ <VideosFetcher\n++ on_click={on_video_select}\n++ selected_video={(*selected_video).clone()}\n++ />\n++ </Suspense>\n }\n }\n ```\n \n :::note\n-ここでは `unwrap` を使用していますが、これはデモアプリケーションのためです。実際のアプリケーションでは、[適切なエラーハンドリング](https://doc.rust-lang.org/book/ch09-02-recoverable-errors-with-result.html)を行うことをお勧めします。\n+`use_future` の呼び出しでは、サスペンド状態を伝播させるために `?` を使っています。サスペンス対応のフックを使う場合、コンポーネントは `Html` ではなく `HtmlResult` を返します。親コンポーネントはこれを `<Suspense fallback=...>` で包み、データ取得中にローディングインジケーターを表示します。\n :::\n \n-さて、ブラウザを確認して、すべてが期待通りに動作しているかを確認しましょう……CORS の問題がなければ。これを解決するために、プロキシサーバーが必要です。幸いなことに、trunk はこの機能を提供しています。\n+では、ブラウザを見て、すべてが期待どおりに動作していることを確認しましょう……と言いたいところですが、CORS のせいでそうはいきません。\n+\n+これを解決するには、プロキシサーバーが必要です。幸い、Trunk にはその機能が用意されています。\n \n これらの行を更新します：\n \n@@ -563,6 +639,25 @@ trunk serve --proxy-backend=https://yew.rs/tutorial\n \n ページをリフレッシュすると、すべてが期待通りに動作するはずです。\n \n+データの読み込みが非常に速いため、ローディングテキストが見えない場合があります。確認したい場合は、`TimeoutFuture` を使って `use_future` フック内に人工的な遅延を追加できます。まず、`Cargo.toml` に `gloo-timers` を追加します。\n+\n+```toml\n+gloo-timers = { version = \"0.3\", features = [\"futures\"] }\n+```\n+\n+次に、フック内に遅延を追加します\n+\n+```\n+let videos = use_future(|| async {\n++ gloo_timers::future::TimeoutFuture::new(3_000).await; // 3 second delay\n+ Request::get(\"/tutorial/data.json\")\n+ .send()\n+ .await?\n+ .json::<Vec<Video>>()\n+ .await\n+})?;\n+```\n+\n ## まとめ\n \n おめでとうございます！外部 API からデータを取得し、ビデオリストを表示する Web アプリケーションを作成しました。\ndiff --git a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/tutorial/index.mdx b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/tutorial/index.mdx\nindex c0e9598a59d..55ca9ede59b 100644\n--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/tutorial/index.mdx\n+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/tutorial/index.mdx\n@@ -450,108 +450,208 @@ fn app() -> Html {\n \n ## 获取数据（使用外部 REST API）\n \n-在真实的应用程序中，数据通常来自 API 而不是硬编码。让我们从外部源获取我们的视频列表。为此，我们需要添加以下 crate：\n+在真实世界的应用程序中，数据通常会来自 API，而不是直接硬编码在程序里。现在让我们从外部来源获取影片列表。为此，我们需要添加以下 crates：\n \n-- [`gloo-net`](https://crates.io/crates/gloo-net)\n- 用于进行 fetch 调用。\n-- [`serde`](https://serde.rs) 和其派生特性\n- 用于反序列化 JSON 响应\n-- [`wasm-bindgen-futures`](https://crates.io/crates/wasm-bindgen-futures)\n- 用于将 Rust 的 Future 作为 Promise 执行\n+- [`gloo-net`](https://crates.io/crates/gloo-net) \n+ 用于发送 fetch 请求。\n+- [`serde`](https://serde.rs) 并启用 `derive` 功能 \n+ 用于将 JSON 响应反序列化。\n \n 让我们更新 `Cargo.toml` 文件中的依赖项：\n \n-```toml title=\"Cargo.toml\"\n+```toml title=\"Cargo.toml\" {2-5}\n [dependencies]\n-gloo-net = \"0.6\"\n-serde = { version = \"1.0\", features = [\"derive\"] }\n-wasm-bindgen-futures = \"0.4\"\n+-yew = { git = \"https://github.com/yewstack/yew/\", features = [\"csr\"] }\n++yew = { git = \"https://github.com/yewstack/yew/\", features = [\"csr\", \"serde\"] }\n++gloo-net = \"0.7\"\n++serde = { version = \"1.0\", features = [\"derive\"] }\n ```\n \n+Yew 的 `serde` 功能会启用与 `serde` crate 的集成。对我们来说最重要的一点是，\n+它会为 `AttrValue` 添加 `serde::Deserialize` 的实现。\n+\n :::note\n-在选择依赖项时，请确保它们与 `wasm32` 兼容！否则，您将无法运行您的应用程序。\n+选择依赖项时，请务必确认它们与 `wasm32` 兼容！ \n+否则你的应用程序将无法运行。\n :::\n \n-更新 `Video` 结构体以派生 `Deserialize` 特性：\n+更新导入：\n+\n+```rust {2}\n+use yew::prelude::*;\n++use serde::Deserialize;\n+```\n \n-```rust ,ignore {1, 3-4}\n-+ use serde::Deserialize;\n+更新 `Video` 结构体，让它派生 `Deserialize` trait：\n \n-- #[derive(Clone, PartialEq)]\n-+ #[derive(Clone, PartialEq, Deserialize)]\n+```rust {1-2}\n+-#[derive(Clone, PartialEq)]\n++#[derive(Clone, PartialEq, Deserialize)]\n struct Video {\n id: usize,\n- title: String,\n- speaker: String,\n- url: String,\n+ title: AttrValue,\n+ speaker: AttrValue,\n+ url: AttrValue,\n }\n ```\n \n-作为最后一步，我们需要更新我们的 `App` 组件，以便进行 fetch 请求，而不是使用硬编码的数据\n+接下来我们需要更新 `App` 组件，让它能够获取数据。现代 Yew 的做法是使用 [`use_future`](https://docs.rs/yew/latest/yew/suspense/fn.use_future.html) 和 [`<Suspense>`](https://yew.rs/docs/concepts/suspense)。\n \n-```rust ,ignore {1,5-25,34-35}\n-+ use gloo_net::http::Request;\n+另一种方式是使用 [`yew::platform::spawn_local`](https://docs.rs/yew/latest/yew/platform/fn.spawn_local.html)，\n+如果 hooks 无法使用，例如在 struct component 或普通函数中时，可以采用这种方式。\n \n-#[component(App)]\n-fn app() -> Html {\n-- let videos = vec![\n-- // ...\n-- ]\n-+ let videos = use_state(|| vec![]);\n-+ {\n-+ let videos = videos.clone();\n-+ use_effect_with((), move |_| {\n-+ let videos = videos.clone();\n-+ wasm_bindgen_futures::spawn_local(async move {\n-+ let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ .send()\n-+ .await\n-+ .unwrap()\n-+ .json()\n-+ .await\n-+ .unwrap();\n-+ videos.set(fetched_videos);\n-+ });\n-+ || ()\n-+ });\n+`use_future` 会在异步操作完成前挂起该组件，而 `<Suspense>` 则会在这段期间显示\n+后备 UI（例如加载中的提示）。\n+\n+更新导入：\n+\n+```rust {3-4}\n+use yew::prelude::*;\n+use serde::Deserialize;\n++use gloo_net::http::Request;\n++use yew::suspense::use_future;\n+```\n+\n+我们将数据获取逻辑拆分到一个子组件 `VideosFetcher` 中，该组件返回 `HtmlResult`，\n+而父组件 `App` 则使用 `<Suspense>` 将它包裹起来：\n+\n+```rust {2-6,8-39}\n+use yew::suspense::use_future;\n++#[derive(Properties, PartialEq)]\n++struct VideosFetchProps {\n++ on_click: Callback<Video>,\n++ selected_video: Option<Video>,\n++}\n+\n++#[component]\n++fn VideosFetcher(\n++ VideosFetchProps {\n++ on_click,\n++ selected_video,\n++ }: &VideosFetchProps,\n++) -> HtmlResult {\n++ let videos = use_future(|| async {\n++ Request::get(\"https://yew.rs/tutorial/data.json\")\n++ .send()\n++ .await?\n++ .json::<Vec<Video>>()\n++ .await\n++ })?;\n++\n++ match &*videos {\n++ Ok(videos) => Ok(html! {\n++ <>\n++ <div>\n++ <h3>{ \"Videos to watch\" }</h3>\n++ <VideosList videos={videos.clone()} on_click={on_click.clone()} />\n++ </div>\n++ if let Some(video) = selected_video {\n++ <VideoDetails video={video.clone()} />\n++ }\n++ </>\n++ }),\n++ Err(err) => Ok(html! {\n++ <p>{format!(\"Error fetching videos: {err}\")}</p>\n++ }),\n + }\n++}\n+```\n+\n+现在我们会在 `App` 组件中使用这个新组件。\n+\n+```rust {3-28,33-47}\n+#[component]\n+fn App() -> Html {\n+- let videos = vec![\n+- Video {\n+- id: 1,\n+- title: \"Building and breaking things\".into(),\n+- speaker: \"John Doe\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 2,\n+- title: \"The development process\".into(),\n+- speaker: \"Jane Smith\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 3,\n+- title: \"The Web 7.0\".into(),\n+- speaker: \"Matt Miller\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 4,\n+- title: \"Mouseless development\".into(),\n+- speaker: \"Tom Jerry\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- ];\n \n // ...\n \n html! {\n- <h1>{ \"RustConf Explorer\" }</h1>\n- <div>\n- <h3>{\"Videos to watch\"}</h3>\n-- <VideosList videos={videos} on_click={on_video_select.clone()} />\n-+ <VideosList videos={(*videos).clone()} on_click={on_video_select.clone()} />\n- </div>\n- { for details }\n+- <h1>{ \"RustConf Explorer\" }</h1>\n+- <div>\n+- <h3>{ \"Videos to watch\" }</h3>\n+- <VideosList {videos} on_click={on_video_select} />\n+- </div>\n+- if let Some(video) = &*selected_video {\n+- <VideoDetails video={video.clone()} />\n+- }\n++ <h1>{ \"RustConf Explorer\" }</h1>\n++ <Suspense fallback={html! {<p> {\"Loading...\"} </p>}} >\n++ <VideosFetcher\n++ on_click={on_video_select}\n++ selected_video={(*selected_video).clone()}\n++ />\n++ </Suspense>\n }\n }\n ```\n \n :::note\n-我们在这里使用 `unwrap`，因为这是一个演示应用程序。在真实的应用程序中，您可能希望有[适当的错误处理](https://doc.rust-lang.org/book/ch09-02-recoverable-errors-with-result.html)。\n+我们在 `use_future` 调用上使用 `?` 来传递 suspension。 \n+使用 suspense hooks 时，组件返回的是 `HtmlResult`，而不是 `Html`。父组件则通过 `<Suspense fallback=...>` 在数据获取期间显示加载提示。\n :::\n \n-现在，查看浏览器，看看一切是否按预期工作……如果不是因为 CORS 的话。为了解决这个问题，我们需要一个代理服务器。幸运的是 trunk 提供了这个功能。\n+现在，回到浏览器查看，一切本来应该会如预期运行……如果不是因为 CORS 的话。 \n+要解决这个问题，我们需要一个代理服务器。幸运的是，trunk 已经提供了这个功能。\n \n-更新这些行：\n+更新以下这一行：\n \n-```rust ,ignore {2-3}\n-// ...\n-- let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ let fetched_videos: Vec<Video> = Request::get(\"/tutorial/data.json\")\n-// ...\n+```rust {1-2}\n+- Request::get(\"https://yew.rs/tutorial/data.json\")\n++ Request::get(\"/tutorial/data.json\")\n ```\n \n-现在，使用以下命令重新运行服务器：\n+现在，使用以下命令重新启动服务器：\n \n ```bash\n trunk serve --proxy-backend=https://yew.rs/tutorial\n ```\n \n-刷新网页，一切应该按预期工作。\n+刷新页面后，一切就应该能如预期运行。\n+\n+由于数据加载速度很快，你可能看不到加载中的文字。如果你想看到它，可以在 `use_future` hook 中使用 `TimeoutFuture` 添加一段人为延迟。首先，将 `gloo-timers` 添加到 `Cargo.toml`：\n+\n+```toml\n+gloo-timers = { version = \"0.3\", features = [\"futures\"] }\n+```\n+\n+然后在 hook 中加入延迟：\n+\n+```rust\n+let videos = use_future(|| async {\n++ gloo_timers::future::TimeoutFuture::new(3_000).await; // 延迟 3 秒\n+ Request::get(\"/tutorial/data.json\")\n+ .send()\n+ .await?\n+ .json::<Vec<Video>>()\n+ .await\n+})?;\n+```\n \n ## 总结\n \ndiff --git a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx\nindex a3be857c9d0..38be61d4aef 100644\n--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx\n+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx\n@@ -458,110 +458,208 @@ fn app() -> Html {\n \n ## 获取数据（使用外部 REST API）\n \n-在真实的应用程序中，数据通常来自 API 而不是硬编码。让我们从外部源获取我们的视频列表。为此，我们需要添加以下 crate：\n+在真实世界的应用程序中，数据通常会来自 API，而不是直接硬编码在程序里。现在让我们从外部来源获取影片列表。为此，我们需要添加以下 crates：\n \n-- [`gloo-net`](https://crates.io/crates/gloo-net)\n- 用于进行 fetch 调用。\n-- [`serde`](https://serde.rs) 和其派生特性\n- 用于反序列化 JSON 响应\n-- [`wasm-bindgen-futures`](https://crates.io/crates/wasm-bindgen-futures)\n- 用于将 Rust 的 Future 作为 Promise 执行\n+- [`gloo-net`](https://crates.io/crates/gloo-net) \n+ 用于发送 fetch 请求。\n+- [`serde`](https://serde.rs) 并启用 `derive` 功能 \n+ 用于将 JSON 响应反序列化。\n \n 让我们更新 `Cargo.toml` 文件中的依赖项：\n \n-```toml title=\"Cargo.toml\"\n+```toml title=\"Cargo.toml\" {2-5}\n [dependencies]\n-gloo-net = \"0.6\"\n-serde = { version = \"1.0\", features = [\"derive\"] }\n-wasm-bindgen-futures = \"0.4\"\n+-yew = { version = \"0.22\", features = [\"csr\"] }\n++yew = { version = \"0.22\", features = [\"csr\", \"serde\"] }\n++gloo-net = \"0.7\"\n++serde = { version = \"1.0\", features = [\"derive\"] }\n ```\n \n+Yew 的 `serde` 功能会启用与 `serde` crate 的集成。对我们来说最重要的一点是，\n+它会为 `AttrValue` 添加 `serde::Deserialize` 的实现。\n+\n :::note\n-在选择依赖项时，请确保它们与 `wasm32` 兼容！否则，您将无法运行您的应用程序。\n+选择依赖项时，请务必确认它们与 `wasm32` 兼容！ \n+否则你的应用程序将无法运行。\n :::\n \n-更新 `Video` 结构体以派生 `Deserialize` 特性：\n+更新导入：\n+\n+```rust {2}\n+use yew::prelude::*;\n++use serde::Deserialize;\n+```\n \n-```rust ,ignore {1, 3-4}\n-+ use serde::Deserialize;\n+更新 `Video` 结构体，让它派生 `Deserialize` trait：\n \n-- #[derive(Clone, PartialEq)]\n-+ #[derive(Clone, PartialEq, Deserialize)]\n+```rust {1-2}\n+-#[derive(Clone, PartialEq)]\n++#[derive(Clone, PartialEq, Deserialize)]\n struct Video {\n id: usize,\n- title: String,\n- speaker: String,\n- url: String,\n+ title: AttrValue,\n+ speaker: AttrValue,\n+ url: AttrValue,\n }\n ```\n \n-作为最后一步，我们需要更新我们的 `App` 组件，以便进行 fetch 请求，而不是使用硬编码的数据\n+接下来我们需要更新 `App` 组件，让它能够获取数据。现代 Yew 的做法是使用 [`use_future`](https://docs.rs/yew/0.22.0/yew/suspense/fn.use_future.html) 和 [`<Suspense>`](https://yew.rs/docs/concepts/suspense)。\n \n-```rust ,ignore {1,5-25,34-35}\n-+ use gloo_net::http::Request;\n+另一种方式是使用 [`yew::platform::spawn_local`](https://docs.rs/yew/0.22.0/yew/platform/fn.spawn_local.html)，\n+如果 hooks 无法使用，例如在 struct component 或普通函数中时，可以采用这种方式。\n \n-#[component(App)]\n-fn app() -> Html {\n-- let videos = vec![\n-- // ...\n-- ]\n-+ let videos = use_state(|| vec![]);\n-+ {\n-+ let videos = videos.clone();\n-+ use_effect_with((), move |_| {\n-+ let videos = videos.clone();\n-+ wasm_bindgen_futures::spawn_local(async move {\n-+ let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ .send()\n-+ .await\n-+ .unwrap()\n-+ .json()\n-+ .await\n-+ .unwrap();\n-+ videos.set(fetched_videos);\n-+ });\n-+ || ()\n-+ });\n+`use_future` 会在异步操作完成前挂起该组件，而 `<Suspense>` 则会在这段期间显示\n+后备 UI（例如加载中的提示）。\n+\n+更新导入：\n+\n+```rust {3-4}\n+use yew::prelude::*;\n+use serde::Deserialize;\n++use gloo_net::http::Request;\n++use yew::suspense::use_future;\n+```\n+\n+我们将数据获取逻辑拆分到一个子组件 `VideosFetcher` 中，该组件返回 `HtmlResult`，\n+而父组件 `App` 则使用 `<Suspense>` 将它包裹起来：\n+\n+```rust {2-6,8-39}\n+use yew::suspense::use_future;\n++#[derive(Properties, PartialEq)]\n++struct VideosFetchProps {\n++ on_click: Callback<Video>,\n++ selected_video: Option<Video>,\n++}\n+\n++#[component]\n++fn VideosFetcher(\n++ VideosFetchProps {\n++ on_click,\n++ selected_video,\n++ }: &VideosFetchProps,\n++) -> HtmlResult {\n++ let videos = use_future(|| async {\n++ Request::get(\"https://yew.rs/tutorial/data.json\")\n++ .send()\n++ .await?\n++ .json::<Vec<Video>>()\n++ .await\n++ })?;\n++\n++ match &*videos {\n++ Ok(videos) => Ok(html! {\n++ <>\n++ <div>\n++ <h3>{ \"Videos to watch\" }</h3>\n++ <VideosList videos={videos.clone()} on_click={on_click.clone()} />\n++ </div>\n++ if let Some(video) = selected_video {\n++ <VideoDetails video={video.clone()} />\n++ }\n++ </>\n++ }),\n++ Err(err) => Ok(html! {\n++ <p>{format!(\"Error fetching videos: {err}\")}</p>\n++ }),\n + }\n++}\n+```\n+\n+现在我们会在 `App` 组件中使用这个新组件。\n+\n+```rust {3-28,33-47}\n+#[component]\n+fn App() -> Html {\n+- let videos = vec![\n+- Video {\n+- id: 1,\n+- title: \"Building and breaking things\".into(),\n+- speaker: \"John Doe\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 2,\n+- title: \"The development process\".into(),\n+- speaker: \"Jane Smith\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 3,\n+- title: \"The Web 7.0\".into(),\n+- speaker: \"Matt Miller\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 4,\n+- title: \"Mouseless development\".into(),\n+- speaker: \"Tom Jerry\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- ];\n \n // ...\n \n html! {\n- <>\n- <h1>{ \"RustConf Explorer\" }</h1>\n- <div>\n- <h3>{\"Videos to watch\"}</h3>\n-- <VideosList videos={videos} on_click={on_video_select.clone()} />\n-+ <VideosList videos={(*videos).clone()} on_click={on_video_select.clone()} />\n- </div>\n- { for details }\n- </>\n+- <h1>{ \"RustConf Explorer\" }</h1>\n+- <div>\n+- <h3>{ \"Videos to watch\" }</h3>\n+- <VideosList {videos} on_click={on_video_select} />\n+- </div>\n+- if let Some(video) = &*selected_video {\n+- <VideoDetails video={video.clone()} />\n+- }\n++ <h1>{ \"RustConf Explorer\" }</h1>\n++ <Suspense fallback={html! {<p> {\"Loading...\"} </p>}} >\n++ <VideosFetcher\n++ on_click={on_video_select}\n++ selected_video={(*selected_video).clone()}\n++ />\n++ </Suspense>\n }\n }\n ```\n \n :::note\n-我们在这里使用 `unwrap`，因为这是一个演示应用程序。在真实的应用程序中，您可能希望有[适当的错误处理](https://doc.rust-lang.org/book/ch09-02-recoverable-errors-with-result.html)。\n+我们在 `use_future` 调用上使用 `?` 来传递 suspension。 \n+使用 suspense hooks 时，组件返回的是 `HtmlResult`，而不是 `Html`。父组件则通过 `<Suspense fallback=...>` 在数据获取期间显示加载提示。\n :::\n \n-现在，查看浏览器，看看一切是否按预期工作……如果不是因为 CORS 的话。为了解决这个问题，我们需要一个代理服务器。幸运的是 trunk 提供了这个功能。\n+现在，回到浏览器查看，一切本来应该会如预期运行……如果不是因为 CORS 的话。 \n+要解决这个问题，我们需要一个代理服务器。幸运的是，trunk 已经提供了这个功能。\n \n-更新这些行：\n+更新以下这一行：\n \n-```rust ,ignore {2-3}\n-// ...\n-- let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ let fetched_videos: Vec<Video> = Request::get(\"/tutorial/data.json\")\n-// ...\n+```rust {1-2}\n+- Request::get(\"https://yew.rs/tutorial/data.json\")\n++ Request::get(\"/tutorial/data.json\")\n ```\n \n-现在，使用以下命令重新运行服务器：\n+现在，使用以下命令重新启动服务器：\n \n ```bash\n trunk serve --proxy-backend=https://yew.rs/tutorial\n ```\n \n-刷新网页，一切应该按预期工作。\n+刷新页面后，一切就应该能如预期运行。\n+\n+由于数据加载速度很快，你可能看不到加载中的文字。如果你想看到它，可以在 `use_future` hook 中使用 `TimeoutFuture` 添加一段人为延迟。首先，将 `gloo-timers` 添加到 `Cargo.toml`：\n+\n+```toml\n+gloo-timers = { version = \"0.3\", features = [\"futures\"] }\n+```\n+\n+然后在 hook 中加入延迟：\n+\n+```rust\n+let videos = use_future(|| async {\n++ gloo_timers::future::TimeoutFuture::new(3_000).await; // 延迟 3 秒\n+ Request::get(\"/tutorial/data.json\")\n+ .send()\n+ .await?\n+ .json::<Vec<Video>>()\n+ .await\n+})?;\n+```\n \n ## 总结\n \ndiff --git a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx\nindex 3ae26b4a708..0ef18333fcd 100644\n--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx\n+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx\n@@ -458,110 +458,208 @@ fn app() -> Html {\n \n ## 获取数据（使用外部 REST API）\n \n-在真实的应用程序中，数据通常来自 API 而不是硬编码。让我们从外部源获取我们的视频列表。为此，我们需要添加以下 crate：\n+在真实世界的应用程序中，数据通常会来自 API，而不是直接硬编码在程序里。现在让我们从外部来源获取影片列表。为此，我们需要添加以下 crates：\n \n-- [`gloo-net`](https://crates.io/crates/gloo-net)\n- 用于进行 fetch 调用。\n-- [`serde`](https://serde.rs) 和其派生特性\n- 用于反序列化 JSON 响应\n-- [`wasm-bindgen-futures`](https://crates.io/crates/wasm-bindgen-futures)\n- 用于将 Rust 的 Future 作为 Promise 执行\n+- [`gloo-net`](https://crates.io/crates/gloo-net) \n+ 用于发送 fetch 请求。\n+- [`serde`](https://serde.rs) 并启用 `derive` 功能 \n+ 用于将 JSON 响应反序列化。\n \n 让我们更新 `Cargo.toml` 文件中的依赖项：\n \n-```toml title=\"Cargo.toml\"\n+```toml title=\"Cargo.toml\" {2-5}\n [dependencies]\n-gloo-net = \"0.6\"\n-serde = { version = \"1.0\", features = [\"derive\"] }\n-wasm-bindgen-futures = \"0.4\"\n+-yew = { version = \"0.23\", features = [\"csr\"] }\n++yew = { version = \"0.23\", features = [\"csr\", \"serde\"] }\n++gloo-net = \"0.7\"\n++serde = { version = \"1.0\", features = [\"derive\"] }\n ```\n \n+Yew 的 `serde` 功能会启用与 `serde` crate 的集成。对我们来说最重要的一点是，\n+它会为 `AttrValue` 添加 `serde::Deserialize` 的实现。\n+\n :::note\n-在选择依赖项时，请确保它们与 `wasm32` 兼容！否则，您将无法运行您的应用程序。\n+选择依赖项时，请务必确认它们与 `wasm32` 兼容！ \n+否则你的应用程序将无法运行。\n :::\n \n-更新 `Video` 结构体以派生 `Deserialize` 特性：\n+更新导入：\n+\n+```rust {2}\n+use yew::prelude::*;\n++use serde::Deserialize;\n+```\n \n-```rust ,ignore {1, 3-4}\n-+ use serde::Deserialize;\n+更新 `Video` 结构体，让它派生 `Deserialize` trait：\n \n-- #[derive(Clone, PartialEq)]\n-+ #[derive(Clone, PartialEq, Deserialize)]\n+```rust {1-2}\n+-#[derive(Clone, PartialEq)]\n++#[derive(Clone, PartialEq, Deserialize)]\n struct Video {\n id: usize,\n- title: String,\n- speaker: String,\n- url: String,\n+ title: AttrValue,\n+ speaker: AttrValue,\n+ url: AttrValue,\n }\n ```\n \n-作为最后一步，我们需要更新我们的 `App` 组件，以便进行 fetch 请求，而不是使用硬编码的数据\n+接下来我们需要更新 `App` 组件，让它能够获取数据。现代 Yew 的做法是使用 [`use_future`](https://docs.rs/yew/0.23.0/yew/suspense/fn.use_future.html) 和 [`<Suspense>`](https://yew.rs/docs/concepts/suspense)。\n \n-```rust ,ignore {1,5-25,34-35}\n-+ use gloo_net::http::Request;\n+另一种方式是使用 [`yew::platform::spawn_local`](https://docs.rs/yew/0.23.0/yew/platform/fn.spawn_local.html)，\n+如果 hooks 无法使用，例如在 struct component 或普通函数中时，可以采用这种方式。\n \n-#[component(App)]\n-fn app() -> Html {\n-- let videos = vec![\n-- // ...\n-- ]\n-+ let videos = use_state(|| vec![]);\n-+ {\n-+ let videos = videos.clone();\n-+ use_effect_with((), move |_| {\n-+ let videos = videos.clone();\n-+ wasm_bindgen_futures::spawn_local(async move {\n-+ let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ .send()\n-+ .await\n-+ .unwrap()\n-+ .json()\n-+ .await\n-+ .unwrap();\n-+ videos.set(fetched_videos);\n-+ });\n-+ || ()\n-+ });\n+`use_future` 会在异步操作完成前挂起该组件，而 `<Suspense>` 则会在这段期间显示\n+后备 UI（例如加载中的提示）。\n+\n+更新导入：\n+\n+```rust {3-4}\n+use yew::prelude::*;\n+use serde::Deserialize;\n++use gloo_net::http::Request;\n++use yew::suspense::use_future;\n+```\n+\n+我们将数据获取逻辑拆分到一个子组件 `VideosFetcher` 中，该组件返回 `HtmlResult`，\n+而父组件 `App` 则使用 `<Suspense>` 将它包裹起来：\n+\n+```rust {2-6,8-39}\n+use yew::suspense::use_future;\n++#[derive(Properties, PartialEq)]\n++struct VideosFetchProps {\n++ on_click: Callback<Video>,\n++ selected_video: Option<Video>,\n++}\n+\n++#[component]\n++fn VideosFetcher(\n++ VideosFetchProps {\n++ on_click,\n++ selected_video,\n++ }: &VideosFetchProps,\n++) -> HtmlResult {\n++ let videos = use_future(|| async {\n++ Request::get(\"https://yew.rs/tutorial/data.json\")\n++ .send()\n++ .await?\n++ .json::<Vec<Video>>()\n++ .await\n++ })?;\n++\n++ match &*videos {\n++ Ok(videos) => Ok(html! {\n++ <>\n++ <div>\n++ <h3>{ \"Videos to watch\" }</h3>\n++ <VideosList videos={videos.clone()} on_click={on_click.clone()} />\n++ </div>\n++ if let Some(video) = selected_video {\n++ <VideoDetails video={video.clone()} />\n++ }\n++ </>\n++ }),\n++ Err(err) => Ok(html! {\n++ <p>{format!(\"Error fetching videos: {err}\")}</p>\n++ }),\n + }\n++}\n+```\n+\n+现在我们会在 `App` 组件中使用这个新组件。\n+\n+```rust {3-28,33-47}\n+#[component]\n+fn App() -> Html {\n+- let videos = vec![\n+- Video {\n+- id: 1,\n+- title: \"Building and breaking things\".into(),\n+- speaker: \"John Doe\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 2,\n+- title: \"The development process\".into(),\n+- speaker: \"Jane Smith\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 3,\n+- title: \"The Web 7.0\".into(),\n+- speaker: \"Matt Miller\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 4,\n+- title: \"Mouseless development\".into(),\n+- speaker: \"Tom Jerry\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- ];\n \n // ...\n \n html! {\n- <>\n- <h1>{ \"RustConf Explorer\" }</h1>\n- <div>\n- <h3>{\"Videos to watch\"}</h3>\n-- <VideosList videos={videos} on_click={on_video_select.clone()} />\n-+ <VideosList videos={(*videos).clone()} on_click={on_video_select.clone()} />\n- </div>\n- { for details }\n- </>\n+- <h1>{ \"RustConf Explorer\" }</h1>\n+- <div>\n+- <h3>{ \"Videos to watch\" }</h3>\n+- <VideosList {videos} on_click={on_video_select} />\n+- </div>\n+- if let Some(video) = &*selected_video {\n+- <VideoDetails video={video.clone()} />\n+- }\n++ <h1>{ \"RustConf Explorer\" }</h1>\n++ <Suspense fallback={html! {<p> {\"Loading...\"} </p>}} >\n++ <VideosFetcher\n++ on_click={on_video_select}\n++ selected_video={(*selected_video).clone()}\n++ />\n++ </Suspense>\n }\n }\n ```\n \n :::note\n-我们在这里使用 `unwrap`，因为这是一个演示应用程序。在真实的应用程序中，您可能希望有[适当的错误处理](https://doc.rust-lang.org/book/ch09-02-recoverable-errors-with-result.html)。\n+我们在 `use_future` 调用上使用 `?` 来传递 suspension。 \n+使用 suspense hooks 时，组件返回的是 `HtmlResult`，而不是 `Html`。父组件则通过 `<Suspense fallback=...>` 在数据获取期间显示加载提示。\n :::\n \n-现在，查看浏览器，看看一切是否按预期工作……如果不是因为 CORS 的话。为了解决这个问题，我们需要一个代理服务器。幸运的是 trunk 提供了这个功能。\n+现在，回到浏览器查看，一切本来应该会如预期运行……如果不是因为 CORS 的话。 \n+要解决这个问题，我们需要一个代理服务器。幸运的是，trunk 已经提供了这个功能。\n \n-更新这些行：\n+更新以下这一行：\n \n-```rust ,ignore {2-3}\n-// ...\n-- let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ let fetched_videos: Vec<Video> = Request::get(\"/tutorial/data.json\")\n-// ...\n+```rust {1-2}\n+- Request::get(\"https://yew.rs/tutorial/data.json\")\n++ Request::get(\"/tutorial/data.json\")\n ```\n \n-现在，使用以下命令重新运行服务器：\n+现在，使用以下命令重新启动服务器：\n \n ```bash\n trunk serve --proxy-backend=https://yew.rs/tutorial\n ```\n \n-刷新网页，一切应该按预期工作。\n+刷新页面后，一切就应该能如预期运行。\n+\n+由于数据加载速度很快，你可能看不到加载中的文字。如果你想看到它，可以在 `use_future` hook 中使用 `TimeoutFuture` 添加一段人为延迟。首先，将 `gloo-timers` 添加到 `Cargo.toml`：\n+\n+```toml\n+gloo-timers = { version = \"0.3\", features = [\"futures\"] }\n+```\n+\n+然后在 hook 中加入延迟：\n+\n+```rust\n+let videos = use_future(|| async {\n++ gloo_timers::future::TimeoutFuture::new(3_000).await; // 延迟 3 秒\n+ Request::get(\"/tutorial/data.json\")\n+ .send()\n+ .await?\n+ .json::<Vec<Video>>()\n+ .await\n+})?;\n+```\n \n ## 总结\n \ndiff --git a/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/tutorial/index.mdx b/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/tutorial/index.mdx\nindex 01277965e72..ad21889ff46 100644\n--- a/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/tutorial/index.mdx\n+++ b/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/tutorial/index.mdx\n@@ -448,110 +448,210 @@ fn app() -> Html {\n 結構體組件的行為不同。請查看[文件](advanced-topics/struct-components/introduction.mdx)以了解有關這些的資訊。\n :::\n \n-## 取得資料（使用外部 REST API）\n+## 擷取資料（使用外部 REST API）\n \n-在真實的應用程式中，資料通常來自 API 而不是硬編碼。讓我們從外部來源取得我們的影片清單。為此，我們需要添加以下 crate：\n+在真實世界的應用程式中，資料通常會來自 API，而不是直接硬編碼在程式裡。現在讓我們從外部來源擷取影片清單。為此，我們需要加入以下 crates：\n \n-- [`gloo-net`](https://crates.io/crates/gloo-net)\n- 用於進行 fetch 調用。\n-- [`serde`](https://serde.rs) 及其衍生特性\n- 用於反序列化 JSON 回應\n-- [`wasm-bindgen-futures`](https://crates.io/crates/wasm-bindgen-futures)\n- 用於將 Rust 的 Future 作為 Promise 執行\n+- [`gloo-net`](https://crates.io/crates/gloo-net) \n+ 用來發送 fetch 請求。\n+- [`serde`](https://serde.rs) 並啟用 `derive` 功能 \n+ 用來將 JSON 回應反序列化。\n \n-讓我們更新 `Cargo.toml` 檔案中的依賴項：\n+讓我們更新 `Cargo.toml` 檔案中的相依套件：\n \n-```toml title=\"Cargo.toml\"\n+```toml title=\"Cargo.toml\" {2-5}\n [dependencies]\n-gloo-net = \"0.6\"\n-serde = { version = \"1.0\", features = [\"derive\"] }\n-wasm-bindgen-futures = \"0.4\"\n+-yew = { git = \"https://github.com/yewstack/yew/\", features = [\"csr\"] }\n++yew = { git = \"https://github.com/yewstack/yew/\", features = [\"csr\", \"serde\"] }\n++gloo-net = \"0.7\"\n++serde = { version = \"1.0\", features = [\"derive\"] }\n ```\n \n+Yew 的 `serde` 功能會啟用與 `serde` crate 的整合。對我們來說最重要的一點是，\n+它會為 `AttrValue` 加上 `serde::Deserialize` 的實作。\n+\n :::note\n-在選擇依賴項時，請確保它們與 `wasm32` 相容！否則，您將無法運行您的應用程式。\n+選擇相依套件時，請務必確認它們與 `wasm32` 相容！ \n+否則你的應用程式將無法執行。\n :::\n \n-更新 `Video` 結構體以衍生 `Deserialize` 特性：\n+更新匯入：\n+\n+```rust {2}\n+use yew::prelude::*;\n++use serde::Deserialize;\n+```\n \n-```rust ,ignore {1, 3-4}\n-+ use serde::Deserialize;\n+更新 `Video` 結構，讓它衍生 `Deserialize` trait：\n \n-- #[derive(Clone, PartialEq)]\n-+ #[derive(Clone, PartialEq, Deserialize)]\n+```rust {1-2}\n+-#[derive(Clone, PartialEq)]\n++#[derive(Clone, PartialEq, Deserialize)]\n struct Video {\n id: usize,\n- title: String,\n- speaker: String,\n- url: String,\n+ title: AttrValue,\n+ speaker: AttrValue,\n+ url: AttrValue,\n }\n ```\n \n-最後一步，我們需要更新我們的 `App` 元件，以便進行 fetch 請求，而不是使用硬編碼的數據\n+接著我們需要更新 `App` 元件，讓它能擷取資料。現代 Yew 的作法是使用 [`use_future`](https://docs.rs/yew/latest/yew/suspense/fn.use_future.html) 與 [`<Suspense>`](https://yew.rs/docs/concepts/suspense)。\n \n-```rust ,ignore {1,5-25,34-35}\n-+ use gloo_net::http::Request;\n+另一種方式是使用 [`yew::platform::spawn_local`](https://docs.rs/yew/latest/yew/platform/fn.spawn_local.html)，\n+如果 hooks 無法使用，例如在 struct component 或一般函式中時，可以採用這種方法。\n \n-#[component(App)]\n-fn app() -> Html {\n-- let videos = vec![\n-- // ...\n-- ]\n-+ let videos = use_state(|| vec![]);\n-+ {\n-+ let videos = videos.clone();\n-+ use_effect_with((), move |_| {\n-+ let videos = videos.clone();\n-+ wasm_bindgen_futures::spawn_local(async move {\n-+ let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ .send()\n-+ .await\n-+ .unwrap()\n-+ .json()\n-+ .await\n-+ .unwrap();\n-+ videos.set(fetched_videos);\n-+ });\n-+ || ()\n-+ });\n+`use_future` 會在非同步操作完成前暫停該元件，而 `<Suspense>` 則會在這段期間顯示\n+備援 UI（例如載入中的提示）。\n+\n+更新匯入：\n+\n+```rust {3-4}\n+use yew::prelude::*;\n+use serde::Deserialize;\n++use gloo_net::http::Request;\n++use yew::suspense::use_future;\n+```\n+\n+我們將資料擷取邏輯拆分到一個子元件 `VideosFetcher` 中，該元件回傳 `HtmlResult`，\n+而父元件 `App` 則使用 `<Suspense>` 將它包起來：\n+\n+```rust {2-6,8-39}\n+use yew::suspense::use_future;\n++#[derive(Properties, PartialEq)]\n++struct VideosFetchProps {\n++ on_click: Callback<Video>,\n++ selected_video: Option<Video>,\n++}\n+\n++#[component]\n++fn VideosFetcher(\n++ VideosFetchProps {\n++ on_click,\n++ selected_video,\n++ }: &VideosFetchProps,\n++) -> HtmlResult {\n++ let videos = use_future(|| async {\n++ Request::get(\"https://yew.rs/tutorial/data.json\")\n++ .send()\n++ .await?\n++ .json::<Vec<Video>>()\n++ .await\n++ })?;\n++\n++ match &*videos {\n++ Ok(videos) => Ok(html! {\n++ <>\n++ <div>\n++ <h3>{ \"Videos to watch\" }</h3>\n++ <VideosList videos={videos.clone()} on_click={on_click.clone()} />\n++ </div>\n++ if let Some(video) = selected_video {\n++ <VideoDetails video={video.clone()} />\n++ }\n++ </>\n++ }),\n++ Err(err) => Ok(html! {\n++ <p>{format!(\"Error fetching videos: {err}\")}</p>\n++ }),\n + }\n++}\n+```\n+\n+現在我們會在 `App` 元件中使用這個新元件。\n+\n+```rust {3-28,33-47}\n+#[component]\n+fn App() -> Html {\n+- let videos = vec![\n+- Video {\n+- id: 1,\n+- title: \"Building and breaking things\".into(),\n+- speaker: \"John Doe\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 2,\n+- title: \"The development process\".into(),\n+- speaker: \"Jane Smith\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 3,\n+- title: \"The Web 7.0\".into(),\n+- speaker: \"Matt Miller\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 4,\n+- title: \"Mouseless development\".into(),\n+- speaker: \"Tom Jerry\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- ];\n \n // ...\n \n html! {\n- <h1>{ \"RustConf Explorer\" }</h1>\n- <div>\n- <h3>{\"Videos to watch\"}</h3>\n-- <VideosList videos={videos} on_click={on_video_select.clone()} />\n-+ <VideosList videos={(*videos).clone()} on_click={on_video_select.clone()} />\n- </div>\n- { for details }\n+- <h1>{ \"RustConf Explorer\" }</h1>\n+- <div>\n+- <h3>{ \"Videos to watch\" }</h3>\n+- <VideosList {videos} on_click={on_video_select} />\n+- </div>\n+- if let Some(video) = &*selected_video {\n+- <VideoDetails video={video.clone()} />\n+- }\n++ <h1>{ \"RustConf Explorer\" }</h1>\n++ <Suspense fallback={html! {<p> {\"Loading...\"} </p>}} >\n++ <VideosFetcher\n++ on_click={on_video_select}\n++ selected_video={(*selected_video).clone()}\n++ />\n++ </Suspense>\n }\n }\n ```\n \n :::note\n-我們在這裡使用 `unwrap`，因為這是一個演示應用程式。在真實的應用程式中，您可能希望有[適當的錯誤處理](https://doc.rust-lang.org/book/ch09-02-recoverable-errors-with-result.html)。\n+我們在 `use_future` 呼叫上使用 `?` 來傳遞 suspension。 \n+使用 suspense hooks 時，元件回傳的是 `HtmlResult`，而不是 `Html`。父元件則透過 `<Suspense fallback=...>` 在資料擷取期間顯示載入提示。\n :::\n \n-現在，查看瀏覽器，看看一切是否按預期工作……如果不是因為 CORS 的話。為了解決這個問題，我們需要一個代理伺服器。幸運的是 trunk 提供了這個功能。\n+現在，回到瀏覽器查看，一切本來應該會如預期運作……如果不是因為 CORS 的話。 \n+要解決這個問題，我們需要一個代理伺服器。幸運的是，trunk 已經提供了這個功能。\n \n-更新這些行：\n+更新以下這一行：\n \n-```rust ,ignore {2-3}\n-// ...\n-- let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ let fetched_videos: Vec<Video> = Request::get(\"/tutorial/data.json\")\n-// ...\n+```rust {1-2}\n+- Request::get(\"https://yew.rs/tutorial/data.json\")\n++ Request::get(\"/tutorial/data.json\")\n ```\n \n-現在，使用以下命令重新運行伺服器：\n+現在，使用以下指令重新啟動伺服器：\n \n ```bash\n trunk serve --proxy-backend=https://yew.rs/tutorial\n ```\n \n-刷新網頁，一切都應該按預期工作。\n+重新整理分頁後，一切就應該能如預期運作。\n+\n+由於資料載入速度很快，你可能看不到載入中的文字。如果你想看見它，可以在 `use_future` hook 中使用 `TimeoutFuture` 加入一段人為延遲。首先，將 `gloo-timers` 加入 `Cargo.toml`：\n+\n+```toml\n+gloo-timers = { version = \"0.3\", features = [\"futures\"] }\n+```\n+\n+接著在 hook 中加入延遲：\n+\n+```rust\n+let videos = use_future(|| async {\n++ gloo_timers::future::TimeoutFuture::new(3_000).await; // 延遲 3 秒\n+ Request::get(\"/tutorial/data.json\")\n+ .send()\n+ .await?\n+ .json::<Vec<Video>>()\n+ .await\n+})?;\n+```\n \n ## 總結\n \ndiff --git a/website/i18n/zh-Hant/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx b/website/i18n/zh-Hant/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx\nindex 7ad81c2946d..b8fbfc1f95f 100644\n--- a/website/i18n/zh-Hant/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx\n+++ b/website/i18n/zh-Hant/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx\n@@ -456,112 +456,210 @@ fn app() -> Html {\n 結構體組件的行為不同。請查看[文件](advanced-topics/struct-components/introduction.mdx)以了解有關這些的資訊。\n :::\n \n-## 取得資料（使用外部 REST API）\n+## 擷取資料（使用外部 REST API）\n \n-在真實的應用程式中，資料通常來自 API 而不是硬編碼。讓我們從外部來源取得我們的影片清單。為此，我們需要添加以下 crate：\n+在真實世界的應用程式中，資料通常會來自 API，而不是直接硬編碼在程式裡。現在讓我們從外部來源擷取影片清單。為此，我們需要加入以下 crates：\n \n-- [`gloo-net`](https://crates.io/crates/gloo-net)\n- 用於進行 fetch 調用。\n-- [`serde`](https://serde.rs) 及其衍生特性\n- 用於反序列化 JSON 回應\n-- [`wasm-bindgen-futures`](https://crates.io/crates/wasm-bindgen-futures)\n- 用於將 Rust 的 Future 作為 Promise 執行\n+- [`gloo-net`](https://crates.io/crates/gloo-net) \n+ 用來發送 fetch 請求。\n+- [`serde`](https://serde.rs) 並啟用 `derive` 功能 \n+ 用來將 JSON 回應反序列化。\n \n-讓我們更新 `Cargo.toml` 檔案中的依賴項：\n+讓我們更新 `Cargo.toml` 檔案中的相依套件：\n \n-```toml title=\"Cargo.toml\"\n+```toml title=\"Cargo.toml\" {2-5}\n [dependencies]\n-gloo-net = \"0.6\"\n-serde = { version = \"1.0\", features = [\"derive\"] }\n-wasm-bindgen-futures = \"0.4\"\n+-yew = { git = \"https://github.com/yewstack/yew/\", features = [\"csr\"] }\n++yew = { git = \"https://github.com/yewstack/yew/\", features = [\"csr\", \"serde\"] }\n++gloo-net = \"0.7\"\n++serde = { version = \"1.0\", features = [\"derive\"] }\n ```\n \n+Yew 的 `serde` 功能會啟用與 `serde` crate 的整合。對我們來說最重要的一點是，\n+它會為 `AttrValue` 加上 `serde::Deserialize` 的實作。\n+\n :::note\n-在選擇依賴項時，請確保它們與 `wasm32` 相容！否則，您將無法運行您的應用程式。\n+選擇相依套件時，請務必確認它們與 `wasm32` 相容！ \n+否則你的應用程式將無法執行。\n :::\n \n-更新 `Video` 結構體以衍生 `Deserialize` 特性：\n+更新匯入：\n+\n+```rust {2}\n+use yew::prelude::*;\n++use serde::Deserialize;\n+```\n \n-```rust ,ignore {1, 3-4}\n-+ use serde::Deserialize;\n+更新 `Video` 結構，讓它衍生 `Deserialize` trait：\n \n-- #[derive(Clone, PartialEq)]\n-+ #[derive(Clone, PartialEq, Deserialize)]\n+```rust {1-2}\n+-#[derive(Clone, PartialEq)]\n++#[derive(Clone, PartialEq, Deserialize)]\n struct Video {\n id: usize,\n- title: String,\n- speaker: String,\n- url: String,\n+ title: AttrValue,\n+ speaker: AttrValue,\n+ url: AttrValue,\n }\n ```\n \n-最後一步，我們需要更新我們的 `App` 元件，以便進行 fetch 請求，而不是使用硬編碼的數據\n+接著我們需要更新 `App` 元件，讓它能擷取資料。現代 Yew 的作法是使用 [`use_future`](https://docs.rs/yew/0.22.0/yew/suspense/fn.use_future.html) 與 [`<Suspense>`](https://yew.rs/docs/concepts/suspense)。\n \n-```rust ,ignore {1,5-25,34-35}\n-+ use gloo_net::http::Request;\n+另一種方式是使用 [`yew::platform::spawn_local`](https://docs.rs/yew/0.22.0/yew/platform/fn.spawn_local.html)，\n+如果 hooks 無法使用，例如在 struct component 或一般函式中時，可以採用這種方法。\n \n-#[component(App)]\n-fn app() -> Html {\n-- let videos = vec![\n-- // ...\n-- ]\n-+ let videos = use_state(|| vec![]);\n-+ {\n-+ let videos = videos.clone();\n-+ use_effect_with((), move |_| {\n-+ let videos = videos.clone();\n-+ wasm_bindgen_futures::spawn_local(async move {\n-+ let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ .send()\n-+ .await\n-+ .unwrap()\n-+ .json()\n-+ .await\n-+ .unwrap();\n-+ videos.set(fetched_videos);\n-+ });\n-+ || ()\n-+ });\n+`use_future` 會在非同步操作完成前暫停該元件，而 `<Suspense>` 則會在這段期間顯示\n+備援 UI（例如載入中的提示）。\n+\n+更新匯入：\n+\n+```rust {3-4}\n+use yew::prelude::*;\n+use serde::Deserialize;\n++use gloo_net::http::Request;\n++use yew::suspense::use_future;\n+```\n+\n+我們將資料擷取邏輯拆分到一個子元件 `VideosFetcher` 中，該元件回傳 `HtmlResult`，\n+而父元件 `App` 則使用 `<Suspense>` 將它包起來：\n+\n+```rust {2-6,8-39}\n+use yew::suspense::use_future;\n++#[derive(Properties, PartialEq)]\n++struct VideosFetchProps {\n++ on_click: Callback<Video>,\n++ selected_video: Option<Video>,\n++}\n+\n++#[component]\n++fn VideosFetcher(\n++ VideosFetchProps {\n++ on_click,\n++ selected_video,\n++ }: &VideosFetchProps,\n++) -> HtmlResult {\n++ let videos = use_future(|| async {\n++ Request::get(\"https://yew.rs/tutorial/data.json\")\n++ .send()\n++ .await?\n++ .json::<Vec<Video>>()\n++ .await\n++ })?;\n++\n++ match &*videos {\n++ Ok(videos) => Ok(html! {\n++ <>\n++ <div>\n++ <h3>{ \"Videos to watch\" }</h3>\n++ <VideosList videos={videos.clone()} on_click={on_click.clone()} />\n++ </div>\n++ if let Some(video) = selected_video {\n++ <VideoDetails video={video.clone()} />\n++ }\n++ </>\n++ }),\n++ Err(err) => Ok(html! {\n++ <p>{format!(\"Error fetching videos: {err}\")}</p>\n++ }),\n + }\n++}\n+```\n+\n+現在我們會在 `App` 元件中使用這個新元件。\n+\n+```rust {3-28,33-47}\n+#[component]\n+fn App() -> Html {\n+- let videos = vec![\n+- Video {\n+- id: 1,\n+- title: \"Building and breaking things\".into(),\n+- speaker: \"John Doe\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 2,\n+- title: \"The development process\".into(),\n+- speaker: \"Jane Smith\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 3,\n+- title: \"The Web 7.0\".into(),\n+- speaker: \"Matt Miller\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 4,\n+- title: \"Mouseless development\".into(),\n+- speaker: \"Tom Jerry\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- ];\n \n // ...\n \n html! {\n- <>\n- <h1>{ \"RustConf Explorer\" }</h1>\n- <div>\n- <h3>{\"Videos to watch\"}</h3>\n-- <VideosList videos={videos} on_click={on_video_select.clone()} />\n-+ <VideosList videos={(*videos).clone()} on_click={on_video_select.clone()} />\n- </div>\n- { for details }\n- </>\n+- <h1>{ \"RustConf Explorer\" }</h1>\n+- <div>\n+- <h3>{ \"Videos to watch\" }</h3>\n+- <VideosList {videos} on_click={on_video_select} />\n+- </div>\n+- if let Some(video) = &*selected_video {\n+- <VideoDetails video={video.clone()} />\n+- }\n++ <h1>{ \"RustConf Explorer\" }</h1>\n++ <Suspense fallback={html! {<p> {\"Loading...\"} </p>}} >\n++ <VideosFetcher\n++ on_click={on_video_select}\n++ selected_video={(*selected_video).clone()}\n++ />\n++ </Suspense>\n }\n }\n ```\n \n :::note\n-我們在這裡使用 `unwrap`，因為這是一個演示應用程式。在真實的應用程式中，您可能希望有[適當的錯誤處理](https://doc.rust-lang.org/book/ch09-02-recoverable-errors-with-result.html)。\n+我們在 `use_future` 呼叫上使用 `?` 來傳遞 suspension。 \n+使用 suspense hooks 時，元件回傳的是 `HtmlResult`，而不是 `Html`。父元件則透過 `<Suspense fallback=...>` 在資料擷取期間顯示載入提示。\n :::\n \n-現在，查看瀏覽器，看看一切是否按預期工作……如果不是因為 CORS 的話。為了解決這個問題，我們需要一個代理伺服器。幸運的是 trunk 提供了這個功能。\n+現在，回到瀏覽器查看，一切本來應該會如預期運作……如果不是因為 CORS 的話。 \n+要解決這個問題，我們需要一個代理伺服器。幸運的是，trunk 已經提供了這個功能。\n \n-更新這些行：\n+更新以下這一行：\n \n-```rust ,ignore {2-3}\n-// ...\n-- let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ let fetched_videos: Vec<Video> = Request::get(\"/tutorial/data.json\")\n-// ...\n+```rust {1-2}\n+- Request::get(\"https://yew.rs/tutorial/data.json\")\n++ Request::get(\"/tutorial/data.json\")\n ```\n \n-現在，使用以下命令重新運行伺服器：\n+現在，使用以下指令重新啟動伺服器：\n \n ```bash\n trunk serve --proxy-backend=https://yew.rs/tutorial\n ```\n \n-刷新網頁，一切都應該按預期工作。\n+重新整理分頁後，一切就應該能如預期運作。\n+\n+由於資料載入速度很快，你可能看不到載入中的文字。如果你想看見它，可以在 `use_future` hook 中使用 `TimeoutFuture` 加入一段人為延遲。首先，將 `gloo-timers` 加入 `Cargo.toml`：\n+\n+```toml\n+gloo-timers = { version = \"0.3\", features = [\"futures\"] }\n+```\n+\n+接著在 hook 中加入延遲：\n+\n+```rust\n+let videos = use_future(|| async {\n++ gloo_timers::future::TimeoutFuture::new(3_000).await; // 延遲 3 秒\n+ Request::get(\"/tutorial/data.json\")\n+ .send()\n+ .await?\n+ .json::<Vec<Video>>()\n+ .await\n+})?;\n+```\n \n ## 總結\n \ndiff --git a/website/i18n/zh-Hant/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx b/website/i18n/zh-Hant/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx\nindex cc20d6ccdc0..daf3f4b47b0 100644\n--- a/website/i18n/zh-Hant/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx\n+++ b/website/i18n/zh-Hant/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx\n@@ -456,112 +456,210 @@ fn app() -> Html {\n 結構體組件的行為不同。請查看[文件](advanced-topics/struct-components/introduction.mdx)以了解有關這些的資訊。\n :::\n \n-## 取得資料（使用外部 REST API）\n+## 擷取資料（使用外部 REST API）\n \n-在真實的應用程式中，資料通常來自 API 而不是硬編碼。讓我們從外部來源取得我們的影片清單。為此，我們需要添加以下 crate：\n+在真實世界的應用程式中，資料通常會來自 API，而不是直接硬編碼在程式裡。現在讓我們從外部來源擷取影片清單。為此，我們需要加入以下 crates：\n \n-- [`gloo-net`](https://crates.io/crates/gloo-net)\n- 用於進行 fetch 調用。\n-- [`serde`](https://serde.rs) 及其衍生特性\n- 用於反序列化 JSON 回應\n-- [`wasm-bindgen-futures`](https://crates.io/crates/wasm-bindgen-futures)\n- 用於將 Rust 的 Future 作為 Promise 執行\n+- [`gloo-net`](https://crates.io/crates/gloo-net) \n+ 用來發送 fetch 請求。\n+- [`serde`](https://serde.rs) 並啟用 `derive` 功能 \n+ 用來將 JSON 回應反序列化。\n \n-讓我們更新 `Cargo.toml` 檔案中的依賴項：\n+讓我們更新 `Cargo.toml` 檔案中的相依套件：\n \n-```toml title=\"Cargo.toml\"\n+```toml title=\"Cargo.toml\" {2-5}\n [dependencies]\n-gloo-net = \"0.6\"\n-serde = { version = \"1.0\", features = [\"derive\"] }\n-wasm-bindgen-futures = \"0.4\"\n+-yew = { version = \"0.23\", features = [\"csr\"] }\n++yew = { version = \"0.23\", features = [\"csr\", \"serde\"] }\n++gloo-net = \"0.7\"\n++serde = { version = \"1.0\", features = [\"derive\"] }\n ```\n \n+Yew 的 `serde` 功能會啟用與 `serde` crate 的整合。對我們來說最重要的一點是，\n+它會為 `AttrValue` 加上 `serde::Deserialize` 的實作。\n+\n :::note\n-在選擇依賴項時，請確保它們與 `wasm32` 相容！否則，您將無法運行您的應用程式。\n+選擇相依套件時，請務必確認它們與 `wasm32` 相容！ \n+否則你的應用程式將無法執行。\n :::\n \n-更新 `Video` 結構體以衍生 `Deserialize` 特性：\n+更新匯入：\n+\n+```rust {2}\n+use yew::prelude::*;\n++use serde::Deserialize;\n+```\n \n-```rust ,ignore {1, 3-4}\n-+ use serde::Deserialize;\n+更新 `Video` 結構，讓它衍生 `Deserialize` trait：\n \n-- #[derive(Clone, PartialEq)]\n-+ #[derive(Clone, PartialEq, Deserialize)]\n+```rust {1-2}\n+-#[derive(Clone, PartialEq)]\n++#[derive(Clone, PartialEq, Deserialize)]\n struct Video {\n id: usize,\n- title: String,\n- speaker: String,\n- url: String,\n+ title: AttrValue,\n+ speaker: AttrValue,\n+ url: AttrValue,\n }\n ```\n \n-最後一步，我們需要更新我們的 `App` 元件，以便進行 fetch 請求，而不是使用硬編碼的數據\n+接著我們需要更新 `App` 元件，讓它能擷取資料。現代 Yew 的作法是使用 [`use_future`](https://docs.rs/yew/0.23.0/yew/suspense/fn.use_future.html) 與 [`<Suspense>`](https://yew.rs/docs/concepts/suspense)。\n \n-```rust ,ignore {1,5-25,34-35}\n-+ use gloo_net::http::Request;\n+另一種方式是使用 [`yew::platform::spawn_local`](https://docs.rs/yew/0.23.0/yew/platform/fn.spawn_local.html)，\n+如果 hooks 無法使用，例如在 struct component 或一般函式中時，可以採用這種方法。\n \n-#[component(App)]\n-fn app() -> Html {\n-- let videos = vec![\n-- // ...\n-- ]\n-+ let videos = use_state(|| vec![]);\n-+ {\n-+ let videos = videos.clone();\n-+ use_effect_with((), move |_| {\n-+ let videos = videos.clone();\n-+ wasm_bindgen_futures::spawn_local(async move {\n-+ let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ .send()\n-+ .await\n-+ .unwrap()\n-+ .json()\n-+ .await\n-+ .unwrap();\n-+ videos.set(fetched_videos);\n-+ });\n-+ || ()\n-+ });\n+`use_future` 會在非同步操作完成前暫停該元件，而 `<Suspense>` 則會在這段期間顯示\n+備援 UI（例如載入中的提示）。\n+\n+更新匯入：\n+\n+```rust {3-4}\n+use yew::prelude::*;\n+use serde::Deserialize;\n++use gloo_net::http::Request;\n++use yew::suspense::use_future;\n+```\n+\n+我們將資料擷取邏輯拆分到一個子元件 `VideosFetcher` 中，該元件回傳 `HtmlResult`，\n+而父元件 `App` 則使用 `<Suspense>` 將它包起來：\n+\n+```rust {2-6,8-39}\n+use yew::suspense::use_future;\n++#[derive(Properties, PartialEq)]\n++struct VideosFetchProps {\n++ on_click: Callback<Video>,\n++ selected_video: Option<Video>,\n++}\n+\n++#[component]\n++fn VideosFetcher(\n++ VideosFetchProps {\n++ on_click,\n++ selected_video,\n++ }: &VideosFetchProps,\n++) -> HtmlResult {\n++ let videos = use_future(|| async {\n++ Request::get(\"https://yew.rs/tutorial/data.json\")\n++ .send()\n++ .await?\n++ .json::<Vec<Video>>()\n++ .await\n++ })?;\n++\n++ match &*videos {\n++ Ok(videos) => Ok(html! {\n++ <>\n++ <div>\n++ <h3>{ \"Videos to watch\" }</h3>\n++ <VideosList videos={videos.clone()} on_click={on_click.clone()} />\n++ </div>\n++ if let Some(video) = selected_video {\n++ <VideoDetails video={video.clone()} />\n++ }\n++ </>\n++ }),\n++ Err(err) => Ok(html! {\n++ <p>{format!(\"Error fetching videos: {err}\")}</p>\n++ }),\n + }\n++}\n+```\n+\n+現在我們會在 `App` 元件中使用這個新元件。\n+\n+```rust {3-28,33-47}\n+#[component]\n+fn App() -> Html {\n+- let videos = vec![\n+- Video {\n+- id: 1,\n+- title: \"Building and breaking things\".into(),\n+- speaker: \"John Doe\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 2,\n+- title: \"The development process\".into(),\n+- speaker: \"Jane Smith\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 3,\n+- title: \"The Web 7.0\".into(),\n+- speaker: \"Matt Miller\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- Video {\n+- id: 4,\n+- title: \"Mouseless development\".into(),\n+- speaker: \"Tom Jerry\".into(),\n+- url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n+- },\n+- ];\n \n // ...\n \n html! {\n- <>\n- <h1>{ \"RustConf Explorer\" }</h1>\n- <div>\n- <h3>{\"Videos to watch\"}</h3>\n-- <VideosList videos={videos} on_click={on_video_select.clone()} />\n-+ <VideosList videos={(*videos).clone()} on_click={on_video_select.clone()} />\n- </div>\n- { for details }\n- </>\n+- <h1>{ \"RustConf Explorer\" }</h1>\n+- <div>\n+- <h3>{ \"Videos to watch\" }</h3>\n+- <VideosList {videos} on_click={on_video_select} />\n+- </div>\n+- if let Some(video) = &*selected_video {\n+- <VideoDetails video={video.clone()} />\n+- }\n++ <h1>{ \"RustConf Explorer\" }</h1>\n++ <Suspense fallback={html! {<p> {\"Loading...\"} </p>}} >\n++ <VideosFetcher\n++ on_click={on_video_select}\n++ selected_video={(*selected_video).clone()}\n++ />\n++ </Suspense>\n }\n }\n ```\n \n :::note\n-我們在這裡使用 `unwrap`，因為這是一個演示應用程式。在真實的應用程式中，您可能希望有[適當的錯誤處理](https://doc.rust-lang.org/book/ch09-02-recoverable-errors-with-result.html)。\n+我們在 `use_future` 呼叫上使用 `?` 來傳遞 suspension。 \n+使用 suspense hooks 時，元件回傳的是 `HtmlResult`，而不是 `Html`。父元件則透過 `<Suspense fallback=...>` 在資料擷取期間顯示載入提示。\n :::\n \n-現在，查看瀏覽器，看看一切是否按預期工作……如果不是因為 CORS 的話。為了解決這個問題，我們需要一個代理伺服器。幸運的是 trunk 提供了這個功能。\n+現在，回到瀏覽器查看，一切本來應該會如預期運作……如果不是因為 CORS 的話。 \n+要解決這個問題，我們需要一個代理伺服器。幸運的是，trunk 已經提供了這個功能。\n \n-更新這些行：\n+更新以下這一行：\n \n-```rust ,ignore {2-3}\n-// ...\n-- let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ let fetched_videos: Vec<Video> = Request::get(\"/tutorial/data.json\")\n-// ...\n+```rust {1-2}\n+- Request::get(\"https://yew.rs/tutorial/data.json\")\n++ Request::get(\"/tutorial/data.json\")\n ```\n \n-現在，使用以下命令重新運行伺服器：\n+現在，使用以下指令重新啟動伺服器：\n \n ```bash\n trunk serve --proxy-backend=https://yew.rs/tutorial\n ```\n \n-刷新網頁，一切都應該按預期工作。\n+重新整理分頁後，一切就應該能如預期運作。\n+\n+由於資料載入速度很快，你可能看不到載入中的文字。如果你想看見它，可以在 `use_future` hook 中使用 `TimeoutFuture` 加入一段人為延遲。首先，將 `gloo-timers` 加入 `Cargo.toml`：\n+\n+```toml\n+gloo-timers = { version = \"0.3\", features = [\"futures\"] }\n+```\n+\n+接著在 hook 中加入延遲：\n+\n+```rust\n+let videos = use_future(|| async {\n++ gloo_timers::future::TimeoutFuture::new(3_000).await; // 延遲 3 秒\n+ Request::get(\"/tutorial/data.json\")\n+ .send()\n+ .await?\n+ .json::<Vec<Video>>()\n+ .await\n+})?;\n+```\n \n ## 總結\n \ndiff --git a/website/versioned_docs/version-0.22/tutorial/index.mdx b/website/versioned_docs/version-0.22/tutorial/index.mdx\nindex 98c606e7897..970e1dcc389 100644\n--- a/website/versioned_docs/version-0.22/tutorial/index.mdx\n+++ b/website/versioned_docs/version-0.22/tutorial/index.mdx\n@@ -468,18 +468,15 @@ videos list from an external source. For this we will need to add the following\n For making the fetch call.\n - [`serde`](https://serde.rs) with derive features\n For de-serializing the JSON response\n-- [`wasm-bindgen-futures`](https://crates.io/crates/wasm-bindgen-futures)\n- For executing Rust Future as a Promise\n \n Let's update the dependencies in `Cargo.toml` file:\n \n-```toml title=\"Cargo.toml\" {2-6}\n+```toml title=\"Cargo.toml\" {2-5}\n [dependencies]\n -yew = { version = \"0.22\", features = [\"csr\"] }\n +yew = { version = \"0.22\", features = [\"csr\", \"serde\"] }\n-+gloo-net = \"0.6\"\n++gloo-net = \"0.7\"\n +serde = { version = \"1.0\", features = [\"derive\"] }\n-+wasm-bindgen-futures = \"0.4\"\n ```\n \n Yew's `serde` feature enables integration with the `serde` crate, the important point for us is that\n@@ -490,12 +487,16 @@ When choosing dependencies make sure they are `wasm32` compatible!\n Otherwise you won't be able to run your application.\n :::\n \n-Update the `Video` struct to derive the `Deserialize` trait:\n+Update the imports:\n \n-```rust {2,4-5}\n+```rust {2}\n use yew::prelude::*;\n +use serde::Deserialize;\n-// ...\n+```\n+\n+Update the `Video` struct to derive the `Deserialize` trait:\n+\n+```rust {1-2}\n -#[derive(Clone, PartialEq)]\n +#[derive(Clone, PartialEq, Deserialize)]\n struct Video {\n@@ -506,12 +507,71 @@ struct Video {\n }\n ```\n \n-Now as the last step, we need to update our `App` component to make the fetch request instead of using hardcoded data\n+Now we need to update our `App` component to fetch data. The modern yew way to do this is with [`use_future`](https://docs.rs/yew/0.22.0/yew/suspense/fn.use_future.html) and [`<Suspense>`](https://yew.rs/docs/concepts/suspense).\n+\n+Alternatively, you can use [`yew::platform::spawn_local`](https://docs.rs/yew/0.22.0/yew/platform/fn.spawn_local.html)\n+if hooks are unavailable, such as within struct components or standard functions.\n+\n+`use_future` suspends the component until the async operation completes, and `<Suspense>` shows a\n+fallback UI (e.g. a loading indicator) in the meantime.\n+\n+Update the imports:\n \n-```rust {2,6-50,59-60}\n+```rust {3-4}\n use yew::prelude::*;\n+use serde::Deserialize;\n +use gloo_net::http::Request;\n++use yew::suspense::use_future;\n+```\n+\n+We split the data fetching logic into a child component (`VideosFetcher`) that returns `HtmlResult`,\n+while the parent `App` wraps it in `<Suspense>`:\n+\n+```rust {2-6,8-39}\n+use yew::suspense::use_future;\n++#[derive(Properties, PartialEq)]\n++struct VideosFetchProps {\n++ on_click: Callback<Video>,\n++ selected_video: Option<Video>,\n++}\n+\n++#[component]\n++fn VideosFetcher(\n++ VideosFetchProps {\n++ on_click,\n++ selected_video,\n++ }: &VideosFetchProps,\n++) -> HtmlResult {\n++ let videos = use_future(|| async {\n++ Request::get(\"https://yew.rs/tutorial/data.json\")\n++ .send()\n++ .await?\n++ .json::<Vec<Video>>()\n++ .await\n++ })?;\n++\n++ match &*videos {\n++ Ok(videos) => Ok(html! {\n++ <>\n++ <div>\n++ <h3>{ \"Videos to watch\" }</h3>\n++ <VideosList videos={videos.clone()} on_click={on_click.clone()} />\n++ </div>\n++ if let Some(video) = selected_video {\n++ <VideoDetails video={video.clone()} />\n++ }\n++ </>\n++ }),\n++ Err(err) => Ok(html! {\n++ <p>{format!(\"Error fetching videos: {err}\")}</p>\n++ }),\n++ }\n++}\n+```\n \n+Now we will use the new component inside the App component.\n+\n+```rust {3-28,33-47}\n #[component]\n fn App() -> Html {\n - let videos = vec![\n@@ -541,44 +601,32 @@ fn App() -> Html {\n - },\n - ];\n -\n-+ let videos = use_state(|| vec![]);\n-+ {\n-+ let videos = videos.clone();\n-+ use_effect_with((), move |_| {\n-+ let videos = videos.clone();\n-+ wasm_bindgen_futures::spawn_local(async move {\n-+ let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ .send()\n-+ .await\n-+ .unwrap()\n-+ .json()\n-+ .await\n-+ .unwrap();\n-+ videos.set(fetched_videos);\n-+ });\n-+ || ()\n-+ });\n-+ }\n-\n // ...\n \n html! {\n- <>\n- <h1>{ \"RustConf Explorer\" }</h1>\n- <div>\n- <h3>{ \"Videos to watch\" }</h3>\n-- <VideosList {videos} on_click={on_video_select} />\n-+ <VideosList videos={(*videos).clone()} on_click={on_video_select} />\n- </div>\n- // ...\n- </>\n+- <h1>{ \"RustConf Explorer\" }</h1>\n+- <div>\n+- <h3>{ \"Videos to watch\" }</h3>\n+- <VideosList {videos} on_click={on_video_select} />\n+- </div>\n+- if let Some(video) = &*selected_video {\n+- <VideoDetails video={video.clone()} />\n+- }\n++ <h1>{ \"RustConf Explorer\" }</h1>\n++ <Suspense fallback={html! {<p> {\"Loading...\"} </p>}} >\n++ <VideosFetcher\n++ on_click={on_video_select}\n++ selected_video={(*selected_video).clone()}\n++ />\n++ </Suspense>\n }\n }\n ```\n \n :::note\n-We are using `unwrap`s here because this is a demo application. In a real-world app, you would likely want to have\n-[proper error handling](https://doc.rust-lang.org/book/ch09-02-recoverable-errors-with-result.html).\n+We use `?` on the `use_future` call to propagate the suspension. The component returns `HtmlResult`\n+instead of `Html` when using suspense hooks. The parent wraps it in `<Suspense fallback=...>` to show\n+a loading indicator while the data is being fetched.\n :::\n \n Now, look at the browser to see everything working as expected... which would have been the case if it were not for CORS.\n@@ -586,9 +634,9 @@ To fix that, we need a proxy server. Luckily trunk provides that.\n \n Update the following line:\n \n-```rust {2-3}\n-- let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ let fetched_videos: Vec<Video> = Request::get(\"/tutorial/data.json\")\n+```rust {1-2}\n+- Request::get(\"https://yew.rs/tutorial/data.json\")\n++ Request::get(\"/tutorial/data.json\")\n ```\n \n Now, rerun the server with the following command:\n@@ -599,6 +647,26 @@ trunk serve --proxy-backend=https://yew.rs/tutorial\n \n Refresh the tab and everything should work as expected.\n \n+The loading text may not be visible because the data loads very quickly. If you'd like to see it, you can add an\n+artificial delay inside the `use_future` hook using `TimeoutFuture`. First, add `gloo-timers` to your `Cargo.toml`:\n+\n+```toml\n+gloo-timers = { version = \"0.3\", features = [\"futures\"] }\n+```\n+\n+Then add the delay inside the hook:\n+\n+```\n+let videos = use_future(|| async {\n++ gloo_timers::future::TimeoutFuture::new(3_000).await; // 3 second delay\n+ Request::get(\"/tutorial/data.json\")\n+ .send()\n+ .await?\n+ .json::<Vec<Video>>()\n+ .await\n+\n+```\n+\n ## Wrapping up\n \n Congratulations! You’ve created a web application that fetches data from an external API and displays a list of videos.\ndiff --git a/website/versioned_docs/version-0.23/tutorial/index.mdx b/website/versioned_docs/version-0.23/tutorial/index.mdx\nindex 4b13c2d931d..519d91f6d6c 100644\n--- a/website/versioned_docs/version-0.23/tutorial/index.mdx\n+++ b/website/versioned_docs/version-0.23/tutorial/index.mdx\n@@ -468,18 +468,15 @@ videos list from an external source. For this we will need to add the following\n For making the fetch call.\n - [`serde`](https://serde.rs) with derive features\n For de-serializing the JSON response\n-- [`wasm-bindgen-futures`](https://crates.io/crates/wasm-bindgen-futures)\n- For executing Rust Future as a Promise\n \n Let's update the dependencies in `Cargo.toml` file:\n \n-```toml title=\"Cargo.toml\" {2-6}\n+```toml title=\"Cargo.toml\" {2-5}\n [dependencies]\n -yew = { version = \"0.23\", features = [\"csr\"] }\n +yew = { version = \"0.23\", features = [\"csr\", \"serde\"] }\n-+gloo-net = \"0.6\"\n++gloo-net = \"0.7\"\n +serde = { version = \"1.0\", features = [\"derive\"] }\n-+wasm-bindgen-futures = \"0.4\"\n ```\n \n Yew's `serde` feature enables integration with the `serde` crate, the important point for us is that\n@@ -490,12 +487,16 @@ When choosing dependencies make sure they are `wasm32` compatible!\n Otherwise you won't be able to run your application.\n :::\n \n-Update the `Video` struct to derive the `Deserialize` trait:\n+Update the imports:\n \n-```rust {2,4-5}\n+```rust {2}\n use yew::prelude::*;\n +use serde::Deserialize;\n-// ...\n+```\n+\n+Update the `Video` struct to derive the `Deserialize` trait:\n+\n+```rust {1-2}\n -#[derive(Clone, PartialEq)]\n +#[derive(Clone, PartialEq, Deserialize)]\n struct Video {\n@@ -506,12 +507,71 @@ struct Video {\n }\n ```\n \n-Now as the last step, we need to update our `App` component to make the fetch request instead of using hardcoded data\n+Now we need to update our `App` component to fetch data. The modern yew way to do this is with [`use_future`](https://docs.rs/yew/0.23.0/yew/suspense/fn.use_future.html) and [`<Suspense>`](https://yew.rs/docs/concepts/suspense).\n+\n+Alternatively, you can use [`yew::platform::spawn_local`](https://docs.rs/yew/0.23.0/yew/platform/fn.spawn_local.html)\n+if hooks are unavailable, such as within struct components or standard functions.\n+\n+`use_future` suspends the component until the async operation completes, and `<Suspense>` shows a\n+fallback UI (e.g. a loading indicator) in the meantime.\n+\n+Update the imports:\n \n-```rust {2,6-50,59-60}\n+```rust {3-4}\n use yew::prelude::*;\n+use serde::Deserialize;\n +use gloo_net::http::Request;\n++use yew::suspense::use_future;\n+```\n+\n+We split the data fetching logic into a child component (`VideosFetcher`) that returns `HtmlResult`,\n+while the parent `App` wraps it in `<Suspense>`:\n+\n+```rust {2-6,8-39}\n+use yew::suspense::use_future;\n++#[derive(Properties, PartialEq)]\n++struct VideosFetchProps {\n++ on_click: Callback<Video>,\n++ selected_video: Option<Video>,\n++}\n+\n++#[component]\n++fn VideosFetcher(\n++ VideosFetchProps {\n++ on_click,\n++ selected_video,\n++ }: &VideosFetchProps,\n++) -> HtmlResult {\n++ let videos = use_future(|| async {\n++ Request::get(\"https://yew.rs/tutorial/data.json\")\n++ .send()\n++ .await?\n++ .json::<Vec<Video>>()\n++ .await\n++ })?;\n++\n++ match &*videos {\n++ Ok(videos) => Ok(html! {\n++ <>\n++ <div>\n++ <h3>{ \"Videos to watch\" }</h3>\n++ <VideosList videos={videos.clone()} on_click={on_click.clone()} />\n++ </div>\n++ if let Some(video) = selected_video {\n++ <VideoDetails video={video.clone()} />\n++ }\n++ </>\n++ }),\n++ Err(err) => Ok(html! {\n++ <p>{format!(\"Error fetching videos: {err}\")}</p>\n++ }),\n++ }\n++}\n+```\n \n+Now we will use the new component inside the App component.\n+\n+```rust {3-28,33-47}\n #[component]\n fn App() -> Html {\n - let videos = vec![\n@@ -540,45 +600,33 @@ fn App() -> Html {\n - url: \"https://youtu.be/PsaFVLr8t4E\".into(),\n - },\n - ];\n--\n-+ let videos = use_state(|| vec![]);\n-+ {\n-+ let videos = videos.clone();\n-+ use_effect_with((), move |_| {\n-+ let videos = videos.clone();\n-+ wasm_bindgen_futures::spawn_local(async move {\n-+ let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ .send()\n-+ .await\n-+ .unwrap()\n-+ .json()\n-+ .await\n-+ .unwrap();\n-+ videos.set(fetched_videos);\n-+ });\n-+ || ()\n-+ });\n-+ }\n \n // ...\n \n html! {\n- <>\n- <h1>{ \"RustConf Explorer\" }</h1>\n- <div>\n- <h3>{ \"Videos to watch\" }</h3>\n-- <VideosList {videos} on_click={on_video_select} />\n-+ <VideosList videos={(*videos).clone()} on_click={on_video_select} />\n- </div>\n- // ...\n- </>\n+- <h1>{ \"RustConf Explorer\" }</h1>\n+- <div>\n+- <h3>{ \"Videos to watch\" }</h3>\n+- <VideosList {videos} on_click={on_video_select} />\n+- </div>\n+- if let Some(video) = &*selected_video {\n+- <VideoDetails video={video.clone()} />\n+- }\n++ <h1>{ \"RustConf Explorer\" }</h1>\n++ <Suspense fallback={html! {<p> {\"Loading...\"} </p>}} >\n++ <VideosFetcher\n++ on_click={on_video_select}\n++ selected_video={(*selected_video).clone()}\n++ />\n++ </Suspense>\n }\n }\n ```\n \n :::note\n-We are using `unwrap`s here because this is a demo application. In a real-world app, you would likely want to have\n-[proper error handling](https://doc.rust-lang.org/book/ch09-02-recoverable-errors-with-result.html).\n+We use `?` on the `use_future` call to propagate the suspension. The component returns `HtmlResult`\n+instead of `Html` when using suspense hooks. The parent wraps it in `<Suspense fallback=...>` to show\n+a loading indicator while the data is being fetched.\n :::\n \n Now, look at the browser to see everything working as expected... which would have been the case if it were not for CORS.\n@@ -586,9 +634,9 @@ To fix that, we need a proxy server. Luckily trunk provides that.\n \n Update the following line:\n \n-```rust {2-3}\n-- let fetched_videos: Vec<Video> = Request::get(\"https://yew.rs/tutorial/data.json\")\n-+ let fetched_videos: Vec<Video> = Request::get(\"/tutorial/data.json\")\n+```rust {1-2}\n+- Request::get(\"https://yew.rs/tutorial/data.json\")\n++ Request::get(\"/tutorial/data.json\")\n ```\n \n Now, rerun the server with the following command:\n@@ -599,6 +647,26 @@ trunk serve --proxy-backend=https://yew.rs/tutorial\n \n Refresh the tab and everything should work as expected.\n \n+The loading text may not be visible because the data loads very quickly. If you'd like to see it, you can add an\n+artificial delay inside the `use_future` hook using `TimeoutFuture`. First, add `gloo-timers` to your `Cargo.toml`:\n+\n+```toml\n+gloo-timers = { version = \"0.3\", features = [\"futures\"] }\n+```\n+\n+Then add the delay inside the hook:\n+\n+```\n+let videos = use_future(|| async {\n++ gloo_timers::future::TimeoutFuture::new(3_000).await; // 3 second delay\n+ Request::get(\"/tutorial/data.json\")\n+ .send()\n+ .await?\n+ .json::<Vec<Video>>()\n+ .await\n+\n+```\n+\n ## Wrapping up\n \n Congratulations! You’ve created a web application that fetches data from an external API and displays a list of videos.\n"},"changed_files":{"kind":"list like","value":["website/docs/tutorial/index.mdx","website/i18n/ja/docusaurus-plugin-content-docs/current/tutorial/index.mdx","website/i18n/ja/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx","website/i18n/ja/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx","website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/tutorial/index.mdx","website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx","website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx","website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/tutorial/index.mdx","website/i18n/zh-Hant/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx","website/i18n/zh-Hant/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx","website/versioned_docs/version-0.22/tutorial/index.mdx","website/versioned_docs/version-0.23/tutorial/index.mdx"],"string":"[\n \"website/docs/tutorial/index.mdx\",\n \"website/i18n/ja/docusaurus-plugin-content-docs/current/tutorial/index.mdx\",\n \"website/i18n/ja/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx\",\n \"website/i18n/ja/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx\",\n \"website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/tutorial/index.mdx\",\n \"website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx\",\n \"website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx\",\n \"website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/tutorial/index.mdx\",\n \"website/i18n/zh-Hant/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx\",\n \"website/i18n/zh-Hant/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx\",\n \"website/versioned_docs/version-0.22/tutorial/index.mdx\",\n \"website/versioned_docs/version-0.23/tutorial/index.mdx\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86284,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4158,"string":"4,158"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":"<img src> re-downloaded on hydration because all attributes are unconditionally re-applied\n\n**Problem**\nDuring SSR hydration, Yew unconditionally re-applies every attribute to the already rendered DOM element. For attributes like src on `<img>`, setting the attribute again even to the same value - causes the browser to restart the resource fetch, resulting in duplicate network requests.\n\n**Steps To Reproduce**\n1. Create a Yew app with SSR + hydration enabled.\n2. Render an `<img>` with a src attribute server-side.\n3. To make the issue clearly observable, introduce an artificial delay before the WASM bundle is loaded. This ensures the browser has time to fully download the resource from the SSR-rendered HTML before hydration runs and resets the attribute.\n4. Open DevTools → Network tab before the page loads.\n5. Load the page and wait for the initial resource fetch to complete.\n6. Once WASM starts and hydration runs, observe the same resource being fetched a second time.\n\n\n**Expected behavior**\nDuring hydration, attributes that already have the correct value on the SSR-rendered DOM element should not be re-applied. No duplicate network requests should occur.\n\n**Environment:**\n - Yew version: master\n - Rust version: any\n - Target: wasm32-unknown-unknown\n - Build tool: trunk / wasm-pack\n - OS: any\n - Browser and version: any, (FireFox tested)\n\n**Root cause (for reference)**\n\n`packages/yew/src/dom_bundle/btag/mod.rs` - the hydrate `impl for VTag` calls `attributes.apply(root, &el)` which unconditionally calls `el.set_attribute(k, v)` for every attribute, regardless of whether the DOM already has that value.\n\n**Questionnaire**\n- [ ] I'm interested in fixing this myself but don't know where to start\n- [x] I would like to fix and I have a solution\n- [ ] I don't have time to fix this right now, but maybe later"},"pr_title":{"kind":"string","value":"add hydrate_set(Attributes) and hydrate(trait Apply) methods"},"pr_body":{"kind":"string","value":"#### Description\r\nIntroduce an optimized hydration path for DOM attributes - skip unnecessary set_attribute calls when SSR has already written the correct value.\r\n\r\nFixes #4157\r\n\r\n#### Checklist\r\n\r\n- [x] I have reviewed my own code\r\n- [x] I have added tests\r\n"},"base_sha":{"kind":"string","value":"65972c34fe8c18e6961c9473c572c71e03de43d5"},"head_sha":{"kind":"string","value":"c39803edc34799571b92d3f9601d66d64af62f82"},"gold_diff":{"kind":"string","value":"diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml\nindex 629e50f9ccc..a83f1e8e74e 100644\n--- a/packages/yew/Cargo.toml\n+++ b/packages/yew/Cargo.toml\n@@ -92,7 +92,13 @@ trybuild = { workspace = true }\n \n [dev-dependencies.web-sys]\n workspace = true\n-features = [\"ShadowRootInit\", \"ShadowRootMode\", \"HtmlButtonElement\"]\n+features = [\n+ \"ShadowRootInit\",\n+ \"ShadowRootMode\",\n+ \"HtmlButtonElement\",\n+ \"MutationObserver\",\n+ \"MutationObserverInit\",\n+]\n \n [features]\n ssr = [\"dep:html-escape\", \"dep:base64ct\", \"dep:bincode\"]\ndiff --git a/packages/yew/src/dom_bundle/btag/attributes.rs b/packages/yew/src/dom_bundle/btag/attributes.rs\nindex 3bdfcf3e5bb..5bfb7f035ac 100644\n--- a/packages/yew/src/dom_bundle/btag/attributes.rs\n+++ b/packages/yew/src/dom_bundle/btag/attributes.rs\n@@ -181,6 +181,27 @@ impl Attributes {\n }\n }\n \n+ /// Applies a value during hydration.\n+ ///\n+ /// Hydration assumes the DOM already matches the server-rendered HTML, so\n+ /// attributes are left untouched: re-writing them would needlessly trigger\n+ /// side effects. In debug builds we only assert that the existing attribute\n+ /// matches the expected value. Properties are not reflected in the HTML, so\n+ /// they are always set.\n+ #[cfg(feature = \"hydration\")]\n+ fn hydrate_set(el: &Element, key: &str, value: &AttributeOrProperty) {\n+ match value {\n+ AttributeOrProperty::Attribute(value) => {\n+ debug_assert_eq!(\n+ el.get_attribute(key).as_deref(),\n+ Some(value.as_ref()),\n+ \"attribute `{key}` does not match the server-rendered value during hydration\",\n+ );\n+ }\n+ AttributeOrProperty::Property(_) => Self::set(el, key, value),\n+ }\n+ }\n+\n fn remove(el: &Element, key: &str, old_value: &AttributeOrProperty) {\n match old_value {\n AttributeOrProperty::Attribute(_) => el\n@@ -223,6 +244,31 @@ impl Apply for Attributes {\n self\n }\n \n+ #[cfg(feature = \"hydration\")]\n+ fn hydrate(self, _root: &BSubtree, el: &Element) -> Self {\n+ #[expect(deprecated)]\n+ match &self {\n+ Self::Static(arr) => {\n+ for (k, v) in arr.iter() {\n+ Self::hydrate_set(el, k, v);\n+ }\n+ }\n+ Self::Dynamic { keys, values } => {\n+ for (k, v) in keys.iter().zip(values.iter()) {\n+ if let Some(v) = v {\n+ Self::hydrate_set(el, k, v)\n+ }\n+ }\n+ }\n+ Self::IndexMap(m) => {\n+ for (k, v) in m.iter() {\n+ Self::hydrate_set(el, k, v)\n+ }\n+ }\n+ }\n+ self\n+ }\n+\n fn apply_diff(self, _root: &BSubtree, el: &Element, bundle: &mut Self) {\n #[inline]\n fn ptr_eq<T>(a: &[T], b: &[T]) -> bool {\ndiff --git a/packages/yew/src/dom_bundle/btag/mod.rs b/packages/yew/src/dom_bundle/btag/mod.rs\nindex 11733c7d8d0..3b822409e7b 100644\n--- a/packages/yew/src/dom_bundle/btag/mod.rs\n+++ b/packages/yew/src/dom_bundle/btag/mod.rs\n@@ -35,6 +35,17 @@ trait Apply {\n \n /// Apply diff between [self] and `bundle` to [Element](Self::Element).\n fn apply_diff(self, root: &BSubtree, el: &Self::Element, bundle: &mut Self::Bundle);\n+\n+ /// Apply contained values to an existing [Element](Self::Element).\n+ ///\n+ /// The default implementation delegates to [`apply`](Self::apply).\n+ #[cfg(feature = \"hydration\")]\n+ fn hydrate(self, root: &BSubtree, el: &Self::Element) -> Self::Bundle\n+ where\n+ Self: Sized,\n+ {\n+ self.apply(root, el)\n+ }\n }\n \n /// [BTag] fields that are specific to different [BTag] kinds.\n@@ -401,8 +412,8 @@ mod feat_hydration {\n );\n }\n }\n- // We simply register listeners and update all attributes.\n- let attributes = attributes.apply(root, &el);\n+ // Register listeners and attributes.\n+ let attributes = attributes.hydrate(root, &el);\n let listeners = listeners.apply(root, &el);\n \n // For input and textarea elements, we update their value anyways.\n"},"changed_files":{"kind":"list like","value":["packages/yew/Cargo.toml","packages/yew/src/dom_bundle/btag/attributes.rs","packages/yew/src/dom_bundle/btag/mod.rs","packages/yew/tests/hydration.rs"],"string":"[\n \"packages/yew/Cargo.toml\",\n \"packages/yew/src/dom_bundle/btag/attributes.rs\",\n \"packages/yew/src/dom_bundle/btag/mod.rs\",\n \"packages/yew/tests/hydration.rs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":"diff --git a/packages/yew/tests/hydration.rs b/packages/yew/tests/hydration.rs\nindex 63ca2144edd..7fb1488ed28 100644\n--- a/packages/yew/tests/hydration.rs\n+++ b/packages/yew/tests/hydration.rs\n@@ -1,6 +1,7 @@\n #![cfg(feature = \"hydration\")]\n #![cfg(all(target_arch = \"wasm32\", not(target_os = \"wasi\")))]\n \n+use std::cell::RefCell;\n use std::ops::Range;\n use std::rc::Rc;\n use std::time::Duration;\n@@ -9,6 +10,7 @@ mod common;\n \n use common::{obtain_result, obtain_result_by_id};\n use wasm_bindgen::JsCast;\n+use wasm_bindgen::closure::Closure;\n use wasm_bindgen_futures::spawn_local;\n use wasm_bindgen_test::*;\n use web_sys::{HtmlElement, HtmlTextAreaElement};\n@@ -1260,3 +1262,60 @@ async fn hydration_suspended_child_does_not_trap_sibling_slot() {\n r#\"<p class=\"new-sibling\">new sibling</p><div class=\"suspended\">child</div>\"#,\n );\n }\n+\n+#[wasm_bindgen_test]\n+async fn hydration_does_not_reapply_matching_attributes() {\n+ #[component(App)]\n+ fn app() -> Html {\n+ html! {\n+ <div id=\"result\">\n+ <img class=\"pic\" src=\"/picture.png\" alt=\"a picture\" />\n+ </div>\n+ }\n+ }\n+\n+ let s = ServerRenderer::<App>::new().render().await;\n+\n+ gloo::utils::document()\n+ .query_selector(\"#output\")\n+ .unwrap()\n+ .unwrap()\n+ .set_inner_html(&s);\n+\n+ scheduler::flush().await;\n+\n+ let img = gloo::utils::document()\n+ .query_selector(\"#output .pic\")\n+ .unwrap()\n+ .unwrap();\n+\n+ let mutations = Rc::new(RefCell::new(0usize));\n+ let observer = {\n+ let mutations = mutations.clone();\n+ let callback = Closure::<dyn FnMut(js_sys::Array)>::new(move |records: js_sys::Array| {\n+ *mutations.borrow_mut() += records.length() as usize;\n+ });\n+ let observer = web_sys::MutationObserver::new(callback.as_ref().unchecked_ref()).unwrap();\n+ callback.forget();\n+ observer\n+ };\n+ let init = web_sys::MutationObserverInit::new();\n+ init.set_attributes(true);\n+ observer.observe_with_options(&img, &init).unwrap();\n+\n+ Renderer::<App>::with_root(gloo::utils::document().get_element_by_id(\"output\").unwrap())\n+ .hydrate();\n+\n+ scheduler::flush().await;\n+ observer.disconnect();\n+\n+ assert_eq!(\n+ *mutations.borrow(),\n+ 0,\n+ \"hydration must not re-apply attributes that already match the DOM\",\n+ );\n+\n+ assert_eq!(img.get_attribute(\"src\").as_deref(), Some(\"/picture.png\"));\n+ assert_eq!(img.get_attribute(\"alt\").as_deref(), Some(\"a picture\"));\n+ assert_eq!(img.get_attribute(\"class\").as_deref(), Some(\"pic\"));\n+}\n"},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86285,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4163,"string":"4,163"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"chore(deps): bump the cargo-deps group across 1 directory with 18 updates"},"pr_body":{"kind":"string","value":"Bumps the cargo-deps group with 18 updates in the / directory:\n\n| Package | From | To |\n| --- | --- | --- |\n| [tokio](https://github.com/tokio-rs/tokio) | `1.51.0` | `1.52.3` |\n| [clap](https://github.com/clap-rs/clap) | `4.6.0` | `4.6.1` |\n| [serde_json](https://github.com/serde-rs/json) | `1.0.149` | `1.0.150` |\n| [log](https://github.com/rust-lang/log) | `0.4.29` | `0.4.31` |\n| [reqwest](https://github.com/seanmonstar/reqwest) | `0.13.2` | `0.13.4` |\n| [axum](https://github.com/tokio-rs/axum) | `0.8.8` | `0.8.9` |\n| [indexmap](https://github.com/indexmap-rs/indexmap) | `2.13.1` | `2.14.0` |\n| [gloo-net](https://github.com/rustwasm/gloo) | `0.6.0` | `0.7.0` |\n| [lru](https://github.com/jeromefroe/lru-rs) | `0.16.3` | `0.18.0` |\n| [matchit](https://github.com/ibraheemdev/matchit) | `0.9.1` | `0.9.2` |\n| [average](https://github.com/vks/average) | `0.16.0` | `0.17.0` |\n| [tabled](https://github.com/zhiburt/tabled) | `0.20.0` | `0.21.0` |\n| [libc](https://github.com/rust-lang/libc) | `0.2.184` | `0.2.186` |\n| [tower-http](https://github.com/tower-rs/tower-http) | `0.6.8` | `0.6.11` |\n| [hyper](https://github.com/hyperium/hyper) | `1.9.0` | `1.10.1` |\n| [pulldown-cmark](https://github.com/raphlinus/pulldown-cmark) | `0.13.3` | `0.13.4` |\n| [zxcvbn](https://github.com/shssoichiro/zxcvbn-rs) | `3.1.0` | `3.1.1` |\n| [uuid](https://github.com/uuid-rs/uuid) | `1.23.0` | `1.23.2` |\n\n\nUpdates `tokio` from 1.51.0 to 1.52.3\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/tokio-rs/tokio/releases\">tokio's releases</a>.</em></p>\n<blockquote>\n<h2>Tokio v1.52.3</h2>\n<h1>1.52.3 (May 8th, 2026)</h1>\n<h3>Fixed</h3>\n<ul>\n<li>sync: fix underflow in mpsc channel <code>len()</code> (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8062\">#8062</a>)</li>\n<li>sync: notify receivers in mpsc <code>OwnedPermit::release()</code> method (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8075\">#8075</a>)</li>\n<li>sync: require that an <code>RwLock</code> has <code>max_readers != 0</code> (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8076\">#8076</a>)</li>\n<li>sync: return <code>Empty</code> from <code>try_recv()</code> when mpsc is closed with outstanding permits (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8074\">#8074</a>)</li>\n</ul>\n<p><a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8062\">#8062</a>: <a href=\"https://redirect.github.com/tokio-rs/tokio/pull/8062\">tokio-rs/tokio#8062</a>\n<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8074\">#8074</a>: <a href=\"https://redirect.github.com/tokio-rs/tokio/pull/8074\">tokio-rs/tokio#8074</a>\n<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8075\">#8075</a>: <a href=\"https://redirect.github.com/tokio-rs/tokio/pull/8075\">tokio-rs/tokio#8075</a>\n<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8076\">#8076</a>: <a href=\"https://redirect.github.com/tokio-rs/tokio/pull/8076\">tokio-rs/tokio#8076</a></p>\n<h2>Tokio v1.52.2</h2>\n<h1>1.52.2 (May 4th, 2026)</h1>\n<p>This release reverts the LIFO slot stealing change introduced in 1.51.0 (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/7431\">#7431</a>), due to [its performance impact]<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8065\">#8065</a>. (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8100\">#8100</a>)</p>\n<p><a href=\"https://redirect.github.com/tokio-rs/tokio/issues/7431\">#7431</a>: <a href=\"https://redirect.github.com/tokio-rs/tokio/pull/7431\">tokio-rs/tokio#7431</a>\n<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8065\">#8065</a>: <a href=\"https://redirect.github.com/tokio-rs/tokio/pull/8065\">tokio-rs/tokio#8065</a>\n<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8100\">#8100</a>: <a href=\"https://redirect.github.com/tokio-rs/tokio/pull/8100\">tokio-rs/tokio#8100</a></p>\n<h2>Tokio v1.52.1</h2>\n<h1>1.52.1 (April 16th, 2026)</h1>\n<h2>Fixed</h2>\n<ul>\n<li>runtime: revert <a href=\"https://redirect.github.com/tokio-rs/tokio/issues/7757\">#7757</a> to fix [a regression]<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8056\">#8056</a> that causes <code>spawn_blocking</code> to hang (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8057\">#8057</a>)</li>\n</ul>\n<p><a href=\"https://redirect.github.com/tokio-rs/tokio/issues/7757\">#7757</a>: <a href=\"https://redirect.github.com/tokio-rs/tokio/pull/7757\">tokio-rs/tokio#7757</a>\n<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8056\">#8056</a>: <a href=\"https://redirect.github.com/tokio-rs/tokio/pull/8056\">tokio-rs/tokio#8056</a>\n<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8057\">#8057</a>: <a href=\"https://redirect.github.com/tokio-rs/tokio/pull/8057\">tokio-rs/tokio#8057</a></p>\n<h2>Tokio v1.52.0</h2>\n<h1>1.52.0 (April 14th, 2026)</h1>\n<h2>Added</h2>\n<ul>\n<li>io: <code>AioSource::register_borrowed</code> for I/O safety support (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/7992\">#7992</a>)</li>\n<li>net: add <code>try_io</code> function to <code>unix::pipe</code> sender and receiver types (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8030\">#8030</a>)</li>\n</ul>\n<h2>Added (unstable)</h2>\n<ul>\n<li>runtime: <code>Builder::enable_eager_driver_handoff</code> setting enable eager hand off of the I/O and time drivers before polling tasks (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8010\">#8010</a>)</li>\n<li>taskdump: add <code>trace_with()</code> for customized task dumps (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8025\">#8025</a>)</li>\n<li>taskdump: allow <code>impl FnMut()</code> in <code>trace_with</code> instead of just <code>fn()</code> (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8040\">#8040</a>)</li>\n<li>fs: support <code>io_uring</code> in <code>AsyncRead</code> for <code>File</code> (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/7907\">#7907</a>)</li>\n</ul>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/tokio-rs/tokio/commit/d87569164fb61145e79e7ffe0b25783569cc8f93\"><code>d875691</code></a> chore: prepare Tokio v1.52.3 (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8130\">#8130</a>)</li>\n<li><a href=\"https://github.com/tokio-rs/tokio/commit/e1aebb031cb24bdb52289561343308f4a44a4d81\"><code>e1aebb0</code></a> Merge 'tokio-1.51.3' into 'tokio-1.52.x' (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8129\">#8129</a>)</li>\n<li><a href=\"https://github.com/tokio-rs/tokio/commit/fd63094ee0d34b4f3f93f59507e91c65919a2d71\"><code>fd63094</code></a> chore: prepare Tokio v1.51.3 (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8127\">#8127</a>)</li>\n<li><a href=\"https://github.com/tokio-rs/tokio/commit/8c600d0fd2cdebea4828fe9f699ced4dfd8aad3b\"><code>8c600d0</code></a> Merge 'tokio-1.47.5' into 'tokio-1.51.x' (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8123\">#8123</a>)</li>\n<li><a href=\"https://github.com/tokio-rs/tokio/commit/11bfc1345bbd5e901187e2b3702de10b0efbffdc\"><code>11bfc13</code></a> chore: prepare Tokio v1.47.5 (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8122\">#8122</a>)</li>\n<li><a href=\"https://github.com/tokio-rs/tokio/commit/f085b6211b8ebb6aba21f1f1f91e7b8b243aa815\"><code>f085b62</code></a> sync: notify receivers in mpsc <code>OwnedPermit::release()</code> method (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8075\">#8075</a>)</li>\n<li><a href=\"https://github.com/tokio-rs/tokio/commit/30d25ccb8bc91ca811773ee243e71e31772275d2\"><code>30d25cc</code></a> sync: require that an <code>RwLock</code> has <code>max_readers != 0</code> (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8076\">#8076</a>)</li>\n<li><a href=\"https://github.com/tokio-rs/tokio/commit/9fccf5339d41c1f2f863f97b9133bc8a5a10bc28\"><code>9fccf53</code></a> sync: return <code>Empty</code> from <code>try_recv()</code> when mpsc is closed with outstanding p...</li>\n<li><a href=\"https://github.com/tokio-rs/tokio/commit/ebf61b45b5184018f00bc666887ebccf3d4fe51b\"><code>ebf61b4</code></a> sync: fix underflow in mpsc channel <code>len()</code> (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8062\">#8062</a>)</li>\n<li><a href=\"https://github.com/tokio-rs/tokio/commit/4abe9d732eb01f7b092a571c3dcc4fbd266f4067\"><code>4abe9d7</code></a> chore: prepare Tokio v1.52.2 (<a href=\"https://redirect.github.com/tokio-rs/tokio/issues/8115\">#8115</a>)</li>\n<li>Additional commits viewable in <a href=\"https://github.com/tokio-rs/tokio/compare/tokio-1.51.0...tokio-1.52.3\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `clap` from 4.6.0 to 4.6.1\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/clap-rs/clap/releases\">clap's releases</a>.</em></p>\n<blockquote>\n<h2>v4.6.1</h2>\n<h2>[4.6.1] - 2026-04-15</h2>\n<h3>Fixes</h3>\n<ul>\n<li><em>(derive)</em> Ensure rebuilds happen when an read env variable is changed</li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/clap-rs/clap/blob/master/CHANGELOG.md\">clap's changelog</a>.</em></p>\n<blockquote>\n<h2>[4.6.1] - 2026-04-15</h2>\n<h3>Fixes</h3>\n<ul>\n<li><em>(derive)</em> Ensure rebuilds happen when an read env variable is changed</li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/clap-rs/clap/commit/14202755e52802a3d294c4ceeadd703d24b21fe6\"><code>1420275</code></a> chore: Release</li>\n<li><a href=\"https://github.com/clap-rs/clap/commit/d2c817d151db23e0bff70d3df5f9dd9fc311ad5d\"><code>d2c817d</code></a> docs: Update changelog</li>\n<li><a href=\"https://github.com/clap-rs/clap/commit/f88c94e53d40c2427450ed65ec025951906eb1d4\"><code>f88c94e</code></a> Merge pull request <a href=\"https://redirect.github.com/clap-rs/clap/issues/6341\">#6341</a> from epage/sep</li>\n<li><a href=\"https://github.com/clap-rs/clap/commit/acbb8225054e0a498f6941f278ad0095a893efe8\"><code>acbb822</code></a> fix(complete): Reduce risk of conflict with actual subcommands</li>\n<li><a href=\"https://github.com/clap-rs/clap/commit/a49fadbf4acf1853f52ae43a445c8f3c81096b01\"><code>a49fadb</code></a> refactor(complete): Pull out subcommand separator</li>\n<li><a href=\"https://github.com/clap-rs/clap/commit/ddc008bbbc1924fbda5d6f2c66bcf4d165984977\"><code>ddc008b</code></a> Merge pull request <a href=\"https://redirect.github.com/clap-rs/clap/issues/6332\">#6332</a> from epage/update</li>\n<li><a href=\"https://github.com/clap-rs/clap/commit/497dc50aebe9384dc229e1b4e92850306231f9c9\"><code>497dc50</code></a> chore: Update compatible dependencies</li>\n<li><a href=\"https://github.com/clap-rs/clap/commit/dca2326243615b2375cccb709b19de912910413d\"><code>dca2326</code></a> Merge pull request <a href=\"https://redirect.github.com/clap-rs/clap/issues/6331\">#6331</a> from clap-rs/renovate/j178-prek-action-2.x</li>\n<li><a href=\"https://github.com/clap-rs/clap/commit/54bdaa340ed434535bbd2d95a05b69d8abd2eb34\"><code>54bdaa3</code></a> chore(deps): Update j178/prek-action action to v2</li>\n<li><a href=\"https://github.com/clap-rs/clap/commit/f0d30d961d26f8fb636b33242256fca73a717f77\"><code>f0d30d9</code></a> chore: Release</li>\n<li>Additional commits viewable in <a href=\"https://github.com/clap-rs/clap/compare/clap_complete-v4.6.0...clap_complete-v4.6.1\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `serde_json` from 1.0.149 to 1.0.150\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/serde-rs/json/releases\">serde_json's releases</a>.</em></p>\n<blockquote>\n<h2>v1.0.150</h2>\n<ul>\n<li>Reject non-string enum object keys (<a href=\"https://redirect.github.com/serde-rs/json/issues/1324\">#1324</a>, thanks <a href=\"https://github.com/puneetdixit200\"><code>@puneetdixit200</code></a>)</li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/serde-rs/json/commit/a1ae73ac6a6940a4a57c673aebaa13ed4dfe3e8c\"><code>a1ae73a</code></a> Release 1.0.150</li>\n<li><a href=\"https://github.com/serde-rs/json/commit/1a360b0a6c003912afc3503c834b0edd798bca28\"><code>1a360b0</code></a> Merge pull request <a href=\"https://redirect.github.com/serde-rs/json/issues/1324\">#1324</a> from puneetdixit200/reject-non-string-enum-keys</li>\n<li><a href=\"https://github.com/serde-rs/json/commit/2037b634f9dccbddc11cff189ebeb5854fa0e01c\"><code>2037b63</code></a> Reject non-string enum object keys</li>\n<li><a href=\"https://github.com/serde-rs/json/commit/5d30df60e916e9b8fc46c74794007ff271fdfbbf\"><code>5d30df6</code></a> Resolve manual_assert_eq pedantic clippy lint</li>\n<li><a href=\"https://github.com/serde-rs/json/commit/dc8003a88e7142529cf4a7429c4778af31dadf50\"><code>dc8003a</code></a> Raise required compiler for preserve_order feature to 1.85</li>\n<li><a href=\"https://github.com/serde-rs/json/commit/a42fa980f8556cda36d896fa3713544b2e5eaa2c\"><code>a42fa98</code></a> Unpin CI miri toolchain</li>\n<li><a href=\"https://github.com/serde-rs/json/commit/684a60eba18abfc0e0f7ddb0c2cd39f8f60249cf\"><code>684a60e</code></a> Pin CI miri to nightly-2026-02-11</li>\n<li><a href=\"https://github.com/serde-rs/json/commit/7c7da3302b6b1cdab7f11ea49ca1a74422ab4551\"><code>7c7da33</code></a> Raise required compiler to Rust 1.71</li>\n<li><a href=\"https://github.com/serde-rs/json/commit/acf4850e2969f1caccab2c4727a90ed006ba35bb\"><code>acf4850</code></a> Simplify Number::is_f64</li>\n<li><a href=\"https://github.com/serde-rs/json/commit/6b8ceab565dcfe4f83dfaacd287d11c8bd8f306c\"><code>6b8ceab</code></a> Resolve unnecessary_map_or clippy lint</li>\n<li>Additional commits viewable in <a href=\"https://github.com/serde-rs/json/compare/v1.0.149...v1.0.150\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `log` from 0.4.29 to 0.4.31\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/rust-lang/log/releases\">log's releases</a>.</em></p>\n<blockquote>\n<h2>0.4.31</h2>\n<h2>What's Changed</h2>\n<ul>\n<li>fix typos in kv compile errors and log documentation by <a href=\"https://github.com/Isvane\"><code>@Isvane</code></a> in <a href=\"https://redirect.github.com/rust-lang/log/pull/726\">rust-lang/log#726</a></li>\n<li>Leverage static str key when possible by <a href=\"https://github.com/tisonkun\"><code>@tisonkun</code></a> in <a href=\"https://redirect.github.com/rust-lang/log/pull/727\">rust-lang/log#727</a></li>\n<li>Prepare for 0.4.31 release by <a href=\"https://github.com/KodrAus\"><code>@KodrAus</code></a> in <a href=\"https://redirect.github.com/rust-lang/log/pull/728\">rust-lang/log#728</a></li>\n</ul>\n<h2>New Contributors</h2>\n<ul>\n<li><a href=\"https://github.com/Isvane\"><code>@Isvane</code></a> made their first contribution in <a href=\"https://redirect.github.com/rust-lang/log/pull/726\">rust-lang/log#726</a></li>\n</ul>\n<p><strong>Full Changelog</strong>: <a href=\"https://github.com/rust-lang/log/compare/0.4.30...0.4.31\">https://github.com/rust-lang/log/compare/0.4.30...0.4.31</a></p>\n<h2>0.4.30</h2>\n<h3>What's Changed</h3>\n<ul>\n<li>Support capturing of <code>std::net</code> types by <a href=\"https://github.com/KodrAus\"><code>@KodrAus</code></a> in <a href=\"https://redirect.github.com/rust-lang/log/pull/724\">rust-lang/log#724</a></li>\n</ul>\n<h3>New Contributors</h3>\n<ul>\n<li><a href=\"https://github.com/V0ldek\"><code>@V0ldek</code></a> made their first contribution in <a href=\"https://redirect.github.com/rust-lang/log/pull/720\">rust-lang/log#720</a></li>\n<li><a href=\"https://github.com/woodruffw\"><code>@woodruffw</code></a> made their first contribution in <a href=\"https://redirect.github.com/rust-lang/log/pull/723\">rust-lang/log#723</a></li>\n</ul>\n<p><strong>Full Changelog</strong>: <a href=\"https://github.com/rust-lang/log/compare/0.4.29...0.4.30\">https://github.com/rust-lang/log/compare/0.4.29...0.4.30</a></p>\n<h3>Notable Changes</h3>\n<ul>\n<li>MSRV is bumped to 1.71.0 in <a href=\"https://redirect.github.com/rust-lang/log/pull/723\">rust-lang/log#723</a></li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/rust-lang/log/blob/master/CHANGELOG.md\">log's changelog</a>.</em></p>\n<blockquote>\n<h2>[0.4.31] - 2026-06-02</h2>\n<h2>What's Changed</h2>\n<ul>\n<li>Leverage static str key when possible by <a href=\"https://github.com/tisonkun\"><code>@tisonkun</code></a> in <a href=\"https://redirect.github.com/rust-lang/log/pull/727\">rust-lang/log#727</a></li>\n</ul>\n<h2>New Contributors</h2>\n<ul>\n<li><a href=\"https://github.com/Isvane\"><code>@Isvane</code></a> made their first contribution in <a href=\"https://redirect.github.com/rust-lang/log/pull/726\">rust-lang/log#726</a></li>\n</ul>\n<p><strong>Full Changelog</strong>: <a href=\"https://github.com/rust-lang/log/compare/0.4.30...0.4.31\">https://github.com/rust-lang/log/compare/0.4.30...0.4.31</a></p>\n<h2>[Unreleased]</h2>\n<h2>[0.4.30] - 2026-05-21</h2>\n<h3>What's Changed</h3>\n<ul>\n<li>Support capturing of <code>std::net</code> types by <a href=\"https://github.com/KodrAus\"><code>@KodrAus</code></a> in <a href=\"https://redirect.github.com/rust-lang/log/pull/724\">rust-lang/log#724</a></li>\n</ul>\n<h3>New Contributors</h3>\n<ul>\n<li><a href=\"https://github.com/V0ldek\"><code>@V0ldek</code></a> made their first contribution in <a href=\"https://redirect.github.com/rust-lang/log/pull/720\">rust-lang/log#720</a></li>\n<li><a href=\"https://github.com/woodruffw\"><code>@woodruffw</code></a> made their first contribution in <a href=\"https://redirect.github.com/rust-lang/log/pull/723\">rust-lang/log#723</a></li>\n</ul>\n<p><strong>Full Changelog</strong>: <a href=\"https://github.com/rust-lang/log/compare/0.4.29...0.4.30\">https://github.com/rust-lang/log/compare/0.4.29...0.4.30</a></p>\n<h3>Notable Changes</h3>\n<ul>\n<li>MSRV is bumped to 1.71.0 in <a href=\"https://redirect.github.com/rust-lang/log/pull/723\">rust-lang/log#723</a></li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/rust-lang/log/commit/580839288e5f2babc17e6c36f7d56e60082a47ef\"><code>5808392</code></a> Merge pull request <a href=\"https://redirect.github.com/rust-lang/log/issues/728\">#728</a> from rust-lang/cargo/0.4.31</li>\n<li><a href=\"https://github.com/rust-lang/log/commit/86d739f51a9c59a3cb66a79e695639e6fb41465b\"><code>86d739f</code></a> prepare for 0.4.31 release</li>\n<li><a href=\"https://github.com/rust-lang/log/commit/c906cfb02e351b59cfe35c0f0be22093086aabb1\"><code>c906cfb</code></a> Merge pull request <a href=\"https://redirect.github.com/rust-lang/log/issues/727\">#727</a> from tisonkun/leverage-static-str-key-when-possible</li>\n<li><a href=\"https://github.com/rust-lang/log/commit/756c279649f79ce0ef8dccf952c5df4017791d1c\"><code>756c279</code></a> leverage str literal as well</li>\n<li><a href=\"https://github.com/rust-lang/log/commit/3dd250d1537fd7e5974e0802b1025cc3e4561503\"><code>3dd250d</code></a> rename Key::from_static_str to from_str_static</li>\n<li><a href=\"https://github.com/rust-lang/log/commit/db145979e229549215300f2696fa89b215cb1cab\"><code>db14597</code></a> Leverage static str key when possible</li>\n<li><a href=\"https://github.com/rust-lang/log/commit/761461a5d0c8ea3d483d79b1de0205c2897318d2\"><code>761461a</code></a> Merge pull request <a href=\"https://redirect.github.com/rust-lang/log/issues/726\">#726</a> from Isvane/fix/typos</li>\n<li><a href=\"https://github.com/rust-lang/log/commit/48ce372edd343179cb9f4837381bf34c7679db3e\"><code>48ce372</code></a> fix typos in kv compile errors and log documentation</li>\n<li><a href=\"https://github.com/rust-lang/log/commit/9c55760b499b18e81de7df5f3c13a67d5661131d\"><code>9c55760</code></a> Merge pull request <a href=\"https://redirect.github.com/rust-lang/log/issues/725\">#725</a> from rust-lang/cargo/0.4.30</li>\n<li><a href=\"https://github.com/rust-lang/log/commit/d1acb0585c0f6af5dc466eb255187cd6d3b7359e\"><code>d1acb05</code></a> update docs on current MSRV and note latest bump in changelog</li>\n<li>Additional commits viewable in <a href=\"https://github.com/rust-lang/log/compare/0.4.29...0.4.31\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `reqwest` from 0.13.2 to 0.13.4\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/seanmonstar/reqwest/releases\">reqwest's releases</a>.</em></p>\n<blockquote>\n<h2>v0.13.4</h2>\n<h2>tl;dr</h2>\n<ul>\n<li>Add <code>ClientBuilder::tls_sslkeylogfile(bool)</code> option to allow using the related environment variable.</li>\n<li>Add <code>ClientBuilder::http2_keep_alive_*</code> options for the <code>blocking</code> client.</li>\n<li>Add TLS 1.3 support when using <code>native-tls</code> backend.</li>\n<li>Fix redirect handling to strip sensitive headers when the scheme changes.</li>\n<li>Fix HTTP/3 happy-eyeball connection creation.</li>\n<li>Upgrade hickory-resolver to 0.26.</li>\n</ul>\n<h2>What's Changed</h2>\n<ul>\n<li>fix(tls): improve rustls-no-provider panic message and add module docs by <a href=\"https://github.com/smythg4\"><code>@smythg4</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3021\">seanmonstar/reqwest#3021</a></li>\n<li>fix: do not lose the url in error when decoding json by <a href=\"https://github.com/Dushistov\"><code>@Dushistov</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3026\">seanmonstar/reqwest#3026</a></li>\n<li>Add tls_sslkeylogfile builder method by <a href=\"https://github.com/passcod\"><code>@passcod</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/2923\">seanmonstar/reqwest#2923</a></li>\n<li>fix(redirect): strip sensitive headers on scheme change across redirects by <a href=\"https://github.com/SAY-5\"><code>@SAY-5</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3034\">seanmonstar/reqwest#3034</a></li>\n<li>chore: upgrade MSRV to 1.85 by <a href=\"https://github.com/seanmonstar\"><code>@seanmonstar</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3038\">seanmonstar/reqwest#3038</a></li>\n<li>chore: clean up minimal-versions CI job by <a href=\"https://github.com/seanmonstar\"><code>@seanmonstar</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3039\">seanmonstar/reqwest#3039</a></li>\n<li>fix(http3): use happy eyeballs for h3 connect by <a href=\"https://github.com/lyuzichong\"><code>@lyuzichong</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3030\">seanmonstar/reqwest#3030</a></li>\n<li>fix: update hickory-resolver to 0.26 and adjust code accordingly by <a href=\"https://github.com/seanmonstar\"><code>@seanmonstar</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3040\">seanmonstar/reqwest#3040</a></li>\n<li>fix: remove unwrap in hickory initialization by <a href=\"https://github.com/mat813\"><code>@mat813</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3041\">seanmonstar/reqwest#3041</a></li>\n<li>feat(https): support TLS 1.3 as min version under native-tls 🎉 by <a href=\"https://github.com/AverageHelper\"><code>@AverageHelper</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/2975\">seanmonstar/reqwest#2975</a></li>\n<li>Expose keep alive configurations in blocking client by <a href=\"https://github.com/aeb-dev\"><code>@aeb-dev</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3043\">seanmonstar/reqwest#3043</a></li>\n<li>Prepare v0.13.4 by <a href=\"https://github.com/seanmonstar\"><code>@seanmonstar</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3046\">seanmonstar/reqwest#3046</a></li>\n</ul>\n<h2>New Contributors</h2>\n<ul>\n<li><a href=\"https://github.com/smythg4\"><code>@smythg4</code></a> made their first contribution in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3021\">seanmonstar/reqwest#3021</a></li>\n<li><a href=\"https://github.com/Dushistov\"><code>@Dushistov</code></a> made their first contribution in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3026\">seanmonstar/reqwest#3026</a></li>\n<li><a href=\"https://github.com/SAY-5\"><code>@SAY-5</code></a> made their first contribution in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3034\">seanmonstar/reqwest#3034</a></li>\n<li><a href=\"https://github.com/mat813\"><code>@mat813</code></a> made their first contribution in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3041\">seanmonstar/reqwest#3041</a></li>\n<li><a href=\"https://github.com/AverageHelper\"><code>@AverageHelper</code></a> made their first contribution in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/2975\">seanmonstar/reqwest#2975</a></li>\n<li><a href=\"https://github.com/aeb-dev\"><code>@aeb-dev</code></a> made their first contribution in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/3043\">seanmonstar/reqwest#3043</a></li>\n</ul>\n<p><strong>Full Changelog</strong>: <a href=\"https://github.com/seanmonstar/reqwest/compare/v0.13.3...v0.13.4\">https://github.com/seanmonstar/reqwest/compare/v0.13.3...v0.13.4</a></p>\n<h2>v0.13.3</h2>\n<h2>tl;dr</h2>\n<ul>\n<li>Fix CertificateRevocationList parsing of PEM values.</li>\n<li>Fix logging in resolver to only show host, not full URL.</li>\n<li>Fix hickory-dns to fallback to a default if <code>/etc/resolv.conf</code> fails.</li>\n<li>Fix HTTP/3 to handle <code>STOP_SENDING</code> as not an error.</li>\n<li>Fix HTTP/3 pool to remove timed out QUIC connections.</li>\n<li>Fix HTTP/3 connection establishment picking IPv4 and IPv6.</li>\n<li>Upgrade rustls-platform-verifier.</li>\n<li>(wasm) Only use wasm-bindgen on unknown-* targets.</li>\n</ul>\n<h2>What's Changed</h2>\n<ul>\n<li>Update docs.rs Features by <a href=\"https://github.com/JamesWiresmith\"><code>@JamesWiresmith</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/2961\">seanmonstar/reqwest#2961</a></li>\n<li>fix: fallback to hickory_resolver's default config if reading /etc/resolv.conf fails by <a href=\"https://github.com/monosans\"><code>@monosans</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/2797\">seanmonstar/reqwest#2797</a></li>\n<li>fix: remove timeout con by <a href=\"https://github.com/cuiweixie\"><code>@cuiweixie</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/2967\">seanmonstar/reqwest#2967</a></li>\n<li>http3: handle stop_sending without error by <a href=\"https://github.com/anuraaga\"><code>@anuraaga</code></a> in <a href=\"https://redirect.github.com/seanmonstar/reqwest/pull/2978\">seanmonstar/reqwest#2978</a></li>\n</ul>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md\">reqwest's changelog</a>.</em></p>\n<blockquote>\n<h2>v0.13.4</h2>\n<ul>\n<li>Add <code>ClientBuilder::tls_sslkeylogfile(bool)</code> option to allow using the related environment variable.</li>\n<li>Add <code>ClientBuilder::http2_keep_alive_*</code> options for the <code>blocking</code> client.</li>\n<li>Add TLS 1.3 support when using <code>native-tls</code> backend.</li>\n<li>Fix redirect handling to strip sensitive headers when the scheme changes.</li>\n<li>Fix HTTP/3 happy-eyeball connection creation.</li>\n<li>Upgrade hickory-resolver to 0.26.</li>\n</ul>\n<h2>v0.13.3</h2>\n<ul>\n<li>Fix CertificateRevocationList parsing of PEM values.</li>\n<li>Fix logging in resolver to only show host, not full URL.</li>\n<li>Fix hickory-dns to fallback to a default if <code>/etc/resolv.conf</code> fails.</li>\n<li>Fix HTTP/3 to handle <code>STOP_SENDING</code> as not an error.</li>\n<li>Fix HTTP/3 pool to remove timed out QUIC connections.</li>\n<li>Fix HTTP/3 connection establishment picking IPv4 and IPv6.</li>\n<li>Upgrade rustls-platform-verifier.</li>\n<li>(wasm) Only use wasm-bindgen on unknown-* targets.</li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/seanmonstar/reqwest/commit/11489b34eda6d32b15ad4033e62beba2ee401350\"><code>11489b3</code></a> v0.13.4</li>\n<li><a href=\"https://github.com/seanmonstar/reqwest/commit/d31ffbbf84ee718eb543fa203f25b9f78d02b5cd\"><code>d31ffbb</code></a> feat: Expose HTTP2 keep alive configurations in blocking client (<a href=\"https://redirect.github.com/seanmonstar/reqwest/issues/3043\">#3043</a>)</li>\n<li><a href=\"https://github.com/seanmonstar/reqwest/commit/79ed0d712b4f9f00ffecb5103593cbf460f5bfa5\"><code>79ed0d7</code></a> feat: support TLS 1.3 as min version under native-tls 🎉 (<a href=\"https://redirect.github.com/seanmonstar/reqwest/issues/2975\">#2975</a>)</li>\n<li><a href=\"https://github.com/seanmonstar/reqwest/commit/fb7bf6ae6dace30613b964425cf2b6039e9d388f\"><code>fb7bf6a</code></a> fix: remove unwrap in hickory initialization (<a href=\"https://redirect.github.com/seanmonstar/reqwest/issues/3041\">#3041</a>)</li>\n<li><a href=\"https://github.com/seanmonstar/reqwest/commit/3da616fd4b5987e5b1f5f7e9f07d14b2cd603254\"><code>3da616f</code></a> fix: update hickory-resolver to 0.26 and adjust code accordingly (<a href=\"https://redirect.github.com/seanmonstar/reqwest/issues/3040\">#3040</a>)</li>\n<li><a href=\"https://github.com/seanmonstar/reqwest/commit/c77e7b2de5b706ec35629e0302feff8e82969d7d\"><code>c77e7b2</code></a> fix(http3): use happy eyeballs for h3 connect (<a href=\"https://redirect.github.com/seanmonstar/reqwest/issues/3030\">#3030</a>)</li>\n<li><a href=\"https://github.com/seanmonstar/reqwest/commit/9cbb65b3d3cd4ab05a859366bbb70e47bec7dc8c\"><code>9cbb65b</code></a> chore: clean up minimal-versions CI job (<a href=\"https://redirect.github.com/seanmonstar/reqwest/issues/3039\">#3039</a>)</li>\n<li><a href=\"https://github.com/seanmonstar/reqwest/commit/17a7dc5a893b64509ed2d539892fe35f5feee255\"><code>17a7dc5</code></a> chore: upgrade MSRV to 1.85 (<a href=\"https://redirect.github.com/seanmonstar/reqwest/issues/3038\">#3038</a>)</li>\n<li><a href=\"https://github.com/seanmonstar/reqwest/commit/03db63a48f35135c2f2c8b7aaa578217d5f678fe\"><code>03db63a</code></a> fix(redirect): strip sensitive headers on scheme change across redirects (<a href=\"https://redirect.github.com/seanmonstar/reqwest/issues/3034\">#3034</a>)</li>\n<li><a href=\"https://github.com/seanmonstar/reqwest/commit/4b813a89dcd97a4b283fda02bd458d44339850c7\"><code>4b813a8</code></a> feat: add tls_sslkeylogfile builder method (<a href=\"https://redirect.github.com/seanmonstar/reqwest/issues/2923\">#2923</a>)</li>\n<li>Additional commits viewable in <a href=\"https://github.com/seanmonstar/reqwest/compare/v0.13.2...v0.13.4\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `axum` from 0.8.8 to 0.8.9\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/tokio-rs/axum/releases\">axum's releases</a>.</em></p>\n<blockquote>\n<h2>axum-v0.8.9</h2>\n<ul>\n<li><strong>added:</strong> <code>WebSocketUpgrade::{requested_protocols, set_selected_protocol}</code> for more flexible subprotocol selection (<a href=\"https://redirect.github.com/tokio-rs/axum/issues/3597\">#3597</a>)</li>\n<li><strong>changed:</strong> Update minimum rust version to 1.80 (<a href=\"https://redirect.github.com/tokio-rs/axum/issues/3620\">#3620</a>)</li>\n<li><strong>fixed:</strong> Set connect endpoint on correct field in MethodRouter (<a href=\"https://redirect.github.com/tokio-rs/axum/issues/3656\">#3656</a>)</li>\n<li><strong>fixed:</strong> Return specific error message when multipart body limit is exceeded (<a href=\"https://redirect.github.com/tokio-rs/axum/issues/3611\">#3611</a>)</li>\n</ul>\n<p><a href=\"https://redirect.github.com/tokio-rs/axum/issues/3597\">#3597</a>: <a href=\"https://redirect.github.com/tokio-rs/axum/pull/3597\">tokio-rs/axum#3597</a>\n<a href=\"https://redirect.github.com/tokio-rs/axum/issues/3620\">#3620</a>: <a href=\"https://redirect.github.com/tokio-rs/axum/pull/3620\">tokio-rs/axum#3620</a>\n<a href=\"https://redirect.github.com/tokio-rs/axum/issues/3656\">#3656</a>: <a href=\"https://redirect.github.com/tokio-rs/axum/pull/3656\">tokio-rs/axum#3656</a>\n<a href=\"https://redirect.github.com/tokio-rs/axum/issues/3611\">#3611</a>: <a href=\"https://redirect.github.com/tokio-rs/axum/pull/3611\">tokio-rs/axum#3611</a></p>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/tokio-rs/axum/commit/c59208c86fded335cd85e388030ad59347b0e5ae\"><code>c59208c</code></a> revert axum-core changelog changes</li>\n<li><a href=\"https://github.com/tokio-rs/axum/commit/99068f5a4b309d0966777eb6e5a8ce924f204e6d\"><code>99068f5</code></a> Revert "Fix <code>IntoResponse</code> for tuples overriding error response codes (<a href=\"https://redirect.github.com/tokio-rs/axum/issues/3603\">#3603</a>)"</li>\n<li><a href=\"https://github.com/tokio-rs/axum/commit/23d7098691871ccec71ca17ea31d1d40b036c0d0\"><code>23d7098</code></a> Revert "axum-core 0.5.6"</li>\n<li><a href=\"https://github.com/tokio-rs/axum/commit/e8a39ad416d1ee4f61249904309691909db2db09\"><code>e8a39ad</code></a> axum-macros 0.5.1</li>\n<li><a href=\"https://github.com/tokio-rs/axum/commit/6e9a249a4fa45507b1157e570f9b6ec58d71cb86\"><code>6e9a249</code></a> axum-extra 0.12.6</li>\n<li><a href=\"https://github.com/tokio-rs/axum/commit/0ec9041a1b903778a91a23558e064a83b43674c1\"><code>0ec9041</code></a> axum 0.8.9</li>\n<li><a href=\"https://github.com/tokio-rs/axum/commit/c3fcebb38f356ccf96da158199d4e920aa8cfda3\"><code>c3fcebb</code></a> axum-core 0.5.6</li>\n<li><a href=\"https://github.com/tokio-rs/axum/commit/a8790fc29b0db5708cdbcae70597d37c5afe1143\"><code>a8790fc</code></a> update release notes</li>\n<li><a href=\"https://github.com/tokio-rs/axum/commit/26ba7bb6f21cf8996493481a5275c01152f0aaf9\"><code>26ba7bb</code></a> docs: consolidate state management docs in crate root (<a href=\"https://redirect.github.com/tokio-rs/axum/issues/3683\">#3683</a>)</li>\n<li><a href=\"https://github.com/tokio-rs/axum/commit/9fc59efc1fa9a11f4157cff1f2d22355f01d7bc0\"><code>9fc59ef</code></a> Update to tokio-tungstenite 0.29 (<a href=\"https://redirect.github.com/tokio-rs/axum/issues/3689\">#3689</a>)</li>\n<li>Additional commits viewable in <a href=\"https://github.com/tokio-rs/axum/compare/axum-v0.8.8...axum-v0.8.9\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `indexmap` from 2.13.1 to 2.14.0\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/indexmap-rs/indexmap/blob/main/RELEASES.md\">indexmap's changelog</a>.</em></p>\n<blockquote>\n<h2>2.14.0 (2026-04-09)</h2>\n<ul>\n<li><strong>MSRV</strong>: Rust 1.85.0 or later is now required.</li>\n<li>Updated the <code>hashbrown</code> dependency to 0.17.</li>\n<li>Made more <code>map::Slice</code> methods <code>const</code>: <code>new_mut</code>, <code>first_mut</code>, <code>last_mut</code>,\n<code>split_at_mut</code>, <code>split_at_mut_checked</code>, <code>split_first_mut</code>, <code>split_last_mut</code></li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/indexmap-rs/indexmap/commit/bcd165baeb12bdf6e57a31d9869e9839e25679c6\"><code>bcd165b</code></a> Merge pull request <a href=\"https://redirect.github.com/indexmap-rs/indexmap/issues/439\">#439</a> from cuviper/release-2.14.0</li>\n<li><a href=\"https://github.com/indexmap-rs/indexmap/commit/4ef06a729e0af095d2f39ec4bda5e0882054726e\"><code>4ef06a7</code></a> Release 2.14.0</li>\n<li><a href=\"https://github.com/indexmap-rs/indexmap/commit/d21826ca9351e968e7c5cff4f818e7a5e3cc481b\"><code>d21826c</code></a> Merge pull request <a href=\"https://redirect.github.com/indexmap-rs/indexmap/issues/438\">#438</a> from cuviper/hashbrown-0.17</li>\n<li><a href=\"https://github.com/indexmap-rs/indexmap/commit/2566bec20dfbca0fa037939e67df4938c0f60f01\"><code>2566bec</code></a> Upgrade to <code>hashbrown v0.17</code></li>\n<li><a href=\"https://github.com/indexmap-rs/indexmap/commit/4b62776c3f7dec98a5b89f907c3add5c603343b0\"><code>4b62776</code></a> Merge pull request <a href=\"https://redirect.github.com/indexmap-rs/indexmap/issues/437\">#437</a> from cuviper/disjoint-panic</li>\n<li><a href=\"https://github.com/indexmap-rs/indexmap/commit/478fba2eb0594f0fdc70b6b93e90fae820bdf82e\"><code>478fba2</code></a> Normalize the panic doc of <code>get_disjoint_mut</code></li>\n<li><a href=\"https://github.com/indexmap-rs/indexmap/commit/fb6dafda4ee443864c88b61a4dfc8982012d3d39\"><code>fb6dafd</code></a> Merge pull request <a href=\"https://redirect.github.com/indexmap-rs/indexmap/issues/436\">#436</a> from cuviper/const-slice-mut</li>\n<li><a href=\"https://github.com/indexmap-rs/indexmap/commit/5c237a2ab7db4017b057f6b52e28c78dd427cd94\"><code>5c237a2</code></a> Make <code>Slice::{first,last,split_*}_mut</code> methods <code>const</code></li>\n<li><a href=\"https://github.com/indexmap-rs/indexmap/commit/48ff9ce2e3a2a464e4f599691df62dff178d655b\"><code>48ff9ce</code></a> Merge pull request <a href=\"https://redirect.github.com/indexmap-rs/indexmap/issues/435\">#435</a> from cuviper/edition-2024</li>\n<li><a href=\"https://github.com/indexmap-rs/indexmap/commit/648be98a3112278e1aea7c5b7d3c3a4f77e1eddb\"><code>648be98</code></a> <code>cargo fmt</code> with edition 2024</li>\n<li>Additional commits viewable in <a href=\"https://github.com/indexmap-rs/indexmap/compare/2.13.1...2.14.0\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `gloo-net` from 0.6.0 to 0.7.0\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/rustwasm/gloo/releases\">gloo-net's releases</a>.</em></p>\n<blockquote>\n<h2>gloo-net 0.7.0</h2>\n<p>MSRV updated to 1.82</p>\n<h3>Breaking</h3>\n<ul>\n<li>Remove <code>Clone</code> implementation for <code>EventSource</code> (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/417\">#417</a>) by <a href=\"https://github.com/vpochapuis\"><code>@vpochapuis</code></a>\nCloning had a bug where dropping any clone would disconnect all instances.</li>\n</ul>\n<h3>New Features</h3>\n<ul>\n<li>Add <code>EventSourceBuilder</code> for configuring <code>EventSource</code> with credentials (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/530\">#530</a>) by <a href=\"https://github.com/zn3x\"><code>@zn3x</code></a></li>\n<li>Add <code>WebSocket::buffered_amount</code> (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/510\">#510</a>) by <a href=\"https://github.com/vi\"><code>@vi</code></a></li>\n<li>Add <code>PartialEq</code>, <code>Eq</code>, <code>Hash</code> derives to <code>CloseEvent</code> (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/504\">#504</a>) by <a href=\"https://github.com/Alexi24601\"><code>@Alexi24601</code></a></li>\n</ul>\n<h3>Fixes</h3>\n<ul>\n<li>Fix <code>RequestBuilder::build</code> producing a URL with an extra <code>&</code> (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/497\">#497</a>) by <a href=\"https://github.com/hmacias-avaya\"><code>@hmacias-avaya</code></a></li>\n<li>Fix WebSocket binary send panicking when <code>SharedArrayBuffer</code> is enabled (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/502\">#502</a>) by <a href=\"https://github.com/Fedeparma74\"><code>@Fedeparma74</code></a></li>\n</ul>\n<h3>Maintenance</h3>\n<ul>\n<li>Bump <code>pin-project</code> to 1.1 and <code>http</code> to 1.4 (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/536\">#536</a>) by <a href=\"https://github.com/Madoshakalaka\"><code>@Madoshakalaka</code></a></li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/ranile/gloo/blob/master/CHANGELOG.md\">gloo-net's changelog</a>.</em></p>\n<blockquote>\n<h3>Version 0.7.0</h3>\n<ul>\n<li>Remove <code>Clone</code> implementation for <code>EventSource</code> (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/417\">#417</a>) by <a href=\"https://github.com/vpochapuis\"><code>@vpochapuis</code></a>\nCloning had a bug where dropping any clone would disconnect all instances.</li>\n<li>Add <code>EventSourceBuilder</code> for configuring <code>EventSource</code> with credentials (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/530\">#530</a>) by <a href=\"https://github.com/zn3x\"><code>@zn3x</code></a></li>\n<li>Add <code>WebSocket::buffered_amount</code> (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/510\">#510</a>) by <a href=\"https://github.com/vi\"><code>@vi</code></a></li>\n<li>Add <code>PartialEq</code>, <code>Eq</code>, <code>Hash</code> derives to <code>CloseEvent</code> (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/504\">#504</a>) by <a href=\"https://github.com/Alexi24601\"><code>@Alexi24601</code></a></li>\n<li>Fix <code>RequestBuilder::build</code> producing a URL with an extra <code>&</code> (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/497\">#497</a>) by <a href=\"https://github.com/hmacias-avaya\"><code>@hmacias-avaya</code></a></li>\n<li>Fix WebSocket binary send panicking when <code>SharedArrayBuffer</code> is enabled (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/502\">#502</a>) by <a href=\"https://github.com/Fedeparma74\"><code>@Fedeparma74</code></a></li>\n<li>Update MSRV to 1.82 (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/505\">#505</a>) by <a href=\"https://github.com/martinfrances107\"><code>@martinfrances107</code></a></li>\n<li>Bump <code>pin-project</code> to 1.1 and <code>http</code> to 1.4 (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/536\">#536</a>) by <a href=\"https://github.com/Madoshakalaka\"><code>@Madoshakalaka</code></a></li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/ranile/gloo/commit/d69fcff62ee63f37076c4a0715a6f828b0036599\"><code>d69fcff</code></a> chore: release gloo-net 0.7.0</li>\n<li><a href=\"https://github.com/ranile/gloo/commit/7a57df39ff9d172ad0bbf91cf0fc48a57d428392\"><code>7a57df3</code></a> chore: release gloo-file 0.4.0</li>\n<li><a href=\"https://github.com/ranile/gloo/commit/2685476cd8495947d61eac98a6a5f25cc90d1a34\"><code>2685476</code></a> fix: correct gloo-history category slugs</li>\n<li><a href=\"https://github.com/ranile/gloo/commit/b1d5129d93ff4dda112a8fd2846485bbcf3562e6\"><code>b1d5129</code></a> fix: correct gloo-storage category slugs</li>\n<li><a href=\"https://github.com/ranile/gloo/commit/8316f33311e7a83cd1611b30f47dc27ecc53955d\"><code>8316f33</code></a> fix: correct gloo-render category slugs</li>\n<li><a href=\"https://github.com/ranile/gloo/commit/07345515229f46045cfa4f480ae401a464a4569a\"><code>0734551</code></a> chore: release gloo-console 0.4.0, gloo-dialogs 0.3.0, gloo-events 0.3.0, glo...</li>\n<li><a href=\"https://github.com/ranile/gloo/commit/e6280d4b93c86a478a8f2f31af5f13d770b156b7\"><code>e6280d4</code></a> chore: release gloo-utils 0.3.0</li>\n<li><a href=\"https://github.com/ranile/gloo/commit/cca8089045c0b208bf2f4581d61503686a197b69\"><code>cca8089</code></a> chore: release gloo-worker-macros 0.2.0 and gloo-worker 0.6.0</li>\n<li><a href=\"https://github.com/ranile/gloo/commit/a8af99c835468f84a1a5c9933cbae07ede9ad174\"><code>a8af99c</code></a> chore: update rust dependencies (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/536\">#536</a>)</li>\n<li><a href=\"https://github.com/ranile/gloo/commit/0de58655d219dbfabf9bc0900a8761e764b36791\"><code>0de5865</code></a> fix(net)!: remove EventSource Clone implementation (<a href=\"https://redirect.github.com/rustwasm/gloo/issues/417\">#417</a>)</li>\n<li>Additional commits viewable in <a href=\"https://github.com/rustwasm/gloo/compare/0.6.0...gloo-net-v0.7.0\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `lru` from 0.16.3 to 0.18.0\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/jeromefroe/lru-rs/blob/master/CHANGELOG.md\">lru's changelog</a>.</em></p>\n<blockquote>\n<h2><a href=\"https://github.com/jeromefroe/lru-rs/tree/0.18.0\">v0.18.0</a> - 2026-04-27</h2>\n<ul>\n<li>Fix unconstrained lifetime in <code>get_or_insert_mut_ref</code>.</li>\n</ul>\n<h2><a href=\"https://github.com/jeromefroe/lru-rs/tree/0.17.0\">v0.17.0</a> - 2026-04-14</h2>\n<ul>\n<li>Upgrade <code>hashbrown</code> to 0.17.0 and update MSRV to 1.85.0.</li>\n</ul>\n<h2><a href=\"https://github.com/jeromefroe/lru-rs/tree/0.16.4\">v0.16.4</a> - 2026-04-13</h2>\n<ul>\n<li>Add <code>get_or_insert_with_key</code> and variants.</li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/jeromefroe/lru-rs/commit/dac07e3edc896f6caec5180ac179b89044399c59\"><code>dac07e3</code></a> Merge pull request <a href=\"https://redirect.github.com/jeromefroe/lru-rs/issues/234\">#234</a> from jeromefroe/jerome/prepare-0-18-0-release</li>\n<li><a href=\"https://github.com/jeromefroe/lru-rs/commit/03353156d0f1a4c5f79001bcbc59bb2ff8f6b041\"><code>0335315</code></a> Prepare 0.18.0 release</li>\n<li><a href=\"https://github.com/jeromefroe/lru-rs/commit/e40bbdc53db7c433e0d8f46cfd903485c8091eac\"><code>e40bbdc</code></a> Merge pull request <a href=\"https://redirect.github.com/jeromefroe/lru-rs/issues/233\">#233</a> from paolobarbolini/get_or_insert_mut_ref-unconstrain...</li>\n<li><a href=\"https://github.com/jeromefroe/lru-rs/commit/a615a5b29f21de6dd222394da91ab4e2c6918016\"><code>a615a5b</code></a> Fix unconstrained lifetime in <code>LruCache::get_or_insert_mut_ref</code></li>\n<li><a href=\"https://github.com/jeromefroe/lru-rs/commit/13321a9f96059b2355aa3697c2a1613b16fd83e5\"><code>13321a9</code></a> Merge pull request <a href=\"https://redirect.github.com/jeromefroe/lru-rs/issues/232\">#232</a> from jeromefroe/jerome/prepare-0-17-0-release</li>\n<li><a href=\"https://github.com/jeromefroe/lru-rs/commit/f7d0ecea8e85d4d912b6ee7caf6f31cf72195a37\"><code>f7d0ece</code></a> Prepare 0.17.0 release</li>\n<li><a href=\"https://github.com/jeromefroe/lru-rs/commit/2d3d6d51db940e791d69cc4afef8896f1170863e\"><code>2d3d6d5</code></a> Merge pull request <a href=\"https://redirect.github.com/jeromefroe/lru-rs/issues/231\">#231</a> from xtqqczze/deps/hashbrown</li>\n<li><a href=\"https://github.com/jeromefroe/lru-rs/commit/346e2fea450e32e69d5ee67aed4ac2b30b23f6fd\"><code>346e2fe</code></a> Bump hashbrown to 0.17.0</li>\n<li><a href=\"https://github.com/jeromefroe/lru-rs/commit/1302b4e5b5bbcffb1f7f9537ec08cc614f16a8b1\"><code>1302b4e</code></a> Update MSRV to 1.85.0</li>\n<li><a href=\"https://github.com/jeromefroe/lru-rs/commit/d8c7f5ca51a86a8f561c14e21508a0f757aa05ad\"><code>d8c7f5c</code></a> Merge pull request <a href=\"https://redirect.github.com/jeromefroe/lru-rs/issues/230\">#230</a> from jeromefroe/jerome/prepare-0-16-4-release</li>\n<li>Additional commits viewable in <a href=\"https://github.com/jeromefroe/lru-rs/compare/0.16.3...0.18.0\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `matchit` from 0.9.1 to 0.9.2\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/ibraheemdev/matchit/releases\">matchit's releases</a>.</em></p>\n<blockquote>\n<h2>0.9.2</h2>\n<ul>\n<li>Fixed a couple false positive route conflicts (<a href=\"https://redirect.github.com/ibraheemdev/matchit/pull/89\">ibraheemdev/matchit#89</a>, <a href=\"https://redirect.github.com/ibraheemdev/matchit/pull/91\">ibraheemdev/matchit#91</a>).</li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/ibraheemdev/matchit/commit/4b5a2c356022f544187d6e67325d8e98dd7f11ca\"><code>4b5a2c3</code></a> release 0.9.2</li>\n<li><a href=\"https://github.com/ibraheemdev/matchit/commit/bc1ac7ad94019a40c2f86946baff56185eb75fa3\"><code>bc1ac7a</code></a> fix prefix-suffix conflict due to insertion order of trailing slashes</li>\n<li><a href=\"https://github.com/ibraheemdev/matchit/commit/500698f409141aae63ca89ab69c921e03951119a\"><code>500698f</code></a> fix false conflict</li>\n<li>See full diff in <a href=\"https://github.com/ibraheemdev/matchit/compare/v0.9.1...v0.9.2\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `average` from 0.16.0 to 0.17.0\n<details>\n<summary>Commits</summary>\n<ul>\n<li>See full diff in <a href=\"https://github.com/vks/average/commits\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `tabled` from 0.20.0 to 0.21.0\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/zhiburt/tabled/blob/master/CHANGELOG.md\">tabled's changelog</a>.</em></p>\n<blockquote>\n<h2>[0.21.0] - 2026-06-01</h2>\n<h3>Added</h3>\n<ul>\n<li>Added <code>Color::is_empty</code> function (by <a href=\"https://github.com/mvanhorn\"><code>@mvanhorn</code></a>).</li>\n<li>Added <code>Settings::modify</code> function (by <a href=\"https://github.com/mvanhorn\"><code>@mvanhorn</code></a>).</li>\n<li>Added qc test for wrap (by <a href=\"https://github.com/mvanhorn\"><code>@mvanhorn</code></a>).</li>\n<li>Added <code>LineText::limit</code> function (by <a href=\"https://github.com/mvanhorn\"><code>@mvanhorn</code></a>).</li>\n<li>Added <code>ColumnNames::padding</code>.</li>\n</ul>\n<h3>Changed</h3>\n<ul>\n<li>Reworked <code>Charset</code> (by <a href=\"https://github.com/mvanhorn\"><code>@mvanhorn</code></a>).</li>\n<li>Removed <code>TabSize</code> in favor of <code>Charset::tab_size()</code>.</li>\n<li>Changed <code>ColumnNames</code> interface - splited it into <code>ColumnNames</code> and <code>RowNames</code>.</li>\n</ul>\n<h3>Fixed</h3>\n<ul>\n<li>Fixed <code>Wrap</code> strings with 0 width (by <a href=\"https://github.com/ymcx\"><code>@ymcx</code></a>).</li>\n<li>Improved examples (by <a href=\"https://github.com/alexanderkjall\"><code>@alexanderkjall</code></a>).</li>\n<li>Remove broken LICENSE symlink (by <a href=\"https://github.com/mvanhorn\"><code>@mvanhorn</code></a>).</li>\n<li>Fixed CHANGELOG.md (by <a href=\"https://github.com/mvanhorn\"><code>@mvanhorn</code></a>).</li>\n<li>Fixed clippy issue (by <a href=\"https://github.com/akiomik\"><code>@akiomik</code></a>).</li>\n<li>Fixed documentation (by <a href=\"https://github.com/akiomik\"><code>@akiomik</code></a>).</li>\n<li>Fixed documentation (by <a href=\"https://github.com/darko-mesaros\"><code>@darko-mesaros</code></a>).</li>\n<li>Fixed documentation (by <a href=\"https://github.com/brownjohnf\"><code>@brownjohnf</code></a>).</li>\n<li>Fixed documentation (by <a href=\"https://github.com/spiritualhost\"><code>@spiritualhost</code></a>).</li>\n<li>Fixed wrong render of vertical char in case of <code>Span</code> (corner case).</li>\n<li>Fixed <code>BorderCorrection::span</code> when <code>Span::column</code> and <code>Span::row</code> is used for same cell (corner case).</li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li>See full diff in <a href=\"https://github.com/zhiburt/tabled/commits\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `libc` from 0.2.184 to 0.2.186\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/rust-lang/libc/releases\">libc's releases</a>.</em></p>\n<blockquote>\n<h2>0.2.186</h2>\n<h3>Added</h3>\n<ul>\n<li>Apple: Add <code>KEVENT_FLAG_*</code> constants (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5070\">#5070</a>)</li>\n<li>Linux: Add <code>PR_SET_MEMORY_MERGE</code> and <code>PR_GET_MEMORY_MERGE</code> (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5060\">#5060</a>)</li>\n</ul>\n<h3>Changed</h3>\n<ul>\n<li>CI: Migrate FreeBSD CI from Cirrus CI to GitHub Actions (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5058\">#5058</a>)</li>\n</ul>\n<h2>0.2.185</h2>\n<h3>Added</h3>\n<ul>\n<li>EspIDF: Add <code>espidf_picolibc</code> cfg for picolibc <code>O_*</code> flag values (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5035\">#5035</a>)</li>\n<li>Hexagon: add missing constants and fix types for linux-musl (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5042\">#5042</a>)</li>\n<li>Redox: Add semaphore functions (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5051\">#5051</a>)</li>\n<li>Windows: Add <code>sprintf</code>, <code>snprintf</code>, and the <code>scanf</code> family (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5024\">#5024</a>)</li>\n</ul>\n<h3>Fixed</h3>\n<ul>\n<li>Hexagon: Decouple <code>time64</code> types from musl symbol redirects (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5040\">#5040</a>)</li>\n<li>Horizon: Change <code>POLL</code> constants from <code>c_short</code> to <code>c_int</code> (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5045\">#5045</a>)</li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/rust-lang/libc/blob/0.2.186/CHANGELOG.md\">libc's changelog</a>.</em></p>\n<blockquote>\n<h2><a href=\"https://github.com/rust-lang/libc/compare/0.2.185...0.2.186\">0.2.186</a> - 2026-04-24</h2>\n<h3>Added</h3>\n<ul>\n<li>Apple: Add <code>KEVENT_FLAG_*</code> constants (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5070\">#5070</a>)</li>\n<li>Linux: Add <code>PR_SET_MEMORY_MERGE</code> and <code>PR_GET_MEMORY_MERGE</code> (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5060\">#5060</a>)</li>\n</ul>\n<h3>Changed</h3>\n<ul>\n<li>CI: Migrate FreeBSD CI from Cirrus CI to GitHub Actions (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5058\">#5058</a>)</li>\n</ul>\n<h2><a href=\"https://github.com/rust-lang/libc/compare/0.2.184...0.2.185\">0.2.185</a> - 2026-04-13</h2>\n<h3>Added</h3>\n<ul>\n<li>EspIDF: Add <code>espidf_picolibc</code> cfg for picolibc <code>O_*</code> flag values (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5035\">#5035</a>)</li>\n<li>Hexagon: add missing constants and fix types for linux-musl (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5042\">#5042</a>)</li>\n<li>Redox: Add semaphore functions (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5051\">#5051</a>)</li>\n<li>Windows: Add <code>sprintf</code>, <code>snprintf</code>, and the <code>scanf</code> family (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5024\">#5024</a>)</li>\n</ul>\n<h3>Fixed</h3>\n<ul>\n<li>Hexagon: Decouple <code>time64</code> types from musl symbol redirects (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5040\">#5040</a>)</li>\n<li>Horizon: Change <code>POLL</code> constants from <code>c_short</code> to <code>c_int</code> (<a href=\"https://redirect.github.com/rust-lang/libc/pull/5045\">#5045</a>)</li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/rust-lang/libc/commit/42620ffc4109dc32e02f1cae9e63a3f4311b4b71\"><code>42620ff</code></a> [0.2] libc: Release 0.2.186</li>\n<li><a href=\"https://github.com/rust-lang/libc/commit/9db2eaaaaea60e0b048785e41ca4eb9c50d30ad5\"><code>9db2eaa</code></a> apple: add KEVENT_FLAG_* constants</li>\n<li><a href=\"https://github.com/rust-lang/libc/commit/38409392ffb50288aa84e94b75fc37bd565fd5bc\"><code>3840939</code></a> Add PR_SET_MEMORY_MERGE and PR_GET_MEMORY_MERGE for linux</li>\n<li><a href=\"https://github.com/rust-lang/libc/commit/f697deb9440a8f916ec2fb95bef9e06fc847b6f7\"><code>f697deb</code></a> chore: migrate from Cirrus CI to GHA</li>\n<li><a href=\"https://github.com/rust-lang/libc/commit/71d5bfcc1bda05da1783666fc2cd7d9669c9c4c8\"><code>71d5bfc</code></a> libc: Release 0.2.185</li>\n<li><a href=\"https://github.com/rust-lang/libc/commit/1027d1c23bd3f07ba3dc6ab4a4eb4660cc91e509\"><code>1027d1c</code></a> Revert "ci: Pin nightly to 2026-04-01"</li>\n<li><a href=\"https://github.com/rust-lang/libc/commit/0e9c6e53cca07b36239a6dc4e65d8b691b39023a\"><code>0e9c6e5</code></a> redox: Add semaphore functions</li>\n<li><a href=\"https://github.com/rust-lang/libc/commit/24ef457ddd312f8b8055a8ed07f5376c5792c211\"><code>24ef457</code></a> feat: add back support for gnu windows x86 in ci</li>\n<li><a href=\"https://github.com/rust-lang/libc/commit/aa75caf30c0153647c9ab9fc0fe382bce2564b0c\"><code>aa75caf</code></a> horizon: Change POLL constants from c_short to c_int</li>\n<li><a href=\"https://github.com/rust-lang/libc/commit/b7eda5a40c678c4a195a389a329d85008eabaf2d\"><code>b7eda5a</code></a> hexagon: add missing constants and fix types for linux-musl</li>\n<li>Additional commits viewable in <a href=\"https://github.com/rust-lang/libc/compare/0.2.184...0.2.186\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `tower-http` from 0.6.8 to 0.6.11\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/tower-rs/tower-http/releases\">tower-http's releases</a>.</em></p>\n<blockquote>\n<h2>tower-http-0.6.11</h2>\n<h2>Added</h2>\n<ul>\n<li>\n<p><code>set-header</code>: add <code>SetMultipleResponseHeadersLayer</code> and\n<code>SetMultipleResponseHeader</code> for setting multiple response headers at once.\nSupports <code>overriding</code>, <code>appending</code>, and <code>if_not_present</code> modes. Header\nvalues can be fixed or computed dynamically via closures (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/672\">#672</a>)</p>\n<pre lang=\"rust\"><code>use http::{Response, header::{self, HeaderValue}};\r\nuse http_body::Body as _;\r\nuse tower_http::set_header::response::SetMultipleResponseHeadersLayer;\r\n<p>let layer = SetMultipleResponseHeadersLayer::overriding(vec![<br />\n(header::X_FRAME_OPTIONS, HeaderValue::from_static("DENY")).into(),<br />\n(header::CONTENT_LENGTH, |res: &Response<MyBody>| {<br />\nres.body().size_hint().exact()<br />\n.map(|size| HeaderValue::from_str(&size.to_string()).unwrap())<br />\n}).into(),<br />\n]);<br />\n</code></pre></p>\n</li>\n<li>\n<p><code>set-header</code>: add <code>SetMultipleRequestHeadersLayer</code> and\n<code>SetMultipleRequestHeaders</code> for setting multiple request headers at once,\nmirroring the response-side API (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/677\">#677</a>)</p>\n</li>\n<li>\n<p><code>classify</code>: add <code>From<i32></code> and <code>From<NonZeroI32></code> impls for <code>GrpcCode</code>.\nUnrecognized status codes map to <code>GrpcCode::Unknown</code> (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/506\">#506</a>)</p>\n</li>\n</ul>\n<h2>Changed</h2>\n<ul>\n<li><code>compression</code>: compress <code>application/grpc-web</code> responses. Previously all\n<code>application/grpc*</code> content types were excluded from compression; now only\n<code>application/grpc</code> (non-web) is excluded (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/408\">#408</a>)</li>\n</ul>\n<h2>Fixed</h2>\n<ul>\n<li><code>fs</code>: fix <code>ServeDir</code> returning 500 instead of 405 for non-GET/HEAD requests\nwhen <code>call_fallback_on_method_not_allowed</code> is enabled but no fallback service\nis configured (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/587\">#587</a>)</li>\n<li><code>fs</code>: remove duplicate <code>cfg</code> attribute on <code>is_reserved_dos_name</code> (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/675\">#675</a>)</li>\n</ul>\n<p><a href=\"https://redirect.github.com/tower-rs/tower-http/issues/408\">#408</a>: <a href=\"https://redirect.github.com/tower-rs/tower-http/pull/408\">tower-rs/tower-http#408</a>\n<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/506\">#506</a>: <a href=\"https://redirect.github.com/tower-rs/tower-http/pull/506\">tower-rs/tower-http#506</a>\n<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/587\">#587</a>: <a href=\"https://redirect.github.com/tower-rs/tower-http/pull/587\">tower-rs/tower-http#587</a>\n<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/672\">#672</a>: <a href=\"https://redirect.github.com/tower-rs/tower-http/pull/672\">tower-rs/tower-http#672</a>\n<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/675\">#675</a>: <a href=\"https://redirect.github.com/tower-rs/tower-http/pull/675\">tower-rs/tower-http#675</a>\n<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/677\">#677</a>: <a href=\"https://redirect.github.com/tower-rs/tower-http/pull/677\">tower-rs/tower-http#677</a></p>\n<h2>All PRs</h2>\n<ul>\n<li>ci: fix flaky encoding test, add nightly stress test job by <a href=\"https://github.com/jlizen\"><code>@jlizen</code></a> in <a href=\"https://redirect.github.com/tower-rs/tower-http/pull/670\">tower-rs/tower-http#670</a></li>\n</ul>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/tower-rs/tower-http/commit/1d082ef7bdb6d80a2964698804a46c338b4c6a99\"><code>1d082ef</code></a> v0.6.11</li>\n<li><a href=\"https://github.com/tower-rs/tower-http/commit/9c3117d856986336ca0662ca7c78318e724e0fda\"><code>9c3117d</code></a> feat: set multiple request header (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/677\">#677</a>)</li>\n<li><a href=\"https://github.com/tower-rs/tower-http/commit/667e7c7a7c109488479b1e9c1d57093dbeb6d867\"><code>667e7c7</code></a> Remove duplicate cfg attribute for is_reserved_dos_name (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/675\">#675</a>)</li>\n<li><a href=\"https://github.com/tower-rs/tower-http/commit/7551a9b8b9706ca1e11c035659b243f688b136bd\"><code>7551a9b</code></a> feat(set_header): refactor and improve multiple header middleware (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/672\">#672</a>)</li>\n<li><a href=\"https://github.com/tower-rs/tower-http/commit/991e9ee595882626fe3a0b3ceec3df54d4e7f9b5\"><code>991e9ee</code></a> add From<i32> impl for GrpcCode (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/506\">#506</a>)</li>\n<li><a href=\"https://github.com/tower-rs/tower-http/commit/3962dbab7b74b8543a8baafa3dae49af06fb8fd7\"><code>3962dba</code></a> Do compress grpc-web responses (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/408\">#408</a>)</li>\n<li><a href=\"https://github.com/tower-rs/tower-http/commit/f0b3bb6dcde9996d11d0b820c7dd1006bbdf9f23\"><code>f0b3bb6</code></a> Fix serve_dir method not allowed handling when no fallback is configured (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/587\">#587</a>)</li>\n<li><a href=\"https://github.com/tower-rs/tower-http/commit/d1a571bdeb2cb0e92f0670b09a4309b8e97cab9f\"><code>d1a571b</code></a> ci: use static timeout in stress-test workflow (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/671\">#671</a>)</li>\n<li><a href=\"https://github.com/tower-rs/tower-http/commit/309555a6a2f0b5343e1bd5aaea958d9e873150b3\"><code>309555a</code></a> ci: fix flaky encoding test, add nightly stress test job (<a href=\"https://redirect.github.com/tower-rs/tower-http/issues/670\">#670</a>)</li>\n<li><a href=\"https://github.com/tower-rs/tower-http/commit/4532fc23ab576c0cfea6444bcc06ddf0ad00f4e3\"><code>4532fc2</code></a> v0.6.10</li>\n<li>Additional commits viewable in <a href=\"https://github.com/tower-rs/tower-http/compare/tower-http-0.6.8...tower-http-0.6.11\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `hyper` from 1.9.0 to 1.10.1\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/hyperium/hyper/releases\">hyper's releases</a>.</em></p>\n<blockquote>\n<h2>v1.10.1</h2>\n<h2>What's Changed</h2>\n<ul>\n<li>fix(http1): fix busy loop when peer half-closes and open body by <a href=\"https://github.com/seanmonstar\"><code>@seanmonstar</code></a> in <a href=\"https://redirect.github.com/hyperium/hyper/pull/4086\">hyperium/hyper#4086</a></li>\n</ul>\n<p><strong>Full Changelog</strong>: <a href=\"https://github.com/hyperium/hyper/compare/v1.10.0...v1.10.1\">https://github.com/hyperium/hyper/compare/v1.10.0...v1.10.1</a></p>\n<h2>v1.10.0</h2>\n<h2>Features</h2>\n<ul>\n<li><strong>http2:</strong>\n<ul>\n<li>add <code>reset_stream_duration()</code> client option (<a href=\"https://redirect.github.com/hyperium/hyper/issues/4068\">#4068</a>) (<a href=\"https://github.com/hyperium/hyper/commit/156a6f6aaacdc782861a4cab23ab3940a029d6ac\">156a6f6a</a>, closes <a href=\"https://redirect.github.com/hyperium/hyper/issues/2599\">#2599</a>)</li>\n<li>Add 'header_table_size()' method to server builder (<a href=\"https://redirect.github.com/hyperium/hyper/issues/4062\">#4062</a>) (<a href=\"https://github.com/hyperium/hyper/commit/6c9182c4e566e716d23e7b54ce2c75e064a9213a\">6c9182c4</a>)</li>\n</ul>\n</li>\n</ul>\n<h2>Bug Fixes</h2>\n<ul>\n<li><strong>http1:</strong>\n<ul>\n<li>send error when dispatcher is dropped mid-body (<a href=\"https://redirect.github.com/hyperium/hyper/issues/4069\">#4069</a>) (<a href=\"https://github.com/hyperium/hyper/commit/b7a679bad5e17d106b4b54835153af4e72027f82\">b7a679ba</a>, closes <a href=\"https://redirect.github.com/hyperium/hyper/issues/3995\">#3995</a>, <a href=\"https://redirect.github.com/hyperium/hyper/issues/4016\">#4016</a>)</li>\n<li>fix reading large bodies on 32-bit systems (<a href=\"https://redirect.github.com/hyperium/hyper/issues/4056\">#4056</a>) (<a href=\"https://github.com/hyperium/hyper/commit/b12f6525432e7fbe80b749fec26f8ed7723006fc\">b12f6525</a>, closes <a href=\"https://redirect.github.com/hyperium/hyper/issues/4055\">#4055</a>)</li>\n<li>fix rare missed write wakeup on connections v2 (<a href=\"https://github.com/hyperium/hyper/commit/743a3ba0706fde95e2095ad42ffefe219d807117\">743a3ba0</a>)</li>\n</ul>\n</li>\n<li><strong>http2:</strong>\n<ul>\n<li>do not reserve capacity before body data is available (<a href=\"https://redirect.github.com/hyperium/hyper/issues/4061\">#4061</a>) (<a href=\"https://github.com/hyperium/hyper/commit/99f243450268cfc8125ff232e0b7de016a1dce5b\">99f24345</a>, closes <a href=\"https://redirect.github.com/hyperium/hyper/issues/4003\">#4003</a>)</li>\n<li>reading trailers shouldn't...\n\n_Description has been truncated_"},"base_sha":{"kind":"string","value":"53bb20c90a192d5efd81a5eef2639bce95219146"},"head_sha":{"kind":"string","value":"42fa537c2252ecb6db204c6d1ee6923720a6b78f"},"gold_diff":{"kind":"string","value":"diff --git a/Cargo.lock b/Cargo.lock\nindex 39976d09500..61fdaceef1f 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -372,7 +372,7 @@ version = \"0.0.1\"\n dependencies = [\n \"chrono\",\n \"futures 0.3.32\",\n- \"gloo-net 0.7.0\",\n+ \"gloo-net\",\n \"yew\",\n ]\n \n@@ -399,9 +399,9 @@ checksum = \"c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8\"\n \n [[package]]\n name = \"average\"\n-version = \"0.16.0\"\n+version = \"0.17.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"75aacce61912644dbb732271789748142bc4bf7ce6382d67bb26850516b7a391\"\n+checksum = \"04c5a79a6c36c527e1c31bc0effa93af02e7278b7369b83e0674255290b6c1b0\"\n dependencies = [\n \"easy-cast\",\n \"float-ord\",\n@@ -432,9 +432,9 @@ dependencies = [\n \n [[package]]\n name = \"axum\"\n-version = \"0.8.8\"\n+version = \"0.8.9\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8\"\n+checksum = \"31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90\"\n dependencies = [\n \"axum-core\",\n \"bytes\",\n@@ -581,18 +581,18 @@ dependencies = [\n \n [[package]]\n name = \"bit-set\"\n-version = \"0.5.3\"\n+version = \"0.8.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1\"\n+checksum = \"08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3\"\n dependencies = [\n \"bit-vec\",\n ]\n \n [[package]]\n name = \"bit-vec\"\n-version = \"0.6.3\"\n+version = \"0.8.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb\"\n+checksum = \"5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7\"\n \n [[package]]\n name = \"bitflags\"\n@@ -775,9 +775,9 @@ dependencies = [\n \n [[package]]\n name = \"clap\"\n-version = \"4.6.0\"\n+version = \"4.6.1\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351\"\n+checksum = \"1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51\"\n dependencies = [\n \"clap_builder\",\n \"clap_derive\",\n@@ -798,9 +798,9 @@ dependencies = [\n \n [[package]]\n name = \"clap_derive\"\n-version = \"4.6.0\"\n+version = \"4.6.1\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a\"\n+checksum = \"f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9\"\n dependencies = [\n \"heck\",\n \"proc-macro2\",\n@@ -1277,9 +1277,9 @@ dependencies = [\n \n [[package]]\n name = \"fancy-regex\"\n-version = \"0.13.0\"\n+version = \"0.18.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2\"\n+checksum = \"e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277\"\n dependencies = [\n \"bit-set\",\n \"regex-automata\",\n@@ -1599,7 +1599,7 @@ dependencies = [\n \"gloo-events\",\n \"gloo-file\",\n \"gloo-history\",\n- \"gloo-net 0.7.0\",\n+ \"gloo-net\",\n \"gloo-render\",\n \"gloo-storage\",\n \"gloo-timers\",\n@@ -1670,27 +1670,6 @@ dependencies = [\n \"web-sys\",\n ]\n \n-[[package]]\n-name = \"gloo-net\"\n-version = \"0.6.0\"\n-source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580\"\n-dependencies = [\n- \"futures-channel\",\n- \"futures-core\",\n- \"futures-sink\",\n- \"gloo-utils 0.2.0\",\n- \"http 1.4.0\",\n- \"js-sys\",\n- \"pin-project\",\n- \"serde\",\n- \"serde_json\",\n- \"thiserror 1.0.69\",\n- \"wasm-bindgen\",\n- \"wasm-bindgen-futures\",\n- \"web-sys\",\n-]\n-\n [[package]]\n name = \"gloo-net\"\n version = \"0.7.0\"\n@@ -1827,9 +1806,9 @@ dependencies = [\n \n [[package]]\n name = \"h2\"\n-version = \"0.4.13\"\n+version = \"0.4.14\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54\"\n+checksum = \"171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733\"\n dependencies = [\n \"atomic-waker\",\n \"bytes\",\n@@ -1864,9 +1843,9 @@ dependencies = [\n \n [[package]]\n name = \"hashbrown\"\n-version = \"0.16.1\"\n+version = \"0.17.1\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100\"\n+checksum = \"ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a\"\n dependencies = [\n \"allocator-api2\",\n \"equivalent\",\n@@ -2002,15 +1981,15 @@ checksum = \"df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9\"\n \n [[package]]\n name = \"hyper\"\n-version = \"1.9.0\"\n+version = \"1.10.1\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca\"\n+checksum = \"55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498\"\n dependencies = [\n \"atomic-waker\",\n \"bytes\",\n \"futures-channel\",\n \"futures-core\",\n- \"h2 0.4.13\",\n+ \"h2 0.4.14\",\n \"http 1.4.0\",\n \"http-body\",\n \"httparse\",\n@@ -2253,12 +2232,12 @@ dependencies = [\n \n [[package]]\n name = \"indexmap\"\n-version = \"2.13.1\"\n+version = \"2.14.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff\"\n+checksum = \"d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9\"\n dependencies = [\n \"equivalent\",\n- \"hashbrown 0.16.1\",\n+ \"hashbrown 0.17.1\",\n \"serde\",\n \"serde_core\",\n ]\n@@ -2303,16 +2282,6 @@ version = \"2.12.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2\"\n \n-[[package]]\n-name = \"iri-string\"\n-version = \"0.7.12\"\n-source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20\"\n-dependencies = [\n- \"memchr\",\n- \"serde\",\n-]\n-\n [[package]]\n name = \"is_terminal_polyfill\"\n version = \"1.70.2\"\n@@ -2321,9 +2290,9 @@ checksum = \"a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695\"\n \n [[package]]\n name = \"itertools\"\n-version = \"0.13.0\"\n+version = \"0.14.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186\"\n+checksum = \"2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285\"\n dependencies = [\n \"either\",\n ]\n@@ -2510,9 +2479,9 @@ checksum = \"09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2\"\n \n [[package]]\n name = \"libc\"\n-version = \"0.2.184\"\n+version = \"0.2.186\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af\"\n+checksum = \"68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66\"\n \n [[package]]\n name = \"libgit2-sys\"\n@@ -2593,17 +2562,17 @@ dependencies = [\n \n [[package]]\n name = \"log\"\n-version = \"0.4.29\"\n+version = \"0.4.31\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897\"\n+checksum = \"113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f\"\n \n [[package]]\n name = \"lru\"\n-version = \"0.16.3\"\n+version = \"0.18.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593\"\n+checksum = \"8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9\"\n dependencies = [\n- \"hashbrown 0.16.1\",\n+ \"hashbrown 0.17.1\",\n ]\n \n [[package]]\n@@ -2620,9 +2589,9 @@ checksum = \"47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3\"\n \n [[package]]\n name = \"matchit\"\n-version = \"0.9.1\"\n+version = \"0.9.2\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"b3eede3bdf92f3b4f9dc04072a9ce5ab557d5ec9038773bf9ffcd5588b3cc05b\"\n+checksum = \"8863b587001c1b9a8a4e36008cebc6b3612cb1226fe2de94858e06092687b608\"\n \n [[package]]\n name = \"memchr\"\n@@ -2786,9 +2755,9 @@ checksum = \"7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe\"\n \n [[package]]\n name = \"papergrid\"\n-version = \"0.17.0\"\n+version = \"0.18.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"6978128c8b51d8f4080631ceb2302ab51e32cc6e8615f735ee2f83fd269ae3f1\"\n+checksum = \"d0984e668274d34691bc2b262ef0d115de5fa9973bcdee7ae32213f93099153e\"\n dependencies = [\n \"bytecount\",\n \"fnv\",\n@@ -3043,9 +3012,9 @@ dependencies = [\n \n [[package]]\n name = \"pulldown-cmark\"\n-version = \"0.13.3\"\n+version = \"0.13.4\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"7c3a14896dfa883796f1cb410461aef38810ea05f2b2c33c5aded3649095fdad\"\n+checksum = \"e9f068eba8e7071c5f9511831b44f32c740d5adf574e990f946ddb53db2f314e\"\n dependencies = [\n \"bitflags\",\n \"memchr\",\n@@ -3227,9 +3196,9 @@ checksum = \"dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a\"\n \n [[package]]\n name = \"reqwest\"\n-version = \"0.13.2\"\n+version = \"0.13.4\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801\"\n+checksum = \"219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3\"\n dependencies = [\n \"base64\",\n \"bytes\",\n@@ -3237,7 +3206,7 @@ dependencies = [\n \"futures-channel\",\n \"futures-core\",\n \"futures-util\",\n- \"h2 0.4.13\",\n+ \"h2 0.4.14\",\n \"http 1.4.0\",\n \"http-body\",\n \"http-body-util\",\n@@ -3517,9 +3486,9 @@ dependencies = [\n \n [[package]]\n name = \"serde_json\"\n-version = \"1.0.149\"\n+version = \"1.0.150\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86\"\n+checksum = \"e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9\"\n dependencies = [\n \"itoa\",\n \"memchr\",\n@@ -3797,9 +3766,9 @@ dependencies = [\n \n [[package]]\n name = \"tabled\"\n-version = \"0.20.0\"\n+version = \"0.21.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"e39a2ee1fbcd360805a771e1b300f78cc88fec7b8d3e2f71cd37bbf23e725c7d\"\n+checksum = \"b5dc662e6da844ad6e428ad16b57967c9d33c82e16bb1c258326c0c078605dff\"\n dependencies = [\n \"papergrid\",\n \"tabled_derive\",\n@@ -3992,9 +3961,9 @@ dependencies = [\n \n [[package]]\n name = \"tokio\"\n-version = \"1.51.0\"\n+version = \"1.52.3\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"2bd1c4c0fc4a7ab90fc15ef6daaa3ec3b893f004f915f2392557ed23237820cd\"\n+checksum = \"8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe\"\n dependencies = [\n \"bytes\",\n \"libc\",\n@@ -4142,9 +4111,9 @@ dependencies = [\n \n [[package]]\n name = \"tower-http\"\n-version = \"0.6.8\"\n+version = \"0.6.11\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8\"\n+checksum = \"4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840\"\n dependencies = [\n \"bitflags\",\n \"bytes\",\n@@ -4155,7 +4124,6 @@ dependencies = [\n \"http-body-util\",\n \"http-range-header\",\n \"httpdate\",\n- \"iri-string\",\n \"mime\",\n \"mime_guess\",\n \"percent-encoding\",\n@@ -4165,7 +4133,7 @@ dependencies = [\n \"tower\",\n \"tower-layer\",\n \"tower-service\",\n- \"tracing\",\n+ \"url\",\n ]\n \n [[package]]\n@@ -4372,9 +4340,9 @@ checksum = \"06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821\"\n \n [[package]]\n name = \"uuid\"\n-version = \"1.23.0\"\n+version = \"1.23.2\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9\"\n+checksum = \"d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7\"\n dependencies = [\n \"js-sys\",\n \"serde_core\",\n@@ -4705,7 +4673,7 @@ dependencies = [\n \"derive_more\",\n \"glob\",\n \"gloo\",\n- \"gloo-net 0.7.0\",\n+ \"gloo-net\",\n \"js-sys\",\n \"serde\",\n \"serde_json\",\n@@ -5206,7 +5174,7 @@ version = \"0.1.0\"\n dependencies = [\n \"actix-web\",\n \"axum\",\n- \"gloo-net 0.6.0\",\n+ \"gloo-net\",\n \"lru\",\n \"serde\",\n \"serde_json\",\n@@ -5245,7 +5213,7 @@ version = \"0.20.0\"\n dependencies = [\n \"gloo\",\n \"js-sys\",\n- \"matchit 0.9.1\",\n+ \"matchit 0.9.2\",\n \"serde\",\n \"serde_urlencoded\",\n \"tracing\",\n@@ -5432,9 +5400,9 @@ dependencies = [\n \n [[package]]\n name = \"zxcvbn\"\n-version = \"3.1.0\"\n+version = \"3.1.1\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"ad76e35b00ad53688d6b90c431cabe3cbf51f7a4a154739e04b63004ab1c736c\"\n+checksum = \"f9eaee90f4a795d1eb4ba6c51e1c1721d4784d550e8efa7b2600f29c867365e0\"\n dependencies = [\n \"chrono\",\n \"derive_builder\",\ndiff --git a/Cargo.toml b/Cargo.toml\nindex 05b3cf7a5c1..424852fa4d9 100644\n--- a/Cargo.toml\n+++ b/Cargo.toml\n@@ -33,7 +33,7 @@ unexpected_cfgs = { level = \"warn\", check-cfg = [\n \"cfg(wasm_bindgen_unstable_test_coverage)\"\n ]}\n [workspace.dependencies]\n-tokio = { version = \"1.50.0\" }\n+tokio = { version = \"1.52.3\" }\n implicit-clone = { version = \"0.6.0\" }\n proc-macro2 = \"1\"\n quote = \"1\"\ndiff --git a/examples/axum_ssr_router/Cargo.toml b/examples/axum_ssr_router/Cargo.toml\nindex a164375d515..6a820f1fe8d 100644\n--- a/examples/axum_ssr_router/Cargo.toml\n+++ b/examples/axum_ssr_router/Cargo.toml\n@@ -36,7 +36,7 @@ tower = { version = \"0.5\", features = [\"make\"] }\n tower-http = { version = \"0.6\", features = [\"fs\", \"cors\"] }\n env_logger = \"0.11\"\n clap = { workspace = true }\n-hyper = { version = \"1.4\", features = [\"server\", \"http1\"] }\n+hyper = { version = \"1.10\", features = [\"server\", \"http1\"] }\n \n [target.'cfg(unix)'.dependencies]\n jemallocator = \"0.5\"\ndiff --git a/examples/password_strength/Cargo.toml b/examples/password_strength/Cargo.toml\nindex 0666877c939..89c0f1d3091 100644\n--- a/examples/password_strength/Cargo.toml\n+++ b/examples/password_strength/Cargo.toml\n@@ -8,7 +8,7 @@ rust-version.workspace = true\n # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html\n [dependencies]\n yew = { path = \"../../packages/yew\", features = [\"csr\"] }\n-zxcvbn = \"3.1.0\"\n+zxcvbn = \"3.1.1\"\n js-sys.workspace = true\n web-sys = { workspace = true, features = [\"Event\",\"EventTarget\",\"InputEvent\"] }\n wasm-bindgen.workspace = true\ndiff --git a/examples/simple_ssr/Cargo.toml b/examples/simple_ssr/Cargo.toml\nindex 32e92c52784..c369cb2bc6c 100644\n--- a/examples/simple_ssr/Cargo.toml\n+++ b/examples/simple_ssr/Cargo.toml\n@@ -17,7 +17,7 @@ required-features = [\"ssr\"]\n yew = { path = \"../../packages/yew\" }\n reqwest = { workspace = true, features = [\"json\"] }\n serde = { workspace = true, features = [\"derive\"] }\n-uuid = { version = \"1.20.0\", features = [\"serde\"] }\n+uuid = { version = \"1.23.2\", features = [\"serde\"] }\n futures.workspace = true\n \n [target.'cfg(target_arch = \"wasm32\")'.dependencies]\ndiff --git a/packages/yew-link/Cargo.toml b/packages/yew-link/Cargo.toml\nindex 6b801a6c854..14c0a3e420b 100644\n--- a/packages/yew-link/Cargo.toml\n+++ b/packages/yew-link/Cargo.toml\n@@ -14,8 +14,8 @@ serde = { workspace = true, features = [\"derive\"] }\n serde_json = { workspace = true }\n \n [target.'cfg(target_arch = \"wasm32\")'.dependencies]\n-gloo-net = { version = \"0.6\", features = [\"http\"] }\n-lru = \"0.16\"\n+gloo-net = { version = \"0.7\", features = [\"http\"] }\n+lru = \"0.18\"\n wasm-bindgen-futures = { workspace = true }\n \n [target.'cfg(not(target_arch = \"wasm32\"))'.dependencies]\ndiff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml\nindex 629e50f9ccc..58ecf5f0dc8 100644\n--- a/packages/yew/Cargo.toml\n+++ b/packages/yew/Cargo.toml\n@@ -19,7 +19,7 @@ rust-version.workspace = true\n [dependencies]\n console_error_panic_hook = \"0.1\"\n gloo.workspace = true\n-indexmap = { version = \"2.13\", features = [\"std\"] }\n+indexmap = { version = \"2.14\", features = [\"std\"] }\n js-sys.workspace = true\n slab = \"0.4\"\n wasm-bindgen.workspace = true\ndiff --git a/tools/benchmark-ssr/Cargo.toml b/tools/benchmark-ssr/Cargo.toml\nindex e3024d63073..4037f39277a 100644\n--- a/tools/benchmark-ssr/Cargo.toml\n+++ b/tools/benchmark-ssr/Cargo.toml\n@@ -10,8 +10,8 @@ rust-version.workspace = true\n yew = { path = \"../../packages/yew\", features = [\"ssr\"] }\n function_router = { path = \"../../examples/function_router\" }\n tokio = { workspace = true, features = [\"macros\", \"rt-multi-thread\", \"time\"] }\n-average = \"0.16.0\"\n-tabled = \"0.20.0\"\n+average = \"0.17.0\"\n+tabled = \"0.21.0\"\n indicatif = \"0.18.4\"\n serde = { workspace = true, features = [\"derive\"] }\n serde_json.workspace = true\n"},"changed_files":{"kind":"list like","value":["Cargo.lock","Cargo.toml","examples/axum_ssr_router/Cargo.toml","examples/password_strength/Cargo.toml","examples/simple_ssr/Cargo.toml","packages/yew-link/Cargo.toml","packages/yew/Cargo.toml","tools/benchmark-ssr/Cargo.toml"],"string":"[\n \"Cargo.lock\",\n \"Cargo.toml\",\n \"examples/axum_ssr_router/Cargo.toml\",\n \"examples/password_strength/Cargo.toml\",\n \"examples/simple_ssr/Cargo.toml\",\n \"packages/yew-link/Cargo.toml\",\n \"packages/yew/Cargo.toml\",\n \"tools/benchmark-ssr/Cargo.toml\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86286,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4164,"string":"4,164"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"fix: make simple_ssr SSR fetch reliable in CI"},"pr_body":{"kind":"string","value":"see commit message"},"base_sha":{"kind":"string","value":"830db95a54af3b685211ac7349e7276383c9565f"},"head_sha":{"kind":"string","value":"c425d48af21003c6f3f9c7438a36f95420259a51"},"gold_diff":{"kind":"string","value":"diff --git a/examples/simple_ssr/src/lib.rs b/examples/simple_ssr/src/lib.rs\nindex 8611b7c0cf9..1d9dc775c83 100644\n--- a/examples/simple_ssr/src/lib.rs\n+++ b/examples/simple_ssr/src/lib.rs\n@@ -9,8 +9,17 @@ struct UuidResponse {\n \n #[cfg(feature = \"ssr\")]\n async fn fetch_uuid() -> Uuid {\n- // reqwest works for both non-wasm and wasm targets.\n- let resp = reqwest::get(\"https://httpbin.org/uuid\").await.unwrap();\n+ let client = reqwest::Client::builder()\n+ .user_agent(\"yew-simple-ssr-example\")\n+ .build()\n+ .unwrap();\n+ let resp = client\n+ .get(\"https://httpbingo.org/uuid\")\n+ .send()\n+ .await\n+ .unwrap()\n+ .error_for_status()\n+ .unwrap();\n let uuid_resp = resp.json::<UuidResponse>().await.unwrap();\n \n uuid_resp.uuid\n"},"changed_files":{"kind":"list like","value":["examples/simple_ssr/src/lib.rs"],"string":"[\n \"examples/simple_ssr/src/lib.rs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86287,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4162,"string":"4,162"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"chore(deps): bump git2 to 0.21 and adapt changelog tool"},"pr_body":{"kind":"string","value":"exposed by a dependabot PR. this is un-blocks the PR.\r\n"},"base_sha":{"kind":"string","value":"6292cbe275cd82fb015ad8bbcd2fc163e7bd854b"},"head_sha":{"kind":"string","value":"e3afb668f059f304bf12e83574d0a60cfe1a3996"},"gold_diff":{"kind":"string","value":"diff --git a/Cargo.lock b/Cargo.lock\nindex 9072a7e731d..39976d09500 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -1572,17 +1572,14 @@ dependencies = [\n \n [[package]]\n name = \"git2\"\n-version = \"0.20.4\"\n+version = \"0.21.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"7b88256088d75a56f8ecfa070513a775dd9107f6530ef14919dac831af9cfe2b\"\n+checksum = \"ddddbf932745a6be37109b6112d3ee09696106f848449069d3a57bba937ab82e\"\n dependencies = [\n \"bitflags\",\n \"libc\",\n \"libgit2-sys\",\n \"log\",\n- \"openssl-probe 0.1.6\",\n- \"openssl-sys\",\n- \"url\",\n ]\n \n [[package]]\n@@ -2519,15 +2516,13 @@ checksum = \"48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af\"\n \n [[package]]\n name = \"libgit2-sys\"\n-version = \"0.18.3+1.9.2\"\n+version = \"0.18.5+1.9.4\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"c9b3acc4b91781bb0b3386669d325163746af5f6e4f73e6d2d630e09a35f3487\"\n+checksum = \"005d6ae6eac1912906073e069f7db60b1fa98e052a68227824afe3e3a1c59ca2\"\n dependencies = [\n \"cc\",\n \"libc\",\n- \"libssh2-sys\",\n \"libz-sys\",\n- \"openssl-sys\",\n \"pkg-config\",\n ]\n \n@@ -2537,20 +2532,6 @@ version = \"0.2.16\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981\"\n \n-[[package]]\n-name = \"libssh2-sys\"\n-version = \"0.3.1\"\n-source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9\"\n-dependencies = [\n- \"cc\",\n- \"libc\",\n- \"libz-sys\",\n- \"openssl-sys\",\n- \"pkg-config\",\n- \"vcpkg\",\n-]\n-\n [[package]]\n name = \"libz-sys\"\n version = \"1.1.28\"\n@@ -2797,30 +2778,12 @@ version = \"11.1.5\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e\"\n \n-[[package]]\n-name = \"openssl-probe\"\n-version = \"0.1.6\"\n-source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e\"\n-\n [[package]]\n name = \"openssl-probe\"\n version = \"0.2.1\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe\"\n \n-[[package]]\n-name = \"openssl-sys\"\n-version = \"0.9.112\"\n-source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb\"\n-dependencies = [\n- \"cc\",\n- \"libc\",\n- \"pkg-config\",\n- \"vcpkg\",\n-]\n-\n [[package]]\n name = \"papergrid\"\n version = \"0.17.0\"\n@@ -3385,7 +3348,7 @@ version = \"0.8.3\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63\"\n dependencies = [\n- \"openssl-probe 0.2.1\",\n+ \"openssl-probe\",\n \"rustls-pki-types\",\n \"schannel\",\n \"security-framework\",\ndiff --git a/tools/changelog/Cargo.toml b/tools/changelog/Cargo.toml\nindex 6ccddbd140c..df7c7f5814f 100644\n--- a/tools/changelog/Cargo.toml\n+++ b/tools/changelog/Cargo.toml\n@@ -10,7 +10,7 @@ rust-version.workspace = true\n [dependencies]\n anyhow.workspace = true\n chrono = \"0.4\"\n-git2 = \"0.20\"\n+git2 = \"0.21\"\n regex = \"1\"\n reqwest = { workspace = true, features = [\"blocking\", \"json\"] }\n serde = { workspace = true, features = [\"derive\"] }\n"},"changed_files":{"kind":"list like","value":["Cargo.lock","tools/changelog/Cargo.toml","tools/changelog/src/get_latest_version.rs"],"string":"[\n \"Cargo.lock\",\n \"tools/changelog/Cargo.toml\",\n \"tools/changelog/src/get_latest_version.rs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":"diff --git a/tools/changelog/src/get_latest_version.rs b/tools/changelog/src/get_latest_version.rs\nindex 89fe646e625..91883b529f2 100644\n--- a/tools/changelog/src/get_latest_version.rs\n+++ b/tools/changelog/src/get_latest_version.rs\n@@ -12,7 +12,7 @@ pub fn get_latest_version(package: &YewPackage) -> Result<Version> {\n .tag_names(Some(&search_pattern))?\n .iter()\n .filter_map(|mb_tag| {\n- mb_tag.map(|tag| {\n+ mb_tag.ok().flatten().map(|tag| {\n let version = tag.replace(&common_tag_pattern, \"\");\n Version::parse(&version)\n })\n"},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86288,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4151,"string":"4,151"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"chore(deps): bump postcss from 8.5.6 to 8.5.13 in /website"},"pr_body":{"kind":"string","value":"Bumps [postcss](https://github.com/postcss/postcss) from 8.5.6 to 8.5.13.\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/postcss/postcss/releases\">postcss's releases</a>.</em></p>\n<blockquote>\n<h2>8.5.13</h2>\n<ul>\n<li>Fixed <code>postcss-scss</code> commend regression.</li>\n</ul>\n<h2>8.5.12</h2>\n<ul>\n<li>Fixed reading any file via user-generated CSS.</li>\n<li>Added <code>opts.unsafeMap</code> to disable checks.</li>\n</ul>\n<h2>8.5.11</h2>\n<ul>\n<li>Fixed nested brackets parsing performance (by <a href=\"https://github.com/offset\"><code>@offset</code></a>).</li>\n</ul>\n<h2>8.5.10</h2>\n<ul>\n<li>Fixed XSS via unescaped <code></style></code> in non-bundler cases (by <a href=\"https://github.com/TharVid\"><code>@TharVid</code></a>).</li>\n</ul>\n<h2>8.5.9</h2>\n<ul>\n<li>Speed up source map encoding paring in case of the error.</li>\n</ul>\n<h2>8.5.8</h2>\n<ul>\n<li>Fixed <code>Processor#version</code>.</li>\n</ul>\n<h2>8.5.7</h2>\n<ul>\n<li>Improved source map annotation cleaning performance (by CodeAnt AI).</li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/postcss/postcss/blob/main/CHANGELOG.md\">postcss's changelog</a>.</em></p>\n<blockquote>\n<h2>8.5.13</h2>\n<ul>\n<li>Fixed <code>postcss-scss</code> commend regression.</li>\n</ul>\n<h2>8.5.12</h2>\n<ul>\n<li>Fixed reading any file via user-generated CSS.</li>\n<li>Added <code>opts.unsafeMap</code> to disable checks.</li>\n</ul>\n<h2>8.5.11</h2>\n<ul>\n<li>Fixed nested brackets parsing performance (by <a href=\"https://github.com/offset\"><code>@offset</code></a>).</li>\n</ul>\n<h2>8.5.10</h2>\n<ul>\n<li>Fixed XSS via unescaped <code></style></code> in non-bundler cases (by <a href=\"https://github.com/TharVid\"><code>@TharVid</code></a>).</li>\n</ul>\n<h2>8.5.9</h2>\n<ul>\n<li>Speed up source map encoding paring in case of the error.</li>\n</ul>\n<h2>8.5.8</h2>\n<ul>\n<li>Fixed <code>Processor#version</code>.</li>\n</ul>\n<h2>8.5.7</h2>\n<ul>\n<li>Improved source map annotation cleaning performance (by CodeAnt AI).</li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/postcss/postcss/commit/af58cf1b7af02e9b9fcb138a4a2d7ef3450158b1\"><code>af58cf1</code></a> Release 8.5.13 version</li>\n<li><a href=\"https://github.com/postcss/postcss/commit/f227dbd0e9443e5f33e18e633b8b4d2b55aac5ee\"><code>f227dbd</code></a> Temporary ignore pnpm 11 config</li>\n<li><a href=\"https://github.com/postcss/postcss/commit/d3abd40d723cf3559e5ddb5fc738b7cb64e92bb0\"><code>d3abd40</code></a> Update dependencies</li>\n<li><a href=\"https://github.com/postcss/postcss/commit/dd06c3e11362087bc18f9c20cee30fd82bda3de9\"><code>dd06c3e</code></a> Revert stringifier changes because of the conflict with postcss-scss</li>\n<li><a href=\"https://github.com/postcss/postcss/commit/ae889c815fb88d785401a88f1a7dfc8cb11915fb\"><code>ae889c8</code></a> Try to fix CI</li>\n<li><a href=\"https://github.com/postcss/postcss/commit/e0093e49bcf00347383a13e40bb1f67bc823ca15\"><code>e0093e4</code></a> Move to pnpm 11</li>\n<li><a href=\"https://github.com/postcss/postcss/commit/9bc81c48f054a630c9a2e3868263b7ad4fc15013\"><code>9bc81c4</code></a> Release 8.5.12 version</li>\n<li><a href=\"https://github.com/postcss/postcss/commit/85c4d7dab830be366f8a96047f9e5b7944e101d8\"><code>85c4d7d</code></a> Another try to fix coverage</li>\n<li><a href=\"https://github.com/postcss/postcss/commit/94484cae6d4308167939f2ac888d166bd80dff01\"><code>94484ca</code></a> Try to fix coverage</li>\n<li><a href=\"https://github.com/postcss/postcss/commit/c64b7488d2731dfa16213739b42c34faf5a9eba3\"><code>c64b748</code></a> Load only .map source maps</li>\n<li>Additional commits viewable in <a href=\"https://github.com/postcss/postcss/compare/8.5.6...8.5.13\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/yewstack/yew/network/alerts).\n\n</details>"},"base_sha":{"kind":"string","value":"d4e5e9f3a82e81e97041f53e0cc7e6bb1796cd48"},"head_sha":{"kind":"string","value":"5de1a63bc69d99f390dbd2713b08dad6f18c08e7"},"gold_diff":{"kind":"string","value":"diff --git a/website/package-lock.json b/website/package-lock.json\nindex a3ef604410b..a5dd6d91937 100644\n--- a/website/package-lock.json\n+++ b/website/package-lock.json\n@@ -14047,9 +14047,9 @@\n }\n },\n \"node_modules/postcss\": {\n- \"version\": \"8.5.6\",\n- \"resolved\": \"https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz\",\n- \"integrity\": \"sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==\",\n+ \"version\": \"8.5.13\",\n+ \"resolved\": \"https://registry.npmjs.org/postcss/-/postcss-8.5.13.tgz\",\n+ \"integrity\": \"sha512-qif0+jGGZoLWdHey3UFHHWP0H7Gbmsk8T5VEqyYFbWqPr1XqvLGBbk/sl8V5exGmcYJklJOhOQq1pV9IcsiFag==\",\n \"funding\": [\n {\n \"type\": \"opencollective\",\n"},"changed_files":{"kind":"list like","value":["website/package-lock.json"],"string":"[\n \"website/package-lock.json\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86289,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4161,"string":"4,161"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"chore(deps): bump crate-ci/typos from 1.44.0 to 1.47.0"},"pr_body":{"kind":"string","value":"Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.44.0 to 1.47.0.\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/crate-ci/typos/releases\">crate-ci/typos's releases</a>.</em></p>\n<blockquote>\n<h2>v1.47.0</h2>\n<h2>[1.47.0] - 2026-05-29</h2>\n<h3>Features</h3>\n<ul>\n<li>Updated the dictionary with the <a href=\"https://redirect.github.com/crate-ci/typos/issues/1545\">May 2026</a> changes</li>\n</ul>\n<h2>v1.46.3</h2>\n<h2>[1.46.3] - 2026-05-23</h2>\n<h3>Fixes</h3>\n<ul>\n<li>Don't correct to <code>sequentials</code></li>\n<li>Don't correct to <code>subdolder</code></li>\n</ul>\n<h2>v1.46.2</h2>\n<h2>[1.46.2] - 2026-05-16</h2>\n<h3>Fixes</h3>\n<ul>\n<li>Don't correct to <code>criterias</code></li>\n<li>Don't correct to <code>replaceables</code></li>\n</ul>\n<h2>v1.46.1</h2>\n<h2>[1.46.1] - 2026-05-08</h2>\n<h3>Fixes</h3>\n<ul>\n<li>Don't correct to <code>confidentials</code></li>\n</ul>\n<h2>v1.46.0</h2>\n<h2>[1.46.0] - 2026-04-30</h2>\n<h3>Features</h3>\n<ul>\n<li>Updated the dictionary with the <a href=\"https://redirect.github.com/crate-ci/typos/issues/1531\">April 2026</a> changes</li>\n</ul>\n<h2>v1.45.2</h2>\n<h2>[1.45.2] - 2026-04-27</h2>\n<h3>Fixes</h3>\n<ul>\n<li>Ignore ssh ed25519 public keys</li>\n</ul>\n<h2>v1.45.1</h2>\n<h2>[1.45.1] - 2026-04-13</h2>\n<h3>Fixes</h3>\n<ul>\n<li><em>(action)</em> Use a temp dir for caching</li>\n</ul>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/crate-ci/typos/blob/master/CHANGELOG.md\">crate-ci/typos's changelog</a>.</em></p>\n<blockquote>\n<h2>[1.47.0] - 2026-05-29</h2>\n<h3>Features</h3>\n<ul>\n<li>Updated the dictionary with the <a href=\"https://redirect.github.com/crate-ci/typos/issues/1545\">May 2026</a> changes</li>\n</ul>\n<h2>[1.46.3] - 2026-05-23</h2>\n<h3>Fixes</h3>\n<ul>\n<li>Don't correct to <code>sequentials</code></li>\n<li>Don't correct to <code>subdolder</code></li>\n</ul>\n<h2>[1.46.2] - 2026-05-16</h2>\n<h3>Fixes</h3>\n<ul>\n<li>Don't correct to <code>criterias</code></li>\n<li>Don't correct to <code>replaceables</code></li>\n</ul>\n<h2>[1.46.1] - 2026-05-08</h2>\n<h3>Fixes</h3>\n<ul>\n<li>Don't correct to <code>confidentials</code></li>\n</ul>\n<h2>[1.46.0] - 2026-04-30</h2>\n<h3>Features</h3>\n<ul>\n<li>Updated the dictionary with the <a href=\"https://redirect.github.com/crate-ci/typos/issues/1531\">April 2026</a> changes</li>\n</ul>\n<h2>[1.45.2] - 2026-04-27</h2>\n<h3>Fixes</h3>\n<ul>\n<li>Ignore ssh ed25519 public keys</li>\n</ul>\n<h2>[1.45.1] - 2026-04-13</h2>\n<h3>Fixes</h3>\n<ul>\n<li><em>(action)</em> Use a temp dir for caching</li>\n</ul>\n<h2>[1.45.0] - 2026-04-01</h2>\n<h3>Features</h3>\n<ul>\n<li>Updated the dictionary with the <a href=\"https://redirect.github.com/crate-ci/typos/issues/1509\">March 2026</a> changes</li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/crate-ci/typos/commit/f8a58b6b53f2279f71eb605f03a4ae4d10608f45\"><code>f8a58b6</code></a> chore: Release</li>\n<li><a href=\"https://github.com/crate-ci/typos/commit/52ee9d721ca31e8358aa2ce20177329d9c5a74ca\"><code>52ee9d7</code></a> chore: Release</li>\n<li><a href=\"https://github.com/crate-ci/typos/commit/f1aafeaffbea23ca6784c9e925d26e6f107733c9\"><code>f1aafea</code></a> docs: Update changelog</li>\n<li><a href=\"https://github.com/crate-ci/typos/commit/0d2e4af4cda5882880f5312c1cc34c4f1d48ddac\"><code>0d2e4af</code></a> Merge pull request <a href=\"https://redirect.github.com/crate-ci/typos/issues/1563\">#1563</a> from epage/may</li>\n<li><a href=\"https://github.com/crate-ci/typos/commit/d818ce0eabd163d7e6b2a1ddd56c3cf197747b75\"><code>d818ce0</code></a> feat(dict): May updates</li>\n<li><a href=\"https://github.com/crate-ci/typos/commit/547b806c4b837d8ca2ff35b577a7f7b697963ed6\"><code>547b806</code></a> chore(deps): Update Rust Stable to v1.96 (<a href=\"https://redirect.github.com/crate-ci/typos/issues/1561\">#1561</a>)</li>\n<li><a href=\"https://github.com/crate-ci/typos/commit/7b04f660f4ee4f048d18fd341887cf28dfbedfe2\"><code>7b04f66</code></a> chore: Release</li>\n<li><a href=\"https://github.com/crate-ci/typos/commit/6eefe9fe8912c8838f92bc036e3a6deb5980a5d6\"><code>6eefe9f</code></a> docs: Update changelog</li>\n<li><a href=\"https://github.com/crate-ci/typos/commit/27ae304665df6c1ed33363f179c1656fc03de0f1\"><code>27ae304</code></a> Merge pull request <a href=\"https://redirect.github.com/crate-ci/typos/issues/1559\">#1559</a> from epage/fixes</li>\n<li><a href=\"https://github.com/crate-ci/typos/commit/5b01f667d285db3c07f1f6f6e5915550d474e364\"><code>5b01f66</code></a> fix(dict): Don't correct to sequentials</li>\n<li>Additional commits viewable in <a href=\"https://github.com/crate-ci/typos/compare/v1.44.0...v1.47.0\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n\n\n</details>"},"base_sha":{"kind":"string","value":"65972c34fe8c18e6961c9473c572c71e03de43d5"},"head_sha":{"kind":"string","value":"0cd3a50f581f9fb0254c0317f47e0d7cfc37dd4c"},"gold_diff":{"kind":"string","value":"diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml\nindex c7514f9a79f..d608767dde2 100644\n--- a/.github/workflows/main-checks.yml\n+++ b/.github/workflows/main-checks.yml\n@@ -20,7 +20,7 @@ jobs:\n steps:\n - uses: actions/checkout@v6\n - name: Check spelling\n- uses: crate-ci/typos@v1.44.0\n+ uses: crate-ci/typos@v1.47.0\n \n doc_tests:\n name: Documentation Tests\n"},"changed_files":{"kind":"list like","value":[".github/workflows/main-checks.yml"],"string":"[\n \".github/workflows/main-checks.yml\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86290,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4145,"string":"4,145"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":"modernize example code with preamble statements\n\n#4124 opened up opportunities to more compact coding styles.\n\n`html!` invocations in example crates and website code snippets can benefit from some refactoring."},"pr_title":{"kind":"string","value":"refactor: inline to html! callsite"},"pr_body":{"kind":"string","value":"#### Description\r\n\r\neliminated a bunch of functions that return Html and were only used once in some `html!` callsite\r\n\r\nFixes #4144 \r\n\r\n#### Checklist\r\n\r\n- [x] I have reviewed my own code\r\n"},"base_sha":{"kind":"string","value":"c28846c3e8c837d90ab8b4bc35377e317520d7c1"},"head_sha":{"kind":"string","value":"623ee28732ab08f4a9919218afc482be57abea71"},"gold_diff":{"kind":"string","value":"diff --git a/examples/actix_ssr_router/src/lib.rs b/examples/actix_ssr_router/src/lib.rs\nindex 913510c7dfc..0f039a5964c 100644\n--- a/examples/actix_ssr_router/src/lib.rs\n+++ b/examples/actix_ssr_router/src/lib.rs\n@@ -115,27 +115,7 @@ fn render_post(post: &content::Post) -> Html {\n }\n };\n \n- let view_content = {\n- let mut show_hero = false;\n- let parts: Vec<Html> = post\n- .content\n- .iter()\n- .map(|part| match part {\n- PostPart::Section(section) => {\n- let html = render_section(section, show_hero);\n- show_hero = true;\n- html\n- }\n- PostPart::Quote(quote) => {\n- show_hero = false;\n- render_quote(quote)\n- }\n- })\n- .collect();\n- html! {\n- {for parts}\n- }\n- };\n+ let mut show_hero = false;\n \n html! {\n <section class=\"hero is-medium is-light has-background\">\n@@ -157,7 +137,23 @@ fn render_post(post: &content::Post) -> Html {\n </div>\n </div>\n </section>\n- <div class=\"section container\">{ view_content }</div>\n+ <div class=\"section container\">\n+ for part in post.content.iter() {\n+ match part {\n+ PostPart::Section(section) => {\n+ let rendered = render_section(section, show_hero);\n+ // show hero between sections\n+ show_hero = true;\n+ { rendered }\n+ }\n+ PostPart::Quote(quote) => {\n+ // don't show hero after a quote\n+ show_hero = false;\n+ { render_quote(quote) }\n+ }\n+ }\n+ }\n+ </div>\n }\n }\n \ndiff --git a/examples/axum_ssr_router/src/lib.rs b/examples/axum_ssr_router/src/lib.rs\nindex 913510c7dfc..0f039a5964c 100644\n--- a/examples/axum_ssr_router/src/lib.rs\n+++ b/examples/axum_ssr_router/src/lib.rs\n@@ -115,27 +115,7 @@ fn render_post(post: &content::Post) -> Html {\n }\n };\n \n- let view_content = {\n- let mut show_hero = false;\n- let parts: Vec<Html> = post\n- .content\n- .iter()\n- .map(|part| match part {\n- PostPart::Section(section) => {\n- let html = render_section(section, show_hero);\n- show_hero = true;\n- html\n- }\n- PostPart::Quote(quote) => {\n- show_hero = false;\n- render_quote(quote)\n- }\n- })\n- .collect();\n- html! {\n- {for parts}\n- }\n- };\n+ let mut show_hero = false;\n \n html! {\n <section class=\"hero is-medium is-light has-background\">\n@@ -157,7 +137,23 @@ fn render_post(post: &content::Post) -> Html {\n </div>\n </div>\n </section>\n- <div class=\"section container\">{ view_content }</div>\n+ <div class=\"section container\">\n+ for part in post.content.iter() {\n+ match part {\n+ PostPart::Section(section) => {\n+ let rendered = render_section(section, show_hero);\n+ // show hero between sections\n+ show_hero = true;\n+ { rendered }\n+ }\n+ PostPart::Quote(quote) => {\n+ // don't show hero after a quote\n+ show_hero = false;\n+ { render_quote(quote) }\n+ }\n+ }\n+ }\n+ </div>\n }\n }\n \ndiff --git a/examples/boids/src/boid.rs b/examples/boids/src/boid.rs\nindex 7b6d94c190e..4c388dc8c6e 100644\n--- a/examples/boids/src/boid.rs\n+++ b/examples/boids/src/boid.rs\n@@ -1,8 +1,6 @@\n-use std::fmt::Write;\n use std::iter;\n \n use rand::RngExt;\n-use yew::{Html, html};\n \n use crate::math::{self, Mean, Vector2D, WeightedMean};\n use crate::settings::Settings;\n@@ -10,10 +8,10 @@ use crate::simulation::SIZE;\n \n #[derive(Clone, Debug, PartialEq)]\n pub struct Boid {\n- position: Vector2D,\n- velocity: Vector2D,\n- radius: f64,\n- hue: f64,\n+ pub position: Vector2D,\n+ pub velocity: Vector2D,\n+ pub radius: f64,\n+ pub hue: f64,\n }\n \n impl Boid {\n@@ -123,32 +121,6 @@ impl Boid {\n boid.update(settings, visible_boids);\n }\n }\n-\n- pub fn render(&self) -> Html {\n- let color = format!(\"hsl({:.3}rad, 100%, 50%)\", self.hue);\n-\n- let mut points = String::new();\n- for offset in iter_shape_points(self.radius, self.velocity.angle()) {\n- let Vector2D { x, y } = self.position + offset;\n-\n- // Write to string will never fail.\n- let _ = write!(points, \"{x:.2},{y:.2} \");\n- }\n-\n- html! { <polygon {points} fill={color} /> }\n- }\n-}\n-\n-fn iter_shape_points(radius: f64, rotation: f64) -> impl Iterator<Item = Vector2D> {\n- const SHAPE: [(f64, f64); 3] = [\n- (0. * math::FRAC_TAU_3, 2.0),\n- (1. * math::FRAC_TAU_3, 1.0),\n- (2. * math::FRAC_TAU_3, 1.0),\n- ];\n- SHAPE\n- .iter()\n- .copied()\n- .map(move |(angle, radius_mul)| Vector2D::from_polar(angle + rotation, radius_mul * radius))\n }\n \n #[derive(Debug)]\ndiff --git a/examples/boids/src/simulation.rs b/examples/boids/src/simulation.rs\nindex b41766c2c2a..781bf6d0edb 100644\n--- a/examples/boids/src/simulation.rs\n+++ b/examples/boids/src/simulation.rs\n@@ -1,8 +1,10 @@\n+use std::fmt::Write;\n+\n use gloo::timers::callback::Interval;\n use yew::{Component, Context, Html, Properties, html};\n \n use crate::boid::Boid;\n-use crate::math::Vector2D;\n+use crate::math::{self, Vector2D};\n use crate::settings::Settings;\n \n pub const SIZE: Vector2D = Vector2D::new(1600.0, 1000.0);\n@@ -103,7 +105,25 @@ impl Component for Simulation {\n \n html! {\n <svg class=\"simulation-window\" viewBox={view_box}>\n- { for self.boids.iter().map(Boid::render) }\n+ for boid in &self.boids {\n+\n+ let color = format!(\"hsl({:.3}rad, 100%, 50%)\", boid.hue);\n+ let mut points = String::new();\n+ for offset in [\n+ (0. * math::FRAC_TAU_3, 2.0),\n+ (1. * math::FRAC_TAU_3, 1.0),\n+ (2. * math::FRAC_TAU_3, 1.0),\n+ ]\n+ .iter()\n+ .copied()\n+ .map(move |(angle, radius_mul)| Vector2D::from_polar(angle + boid.velocity.angle(), radius_mul * boid.radius)) {\n+ let Vector2D { x, y } = boid.position + offset;\n+ // Write to string will never fail.\n+ let _ = write!(points, \"{x:.2},{y:.2} \");\n+ }\n+\n+ <polygon {points} fill={color} />\n+ }\n </svg>\n }\n }\ndiff --git a/examples/file_upload/src/main.rs b/examples/file_upload/src/main.rs\nindex a2a32d9c014..873743e6b8f 100644\n--- a/examples/file_upload/src/main.rs\n+++ b/examples/file_upload/src/main.rs\n@@ -97,33 +97,28 @@ impl Component for App {\n })}\n />\n <div id=\"preview-area\">\n- { for self.files.iter().map(Self::view_file) }\n- </div>\n- </div>\n- }\n- }\n-}\n-\n-impl App {\n- fn view_file(file: &FileDetails) -> Html {\n- let file_type = file.file_type.to_string();\n- let src = format!(\"data:{};base64,{}\", file_type, STANDARD.encode(&file.data));\n- html! {\n- <div class=\"preview-tile\">\n- <p class=\"preview-name\">{ &file.name }</p>\n- <div class=\"preview-media\">\n- if file.file_type.contains(\"image\") {\n- <img src={src} />\n- } else if file.file_type.contains(\"video\") {\n- <video controls={true}>\n- <source src={src} type={ file_type }/>\n- </video>\n+ for file in &self.files {\n+ let file_type = file.file_type.to_string();\n+ let src = format!(\"data:{};base64,{}\", file_type, STANDARD.encode(&file.data));\n+ <div class=\"preview-tile\">\n+ <p class=\"preview-name\">{ &file.name }</p>\n+ <div class=\"preview-media\">\n+ if file.file_type.contains(\"image\") {\n+ <img src={src} />\n+ } else if file.file_type.contains(\"video\") {\n+ <video controls={true}>\n+ <source src={src} type={ file_type }/>\n+ </video>\n+ }\n+ </div>\n+ </div>\n }\n </div>\n </div>\n }\n }\n }\n+\n fn main() {\n yew::Renderer::<App>::new().render();\n }\ndiff --git a/examples/function_router/src/pages/post.rs b/examples/function_router/src/pages/post.rs\nindex dc12a0a769d..7f7daf2b12d 100644\n--- a/examples/function_router/src/pages/post.rs\n+++ b/examples/function_router/src/pages/post.rs\n@@ -101,20 +101,23 @@ pub fn Post(props: &Props) -> Html {\n // don't show hero for the first section\n let mut show_hero = false;\n \n- let parts = post.content.iter().map(|part| match part {\n- PostPart::Section(section) => {\n- let html = render_section(section, show_hero);\n- // show hero between sections\n- show_hero = true;\n- html\n- }\n- PostPart::Quote(quote) => {\n- // don't show hero after a quote\n- show_hero = false;\n- render_quote(quote)\n+ html! {\n+ for part in post.content.iter() {\n+ match part {\n+ PostPart::Section(section) => {\n+ let rendered = render_section(section, show_hero);\n+ // show hero between sections\n+ show_hero = true;\n+ {rendered}\n+ }\n+ PostPart::Quote(quote) => {\n+ // don't show hero after a quote\n+ show_hero = false;\n+ {render_quote(quote)}\n+ }\n+ }\n }\n- });\n- html! {{for parts}}\n+ }\n };\n \n html! {\ndiff --git a/examples/function_router/src/pages/post_list.rs b/examples/function_router/src/pages/post_list.rs\nindex 56107744548..881e112db6b 100644\n--- a/examples/function_router/src/pages/post_list.rs\n+++ b/examples/function_router/src/pages/post_list.rs\n@@ -15,23 +15,25 @@ pub fn PostList() -> Html {\n \n let posts = {\n let start_seed = (current_page - 1) * ITEMS_PER_PAGE;\n- let mut cards = (0..ITEMS_PER_PAGE).map(|seed_offset| {\n- html! {\n- <li class=\"list-item mb-5\">\n- <PostCard seed={start_seed + seed_offset} />\n- </li>\n- }\n- });\n+ let half = ITEMS_PER_PAGE / 2;\n html! {\n <div class=\"columns\">\n <div class=\"column\">\n <ul class=\"list\">\n- { for cards.by_ref().take(ITEMS_PER_PAGE as usize / 2) }\n+ for seed_offset in 0..half {\n+ <li class=\"list-item mb-5\">\n+ <PostCard seed={start_seed + seed_offset} />\n+ </li>\n+ }\n </ul>\n </div>\n <div class=\"column\">\n <ul class=\"list\">\n- { for cards }\n+ for seed_offset in half..ITEMS_PER_PAGE {\n+ <li class=\"list-item mb-5\">\n+ <PostCard seed={start_seed + seed_offset} />\n+ </li>\n+ }\n </ul>\n </div>\n </div>\ndiff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs\nindex faabe7f4bcd..0666ff192ed 100644\n--- a/examples/game_of_life/src/main.rs\n+++ b/examples/game_of_life/src/main.rs\n@@ -1,5 +1,4 @@\n use gloo::timers::callback::Interval;\n-use yew::html::Scope;\n use yew::{Component, Context, Html, classes, html};\n \n mod conway;\n@@ -20,21 +19,6 @@ pub struct App {\n _interval: Interval,\n }\n \n-impl App {\n- fn view_cellule(&self, row: usize, col: usize, link: &Scope<Self>) -> Html {\n- let status = if self.conway.alive(row, col) {\n- \"cellule-live\"\n- } else {\n- \"cellule-dead\"\n- };\n- html! {\n- <div class={classes!(\"game-cellule\", status)}\n- onclick={link.callback(move |_| Msg::ToggleCellule((row,col)))}>\n- </div>\n- }\n- }\n-}\n-\n impl Component for App {\n type Message = Msg;\n type Properties = ();\n@@ -96,9 +80,12 @@ impl Component for App {\n <section class=\"game-area\">\n <div class=\"game-of-life\">\n for (row, cellules) in self.conway.cellules.chunks(self.conway.width).enumerate() {\n- let cells = cellules.iter().enumerate().map(|(col, _)| self.view_cellule(row, col, ctx.link()));\n <div class=\"game-row\">\n- { for cells }\n+ for (col, _) in cellules.iter().enumerate() {\n+ <div class={classes!(\"game-cellule\", if self.conway.alive(row, col) {\"cellule-live\"} else {\"cellule-dead\"})}\n+ onclick={ctx.link().callback(move |_| Msg::ToggleCellule((row,col)))}>\n+ </div>\n+ }\n </div>\n }\n </div>\ndiff --git a/examples/keyed_list/src/main.rs b/examples/keyed_list/src/main.rs\nindex 09904ed58be..0c0f2fa61c1 100644\n--- a/examples/keyed_list/src/main.rs\n+++ b/examples/keyed_list/src/main.rs\n@@ -6,6 +6,8 @@ use web_sys::{HtmlElement, HtmlInputElement};\n use yew::html::Scope;\n use yew::prelude::*;\n \n+use crate::person::PersonComponent;\n+\n mod person;\n mod random;\n \n@@ -274,7 +276,28 @@ impl App {\n <p class=\"h5\">{ \"Ids: \" }{ ids }</p>\n <hr />\n <div class=\"persons\">\n- { for self.persons.iter().map(|p| p.render(self.keyed)) }\n+ for p in &self.persons {\n+ match p {\n+ PersonType::Inline(info) => {\n+ if self.keyed {\n+ <div key={info.id.to_string()} class=\"text-danger\" id={info.id.to_string()}>\n+ { info.render() }\n+ </div>\n+ } else {\n+ <div class=\"text-danger\" id={info.id.to_string()}>\n+ { info.render() }\n+ </div>\n+ }\n+ }\n+ PersonType::Component(info) => {\n+ if self.keyed {\n+ <PersonComponent key={info.id.to_string()} info={info.clone()} />\n+ } else {\n+ <PersonComponent info={info.clone()} />\n+ }\n+ }\n+ }\n+ }\n </div>\n </div>\n }\ndiff --git a/examples/keyed_list/src/person.rs b/examples/keyed_list/src/person.rs\nindex 03a9686749f..ed6e9997c6b 100644\n--- a/examples/keyed_list/src/person.rs\n+++ b/examples/keyed_list/src/person.rs\n@@ -34,7 +34,7 @@ impl PersonInfo {\n }\n }\n \n- fn render(&self) -> Html {\n+ pub fn render(&self) -> Html {\n html! {\n <div class=\"card w-50 card_style\">\n <div class=\"card-body\">\n@@ -49,7 +49,7 @@ impl PersonInfo {\n \n #[derive(Debug, Eq, PartialEq, Properties)]\n pub struct PersonProps {\n- info: PersonInfo,\n+ pub info: PersonInfo,\n }\n \n pub struct PersonComponent;\n@@ -91,31 +91,4 @@ impl PersonType {\n Self::Component(info)\n }\n }\n-\n- pub fn render(&self, keyed: bool) -> Html {\n- match self {\n- Self::Inline(info) => {\n- if keyed {\n- html! {\n- <div key={info.id.to_string()} class=\"text-danger\" id={info.id.to_string()}>\n- { info.render() }\n- </div>\n- }\n- } else {\n- html! {\n- <div class=\"text-danger\" id={info.id.to_string()}>\n- { info.render() }\n- </div>\n- }\n- }\n- }\n- Self::Component(info) => {\n- if keyed {\n- html! { <PersonComponent key={info.id.to_string()} info={info.clone()} /> }\n- } else {\n- html! { <PersonComponent info={info.clone()} /> }\n- }\n- }\n- }\n- }\n }\ndiff --git a/examples/nested_list/src/list.rs b/examples/nested_list/src/list.rs\nindex a05048e9f95..f6a91fb2090 100644\n--- a/examples/nested_list/src/list.rs\n+++ b/examples/nested_list/src/list.rs\n@@ -57,26 +57,21 @@ impl Component for List {\n <div class={classes!(\"list\", inactive)}>\n { &ctx.props().header }\n <div class=\"items\">\n- { Self::view_items(&ctx.props().children) }\n+ for (i, mut c) in ctx\n+ .props()\n+ .children\n+ .iter()\n+ .filter(|c| !c.props.hide)\n+ .cloned()\n+ .enumerate()\n+ {\n+ let props = c.get_mut();\n+ props.name = format!(\"#{} - {}\", i + 1, props.name).into();\n+ { c }\n+ }\n </div>\n </div>\n </div>\n }\n }\n }\n-\n-impl List {\n- fn view_items(children: &IArray<VChild<ListItem>>) -> Html {\n- children\n- .iter()\n- .filter(|c| !c.props.hide)\n- .cloned()\n- .enumerate()\n- .map(|(i, mut c)| {\n- let props = c.get_mut();\n- props.name = format!(\"#{} - {}\", i + 1, props.name).into();\n- c\n- })\n- .collect::<Html>()\n- }\n-}\ndiff --git a/examples/router/src/components/pagination.rs b/examples/router/src/components/pagination.rs\nindex cfc3220423d..dc8b850749d 100644\n--- a/examples/router/src/components/pagination.rs\n+++ b/examples/router/src/components/pagination.rs\n@@ -69,11 +69,10 @@ impl Pagination {\n if len > max_links {\n let last_link = self.render_link(pages.next_back().unwrap(), props);\n // remove 1 for the ellipsis and 1 for the last link\n- let links = pages\n- .take(max_links - 2)\n- .map(|page| self.render_link(page, props));\n html! {\n- { for links }\n+ for page in pages.take(max_links - 2) {\n+ { self.render_link(page, props) }\n+ }\n <li><span class=\"pagination-ellipsis\">{ ELLIPSIS }</span></li>\n { last_link }\n }\ndiff --git a/examples/router/src/pages/post.rs b/examples/router/src/pages/post.rs\nindex a0483b1a450..343201633f3 100644\n--- a/examples/router/src/pages/post.rs\n+++ b/examples/router/src/pages/post.rs\n@@ -31,6 +31,9 @@ impl Component for Post {\n fn view(&self, _ctx: &Context<Self>) -> Html {\n let Self { post } = self;\n \n+ // don't show hero for the first section\n+ let mut show_hero = false;\n+\n html! {\n <section class=\"hero is-medium is-light has-background\">\n <img alt=\"The hero's background\" class=\"hero-background is-transparent\" src={post.meta.image_url.clone()} />\n@@ -54,7 +57,21 @@ impl Component for Post {\n </div>\n </section>\n <div class=\"section container\">\n- { self.view_content() }\n+ for part in &post.content {\n+ match part {\n+ PostPart::Section(section) => {\n+ let rendered = self.render_section(section, show_hero);\n+ // show hero between sections\n+ show_hero = true;\n+ { rendered }\n+ }\n+ PostPart::Quote(quote) => {\n+ // don't show hero after a quote\n+ show_hero = false;\n+ { self.render_quote(quote) }\n+ }\n+ }\n+ }\n </div>\n }\n }\n@@ -109,24 +126,4 @@ impl Post {\n </section>\n }\n }\n-\n- fn view_content(&self) -> Html {\n- // don't show hero for the first section\n- let mut show_hero = false;\n-\n- let parts = self.post.content.iter().map(|part| match part {\n- PostPart::Section(section) => {\n- let html = self.render_section(section, show_hero);\n- // show hero between sections\n- show_hero = true;\n- html\n- }\n- PostPart::Quote(quote) => {\n- // don't show hero after a quote\n- show_hero = false;\n- self.render_quote(quote)\n- }\n- });\n- html! {{for parts}}\n- }\n }\ndiff --git a/examples/router/src/pages/post_list.rs b/examples/router/src/pages/post_list.rs\nindex 6d709878131..e19f75aecf1 100644\n--- a/examples/router/src/pages/post_list.rs\n+++ b/examples/router/src/pages/post_list.rs\n@@ -47,14 +47,37 @@ impl Component for PostList {\n true\n }\n \n- fn view(&self, ctx: &Context<Self>) -> Html {\n+ fn view(&self, _ctx: &Context<Self>) -> Html {\n let page = self.page;\n+ let start_seed = (page - 1) * ITEMS_PER_PAGE;\n+ let mut cards = (0..ITEMS_PER_PAGE).map(|seed_offset| {\n+ html! {\n+ <li class=\"list-item mb-5\">\n+ <PostCard seed={start_seed + seed_offset} />\n+ </li>\n+ }\n+ });\n \n html! {\n <div class=\"section container\">\n <h1 class=\"title\">{ \"Posts\" }</h1>\n <h2 class=\"subtitle\">{ \"All of our quality writing in one place\" }</h2>\n- { self.view_posts(ctx) }\n+ <div class=\"columns\">\n+ <div class=\"column\">\n+ <ul class=\"list\">\n+ for card in cards.by_ref().take(ITEMS_PER_PAGE as usize / 2) {\n+ { card }\n+ }\n+ </ul>\n+ </div>\n+ <div class=\"column\">\n+ <ul class=\"list\">\n+ for card in cards {\n+ { card }\n+ }\n+ </ul>\n+ </div>\n+ </div>\n <Pagination\n {page}\n total_pages={TOTAL_PAGES}\n@@ -64,29 +87,3 @@ impl Component for PostList {\n }\n }\n }\n-impl PostList {\n- fn view_posts(&self, _ctx: &Context<Self>) -> Html {\n- let start_seed = (self.page - 1) * ITEMS_PER_PAGE;\n- let mut cards = (0..ITEMS_PER_PAGE).map(|seed_offset| {\n- html! {\n- <li class=\"list-item mb-5\">\n- <PostCard seed={start_seed + seed_offset} />\n- </li>\n- }\n- });\n- html! {\n- <div class=\"columns\">\n- <div class=\"column\">\n- <ul class=\"list\">\n- { for cards.by_ref().take(ITEMS_PER_PAGE as usize / 2) }\n- </ul>\n- </div>\n- <div class=\"column\">\n- <ul class=\"list\">\n- { for cards }\n- </ul>\n- </div>\n- </div>\n- }\n- }\n-}\ndiff --git a/examples/timer_functional/src/main.rs b/examples/timer_functional/src/main.rs\nindex d0b25a8bff0..d477d7cb626 100644\n--- a/examples/timer_functional/src/main.rs\n+++ b/examples/timer_functional/src/main.rs\n@@ -122,16 +122,6 @@ fn App() -> Html {\n timeout_handle: None,\n });\n \n- let mut key = 0;\n- let messages: Html = state\n- .messages\n- .iter()\n- .map(|message| {\n- key += 1;\n- html! { <p {key}>{ message }</p> }\n- })\n- .collect();\n-\n let has_job = state.interval_handle.is_some() || state.timeout_handle.is_some();\n \n let on_add_timeout = {\n@@ -163,7 +153,7 @@ fn App() -> Html {\n };\n \n let on_cancel = Callback::from({\n- let (_, dispatcher) = state.into_inner();\n+ let dispatcher = state.dispatcher();\n \n move |_: MouseEvent| {\n dispatcher.dispatch(TimerAction::Cancel);\n@@ -179,7 +169,9 @@ fn App() -> Html {\n <div id=\"wrapper\">\n <Clock />\n <div id=\"messages\">\n- { messages }\n+ for (key, message) in state.messages.iter().enumerate() {\n+ <p {key}>{ message }</p>\n+ }\n </div>\n </div>\n )\ndiff --git a/examples/todomvc/src/main.rs b/examples/todomvc/src/main.rs\nindex cbf9aa90db2..7b79b9fb471 100644\n--- a/examples/todomvc/src/main.rs\n+++ b/examples/todomvc/src/main.rs\n@@ -3,7 +3,6 @@ use state::{Entry, Filter, State};\n use strum::IntoEnumIterator;\n use web_sys::HtmlInputElement as InputElement;\n use yew::events::{FocusEvent, KeyboardEvent};\n-use yew::html::Scope;\n use yew::{Classes, Component, Context, Html, NodeRef, TargetCast, classes, html};\n \n mod state;\n@@ -88,17 +87,39 @@ impl Component for App {\n }\n \n fn view(&self, ctx: &Context<Self>) -> Html {\n+ let link = ctx.link();\n let hidden_class = if self.state.entries.is_empty() {\n \"hidden\"\n } else {\n \"\"\n };\n+ let new_todo_onkeypress = link.batch_callback(|e: KeyboardEvent| {\n+ if e.key() == \"Enter\" {\n+ let input: InputElement = e.target_unchecked_into();\n+ let value = input.value();\n+ input.set_value(\"\");\n+ Some(Msg::Add(value))\n+ } else {\n+ None\n+ }\n+ });\n html! {\n <div class=\"todomvc-wrapper\">\n <section class=\"todoapp\">\n <header class=\"header\">\n <h1>{ \"todos\" }</h1>\n- { self.view_input(ctx.link()) }\n+ // You can use standard Rust comments. One line:\n+ // <li></li>\n+ <input\n+ class=\"new-todo\"\n+ placeholder=\"What needs to be done?\"\n+ onkeypress={new_todo_onkeypress}\n+ />\n+ /* Or multiline:\n+ <ul>\n+ <li></li>\n+ </ul>\n+ */\n </header>\n <section class={classes!(\"main\", hidden_class)}>\n <input\n@@ -106,17 +127,62 @@ impl Component for App {\n class=\"toggle-all\"\n id=\"toggle-all\"\n checked={self.state.is_all_completed()}\n- onclick={ctx.link().callback(|_| Msg::ToggleAll)}\n+ onclick={link.callback(|_| Msg::ToggleAll)}\n />\n <label for=\"toggle-all\" />\n <ul class=\"todo-list\">\n- { for self\n+ for (idx, entry) in self\n .state\n .entries\n .iter()\n .enumerate()\n- .filter(|(_, entry)| self.state.filter.fits(entry))\n- .map(|(i, e)| self.view_entry((i, e), ctx.link()))\n+ .filter(|(_, e)| self.state.filter.fits(e))\n+ {\n+ let class = {\n+ let mut c = Classes::from(\"todo\");\n+ if entry.editing {\n+ c.push(\" editing\");\n+ }\n+ if entry.completed {\n+ c.push(\" completed\");\n+ }\n+ c\n+ };\n+ let edit = move |input: InputElement| {\n+ let value = input.value();\n+ input.set_value(\"\");\n+ Msg::Edit((idx, value))\n+ };\n+ let onblur = link\n+ .callback(move |e: FocusEvent| edit(e.target_unchecked_into()));\n+ let onkeypress = link.batch_callback(move |e: KeyboardEvent| {\n+ (e.key() == \"Enter\").then(|| edit(e.target_unchecked_into()))\n+ });\n+ <li {class}>\n+ <div class=\"view\">\n+ <input\n+ type=\"checkbox\"\n+ class=\"toggle\"\n+ checked={entry.completed}\n+ onclick={link.callback(move |_| Msg::Toggle(idx))}\n+ />\n+ <label ondblclick={link.callback(move |_| Msg::ToggleEdit(idx))}>{ &entry.description }</label>\n+ <button class=\"destroy\" onclick={link.callback(move |_| Msg::Remove(idx))} />\n+ </div>\n+ if entry.editing {\n+ <input\n+ class=\"edit\"\n+ type=\"text\"\n+ ref={self.focus_ref.clone()}\n+ value={self.state.edit_value.clone()}\n+ onmouseover={link.callback(|_| Msg::Focus)}\n+ {onblur}\n+ {onkeypress}\n+ />\n+ } else {\n+ <input type=\"hidden\" />\n+ }\n+ </li>\n }\n </ul>\n </section>\n@@ -126,9 +192,23 @@ impl Component for App {\n { \" item(s) left\" }\n </span>\n <ul class=\"filters\">\n- { for Filter::iter().map(|flt| self.view_filter(flt, ctx.link())) }\n+ for filter in Filter::iter() {\n+ let cls = if self.state.filter == filter {\n+ \"selected\"\n+ } else {\n+ \"not-selected\"\n+ };\n+ <li>\n+ <a class={cls}\n+ href={filter.as_href()}\n+ onclick={link.callback(move |_| Msg::SetFilter(filter))}\n+ >\n+ { filter }\n+ </a>\n+ </li>\n+ }\n </ul>\n- <button class=\"clear-completed\" onclick={ctx.link().callback(|_| Msg::ClearCompleted)}>\n+ <button class=\"clear-completed\" onclick={link.callback(|_| Msg::ClearCompleted)}>\n { format!(\"Clear completed ({})\", self.state.total_completed()) }\n </button>\n </footer>\n@@ -143,108 +223,6 @@ impl Component for App {\n }\n }\n \n-impl App {\n- fn view_filter(&self, filter: Filter, link: &Scope<Self>) -> Html {\n- let cls = if self.state.filter == filter {\n- \"selected\"\n- } else {\n- \"not-selected\"\n- };\n- html! {\n- <li>\n- <a class={cls}\n- href={filter.as_href()}\n- onclick={link.callback(move |_| Msg::SetFilter(filter))}\n- >\n- { filter }\n- </a>\n- </li>\n- }\n- }\n-\n- fn view_input(&self, link: &Scope<Self>) -> Html {\n- let onkeypress = link.batch_callback(|e: KeyboardEvent| {\n- if e.key() == \"Enter\" {\n- let input: InputElement = e.target_unchecked_into();\n- let value = input.value();\n- input.set_value(\"\");\n- Some(Msg::Add(value))\n- } else {\n- None\n- }\n- });\n- html! {\n- // You can use standard Rust comments. One line:\n- // <li></li>\n- <input\n- class=\"new-todo\"\n- placeholder=\"What needs to be done?\"\n- {onkeypress}\n- />\n- /* Or multiline:\n- <ul>\n- <li></li>\n- </ul>\n- */\n- }\n- }\n-\n- fn view_entry(&self, (idx, entry): (usize, &Entry), link: &Scope<Self>) -> Html {\n- let mut class = Classes::from(\"todo\");\n- if entry.editing {\n- class.push(\" editing\");\n- }\n- if entry.completed {\n- class.push(\" completed\");\n- }\n- html! {\n- <li {class}>\n- <div class=\"view\">\n- <input\n- type=\"checkbox\"\n- class=\"toggle\"\n- checked={entry.completed}\n- onclick={link.callback(move |_| Msg::Toggle(idx))}\n- />\n- <label ondblclick={link.callback(move |_| Msg::ToggleEdit(idx))}>{ &entry.description }</label>\n- <button class=\"destroy\" onclick={link.callback(move |_| Msg::Remove(idx))} />\n- </div>\n- { self.view_entry_edit_input((idx, entry), link) }\n- </li>\n- }\n- }\n-\n- fn view_entry_edit_input(&self, (idx, entry): (usize, &Entry), link: &Scope<Self>) -> Html {\n- let edit = move |input: InputElement| {\n- let value = input.value();\n- input.set_value(\"\");\n- Msg::Edit((idx, value))\n- };\n-\n- let onblur = link.callback(move |e: FocusEvent| edit(e.target_unchecked_into()));\n-\n- let onkeypress = link.batch_callback(move |e: KeyboardEvent| {\n- (e.key() == \"Enter\").then(|| edit(e.target_unchecked_into()))\n- });\n-\n- if entry.editing {\n- html! {\n- <input\n- class=\"edit\"\n- type=\"text\"\n- ref={self.focus_ref.clone()}\n- value={self.state.edit_value.clone()}\n- onmouseover={link.callback(|_| Msg::Focus)}\n- {onblur}\n- {onkeypress}\n- />\n- }\n- } else {\n- html! { <input type=\"hidden\" /> }\n- }\n- }\n-}\n-\n fn main() {\n yew::Renderer::<App>::new().render();\n }\n"},"changed_files":{"kind":"list like","value":["examples/actix_ssr_router/src/lib.rs","examples/axum_ssr_router/src/lib.rs","examples/boids/src/boid.rs","examples/boids/src/simulation.rs","examples/file_upload/src/main.rs","examples/function_router/src/pages/post.rs","examples/function_router/src/pages/post_list.rs","examples/game_of_life/src/main.rs","examples/keyed_list/src/main.rs","examples/keyed_list/src/person.rs","examples/nested_list/src/list.rs","examples/router/src/components/pagination.rs","examples/router/src/pages/post.rs","examples/router/src/pages/post_list.rs","examples/timer_functional/src/main.rs","examples/todomvc/src/main.rs"],"string":"[\n \"examples/actix_ssr_router/src/lib.rs\",\n \"examples/axum_ssr_router/src/lib.rs\",\n \"examples/boids/src/boid.rs\",\n \"examples/boids/src/simulation.rs\",\n \"examples/file_upload/src/main.rs\",\n \"examples/function_router/src/pages/post.rs\",\n \"examples/function_router/src/pages/post_list.rs\",\n \"examples/game_of_life/src/main.rs\",\n \"examples/keyed_list/src/main.rs\",\n \"examples/keyed_list/src/person.rs\",\n \"examples/nested_list/src/list.rs\",\n \"examples/router/src/components/pagination.rs\",\n \"examples/router/src/pages/post.rs\",\n \"examples/router/src/pages/post_list.rs\",\n \"examples/timer_functional/src/main.rs\",\n \"examples/todomvc/src/main.rs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86291,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4155,"string":"4,155"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"chore: bump nanoid to 0.5 and propagate getrandom wasm_js"},"pr_body":{"kind":"string","value":"#### Description\r\n\r\nBumps `nanoid` to `0.5` in `examples/function_memory_game` and adds the `getrandom_03` workspace dep so the `wasm_js` Cargo feature is activated for the transitive `getrandom 0.3` brought in by nanoid 0.5's `rand 0.9`.\r\n\r\n##### Why this is needed\r\n\r\n`nanoid 0.5` swaps its `rand 0.8` dep for `rand 0.9`, which transitively pulls in `getrandom 0.3.4` instead of `getrandom 0.2.17`. On `wasm32-unknown-unknown`, getrandom 0.3 hard-errors at compile time unless the `wasm_js` feature is activated:\r\n\r\n```\r\nThe \"wasm_js\" backend requires the `wasm_js` feature for `getrandom`.\r\n```\r\n\r\nTrunk builds each example with `--manifest-path`, so feature unification has to happen inside each example's own dep graph. The workspace already aliases `getrandom_03 = { package = \"getrandom\", version = \"0.3\", features = [\"wasm_js\"] }` for exactly this purpose. Adding `getrandom_03 = { workspace = true }` to `function_memory_game` mirrors the workaround landed in 493fe1ca for `examples/router` and `examples/function_router` (lipsum's rand 0.9).\r\n\r\n##### Code changes for nanoid 0.5 features\r\n\r\nReviewed nanoid 0.5.0 release notes: new `HEX_LOWERCASE` / `HEX_UPPERCASE` alphabets, `thread_local` rng source, `FnMut` random generator, expression-arg `nanoid!` macro, power-of-two alphabet fast path. Our only call site is `nanoid!()` with no args (`examples/function_memory_game/src/helper.rs:16`), which is unaffected. No source changes needed.\r\n\r\n##### Context\r\n\r\nSurfaced by dependabot PR #4153 which bumps nanoid as part of a broader cargo-deps group bump and fails the size-cmp CI step on `function_memory_game`. Landing this preemptively on master so dependabot's rebase will pick it up.\r\n\r\n#### Checklist\r\n\r\n- [x] I have reviewed my own code\r\n- [ ] I have added tests\r\n\r\n"},"base_sha":{"kind":"string","value":"b50f17f8e2a1fc677765727a54adec0941fca6a2"},"head_sha":{"kind":"string","value":"0349c27e670a05ca5c9dc1b68e899dda4e88cc1a"},"gold_diff":{"kind":"string","value":"diff --git a/Cargo.lock b/Cargo.lock\nindex 83793809cde..9072a7e731d 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -1374,6 +1374,7 @@ dependencies = [\n name = \"function_memory_game\"\n version = \"0.1.0\"\n dependencies = [\n+ \"getrandom 0.3.4\",\n \"getrandom 0.4.2\",\n \"gloo\",\n \"nanoid\",\n@@ -2574,7 +2575,7 @@ version = \"0.9.1\"\n source = \"git+https://github.com/mgeisler/lipsum.git?rev=233e48a#233e48a36df40641a609a9476fe9009d928757c5\"\n dependencies = [\n \"rand 0.9.2\",\n- \"rand_chacha 0.9.0\",\n+ \"rand_chacha\",\n ]\n \n [[package]]\n@@ -2718,11 +2719,11 @@ dependencies = [\n \n [[package]]\n name = \"nanoid\"\n-version = \"0.4.0\"\n+version = \"0.5.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8\"\n+checksum = \"8628de41fe064cc3f0cf07f3d299ee3e73521adaff72278731d5c8cae3797873\"\n dependencies = [\n- \"rand 0.8.5\",\n+ \"rand 0.9.2\",\n ]\n \n [[package]]\n@@ -3171,24 +3172,13 @@ version = \"6.0.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf\"\n \n-[[package]]\n-name = \"rand\"\n-version = \"0.8.5\"\n-source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404\"\n-dependencies = [\n- \"libc\",\n- \"rand_chacha 0.3.1\",\n- \"rand_core 0.6.4\",\n-]\n-\n [[package]]\n name = \"rand\"\n version = \"0.9.2\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1\"\n dependencies = [\n- \"rand_chacha 0.9.0\",\n+ \"rand_chacha\",\n \"rand_core 0.9.5\",\n ]\n \n@@ -3203,16 +3193,6 @@ dependencies = [\n \"rand_core 0.10.0\",\n ]\n \n-[[package]]\n-name = \"rand_chacha\"\n-version = \"0.3.1\"\n-source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88\"\n-dependencies = [\n- \"ppv-lite86\",\n- \"rand_core 0.6.4\",\n-]\n-\n [[package]]\n name = \"rand_chacha\"\n version = \"0.9.0\"\n@@ -3223,15 +3203,6 @@ dependencies = [\n \"rand_core 0.9.5\",\n ]\n \n-[[package]]\n-name = \"rand_core\"\n-version = \"0.6.4\"\n-source = \"registry+https://github.com/rust-lang/crates.io-index\"\n-checksum = \"ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c\"\n-dependencies = [\n- \"getrandom 0.2.17\",\n-]\n-\n [[package]]\n name = \"rand_core\"\n version = \"0.9.5\"\ndiff --git a/examples/function_memory_game/Cargo.toml b/examples/function_memory_game/Cargo.toml\nindex defa66dac06..0641fef1c72 100644\n--- a/examples/function_memory_game/Cargo.toml\n+++ b/examples/function_memory_game/Cargo.toml\n@@ -11,9 +11,10 @@ serde = { workspace = true, features = [\"derive\"] }\n strum.workspace = true\n strum_macros.workspace = true\n gloo.workspace = true\n-nanoid = \"0.4\"\n+nanoid = \"0.5\"\n rand.workspace = true\n getrandom = { workspace = true }\n+getrandom_03 = { workspace = true }\n yew = { path = \"../../packages/yew\", features = [\"csr\"] }\n \n [dependencies.web-sys]\n"},"changed_files":{"kind":"list like","value":["Cargo.lock","examples/function_memory_game/Cargo.toml"],"string":"[\n \"Cargo.lock\",\n \"examples/function_memory_game/Cargo.toml\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86292,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4013,"string":"4,013"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":"Feature soundness is a chore to deal with\n\n**Problem**\r\nThe feature soundness lints are useful but clippy is not very helpful when determining the correct visibilities and features. At least sometimes I don't understand immediately why clippy is allowing some things but not others. Take for example [this clippy run](https://github.com/yewstack/yew/runs/6177180588?check_suite_focus=true). It complains about a function that is apparently never used, but it *is* used, just in a module that happens to have a `cfg(any(feature = \"csr\", feature = \"ssr\"))` annotation *somewhere* further up in the module hierarchy. It's a pain to figure that out, since the tooling doesn't help much in reasoning *why* the function is unused.\r\n\r\n**Expected behavior**\r\nA clear module tree and feature dependencies. When searching `cfg(feature`, I get 168 results across the code base. That's too many to reasonably figure out which impact what part.\r\n\r\n**Questionnaire**\r\n<!-- Developing Yew is a community effort! -->\r\n<!-- If you feel up to the challenge, please check one of the boxes below: -->\r\n- [x] I'm interested in fixing this myself but don't know where to start\r\n- [ ] I would like to fix and I have a solution\r\n- [ ] I don't have time to fix this right now, but maybe later"},"pr_title":{"kind":"string","value":"ci: replace hand-maintained feature-soundness scripts with cargo-hack"},"pr_body":{"kind":"string","value":"#### Description\r\n\r\n~~98 combinations from the full powerset might be unrealistic for CI~~\r\n\r\n~~that's why there's `--exclude-features test,serde,not_browser_env`. These features don't gate any code paths~~\r\n\r\n~~This then results in 14 clippy invocations are identical to what the old scripts ran, but now auto-discovered by cargo hack, so when features are added/removed, CI adapts automatically~~\r\n\r\n`--keep-going` added so all failures are reported at once\r\n\r\nFixes #2641\r\n\r\n#### Checklist\r\n\r\n- [x] I have reviewed my own code"},"base_sha":{"kind":"string","value":"19b1869ebda5202944d6251243130b6f3303789b"},"head_sha":{"kind":"string","value":"fa72abde4b85914ee0e57ea1930f14459c164a8c"},"gold_diff":{"kind":"string","value":"diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml\nindex f9901ac0cdc..62ef8c6fa46 100644\n--- a/.github/workflows/clippy.yml\n+++ b/.github/workflows/clippy.yml\n@@ -38,13 +38,25 @@ jobs:\n with:\n save-if: ${{ github.ref == 'refs/heads/master' }}\n \n+ - uses: taiki-e/install-action@cargo-hack\n+\n - name: Lint feature soundness\n if: matrix.profile == 'dev'\n- run: bash ./ci/feature-soundness.sh\n+ run: >-\n+ cargo hack clippy\n+ -p yew -p yew-agent -p yew-router\n+ --feature-powerset --no-dev-deps\n+ --keep-going\n+ -- -D warnings\n \n - name: Lint feature soundness\n if: matrix.profile == 'release'\n- run: bash ./ci/feature-soundness-release.sh\n+ run: >-\n+ cargo hack clippy\n+ -p yew -p yew-agent -p yew-router\n+ --feature-powerset --no-dev-deps\n+ --keep-going --release\n+ -- -D warnings\n \n clippy:\n name: Clippy Workspace\ndiff --git a/Makefile.toml b/Makefile.toml\nindex b7132665198..fac26114650 100644\n--- a/Makefile.toml\n+++ b/Makefile.toml\n@@ -10,7 +10,7 @@\n # * doc-test\n # * website-test\n #\n-# packages/yew also contains `clippy-feature-soundness` to ensure everything is fine\n+# packages/yew also contains `clippy-feature-soundness` (requires cargo-hack)\n # Run `cargo make --list-all-steps` for more details.\n #\n ######################\ndiff --git a/ci/feature-soundness-release.sh b/ci/feature-soundness-release.sh\ndeleted file mode 100755\nindex 19387aaeabb..00000000000\n--- a/ci/feature-soundness-release.sh\n+++ /dev/null\n@@ -1,20 +0,0 @@\n-#!/usr/bin/env bash\n-set -xe\n-\n-# You can extract the feature list with the following command:\n-# cargo hack -p yew -p yew-agent -p yew-router --feature-powerset --print-command-list clippy --release -- -D warnings\n-\n-cargo clippy --release --manifest-path packages/yew/Cargo.toml --no-default-features -- -D warnings\n-cargo clippy --release --manifest-path packages/yew/Cargo.toml --no-default-features --features default,hydration,ssr -- -D warnings\n-cargo clippy --release --manifest-path packages/yew/Cargo.toml --no-default-features --features csr -- -D warnings\n-cargo clippy --release --manifest-path packages/yew/Cargo.toml --no-default-features --features default -- -D warnings\n-cargo clippy --release --manifest-path packages/yew/Cargo.toml --no-default-features --features csr,default -- -D warnings\n-cargo clippy --release --manifest-path packages/yew/Cargo.toml --no-default-features --features hydration -- -D warnings\n-cargo clippy --release --manifest-path packages/yew/Cargo.toml --no-default-features --features default,hydration -- -D warnings\n-cargo clippy --release --manifest-path packages/yew/Cargo.toml --no-default-features --features ssr -- -D warnings\n-cargo clippy --release --manifest-path packages/yew/Cargo.toml --no-default-features --features csr,ssr -- -D warnings\n-cargo clippy --release --manifest-path packages/yew/Cargo.toml --no-default-features --features default,ssr -- -D warnings\n-cargo clippy --release --manifest-path packages/yew/Cargo.toml --no-default-features --features csr,default,ssr -- -D warnings\n-cargo clippy --release --manifest-path packages/yew/Cargo.toml --no-default-features --features hydration,ssr -- -D warnings\n-cargo clippy --release --manifest-path packages/yew-agent/Cargo.toml -- -D warnings\n-cargo clippy --release --manifest-path packages/yew-router/Cargo.toml -- -D warnings\ndiff --git a/ci/feature-soundness.sh b/ci/feature-soundness.sh\ndeleted file mode 100755\nindex e4067a531fe..00000000000\n--- a/ci/feature-soundness.sh\n+++ /dev/null\n@@ -1,20 +0,0 @@\n-#!/usr/bin/env bash\n-set -xe\n-\n-# You can extract the feature list with the following command:\n-# cargo hack -p yew -p yew-agent -p yew-router --feature-powerset --print-command-list clippy -- -D warnings\n-\n-cargo clippy --manifest-path packages/yew/Cargo.toml --no-default-features -- -D warnings\n-cargo clippy --manifest-path packages/yew/Cargo.toml --no-default-features --features default,hydration,ssr -- -D warnings\n-cargo clippy --manifest-path packages/yew/Cargo.toml --no-default-features --features csr -- -D warnings\n-cargo clippy --manifest-path packages/yew/Cargo.toml --no-default-features --features default -- -D warnings\n-cargo clippy --manifest-path packages/yew/Cargo.toml --no-default-features --features csr,default -- -D warnings\n-cargo clippy --manifest-path packages/yew/Cargo.toml --no-default-features --features hydration -- -D warnings\n-cargo clippy --manifest-path packages/yew/Cargo.toml --no-default-features --features default,hydration -- -D warnings\n-cargo clippy --manifest-path packages/yew/Cargo.toml --no-default-features --features ssr -- -D warnings\n-cargo clippy --manifest-path packages/yew/Cargo.toml --no-default-features --features csr,ssr -- -D warnings\n-cargo clippy --manifest-path packages/yew/Cargo.toml --no-default-features --features default,ssr -- -D warnings\n-cargo clippy --manifest-path packages/yew/Cargo.toml --no-default-features --features csr,default,ssr -- -D warnings\n-cargo clippy --manifest-path packages/yew/Cargo.toml --no-default-features --features hydration,ssr -- -D warnings\n-cargo clippy --manifest-path packages/yew-agent/Cargo.toml -- -D warnings\n-cargo clippy --manifest-path packages/yew-router/Cargo.toml -- -D warnings\ndiff --git a/packages/yew/Makefile.toml b/packages/yew/Makefile.toml\nindex 643c4b948e7..63fdf541f93 100644\n--- a/packages/yew/Makefile.toml\n+++ b/packages/yew/Makefile.toml\n@@ -22,9 +22,11 @@ args = [\"test\", \"--all-targets\", \"--all-features\"]\n dependencies = [\"native-test\", \"wasm-test\"]\n \n [tasks.clippy-feature-soundness]\n-script = '''\n-#!/usr/bin/env bash\n-set -ex\n-bash ../../ci/feature-soundness.sh\n-bash ../../ci/feature-soundness-release.sh\n-'''\n+command = \"cargo\"\n+args = [\n+ \"hack\", \"clippy\",\n+ \"-p\", \"yew\", \"-p\", \"yew-agent\", \"-p\", \"yew-router\",\n+ \"--feature-powerset\", \"--no-dev-deps\",\n+ \"--keep-going\",\n+ \"--\", \"-D\", \"warnings\",\n+]\n"},"changed_files":{"kind":"list like","value":[".github/workflows/clippy.yml","Makefile.toml","ci/feature-soundness-release.sh","ci/feature-soundness.sh","packages/yew/Makefile.toml"],"string":"[\n \".github/workflows/clippy.yml\",\n \"Makefile.toml\",\n \"ci/feature-soundness-release.sh\",\n \"ci/feature-soundness.sh\",\n \"packages/yew/Makefile.toml\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86293,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4154,"string":"4,154"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"chore: update NO_TRUNK_EXAMPLES for renamed SSR examples"},"pr_body":{"kind":"string","value":"#### Description\r\n\r\nPR #4027 renamed the `ssr_router` example to `axum_ssr_router` and added a new `actix_ssr_router`, but `NO_TRUNK_EXAMPLES` in `tools/build-examples/src/lib.rs` still listed the old `ssr_router`. As a result the size-cmp job iterates over both new SSR examples (which have no `Trunk.toml`), `is_wasm_opt_outdated` returns `true` for any example without a `Trunk.toml`, and CI emits warning:\r\n\r\n```\r\n2 example crates do not have up-to-date wasm_opt: actix_ssr_router, axum_ssr_router\r\n```\r\n\r\nThis PR replaces `\"ssr_router\"` with `\"actix_ssr_router\"` and `\"axum_ssr_router\"` in `NO_TRUNK_EXAMPLES` so the size-cmp tool skips them like the other SSR examples.\r\n\r\n#### Checklist\r\n\r\n- [x] I have reviewed my own code\r\n- [ ] I have added tests\r\n"},"base_sha":{"kind":"string","value":"c28846c3e8c837d90ab8b4bc35377e317520d7c1"},"head_sha":{"kind":"string","value":"c91179372a3899f9e44ae95d383c06224e4b8b72"},"gold_diff":{"kind":"string","value":"diff --git a/tools/build-examples/src/lib.rs b/tools/build-examples/src/lib.rs\nindex 65b5ab6e6cb..90f6afd782a 100644\n--- a/tools/build-examples/src/lib.rs\n+++ b/tools/build-examples/src/lib.rs\n@@ -5,7 +5,12 @@ use serde::Deserialize;\n use toml::Table;\n \n /// Examples that don't use Trunk for building\n-pub const NO_TRUNK_EXAMPLES: [&str; 3] = [\"simple_ssr\", \"ssr_router\", \"wasi_ssr_module\"];\n+pub const NO_TRUNK_EXAMPLES: [&str; 4] = [\n+ \"simple_ssr\",\n+ \"actix_ssr_router\",\n+ \"axum_ssr_router\",\n+ \"wasi_ssr_module\",\n+];\n \n #[derive(Deserialize)]\n struct GitHubRelease {\n"},"changed_files":{"kind":"list like","value":["tools/build-examples/src/lib.rs"],"string":"[\n \"tools/build-examples/src/lib.rs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86294,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4152,"string":"4,152"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Validate attribute names"},"pr_body":{"kind":"string","value":"#### Description\r\n\r\nAttribute names are written to the HTML in SSR without escaping (no such escaping is part of the HTML spec). This means they need to be validated to avoid surprises when they are parsed back in the browser.\r\n\r\nNote that in normal usage, Rust identifiers always form valid attribute names. To catch browser incompat, high unicode (0x10000..) chars are failed.\r\n\r\n`_unchecked` methods are available. The previous enum constructors are now `doc(hidden)` and deprecated for a good migration path.\r\n\r\n#### Checklist\r\n\r\n- [x] I have reviewed my own code\r\n- [ ] I have added tests\r\n <!-- If this is a bug fix, these tests will fail if the bug is present (to stop it from cropping up again) -->\r\n <!-- If this is a feature, my tests prove that the feature works -->\r\n"},"base_sha":{"kind":"string","value":"d4e5e9f3a82e81e97041f53e0cc7e6bb1796cd48"},"head_sha":{"kind":"string","value":"9abb23ceba58beec44400a37949b4b03be24288c"},"gold_diff":{"kind":"string","value":"diff --git a/packages/yew-macro/src/html_tree/html_element.rs b/packages/yew-macro/src/html_tree/html_element.rs\nindex c2f7607d04d..d3444d568ff 100644\n--- a/packages/yew-macro/src/html_tree/html_element.rs\n+++ b/packages/yew-macro/src/html_tree/html_element.rs\n@@ -204,6 +204,15 @@ impl ToTokens for HtmlElement {\n Dynamic(Expr),\n }\n \n+ impl Key {\n+ fn can_use_unchecked_attrs(&self) -> bool {\n+ match self {\n+ Self::Static(_) => true,\n+ Self::Dynamic(_) => false,\n+ }\n+ }\n+ }\n+\n impl From<&PropLabel> for Key {\n fn from(value: &PropLabel) -> Self {\n match value {\n@@ -216,7 +225,22 @@ impl ToTokens for HtmlElement {\n impl ToTokens for Key {\n fn to_tokens(&self, tokens: &mut TokenStream) {\n match self {\n- Key::Static(dashed_name) => dashed_name.to_tokens(tokens),\n+ Key::Static(dashed_name) => {\n+ let value = dashed_name.value();\n+ // `value` is always a html dashed name, hence consists of chars with\n+ // XID_Continue, or XID_Start. Those notable\n+ // do not include whitespace or control characters, nor the special\n+ // sets. We do want to check though for\n+ // \"high\" unicode chars above \\uFFFF\n+ if value.chars().any(|c| c > '\\u{FFFF}') {\n+ tokens.extend(quote_spanned! {dashed_name.span()=>::core::compile_error!(\n+ \"Identifier contains characters above \\\\u{FFFF}. This is known to cause browser \\\n+ incompatibilities and inconsistent parsing behaviour and is not allowed.\"\n+ )})\n+ } else {\n+ dashed_name.to_tokens(tokens)\n+ }\n+ }\n Key::Dynamic(expr) => expr.to_tokens(tokens),\n }\n }\n@@ -307,7 +331,10 @@ impl ToTokens for HtmlElement {\n });\n \n /// Try to turn attribute list into a `::yew::virtual_dom::Attributes::Static`\n- fn try_into_static(src: &[(Key, Value, Option<PropDirective>)]) -> Option<TokenStream> {\n+ fn try_into_static(\n+ src: &[(Key, Value, Option<PropDirective>)],\n+ all_attr_names_ssr_safe: bool,\n+ ) -> Option<TokenStream> {\n if src.iter().any(|(k, _, d)| {\n matches!(k, Key::Dynamic(_))\n || matches!(d, Some(PropDirective::ApplyAsProperty(_)))\n@@ -334,13 +361,19 @@ impl ToTokens for HtmlElement {\n };\n kv.push(quote! { ( #k, #v) });\n }\n+ let to_attributes = if all_attr_names_ssr_safe {\n+ quote! { ::yew::virtual_dom::Attributes::from_static_unchecked }\n+ } else {\n+ quote! { ::yew::virtual_dom::Attributes::from_static }\n+ };\n \n- Some(quote! { ::yew::virtual_dom::Attributes::Static(&[#(#kv),*]) })\n+ Some(quote! { #to_attributes( &[#(#kv),*] ) })\n }\n \n /// Try to turn attribute list into a `::yew::virtual_dom::Attributes::Dynamic`\n fn try_into_dynamic(\n src: &[(Key, Value, Option<PropDirective>)],\n+ all_attr_names_ssr_safe: bool,\n ) -> Option<TokenStream> {\n if src.iter().any(|(k, ..)| {\n !matches!(\n@@ -373,11 +406,16 @@ impl ToTokens for HtmlElement {\n };\n quote! { #value }\n });\n+ let to_attributes = if all_attr_names_ssr_safe {\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values_unchecked }\n+ } else {\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values }\n+ };\n Some(quote! {\n- ::yew::virtual_dom::Attributes::Dynamic{\n- keys: &[#(#keys),*],\n- values: ::std::boxed::Box::new([#(#values),*]),\n- }\n+ #to_attributes (\n+ &[#(#keys),*],\n+ ::std::boxed::Box::new([#(#values),*]),\n+ )\n })\n }\n \n@@ -385,7 +423,9 @@ impl ToTokens for HtmlElement {\n .chain(boolean_attrs)\n .chain(class_attr)\n .collect::<Vec<(Key, Value, Option<PropDirective>)>>();\n- try_into_static(&attrs).or_else(|| try_into_dynamic(&attrs)).unwrap_or_else(|| {\n+ // Refer to `Attributes::*_unchecked` for why this checks ssr safety\n+ let all_attrs_ssr_safe = attrs.iter().all(|(key, ..)| key.can_use_unchecked_attrs());\n+ try_into_static(&attrs, all_attrs_ssr_safe).or_else(|| try_into_dynamic(&attrs, all_attrs_ssr_safe)).unwrap_or_else(|| {\n let results = attrs.iter()\n .map(|(k, v, directive)| {\n let value = match directive {\n@@ -406,7 +446,7 @@ impl ToTokens for HtmlElement {\n quote! { (::std::convert::Into::into(#k), #value) }\n });\n quote! {\n- ::yew::virtual_dom::Attributes::IndexMap(\n+ ::yew::virtual_dom::Attributes::from_index_map(\n ::std::rc::Rc::new(\n ::std::iter::Iterator::collect(\n ::std::iter::Iterator::filter_map(\ndiff --git a/packages/yew/src/dom_bundle/btag/attributes.rs b/packages/yew/src/dom_bundle/btag/attributes.rs\nindex 5b408f8c7e8..3bdfcf3e5bb 100644\n--- a/packages/yew/src/dom_bundle/btag/attributes.rs\n+++ b/packages/yew/src/dom_bundle/btag/attributes.rs\n@@ -136,6 +136,7 @@ impl Attributes {\n fn collect(src: &Attributes) -> HashMap<&str, &AttributeOrProperty> {\n use Attributes::*;\n \n+ #[expect(deprecated)]\n match src {\n Static(arr) => (*arr).iter().map(|(k, v)| (*k, v)).collect(),\n Dynamic { keys, values } => keys\n@@ -199,6 +200,7 @@ impl Apply for Attributes {\n type Element = Element;\n \n fn apply(self, _root: &BSubtree, el: &Element) -> Self {\n+ #[expect(deprecated)]\n match &self {\n Self::Static(arr) => {\n for (k, v) in arr.iter() {\n@@ -229,6 +231,7 @@ impl Apply for Attributes {\n \n let ancestor = std::mem::replace(bundle, self);\n let bundle = &*bundle; // reborrow it immutably from here\n+ #[expect(deprecated)]\n match (bundle, ancestor) {\n // Hot path\n (Self::Static(new), Self::Static(old)) if ptr_eq(new, old) => (),\n@@ -314,7 +317,7 @@ mod tests {\n AttrValue::Static(\"href\") => AttributeOrProperty::Property(JsValue::from_str(\"https://example.com/\")),\n AttrValue::Static(\"alt\") => AttributeOrProperty::Property(JsValue::from_str(\"somewhere\")),\n };\n- let attrs = Attributes::IndexMap(Rc::new(attrs));\n+ let attrs = Attributes::from_index_map(Rc::new(attrs));\n let (element, btree) = create_element();\n attrs.apply(&btree, &element);\n assert_eq!(\n@@ -341,7 +344,7 @@ mod tests {\n AttrValue::Static(\"href\") => AttributeOrProperty::Attribute(AttrValue::from(\"https://example.com/\")),\n AttrValue::Static(\"alt\") => AttributeOrProperty::Property(JsValue::from_str(\"somewhere\")),\n };\n- let attrs = Attributes::IndexMap(Rc::new(attrs));\n+ let attrs = Attributes::from_index_map(Rc::new(attrs));\n let (element, btree) = create_element();\n attrs.apply(&btree, &element);\n assert_eq!(\n@@ -361,7 +364,7 @@ mod tests {\n \n #[test]\n fn class_is_always_attrs() {\n- let attrs = Attributes::Static(&[(\n+ let attrs = Attributes::from_static(&[(\n \"class\",\n AttributeOrProperty::Attribute(AttrValue::Static(\"thing\")),\n )]);\ndiff --git a/packages/yew/src/virtual_dom/mod.rs b/packages/yew/src/virtual_dom/mod.rs\nindex 7017d389ac4..13d5e5eb518 100644\n--- a/packages/yew/src/virtual_dom/mod.rs\n+++ b/packages/yew/src/virtual_dom/mod.rs\n@@ -183,35 +183,152 @@ pub enum AttributeOrProperty {\n Property(JsValue),\n }\n \n+fn is_valid_attr_name(attr: &str) -> bool {\n+ // https://dom.spec.whatwg.org/#valid-attribute-local-name specifies:\n+ // > at least one character, no ASCII whitespace, no \\x00, \\x2F (/), \\x3D (=), \\x3E (>)\n+ // Browsers are more strict in setAttribute(), and the parser for a html document is too.\n+ // The parser specifies that names must consist of\n+ // > one or more [unicode] characters other than the space characters [ \\t\\r\\n\\f],\n+ // > U+0000 NULL, U+0022 QUOTATION MARK (\"), U+0027 APOSTROPHE ('), U+003E GREATER-THAN SIGN\n+ // > (>),\n+ // > U+002F SOLIDUS (/), and U+003D EQUALS SIGN (=) characters, the control characters , [...]\n+ // ref https://w3c.github.io/html-reference/syntax.html#attribute-name\n+ // A fun thing is trying to use non-ascii-whitespace WHITE_SPACE characters such as \" \"\n+ // as part of an attribute name, which seem to get accepted by the parser but not by\n+ // setAttribute.\n+\n+ // Anyway, the goal here is to allow a reasonable subset of names that will parse correctly\n+ // in all browsers when delivered via SSR and also work correctly when used in calls to\n+ // setAttribute. Here is what we will prohibit:\n+ // - all whitespace characters (unicode WS) and control characters (unicode Cc)\n+ // - all syntactically special characters for XHTML parsing [/\"'>=]\n+ // - disallow \"high\" unicode characters in the range [#x10000-#xEFFFF]\n+ // see also: https://github.com/whatwg/dom/issues/849\n+\n+ // If you really need attribute names that are not covered by this open an issue and a self-help\n+ // group. Know that I do care for your pain.\n+ !attr.is_empty()\n+ && attr.chars().all(|c| match c {\n+ c if c.is_control() => false,\n+ '/' | '\"' | '\\'' | '>' | '=' => false,\n+ c if c.is_whitespace() => false,\n+ // For example, try the following in a browser of your choice:\n+ // ```\n+ // let d = document.createElement(\"div\")\n+ // d.setAttribute(\"𐊖𐊗𐊒𐊓\", \"value2\")\n+ // ```\n+ // At the time of writing, the above works in chrome (131) but not in firefox (136)\n+ '\\u{10000}'.. => false,\n+ _ => true,\n+ })\n+}\n+\n+#[track_caller]\n+fn validate_attr_name(attr: &str) {\n+ assert!(\n+ is_valid_attr_name(attr),\n+ \"{attr:?} is not a valid attribute name\"\n+ );\n+}\n+\n /// A collection of attributes for an element\n #[derive(PartialEq, Clone, Debug)]\n+#[non_exhaustive]\n pub enum Attributes {\n+ #[doc(hidden)]\n+ #[deprecated = \"Attribute names are not validated. Use one of the conversion functions\"]\n+ Static(&'static [(&'static str, AttributeOrProperty)]),\n+\n+ #[doc(hidden)]\n+ #[deprecated = \"Attribute names are not validated. Use one of the conversion functions\"]\n+ Dynamic {\n+ /// Attribute keys. Includes both always set and optional attribute keys.\n+ keys: &'static [&'static str],\n+\n+ /// Attribute values. Matches [keys](Attributes::Dynamic::keys). Optional attributes are\n+ /// designated by setting [None].\n+ values: Box<[Option<AttributeOrProperty>]>,\n+ },\n+\n+ #[doc(hidden)]\n+ #[deprecated = \"Attribute names are not validated. Use one of the conversion functions\"]\n+ IndexMap(Rc<IndexMap<AttrValue, AttributeOrProperty>>),\n+}\n+\n+impl Attributes {\n /// Static list of attributes.\n ///\n /// Allows optimizing comparison to a simple pointer equality check and reducing allocations,\n /// if the attributes do not change on a node.\n- Static(&'static [(&'static str, AttributeOrProperty)]),\n+ #[track_caller]\n+ pub fn from_static(statics: &'static [(&'static str, AttributeOrProperty)]) -> Self {\n+ for &(key, _) in statics {\n+ validate_attr_name(key); // Not in a closure for #[track_caller]\n+ }\n+ Self::from_static_unchecked(statics)\n+ }\n+\n+ /// Same as [Self::from_static] but without verifying keys. This can lead to loss of\n+ /// validity of an SSR document!\n+ pub fn from_static_unchecked(statics: &'static [(&'static str, AttributeOrProperty)]) -> Self {\n+ #[expect(deprecated)]\n+ Self::Static(statics)\n+ }\n \n /// Static list of attribute keys with possibility to exclude attributes and dynamic attribute\n /// values.\n ///\n /// Allows optimizing comparison to a simple pointer equality check and reducing allocations,\n /// if the attributes keys do not change on a node.\n- Dynamic {\n- /// Attribute keys. Includes both always set and optional attribute keys.\n+ #[track_caller]\n+ pub fn from_dynamic_values(\n keys: &'static [&'static str],\n+ values: Box<[Option<AttributeOrProperty>]>,\n+ ) -> Self {\n+ for &key in keys {\n+ validate_attr_name(key); // Not in a closure for #[track_caller]\n+ }\n+ Self::from_dynamic_values_unchecked(keys, values)\n+ }\n \n- /// Attribute values. Matches [keys](Attributes::Dynamic::keys). Optional attributes are\n- /// designated by setting [None].\n+ /// Same as [Self::from_dynamic_values] but without verifying keys. This can lead to loss of\n+ /// validity of an SSR document!\n+ pub fn from_dynamic_values_unchecked(\n+ keys: &'static [&'static str],\n values: Box<[Option<AttributeOrProperty>]>,\n- },\n+ ) -> Self {\n+ #[expect(deprecated)]\n+ Self::Dynamic { keys, values }\n+ }\n \n /// IndexMap is used to provide runtime attribute deduplication in cases where the html! macro\n /// was not used to guarantee it.\n- IndexMap(Rc<IndexMap<AttrValue, AttributeOrProperty>>),\n-}\n+ #[track_caller]\n+ pub fn from_index_map(map: Rc<IndexMap<AttrValue, AttributeOrProperty>>) -> Self {\n+ for (key, _) in map.iter() {\n+ validate_attr_name(key); // Not in a closure for #[track_caller]\n+ }\n+ Self::from_index_map_unchecked(map)\n+ }\n+\n+ /// Same as [Self::from_index_map] but without verifying keys. This can lead to loss of validity\n+ /// of an SSR document!\n+ pub fn from_index_map_unchecked(map: Rc<IndexMap<AttrValue, AttributeOrProperty>>) -> Self {\n+ #[expect(deprecated)]\n+ Self::IndexMap(map)\n+ }\n+\n+ /// Validate a single attribute name for validity to be used as a key for an attribute or\n+ /// property. All keys must be valid according to this method when constructing\n+ /// [`Attributes`]. Usually, this is ensured by the usage context.\n+ ///\n+ /// Specifically, this checks that the passed string is a valid XHTML attribute name. This\n+ /// implies that it consists of at least one character, does not contain whitespace or other\n+ /// special characters.\n+ pub fn is_valid_attr_key(name: &str) -> bool {\n+ is_valid_attr_name(name)\n+ }\n \n-impl Attributes {\n /// Construct a default Attributes instance\n pub fn new() -> Self {\n Self::default()\n@@ -222,6 +339,7 @@ impl Attributes {\n ///\n /// This function only returns attributes\n pub fn iter<'a>(&'a self) -> Box<dyn Iterator<Item = (&'a str, &'a str)> + 'a> {\n+ #[expect(deprecated)]\n match self {\n Self::Static(arr) => Box::new(arr.iter().filter_map(|(k, v)| match v {\n AttributeOrProperty::Attribute(v) => Some((*k, v.as_ref())),\n@@ -240,11 +358,23 @@ impl Attributes {\n }\n }\n \n+ /// Get a mutable reference to the underlying `IndexMap`. Deprecated for\n+ /// [`Self::get_mut_index_map_unchecked`].\n+ #[doc(hidden)]\n+ #[deprecated = \"Attribute names are not validated. Use `get_mut_index_map_unchecked` to signal \\\n+ this properly and validate your modifications.\"]\n+ pub fn get_mut_index_map(&mut self) -> &mut IndexMap<AttrValue, AttributeOrProperty> {\n+ self.get_mut_index_map_unchecked()\n+ }\n+\n /// Get a mutable reference to the underlying `IndexMap`.\n /// If the attributes are stored in the `Vec` variant, it will be converted.\n- pub fn get_mut_index_map(&mut self) -> &mut IndexMap<AttrValue, AttributeOrProperty> {\n+ /// The caller is responsible to check that inserted attribute names are valid, see\n+ /// [`Self::is_valid_attr_key`]\n+ pub fn get_mut_index_map_unchecked(&mut self) -> &mut IndexMap<AttrValue, AttributeOrProperty> {\n macro_rules! unpack {\n () => {\n+ #[expect(deprecated)]\n match self {\n Self::IndexMap(m) => Rc::make_mut(m),\n // SAFETY: unreachable because we set self to the `IndexMap` variant above.\n@@ -253,6 +383,7 @@ impl Attributes {\n };\n }\n \n+ #[expect(deprecated)]\n match self {\n Self::IndexMap(m) => Rc::make_mut(m),\n Self::Static(arr) => {\n@@ -262,7 +393,7 @@ impl Attributes {\n unpack!()\n }\n Self::Dynamic { keys, values } => {\n- *self = Self::IndexMap(Rc::new(\n+ *self = Self::from_index_map_unchecked(Rc::new(\n std::mem::take(values)\n .iter_mut()\n .zip(keys.iter())\n@@ -281,7 +412,7 @@ impl From<IndexMap<AttrValue, AttrValue>> for Attributes {\n .into_iter()\n .map(|(k, v)| (k, AttributeOrProperty::Attribute(v)))\n .collect();\n- Self::IndexMap(Rc::new(v))\n+ Self::from_index_map(Rc::new(v))\n }\n }\n \n@@ -291,7 +422,7 @@ impl From<IndexMap<&'static str, AttrValue>> for Attributes {\n .into_iter()\n .map(|(k, v)| (AttrValue::Static(k), (AttributeOrProperty::Attribute(v))))\n .collect();\n- Self::IndexMap(Rc::new(v))\n+ Self::from_index_map(Rc::new(v))\n }\n }\n \n@@ -301,12 +432,12 @@ impl From<IndexMap<&'static str, JsValue>> for Attributes {\n .into_iter()\n .map(|(k, v)| (AttrValue::Static(k), (AttributeOrProperty::Property(v))))\n .collect();\n- Self::IndexMap(Rc::new(v))\n+ Self::from_index_map(Rc::new(v))\n }\n }\n \n impl Default for Attributes {\n fn default() -> Self {\n- Self::Static(&[])\n+ Self::from_static(&[])\n }\n }\ndiff --git a/packages/yew/src/virtual_dom/vtag.rs b/packages/yew/src/virtual_dom/vtag.rs\nindex 9b2c5ca2b42..18cd215a6ae 100644\n--- a/packages/yew/src/virtual_dom/vtag.rs\n+++ b/packages/yew/src/virtual_dom/vtag.rs\n@@ -381,8 +381,13 @@ impl VTag {\n ///\n /// Not every attribute works when it set as an attribute. We use workarounds for:\n /// `value` and `checked`.\n+ #[track_caller]\n pub fn add_attribute(&mut self, key: &'static str, value: impl Into<AttrValue>) {\n- self.attributes.get_mut_index_map().insert(\n+ assert!(\n+ Attributes::is_valid_attr_key(key),\n+ \"{key:?} is not a valid attribute name\"\n+ );\n+ self.attributes.get_mut_index_map_unchecked().insert(\n AttrValue::Static(key),\n AttributeOrProperty::Attribute(value.into()),\n );\n@@ -391,8 +396,13 @@ impl VTag {\n /// Set the given key as property on the element\n ///\n /// [`js_sys::Reflect`] is used for setting properties.\n+ #[track_caller]\n pub fn add_property(&mut self, key: &'static str, value: impl Into<JsValue>) {\n- self.attributes.get_mut_index_map().insert(\n+ assert!(\n+ Attributes::is_valid_attr_key(key),\n+ \"{key:?} is not a valid attribute name\"\n+ );\n+ self.attributes.get_mut_index_map_unchecked().insert(\n AttrValue::Static(key),\n AttributeOrProperty::Property(value.into()),\n );\n@@ -408,7 +418,11 @@ impl VTag {\n \n #[doc(hidden)]\n pub fn __macro_push_attr(&mut self, key: &'static str, value: impl IntoPropValue<AttrValue>) {\n- self.attributes.get_mut_index_map().insert(\n+ debug_assert!(\n+ Attributes::is_valid_attr_key(key),\n+ \"{key:?} is not a valid attribute name\"\n+ );\n+ self.attributes.get_mut_index_map_unchecked().insert(\n AttrValue::from(key),\n AttributeOrProperty::Attribute(value.into_prop_value()),\n );\n@@ -730,4 +744,19 @@ mod ssr_tests {\n r#\"<style>html { background: black } body > a { color: white } </style>\"#\n );\n }\n+\n+ #[cfg_attr(not(target_os = \"wasi\"), test)]\n+ #[cfg_attr(target_os = \"wasi\", test(flavor = \"current_thread\"))]\n+ #[should_panic(expected = \"\\\"x onerror=\\\\\\\"prompt('failed')\\\" is not a valid attribute name\")]\n+ async fn test_should_panic_invalid_attr() {\n+ #[component]\n+ fn Comp() -> Html {\n+ html! { <div \"x onerror=\\\"prompt('failed')\"=\";\"></div> }\n+ }\n+\n+ ServerRenderer::<Comp>::new()\n+ .hydratable(false)\n+ .render()\n+ .await;\n+ }\n }\n"},"changed_files":{"kind":"list like","value":["packages/yew-macro/src/html_tree/html_element.rs","packages/yew-macro/tests/html_macro/node-fail.rs","packages/yew-macro/tests/html_macro/node-fail.stderr","packages/yew-macro/tests/html_macro_test.rs","packages/yew/src/dom_bundle/btag/attributes.rs","packages/yew/src/virtual_dom/mod.rs","packages/yew/src/virtual_dom/vtag.rs"],"string":"[\n \"packages/yew-macro/src/html_tree/html_element.rs\",\n \"packages/yew-macro/tests/html_macro/node-fail.rs\",\n \"packages/yew-macro/tests/html_macro/node-fail.stderr\",\n \"packages/yew-macro/tests/html_macro_test.rs\",\n \"packages/yew/src/dom_bundle/btag/attributes.rs\",\n \"packages/yew/src/virtual_dom/mod.rs\",\n \"packages/yew/src/virtual_dom/vtag.rs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"is this cut short?","path":"packages/yew-macro/src/html_tree/html_element.rs","hunk":"@@ -373,19 +406,26 @@ impl ToTokens for HtmlElement {\n };\n quote! { #value }\n });\n+ let to_attributes = if all_attr_names_ssr_safe {\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values_unchecked }\n+ } else {\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values }\n+ };\n Some(quote! {\n- ::yew::virtual_dom::Attributes::Dynamic{\n- keys: &[#(#keys),*],\n- values: ::std::boxed::Box::new([#(#values),*]),\n- }\n+ #to_attributes (\n+ &[#(#keys),*],\n+ ::std::boxed::Box::new([#(#values),*]),\n+ )\n })\n }\n \n let attrs = normal_attrs\n .chain(boolean_attrs)\n .chain(class_attr)\n .collect::<Vec<(Key, Value, Option<PropDirective>)>>();\n- try_into_static(&attrs).or_else(|| try_into_dynamic(&attrs)).unwrap_or_else(|| {\n+ // Refer to `Attributes::*_unchecked` for","resolving_sha":"9abb23ceba58beec44400a37949b4b03be24288c","resolving_diff":"diff --git a/packages/yew-macro/src/html_tree/html_element.rs b/packages/yew-macro/src/html_tree/html_element.rs\nindex c2f7607d04d..d3444d568ff 100644\n--- a/packages/yew-macro/src/html_tree/html_element.rs\n+++ b/packages/yew-macro/src/html_tree/html_element.rs\n@@ -204,6 +204,15 @@ impl ToTokens for HtmlElement {\n Dynamic(Expr),\n }\n \n+ impl Key {\n+ fn can_use_unchecked_attrs(&self) -> bool {\n+ match self {\n+ Self::Static(_) => true,\n+ Self::Dynamic(_) => false,\n+ }\n+ }\n+ }\n+\n impl From<&PropLabel> for Key {\n fn from(value: &PropLabel) -> Self {\n match value {\n@@ -216,7 +225,22 @@ impl ToTokens for HtmlElement {\n impl ToTokens for Key {\n fn to_tokens(&self, tokens: &mut TokenStream) {\n match self {\n- Key::Static(dashed_name) => dashed_name.to_tokens(tokens),\n+ Key::Static(dashed_name) => {\n+ let value = dashed_name.value();\n+ // `value` is always a html dashed name, hence consists of chars with\n+ // XID_Continue, or XID_Start. Those notable\n+ // do not include whitespace or control characters, nor the special\n+ // sets. We do want to check though for\n+ // \"high\" unicode chars above \\uFFFF\n+ if value.chars().any(|c| c > '\\u{FFFF}') {\n+ tokens.extend(quote_spanned! {dashed_name.span()=>::core::compile_error!(\n+ \"Identifier contains characters above \\\\u{FFFF}. This is known to cause browser \\\n+ incompatibilities and inconsistent parsing behaviour and is not allowed.\"\n+ )})\n+ } else {\n+ dashed_name.to_tokens(tokens)\n+ }\n+ }\n Key::Dynamic(expr) => expr.to_tokens(tokens),\n }\n }\n@@ -307,7 +331,10 @@ impl ToTokens for HtmlElement {\n });\n \n /// Try to turn attribute list into a `::yew::virtual_dom::Attributes::Static`\n- fn try_into_static(src: &[(Key, Value, Option<PropDirective>)]) -> Option<TokenStream> {\n+ fn try_into_static(\n+ src: &[(Key, Value, Option<PropDirective>)],\n+ all_attr_names_ssr_safe: bool,\n+ ) -> Option<TokenStream> {\n if src.iter().any(|(k, _, d)| {\n matches!(k, Key::Dynamic(_))\n || matches!(d, Some(PropDirective::ApplyAsProperty(_)))\n@@ -334,13 +361,19 @@ impl ToTokens for HtmlElement {\n };\n kv.push(quote! { ( #k, #v) });\n }\n+ let to_attributes = if all_attr_names_ssr_safe {\n+ quote! { ::yew::virtual_dom::Attributes::from_static_unchecked }\n+ } else {\n+ quote! { ::yew::virtual_dom::Attributes::from_static }\n+ };\n \n- Some(quote! { ::yew::virtual_dom::Attributes::Static(&[#(#kv),*]) })\n+ Some(quote! { #to_attributes( &[#(#kv),*] ) })\n }\n \n /// Try to turn attribute list into a `::yew::virtual_dom::Attributes::Dynamic`\n fn try_into_dynamic(\n src: &[(Key, Value, Option<PropDirective>)],\n+ all_attr_names_ssr_safe: bool,\n ) -> Option<TokenStream> {\n if src.iter().any(|(k, ..)| {\n !matches!(\n@@ -373,11 +406,16 @@ impl ToTokens for HtmlElement {\n };\n quote! { #value }\n });\n+ let to_attributes = if all_attr_names_ssr_safe {\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values_unchecked }\n+ } else {\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values }\n+ };\n Some(quote! {\n- ::yew::virtual_dom::Attributes::Dynamic{\n- keys: &[#(#keys),*],\n- values: ::std::boxed::Box::new([#(#values),*]),\n- }\n+ #to_attributes (\n+ &[#(#keys),*],\n+ ::std::boxed::Box::new([#(#values),*]),\n+ )\n })\n }\n \n@@ -385,7 +423,9 @@ impl ToTokens for HtmlElement {\n .chain(boolean_attrs)\n .chain(class_attr)\n .collect::<Vec<(Key, Value, Option<PropDirective>)>>();\n- try_into_static(&attrs).or_else(|| try_into_dynamic(&attrs)).unwrap_or_else(|| {\n+ // Refer to `Attributes::*_unchecked` for why this checks ssr safety\n+ let all_attrs_ssr_safe = attrs.iter().all(|(key, ..)| key.can_use_unchecked_attrs());\n+ try_into_static(&attrs, all_attrs_ssr_safe).or_else(|| try_into_dynamic(&attrs, all_attrs_ssr_safe)).unwrap_or_else(|| {\n let results = attrs.iter()\n .map(|(k, v, directive)| {\n let value = match directive {\n@@ -406,7 +446,7 @@ impl ToTokens for HtmlElement {\n quote! { (::std::convert::Into::into(#k), #value) }\n });\n quote! {\n- ::yew::virtual_dom::Attributes::IndexMap(\n+ ::yew::virtual_dom::Attributes::from_index_map(\n ::std::rc::Rc::new(\n ::std::iter::Iterator::collect(\n ::std::iter::Iterator::filter_map(\n"}],"string":"[\n {\n \"comment\": \"is this cut short?\",\n \"path\": \"packages/yew-macro/src/html_tree/html_element.rs\",\n \"hunk\": \"@@ -373,19 +406,26 @@ impl ToTokens for HtmlElement {\\n };\\n quote! { #value }\\n });\\n+ let to_attributes = if all_attr_names_ssr_safe {\\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values_unchecked }\\n+ } else {\\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values }\\n+ };\\n Some(quote! {\\n- ::yew::virtual_dom::Attributes::Dynamic{\\n- keys: &[#(#keys),*],\\n- values: ::std::boxed::Box::new([#(#values),*]),\\n- }\\n+ #to_attributes (\\n+ &[#(#keys),*],\\n+ ::std::boxed::Box::new([#(#values),*]),\\n+ )\\n })\\n }\\n \\n let attrs = normal_attrs\\n .chain(boolean_attrs)\\n .chain(class_attr)\\n .collect::<Vec<(Key, Value, Option<PropDirective>)>>();\\n- try_into_static(&attrs).or_else(|| try_into_dynamic(&attrs)).unwrap_or_else(|| {\\n+ // Refer to `Attributes::*_unchecked` for\",\n \"resolving_sha\": \"9abb23ceba58beec44400a37949b4b03be24288c\",\n \"resolving_diff\": \"diff --git a/packages/yew-macro/src/html_tree/html_element.rs b/packages/yew-macro/src/html_tree/html_element.rs\\nindex c2f7607d04d..d3444d568ff 100644\\n--- a/packages/yew-macro/src/html_tree/html_element.rs\\n+++ b/packages/yew-macro/src/html_tree/html_element.rs\\n@@ -204,6 +204,15 @@ impl ToTokens for HtmlElement {\\n Dynamic(Expr),\\n }\\n \\n+ impl Key {\\n+ fn can_use_unchecked_attrs(&self) -> bool {\\n+ match self {\\n+ Self::Static(_) => true,\\n+ Self::Dynamic(_) => false,\\n+ }\\n+ }\\n+ }\\n+\\n impl From<&PropLabel> for Key {\\n fn from(value: &PropLabel) -> Self {\\n match value {\\n@@ -216,7 +225,22 @@ impl ToTokens for HtmlElement {\\n impl ToTokens for Key {\\n fn to_tokens(&self, tokens: &mut TokenStream) {\\n match self {\\n- Key::Static(dashed_name) => dashed_name.to_tokens(tokens),\\n+ Key::Static(dashed_name) => {\\n+ let value = dashed_name.value();\\n+ // `value` is always a html dashed name, hence consists of chars with\\n+ // XID_Continue, or XID_Start. Those notable\\n+ // do not include whitespace or control characters, nor the special\\n+ // sets. We do want to check though for\\n+ // \\\"high\\\" unicode chars above \\\\uFFFF\\n+ if value.chars().any(|c| c > '\\\\u{FFFF}') {\\n+ tokens.extend(quote_spanned! {dashed_name.span()=>::core::compile_error!(\\n+ \\\"Identifier contains characters above \\\\\\\\u{FFFF}. This is known to cause browser \\\\\\n+ incompatibilities and inconsistent parsing behaviour and is not allowed.\\\"\\n+ )})\\n+ } else {\\n+ dashed_name.to_tokens(tokens)\\n+ }\\n+ }\\n Key::Dynamic(expr) => expr.to_tokens(tokens),\\n }\\n }\\n@@ -307,7 +331,10 @@ impl ToTokens for HtmlElement {\\n });\\n \\n /// Try to turn attribute list into a `::yew::virtual_dom::Attributes::Static`\\n- fn try_into_static(src: &[(Key, Value, Option<PropDirective>)]) -> Option<TokenStream> {\\n+ fn try_into_static(\\n+ src: &[(Key, Value, Option<PropDirective>)],\\n+ all_attr_names_ssr_safe: bool,\\n+ ) -> Option<TokenStream> {\\n if src.iter().any(|(k, _, d)| {\\n matches!(k, Key::Dynamic(_))\\n || matches!(d, Some(PropDirective::ApplyAsProperty(_)))\\n@@ -334,13 +361,19 @@ impl ToTokens for HtmlElement {\\n };\\n kv.push(quote! { ( #k, #v) });\\n }\\n+ let to_attributes = if all_attr_names_ssr_safe {\\n+ quote! { ::yew::virtual_dom::Attributes::from_static_unchecked }\\n+ } else {\\n+ quote! { ::yew::virtual_dom::Attributes::from_static }\\n+ };\\n \\n- Some(quote! { ::yew::virtual_dom::Attributes::Static(&[#(#kv),*]) })\\n+ Some(quote! { #to_attributes( &[#(#kv),*] ) })\\n }\\n \\n /// Try to turn attribute list into a `::yew::virtual_dom::Attributes::Dynamic`\\n fn try_into_dynamic(\\n src: &[(Key, Value, Option<PropDirective>)],\\n+ all_attr_names_ssr_safe: bool,\\n ) -> Option<TokenStream> {\\n if src.iter().any(|(k, ..)| {\\n !matches!(\\n@@ -373,11 +406,16 @@ impl ToTokens for HtmlElement {\\n };\\n quote! { #value }\\n });\\n+ let to_attributes = if all_attr_names_ssr_safe {\\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values_unchecked }\\n+ } else {\\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values }\\n+ };\\n Some(quote! {\\n- ::yew::virtual_dom::Attributes::Dynamic{\\n- keys: &[#(#keys),*],\\n- values: ::std::boxed::Box::new([#(#values),*]),\\n- }\\n+ #to_attributes (\\n+ &[#(#keys),*],\\n+ ::std::boxed::Box::new([#(#values),*]),\\n+ )\\n })\\n }\\n \\n@@ -385,7 +423,9 @@ impl ToTokens for HtmlElement {\\n .chain(boolean_attrs)\\n .chain(class_attr)\\n .collect::<Vec<(Key, Value, Option<PropDirective>)>>();\\n- try_into_static(&attrs).or_else(|| try_into_dynamic(&attrs)).unwrap_or_else(|| {\\n+ // Refer to `Attributes::*_unchecked` for why this checks ssr safety\\n+ let all_attrs_ssr_safe = attrs.iter().all(|(key, ..)| key.can_use_unchecked_attrs());\\n+ try_into_static(&attrs, all_attrs_ssr_safe).or_else(|| try_into_dynamic(&attrs, all_attrs_ssr_safe)).unwrap_or_else(|| {\\n let results = attrs.iter()\\n .map(|(k, v, directive)| {\\n let value = match directive {\\n@@ -406,7 +446,7 @@ impl ToTokens for HtmlElement {\\n quote! { (::std::convert::Into::into(#k), #value) }\\n });\\n quote! {\\n- ::yew::virtual_dom::Attributes::IndexMap(\\n+ ::yew::virtual_dom::Attributes::from_index_map(\\n ::std::rc::Rc::new(\\n ::std::iter::Iterator::collect(\\n ::std::iter::Iterator::filter_map(\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":"diff --git a/packages/yew-macro/tests/html_macro/node-fail.rs b/packages/yew-macro/tests/html_macro/node-fail.rs\nindex 588722bd273..ab67bafbd9d 100644\n--- a/packages/yew-macro/tests/html_macro/node-fail.rs\n+++ b/packages/yew-macro/tests/html_macro/node-fail.rs\n@@ -1,3 +1,4 @@\n+#![allow(uncommon_codepoints)]\n use yew::prelude::*;\n \n fn compile_fail() {\n@@ -15,6 +16,8 @@ fn compile_fail() {\n html! {\n not_node()\n };\n+\n+ html! { <a 𐊖𐊗𐊒𐊓=\"value\"></a> };\n }\n \n fn main() {}\ndiff --git a/packages/yew-macro/tests/html_macro/node-fail.stderr b/packages/yew-macro/tests/html_macro/node-fail.stderr\nindex 99f8c15b85c..8242b8ef1e0 100644\n--- a/packages/yew-macro/tests/html_macro/node-fail.stderr\n+++ b/packages/yew-macro/tests/html_macro/node-fail.stderr\n@@ -1,33 +1,39 @@\n error: unexpected token, expected `}`\n- --> tests/html_macro/node-fail.rs:4:29\n+ --> tests/html_macro/node-fail.rs:5:29\n |\n-4 | html! { <span>{ \"valid\" \"invalid\" }</span> };\n+5 | html! { <span>{ \"valid\" \"invalid\" }</span> };\n | ^^^^^^^^^\n \n error: byte-strings can't be converted to HTML text\n note: remove the `b` prefix or convert this to a `String`\n- --> tests/html_macro/node-fail.rs:10:14\n+ --> tests/html_macro/node-fail.rs:11:14\n |\n-10 | html! { b\"str\" };\n+11 | html! { b\"str\" };\n | ^^^^^^\n \n error: byte-strings can't be converted to HTML text\n note: remove the `b` prefix or convert this to a `String`\n- --> tests/html_macro/node-fail.rs:12:22\n+ --> tests/html_macro/node-fail.rs:13:22\n |\n-12 | html! { <span>{ b\"str\" }</span> };\n+13 | html! { <span>{ b\"str\" }</span> };\n | ^^^^^^\n \n+error: Identifier contains characters above \\u{FFFF}. This is known to cause browser incompatibilities and inconsistent parsing behaviour and is not allowed.\n+ --> tests/html_macro/node-fail.rs:20:16\n+ |\n+20 | html! { <a 𐊖𐊗𐊒𐊓=\"value\"></a> };\n+ | ^^^^\n+\n error[E0425]: cannot find value `invalid` in this scope\n- --> tests/html_macro/node-fail.rs:6:13\n+ --> tests/html_macro/node-fail.rs:7:13\n |\n-6 | html! { invalid };\n+7 | html! { invalid };\n | ^^^^^^^ not found in this scope\n \n error[E0277]: `()` doesn't implement `std::fmt::Display`\n- --> tests/html_macro/node-fail.rs:5:13\n+ --> tests/html_macro/node-fail.rs:6:13\n |\n-5 | html! { () };\n+6 | html! { () };\n | ^^ `()` cannot be formatted with the default formatter\n |\n = help: the trait `std::fmt::Display` is not implemented for `()`\n@@ -47,9 +53,9 @@ error[E0277]: `()` doesn't implement `std::fmt::Display`\n = note: this error originates in the macro `html` (in Nightly builds, run with -Z macro-backtrace for more info)\n \n error[E0277]: `()` doesn't implement `std::fmt::Display`\n- --> tests/html_macro/node-fail.rs:16:9\n+ --> tests/html_macro/node-fail.rs:17:9\n |\n-16 | not_node()\n+17 | not_node()\n | ^^^^^^^^ `()` cannot be formatted with the default formatter\n |\n = help: the trait `std::fmt::Display` is not implemented for `()`\ndiff --git a/packages/yew-macro/tests/html_macro_test.rs b/packages/yew-macro/tests/html_macro_test.rs\nindex 5dcccea0e00..2a67e3eeb8f 100644\n--- a/packages/yew-macro/tests/html_macro_test.rs\n+++ b/packages/yew-macro/tests/html_macro_test.rs\n@@ -41,3 +41,9 @@ fn html_nested_macro_on_html_element() {\n <input/>\n };\n }\n+\n+#[test]\n+#[should_panic(expected = \"\\\"x onerror=\\\\\\\"prompt('failed')\\\" is not a valid attribute name\")]\n+fn dynamic_attrs_catch_bad_names() {\n+ let _ = html! { <div \"x onerror=\\\"prompt('failed')\"=\";\"></div> };\n+}\n"},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86295,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4152,"string":"4,152"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Validate attribute names"},"pr_body":{"kind":"string","value":"is this cut short?"},"base_sha":{"kind":"string","value":"d4e5e9f3a82e81e97041f53e0cc7e6bb1796cd48"},"head_sha":{"kind":"string","value":"9abb23ceba58beec44400a37949b4b03be24288c"},"gold_diff":{"kind":"string","value":"diff --git a/packages/yew-macro/src/html_tree/html_element.rs b/packages/yew-macro/src/html_tree/html_element.rs\nindex c2f7607d04d..d3444d568ff 100644\n--- a/packages/yew-macro/src/html_tree/html_element.rs\n+++ b/packages/yew-macro/src/html_tree/html_element.rs\n@@ -204,6 +204,15 @@ impl ToTokens for HtmlElement {\n Dynamic(Expr),\n }\n \n+ impl Key {\n+ fn can_use_unchecked_attrs(&self) -> bool {\n+ match self {\n+ Self::Static(_) => true,\n+ Self::Dynamic(_) => false,\n+ }\n+ }\n+ }\n+\n impl From<&PropLabel> for Key {\n fn from(value: &PropLabel) -> Self {\n match value {\n@@ -216,7 +225,22 @@ impl ToTokens for HtmlElement {\n impl ToTokens for Key {\n fn to_tokens(&self, tokens: &mut TokenStream) {\n match self {\n- Key::Static(dashed_name) => dashed_name.to_tokens(tokens),\n+ Key::Static(dashed_name) => {\n+ let value = dashed_name.value();\n+ // `value` is always a html dashed name, hence consists of chars with\n+ // XID_Continue, or XID_Start. Those notable\n+ // do not include whitespace or control characters, nor the special\n+ // sets. We do want to check though for\n+ // \"high\" unicode chars above \\uFFFF\n+ if value.chars().any(|c| c > '\\u{FFFF}') {\n+ tokens.extend(quote_spanned! {dashed_name.span()=>::core::compile_error!(\n+ \"Identifier contains characters above \\\\u{FFFF}. This is known to cause browser \\\n+ incompatibilities and inconsistent parsing behaviour and is not allowed.\"\n+ )})\n+ } else {\n+ dashed_name.to_tokens(tokens)\n+ }\n+ }\n Key::Dynamic(expr) => expr.to_tokens(tokens),\n }\n }\n@@ -307,7 +331,10 @@ impl ToTokens for HtmlElement {\n });\n \n /// Try to turn attribute list into a `::yew::virtual_dom::Attributes::Static`\n- fn try_into_static(src: &[(Key, Value, Option<PropDirective>)]) -> Option<TokenStream> {\n+ fn try_into_static(\n+ src: &[(Key, Value, Option<PropDirective>)],\n+ all_attr_names_ssr_safe: bool,\n+ ) -> Option<TokenStream> {\n if src.iter().any(|(k, _, d)| {\n matches!(k, Key::Dynamic(_))\n || matches!(d, Some(PropDirective::ApplyAsProperty(_)))\n@@ -334,13 +361,19 @@ impl ToTokens for HtmlElement {\n };\n kv.push(quote! { ( #k, #v) });\n }\n+ let to_attributes = if all_attr_names_ssr_safe {\n+ quote! { ::yew::virtual_dom::Attributes::from_static_unchecked }\n+ } else {\n+ quote! { ::yew::virtual_dom::Attributes::from_static }\n+ };\n \n- Some(quote! { ::yew::virtual_dom::Attributes::Static(&[#(#kv),*]) })\n+ Some(quote! { #to_attributes( &[#(#kv),*] ) })\n }\n \n /// Try to turn attribute list into a `::yew::virtual_dom::Attributes::Dynamic`\n fn try_into_dynamic(\n src: &[(Key, Value, Option<PropDirective>)],\n+ all_attr_names_ssr_safe: bool,\n ) -> Option<TokenStream> {\n if src.iter().any(|(k, ..)| {\n !matches!(\n@@ -373,11 +406,16 @@ impl ToTokens for HtmlElement {\n };\n quote! { #value }\n });\n+ let to_attributes = if all_attr_names_ssr_safe {\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values_unchecked }\n+ } else {\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values }\n+ };\n Some(quote! {\n- ::yew::virtual_dom::Attributes::Dynamic{\n- keys: &[#(#keys),*],\n- values: ::std::boxed::Box::new([#(#values),*]),\n- }\n+ #to_attributes (\n+ &[#(#keys),*],\n+ ::std::boxed::Box::new([#(#values),*]),\n+ )\n })\n }\n \n@@ -385,7 +423,9 @@ impl ToTokens for HtmlElement {\n .chain(boolean_attrs)\n .chain(class_attr)\n .collect::<Vec<(Key, Value, Option<PropDirective>)>>();\n- try_into_static(&attrs).or_else(|| try_into_dynamic(&attrs)).unwrap_or_else(|| {\n+ // Refer to `Attributes::*_unchecked` for why this checks ssr safety\n+ let all_attrs_ssr_safe = attrs.iter().all(|(key, ..)| key.can_use_unchecked_attrs());\n+ try_into_static(&attrs, all_attrs_ssr_safe).or_else(|| try_into_dynamic(&attrs, all_attrs_ssr_safe)).unwrap_or_else(|| {\n let results = attrs.iter()\n .map(|(k, v, directive)| {\n let value = match directive {\n@@ -406,7 +446,7 @@ impl ToTokens for HtmlElement {\n quote! { (::std::convert::Into::into(#k), #value) }\n });\n quote! {\n- ::yew::virtual_dom::Attributes::IndexMap(\n+ ::yew::virtual_dom::Attributes::from_index_map(\n ::std::rc::Rc::new(\n ::std::iter::Iterator::collect(\n ::std::iter::Iterator::filter_map(\n"},"changed_files":{"kind":"list like","value":["packages/yew-macro/src/html_tree/html_element.rs"],"string":"[\n \"packages/yew-macro/src/html_tree/html_element.rs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"is this cut short?","path":"packages/yew-macro/src/html_tree/html_element.rs","hunk":"@@ -373,19 +406,26 @@ impl ToTokens for HtmlElement {\n };\n quote! { #value }\n });\n+ let to_attributes = if all_attr_names_ssr_safe {\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values_unchecked }\n+ } else {\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values }\n+ };\n Some(quote! {\n- ::yew::virtual_dom::Attributes::Dynamic{\n- keys: &[#(#keys),*],\n- values: ::std::boxed::Box::new([#(#values),*]),\n- }\n+ #to_attributes (\n+ &[#(#keys),*],\n+ ::std::boxed::Box::new([#(#values),*]),\n+ )\n })\n }\n \n let attrs = normal_attrs\n .chain(boolean_attrs)\n .chain(class_attr)\n .collect::<Vec<(Key, Value, Option<PropDirective>)>>();\n- try_into_static(&attrs).or_else(|| try_into_dynamic(&attrs)).unwrap_or_else(|| {\n+ // Refer to `Attributes::*_unchecked` for","resolving_sha":"9abb23ceba58beec44400a37949b4b03be24288c","resolving_diff":"diff --git a/packages/yew-macro/src/html_tree/html_element.rs b/packages/yew-macro/src/html_tree/html_element.rs\nindex c2f7607d04d..d3444d568ff 100644\n--- a/packages/yew-macro/src/html_tree/html_element.rs\n+++ b/packages/yew-macro/src/html_tree/html_element.rs\n@@ -204,6 +204,15 @@ impl ToTokens for HtmlElement {\n Dynamic(Expr),\n }\n \n+ impl Key {\n+ fn can_use_unchecked_attrs(&self) -> bool {\n+ match self {\n+ Self::Static(_) => true,\n+ Self::Dynamic(_) => false,\n+ }\n+ }\n+ }\n+\n impl From<&PropLabel> for Key {\n fn from(value: &PropLabel) -> Self {\n match value {\n@@ -216,7 +225,22 @@ impl ToTokens for HtmlElement {\n impl ToTokens for Key {\n fn to_tokens(&self, tokens: &mut TokenStream) {\n match self {\n- Key::Static(dashed_name) => dashed_name.to_tokens(tokens),\n+ Key::Static(dashed_name) => {\n+ let value = dashed_name.value();\n+ // `value` is always a html dashed name, hence consists of chars with\n+ // XID_Continue, or XID_Start. Those notable\n+ // do not include whitespace or control characters, nor the special\n+ // sets. We do want to check though for\n+ // \"high\" unicode chars above \\uFFFF\n+ if value.chars().any(|c| c > '\\u{FFFF}') {\n+ tokens.extend(quote_spanned! {dashed_name.span()=>::core::compile_error!(\n+ \"Identifier contains characters above \\\\u{FFFF}. This is known to cause browser \\\n+ incompatibilities and inconsistent parsing behaviour and is not allowed.\"\n+ )})\n+ } else {\n+ dashed_name.to_tokens(tokens)\n+ }\n+ }\n Key::Dynamic(expr) => expr.to_tokens(tokens),\n }\n }\n@@ -307,7 +331,10 @@ impl ToTokens for HtmlElement {\n });\n \n /// Try to turn attribute list into a `::yew::virtual_dom::Attributes::Static`\n- fn try_into_static(src: &[(Key, Value, Option<PropDirective>)]) -> Option<TokenStream> {\n+ fn try_into_static(\n+ src: &[(Key, Value, Option<PropDirective>)],\n+ all_attr_names_ssr_safe: bool,\n+ ) -> Option<TokenStream> {\n if src.iter().any(|(k, _, d)| {\n matches!(k, Key::Dynamic(_))\n || matches!(d, Some(PropDirective::ApplyAsProperty(_)))\n@@ -334,13 +361,19 @@ impl ToTokens for HtmlElement {\n };\n kv.push(quote! { ( #k, #v) });\n }\n+ let to_attributes = if all_attr_names_ssr_safe {\n+ quote! { ::yew::virtual_dom::Attributes::from_static_unchecked }\n+ } else {\n+ quote! { ::yew::virtual_dom::Attributes::from_static }\n+ };\n \n- Some(quote! { ::yew::virtual_dom::Attributes::Static(&[#(#kv),*]) })\n+ Some(quote! { #to_attributes( &[#(#kv),*] ) })\n }\n \n /// Try to turn attribute list into a `::yew::virtual_dom::Attributes::Dynamic`\n fn try_into_dynamic(\n src: &[(Key, Value, Option<PropDirective>)],\n+ all_attr_names_ssr_safe: bool,\n ) -> Option<TokenStream> {\n if src.iter().any(|(k, ..)| {\n !matches!(\n@@ -373,11 +406,16 @@ impl ToTokens for HtmlElement {\n };\n quote! { #value }\n });\n+ let to_attributes = if all_attr_names_ssr_safe {\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values_unchecked }\n+ } else {\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values }\n+ };\n Some(quote! {\n- ::yew::virtual_dom::Attributes::Dynamic{\n- keys: &[#(#keys),*],\n- values: ::std::boxed::Box::new([#(#values),*]),\n- }\n+ #to_attributes (\n+ &[#(#keys),*],\n+ ::std::boxed::Box::new([#(#values),*]),\n+ )\n })\n }\n \n@@ -385,7 +423,9 @@ impl ToTokens for HtmlElement {\n .chain(boolean_attrs)\n .chain(class_attr)\n .collect::<Vec<(Key, Value, Option<PropDirective>)>>();\n- try_into_static(&attrs).or_else(|| try_into_dynamic(&attrs)).unwrap_or_else(|| {\n+ // Refer to `Attributes::*_unchecked` for why this checks ssr safety\n+ let all_attrs_ssr_safe = attrs.iter().all(|(key, ..)| key.can_use_unchecked_attrs());\n+ try_into_static(&attrs, all_attrs_ssr_safe).or_else(|| try_into_dynamic(&attrs, all_attrs_ssr_safe)).unwrap_or_else(|| {\n let results = attrs.iter()\n .map(|(k, v, directive)| {\n let value = match directive {\n@@ -406,7 +446,7 @@ impl ToTokens for HtmlElement {\n quote! { (::std::convert::Into::into(#k), #value) }\n });\n quote! {\n- ::yew::virtual_dom::Attributes::IndexMap(\n+ ::yew::virtual_dom::Attributes::from_index_map(\n ::std::rc::Rc::new(\n ::std::iter::Iterator::collect(\n ::std::iter::Iterator::filter_map(\n"}],"string":"[\n {\n \"comment\": \"is this cut short?\",\n \"path\": \"packages/yew-macro/src/html_tree/html_element.rs\",\n \"hunk\": \"@@ -373,19 +406,26 @@ impl ToTokens for HtmlElement {\\n };\\n quote! { #value }\\n });\\n+ let to_attributes = if all_attr_names_ssr_safe {\\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values_unchecked }\\n+ } else {\\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values }\\n+ };\\n Some(quote! {\\n- ::yew::virtual_dom::Attributes::Dynamic{\\n- keys: &[#(#keys),*],\\n- values: ::std::boxed::Box::new([#(#values),*]),\\n- }\\n+ #to_attributes (\\n+ &[#(#keys),*],\\n+ ::std::boxed::Box::new([#(#values),*]),\\n+ )\\n })\\n }\\n \\n let attrs = normal_attrs\\n .chain(boolean_attrs)\\n .chain(class_attr)\\n .collect::<Vec<(Key, Value, Option<PropDirective>)>>();\\n- try_into_static(&attrs).or_else(|| try_into_dynamic(&attrs)).unwrap_or_else(|| {\\n+ // Refer to `Attributes::*_unchecked` for\",\n \"resolving_sha\": \"9abb23ceba58beec44400a37949b4b03be24288c\",\n \"resolving_diff\": \"diff --git a/packages/yew-macro/src/html_tree/html_element.rs b/packages/yew-macro/src/html_tree/html_element.rs\\nindex c2f7607d04d..d3444d568ff 100644\\n--- a/packages/yew-macro/src/html_tree/html_element.rs\\n+++ b/packages/yew-macro/src/html_tree/html_element.rs\\n@@ -204,6 +204,15 @@ impl ToTokens for HtmlElement {\\n Dynamic(Expr),\\n }\\n \\n+ impl Key {\\n+ fn can_use_unchecked_attrs(&self) -> bool {\\n+ match self {\\n+ Self::Static(_) => true,\\n+ Self::Dynamic(_) => false,\\n+ }\\n+ }\\n+ }\\n+\\n impl From<&PropLabel> for Key {\\n fn from(value: &PropLabel) -> Self {\\n match value {\\n@@ -216,7 +225,22 @@ impl ToTokens for HtmlElement {\\n impl ToTokens for Key {\\n fn to_tokens(&self, tokens: &mut TokenStream) {\\n match self {\\n- Key::Static(dashed_name) => dashed_name.to_tokens(tokens),\\n+ Key::Static(dashed_name) => {\\n+ let value = dashed_name.value();\\n+ // `value` is always a html dashed name, hence consists of chars with\\n+ // XID_Continue, or XID_Start. Those notable\\n+ // do not include whitespace or control characters, nor the special\\n+ // sets. We do want to check though for\\n+ // \\\"high\\\" unicode chars above \\\\uFFFF\\n+ if value.chars().any(|c| c > '\\\\u{FFFF}') {\\n+ tokens.extend(quote_spanned! {dashed_name.span()=>::core::compile_error!(\\n+ \\\"Identifier contains characters above \\\\\\\\u{FFFF}. This is known to cause browser \\\\\\n+ incompatibilities and inconsistent parsing behaviour and is not allowed.\\\"\\n+ )})\\n+ } else {\\n+ dashed_name.to_tokens(tokens)\\n+ }\\n+ }\\n Key::Dynamic(expr) => expr.to_tokens(tokens),\\n }\\n }\\n@@ -307,7 +331,10 @@ impl ToTokens for HtmlElement {\\n });\\n \\n /// Try to turn attribute list into a `::yew::virtual_dom::Attributes::Static`\\n- fn try_into_static(src: &[(Key, Value, Option<PropDirective>)]) -> Option<TokenStream> {\\n+ fn try_into_static(\\n+ src: &[(Key, Value, Option<PropDirective>)],\\n+ all_attr_names_ssr_safe: bool,\\n+ ) -> Option<TokenStream> {\\n if src.iter().any(|(k, _, d)| {\\n matches!(k, Key::Dynamic(_))\\n || matches!(d, Some(PropDirective::ApplyAsProperty(_)))\\n@@ -334,13 +361,19 @@ impl ToTokens for HtmlElement {\\n };\\n kv.push(quote! { ( #k, #v) });\\n }\\n+ let to_attributes = if all_attr_names_ssr_safe {\\n+ quote! { ::yew::virtual_dom::Attributes::from_static_unchecked }\\n+ } else {\\n+ quote! { ::yew::virtual_dom::Attributes::from_static }\\n+ };\\n \\n- Some(quote! { ::yew::virtual_dom::Attributes::Static(&[#(#kv),*]) })\\n+ Some(quote! { #to_attributes( &[#(#kv),*] ) })\\n }\\n \\n /// Try to turn attribute list into a `::yew::virtual_dom::Attributes::Dynamic`\\n fn try_into_dynamic(\\n src: &[(Key, Value, Option<PropDirective>)],\\n+ all_attr_names_ssr_safe: bool,\\n ) -> Option<TokenStream> {\\n if src.iter().any(|(k, ..)| {\\n !matches!(\\n@@ -373,11 +406,16 @@ impl ToTokens for HtmlElement {\\n };\\n quote! { #value }\\n });\\n+ let to_attributes = if all_attr_names_ssr_safe {\\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values_unchecked }\\n+ } else {\\n+ quote! { ::yew::virtual_dom::Attributes::from_dynamic_values }\\n+ };\\n Some(quote! {\\n- ::yew::virtual_dom::Attributes::Dynamic{\\n- keys: &[#(#keys),*],\\n- values: ::std::boxed::Box::new([#(#values),*]),\\n- }\\n+ #to_attributes (\\n+ &[#(#keys),*],\\n+ ::std::boxed::Box::new([#(#values),*]),\\n+ )\\n })\\n }\\n \\n@@ -385,7 +423,9 @@ impl ToTokens for HtmlElement {\\n .chain(boolean_attrs)\\n .chain(class_attr)\\n .collect::<Vec<(Key, Value, Option<PropDirective>)>>();\\n- try_into_static(&attrs).or_else(|| try_into_dynamic(&attrs)).unwrap_or_else(|| {\\n+ // Refer to `Attributes::*_unchecked` for why this checks ssr safety\\n+ let all_attrs_ssr_safe = attrs.iter().all(|(key, ..)| key.can_use_unchecked_attrs());\\n+ try_into_static(&attrs, all_attrs_ssr_safe).or_else(|| try_into_dynamic(&attrs, all_attrs_ssr_safe)).unwrap_or_else(|| {\\n let results = attrs.iter()\\n .map(|(k, v, directive)| {\\n let value = match directive {\\n@@ -406,7 +446,7 @@ impl ToTokens for HtmlElement {\\n quote! { (::std::convert::Into::into(#k), #value) }\\n });\\n quote! {\\n- ::yew::virtual_dom::Attributes::IndexMap(\\n+ ::yew::virtual_dom::Attributes::from_index_map(\\n ::std::rc::Rc::new(\\n ::std::iter::Iterator::collect(\\n ::std::iter::Iterator::filter_map(\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86296,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4146,"string":"4,146"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: auto-detect imperative for/while/loop in preamble"},"pr_body":{"kind":"string","value":"#### Description\r\n\r\nFirst off, the final diagnostics patch in [b9fe62a](https://github.com/yewstack/yew/pull/4124/commits/b9fe62a55487fae23ac5aa8047bd8c6892c33107) in #4124 seems unnecessary. Either `let _ = for {...}` or a trailing comma (`for {...};`) seems to do the same job and the latter should have definitely be recommended. I mistakenly thought `let _ =` was the only workaround in some edge cases, tried various patterns today and can't really reproduce.\r\n\r\nThis PR should finally remove the need for all these temporary workarounds though.\r\n\r\nThis PR now auto-detects imperative `for`/`while`/`loop` blocks in `html!` preamble position so users no longer need a trailing `;` or a `let _ =` binding to make them parse as Rust statements.\r\n\r\n#### Details\r\n\r\nBefore, this was an error:\r\n\r\n```rust\r\nhtml! {\r\n for item in items.iter() {\r\n let mut by_han = BTreeMap::new();\r\n for src in &item.sources {\r\n by_han.entry(src.han_nom.clone()).or_default().push(src);\r\n }\r\n <div>{render(by_han)}</div>\r\n }\r\n}\r\n```\r\n\r\nThe inner `for` parses as `Stmt::Expr(ForLoop, None)` and used to be rejected with a help message pointing at `let _ = ...;`. The reason the parser was conservative: a bare imperative loop in preamble looks identical to html-`for`-control-flow with a body that has no html children. The two interpretations are indistinguishable on syntax alone.\r\n\r\nBut they are not indistinguishable in practice. If syn can fully parse the loop as a Rust `Stmt`, the entire expression contains no html elements anywhere inside, and an html-`for` over an html-less body would just emit empty `VList`s per iteration which is rarely what anyone wants. So we accept it as a Rust statement instead.\r\n\r\nWhen the body does contain html, syn fails to parse it as `Stmt` and we fall through to the html-control-flow parser exactly as before. `if`/`match`/bare-`{...}` are unchanged.\r\n\r\nThe trailing-`;` and `let _ = ...;` forms still work as regression patterns.\r\n\r\n#### Checklist\r\n\r\n- [x] I have reviewed my own code\r\n- [x] I have added tests\r\n - `packages/yew-macro/tests/html_macro/imperative-preamble-pass.rs` (new): mirrors the deleted `imperative-preamble-fail.rs`, plus labeled-loop and back-to-back loop coverage.\r\n - `packages/yew/tests/html_for.rs`: three new wasm tests asserting the inner-loop side effects run and that the surrounding html-for emits one node per outer iteration (`for_imperative_inner_for_runs_as_preamble`, `..._while_...`, `..._loop_...`).\r\n - `packages/yew-macro/tests/html_macro/for-pass.rs`: regression cases proving the trailing-`;` and `let _ = ...;` forms still parse.\r\n - Deleted `imperative-preamble-fail.{rs,stderr}` since the cases now compile cleanly.\r\n"},"base_sha":{"kind":"string","value":"d4e5e9f3a82e81e97041f53e0cc7e6bb1796cd48"},"head_sha":{"kind":"string","value":"e611fb0d5c90582ec76b28704ec2a83b4cd46881"},"gold_diff":{"kind":"string","value":"diff --git a/packages/yew-macro/src/html_tree/mod.rs b/packages/yew-macro/src/html_tree/mod.rs\nindex c2f6e626676..1ee2297c94c 100644\n--- a/packages/yew-macro/src/html_tree/mod.rs\n+++ b/packages/yew-macro/src/html_tree/mod.rs\n@@ -582,14 +582,17 @@ impl Parse for HtmlRootBraced {\n /// not Rust-parseable (e.g. an `<element/>` or `if cond { <node/> }` that the\n /// Rust expression grammar rejects).\n ///\n-/// One pitfall: block-like Rust expressions (`for`, `while`, `loop`, `{...}`)\n-/// auto-terminate as statements per Rust grammar, so a trailing `;` is not\n-/// folded into the `Stmt`. Such expressions in preamble position parse as\n-/// `Stmt::Expr(_, None)` and fall through to the html-control-flow parser.\n-/// When the entire expression is Rust-parseable (no html elements anywhere\n-/// inside), the user almost certainly wrote an imperative loop/block, not an\n-/// html-emitting one - we surface a help message pointing at the\n-/// `let _ = ...;` workaround.\n+/// `for`, `while`, and `loop` auto-terminate as statements in Rust grammar, so\n+/// in preamble position they parse as `Stmt::Expr(_, None)`. When the fork\n+/// succeeds at parsing one as a full Rust `Stmt`, the entire expression\n+/// (header, body, all nested calls) was Rust-parseable, which means it\n+/// contains no html elements and cannot be a misread of html-control-flow.\n+/// We accept it as a preamble statement so users can write side-effect loops\n+/// without a trailing `;` or a `let _ =` binding.\n+///\n+/// `if` and `match` are handled separately by the html-control-flow parser\n+/// because their bodies routinely contain VNode-convertible expressions.\n+/// Bare `{...}` blocks stay as html-block-as-child (`{ render(item) }`).\n pub(super) fn parse_preamble_stmts(input: ParseStream) -> syn::Result<Vec<syn::Stmt>> {\n let mut stmts = Vec::new();\n loop {\n@@ -599,21 +602,7 @@ pub(super) fn parse_preamble_stmts(input: ParseStream) -> syn::Result<Vec<syn::S\n Ok(syn::Stmt::Item(_)) => true,\n Ok(syn::Stmt::Expr(_, Some(_))) => true,\n Ok(syn::Stmt::Macro(m)) => m.semi_token.is_some(),\n- Ok(syn::Stmt::Expr(expr, None)) => {\n- if let Some(kind) = imperative_blocklike_kind(&expr) {\n- proc_macro_error::emit_error!(\n- expr,\n- \"this `{}` block is fully Rust-parseable, so it is parsed as html-{} \\\n- here, but its body cannot produce any html nodes\",\n- kind, kind;\n- help = \"to run a Rust `{}` here for side effects only, bind it with \\\n- `let _ = ...;` so the parser sees a Rust statement: \\\n- `let _ = {} ... {{ ... }};`\",\n- kind, kind\n- );\n- }\n- false\n- }\n+ Ok(syn::Stmt::Expr(expr, None)) => is_imperative_blocklike(&expr),\n _ => false,\n };\n if !is_preamble {\n@@ -625,23 +614,14 @@ pub(super) fn parse_preamble_stmts(input: ParseStream) -> syn::Result<Vec<syn::S\n Ok(stmts)\n }\n \n-/// Block-like Rust expressions whose appearance in preamble position\n-/// (`Stmt::Expr(_, None)`, fully Rust-parseable) almost always indicates\n-/// imperative intent rather than html-emission.\n-///\n-/// Excluded:\n-/// - `if` / `match`: their bodies frequently contain plain expressions that produce\n-/// VNode-convertible values, where the html-control-flow form is genuinely intended.\n-/// - bare `{...}` blocks: the canonical html-block-as-child syntax, e.g. `{ render(item) }` and\n-/// `{\"text\"}`, parses as `Stmt::Expr(ExprBlock, None)` and would generate a flood of false\n-/// positives.\n-fn imperative_blocklike_kind(expr: &syn::Expr) -> Option<&'static str> {\n- match expr {\n- syn::Expr::ForLoop(_) => Some(\"for\"),\n- syn::Expr::While(_) => Some(\"while\"),\n- syn::Expr::Loop(_) => Some(\"loop\"),\n- _ => None,\n- }\n+/// Whether `expr` is an imperative block-like Rust expression (`for`, `while`,\n+/// `loop`) that should be accepted as a preamble statement when it appears\n+/// without a trailing `;`.\n+fn is_imperative_blocklike(expr: &syn::Expr) -> bool {\n+ matches!(\n+ expr,\n+ syn::Expr::ForLoop(_) | syn::Expr::While(_) | syn::Expr::Loop(_)\n+ )\n }\n \n /// Parse `break [label] [value]` forgivingly: first try syn's full\ndiff --git a/website/docs/concepts/html/conditional-rendering.mdx b/website/docs/concepts/html/conditional-rendering.mdx\nindex f1f935a6347..422a92374af 100644\n--- a/website/docs/concepts/html/conditional-rendering.mdx\n+++ b/website/docs/concepts/html/conditional-rendering.mdx\n@@ -156,3 +156,46 @@ html! {\n Arms with a single element can omit braces. Arms with multiple children or `let` bindings require braces.\n \n `match` supports all standard Rust patterns including OR-patterns (`A | B`), destructuring, and `if` guards. Exhaustiveness is checked by the Rust compiler.\n+\n+## Loops inside `if`/`match` bodies\n+\n+`for`, `while`, and `loop` inside an `if`/`else if`/`else`/`match`-arm body\n+follow the same rules they do at the top level of `html!`, with one caveat:\n+if the loop body is fully Rust-parseable (no html elements anywhere inside),\n+the macro takes the loop as a Rust statement instead of html-control-flow.\n+\n+The most common way to hit this is a loop whose only child is a bare\n+`{expr}` block:\n+\n+```rust , ignore\n+// Compiles. The for is at the top level, parsed as html-`for`.\n+html! {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+}\n+\n+// Does NOT compile. The for is inside an `if`, parsed as a Rust statement;\n+// rustc then complains that the body returns a value where `()` is expected.\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+ }\n+}\n+```\n+\n+Wrap the child in an html element to keep it as html-`for`:\n+\n+```rust , ignore\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ <span>{my_foo}</span>\n+ }\n+ }\n+}\n+```\n+\n+See [Lists](./lists.mdx) for the full set of workarounds.\ndiff --git a/website/docs/concepts/html/lists.mdx b/website/docs/concepts/html/lists.mdx\nindex 7111aa90a9e..8628c14c672 100644\n--- a/website/docs/concepts/html/lists.mdx\n+++ b/website/docs/concepts/html/lists.mdx\n@@ -25,10 +25,10 @@ html! {\n };\n ```\n \n-`for` loop bodies accept Rust statements before the html children. Any\n-terminated statement works: `let` bindings, expression statements ending in\n-`;`, item definitions (`fn`, `struct`, `use`, ...), and macro invocations with\n-`;`.\n+`for` loop bodies accept Rust statements before the html children: `let`\n+bindings, expression statements ending in `;`, item definitions (`fn`,\n+`struct`, `use`, ...), macro invocations with `;`, and imperative `for`,\n+`while`, or `loop` blocks for side effects.\n \n ```rust , ignore\n use yew::prelude::*;\n@@ -37,7 +37,12 @@ html! {\n for item in items {\n let label = format!(\"{}: {}\", item.id, item.name);\n let class = if item.active { \"active\" } else { \"inactive\" };\n- <div class={class}>{label}</div>\n+ let mut tags = String::new();\n+ for tag in &item.tags {\n+ tags.push_str(tag);\n+ tags.push(' ');\n+ }\n+ <div class={class} data-tags={tags}>{label}</div>\n }\n };\n ```\n@@ -112,15 +117,15 @@ A bare qualified-path expression like `<Type>::method(...)` collides with the\n \n :::note Imperative loops in the preamble\n \n-Block-like Rust expressions (`for`, `while`, `loop`, `{...}`) auto-terminate as\n-statements in Rust grammar - a trailing `;` is not folded into the statement.\n-A bare imperative loop in a preamble:\n+A nested `for`, `while`, or `loop` whose body has only Rust statements (no\n+html elements anywhere inside) is detected as a Rust statement, not as\n+html-control-flow. So this works as written:\n \n ```rust , ignore\n html! {\n for item in items.iter() {\n let mut by_han = BTreeMap::new();\n- for src in &item.sources { // imperative side-effect loop\n+ for src in &item.sources {\n by_han.entry(src.han_nom.clone()).or_default().push(src);\n }\n <div>{render(by_han)}</div>\n@@ -128,26 +133,82 @@ html! {\n }\n ```\n \n-is parsed as html-`for` (emitting children) instead of as a Rust statement,\n-and its body's `()` value cannot be converted to a `VNode`. Bind it with\n-`let _ = ...;` so the parser sees a `Stmt::Local`:\n+If you mix html into the inner loop, the macro takes that loop as\n+html-control-flow instead and emits its children per iteration:\n \n ```rust , ignore\n html! {\n for item in items.iter() {\n- let mut by_han = BTreeMap::new();\n- let _ = for src in &item.sources {\n- by_han.entry(src.han_nom.clone()).or_default().push(src);\n- };\n- <div>{render(by_han)}</div>\n+ for tag in &item.tags {\n+ <span class=\"tag\">{tag}</span>\n+ }\n+ }\n+}\n+```\n+\n+:::\n+\n+:::caution `for` with a bare `{expr}` body inside `if`/`match`/`while`/another `for`\n+\n+A `for` whose only child is a bare `{expr}` block renders one node per\n+iteration at the **top level** of an `html!`, but the same code nested\n+inside an `if`/`match` arm/`while`/another `for` body is rejected with a\n+`mismatched types: expected (), found T` error. The two positions use\n+different parsing strategies, and the nested one tries to parse the loop\n+as a Rust statement first. If the body is fully Rust-parseable (which a\n+bare `{expr}` block is), it stops being html-control-flow.\n+\n+```rust , ignore\n+// Works: the for is at the top level.\n+html! {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+}\n+\n+// Does NOT compile: the for is nested inside an `if`.\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+ }\n+}\n+```\n+\n+To render `my_foo` 9 times conditionally, pick one of:\n+\n+```rust , ignore\n+// 1. Wrap the child in an html element (recommended).\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ <span>{my_foo}</span>\n+ }\n+ }\n+}\n+\n+// 2. Push the for to the top level of a nested `html!`.\n+html! {\n+ if condition {\n+ { html! {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+ } }\n+ }\n+}\n+\n+// 3. Build the list with an iterator and `collect::<Html>()`.\n+html! {\n+ if condition {\n+ { (0..9).map(|_| html!({my_foo})).collect::<Html>() }\n }\n }\n ```\n \n-The same applies to imperative `while`, `loop`, and bare-block `{...}`\n-statements. `match` and `if` are not subject to this collision because their\n-html-control-flow forms naturally accept the same body shapes as their\n-imperative use.\n+The same rule applies inside `match` arms, `while` bodies, and the body\n+of an outer `for`.\n \n :::\n \n@@ -155,7 +216,8 @@ imperative use.\n <TabItem value=\"`while` loops\" label=\"`while` loops\">\n `while` and `while let` loops work the same way as `for`, producing a list of nodes from their\n body. All the statement forms accepted by `for` bodies (let bindings, expression statements,\n-items, macros) are also accepted here, along with `if` blocks and `break`/`continue`.\n+items, macros, and imperative `for`/`while`/`loop` blocks) are also accepted here, along with\n+`if` blocks and `break`/`continue`.\n \n ```rust\n use yew::prelude::*;\ndiff --git a/website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx b/website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx\nindex 0d5c3e726ad..90af1f56580 100644\n--- a/website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx\n+++ b/website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx\n@@ -156,3 +156,42 @@ html! {\n 単一要素のアームはブレースを省略できます。複数の子要素や `let` バインディングを持つアームにはブレースが必要です。\n \n `match` は OR パターン（`A | B`）、分割代入、`if` ガードを含む、すべての標準的な Rust パターンをサポートします。網羅性は Rust コンパイラによってチェックされます。\n+\n+## `if` / `match` の本体内部のループ\n+\n+`if` / `else if` / `else` / `match` のアーム本体内部の `for`、`while`、`loop` は、`html!` のトップレベル位置と同じ規則に従いますが、一つだけ例外があります：ループ本体が完全に Rust として解析可能な場合（内部のどこにも html 要素がない場合）、マクロはそのループを html の制御フローではなく Rust の文として扱います。\n+\n+もっとも遭遇しやすいのは、ループ本体に裸の `{expr}` ブロックしか書かれていないケースです：\n+\n+```rust , ignore\n+// コンパイル可能。for はトップレベルにあり、html-`for` として解析されます。\n+html! {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+}\n+\n+// コンパイル不可。for は `if` の内部にあり、Rust の文として解析されます。\n+// その後 rustc が、ループ本体の戻り型が `()` ではないと報告します。\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+ }\n+}\n+```\n+\n+子要素を html 要素で囲めば html-`for` の挙動が保たれます：\n+\n+```rust , ignore\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ <span>{my_foo}</span>\n+ }\n+ }\n+}\n+```\n+\n+回避策の全体像は[リスト](./lists.mdx)を参照してください。\ndiff --git a/website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx b/website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\nindex fae271b25c4..09843bec909 100644\n--- a/website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\n+++ b/website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\n@@ -97,6 +97,63 @@ let mut rendered = Vec::new();\n - 末尾に `;` を付けてプリアンブルの式文にします：`<Type>::method(...);`。戻り値は破棄されます。\n - `{...}` で囲んで戻り値をノードとして使います：`{ <Type>::method(...) }`。\n \n+:::\n+\n+:::caution `if` / `match` / `while` / 外側の `for` の内部で本体が裸の `{expr}` だけの `for`\n+\n+`for` ループの本体に裸の `{expr}` ブロックしか書かれていない場合、`html!` の**トップレベル**にあれば反復ごとに 1 ノードずつ描画されます。ところが同じコードを `if` / `match` のアーム / `while` / 外側の `for` の本体に入れ子で置くと、`mismatched types: expected (), found T` というエラーで拒否されます。トップレベルと入れ子の位置とでは解析方針が異なり、入れ子の位置ではループをまず Rust の文として解析しようとします。本体が完全に Rust として解析可能であれば（裸の `{expr}` ブロックはまさにそうです）、html の制御フローとして扱われなくなります。\n+\n+```rust , ignore\n+// コンパイル可能：for はトップレベルにあります。\n+html! {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+}\n+\n+// コンパイル不可：for は `if` の内部に入れ子になっています。\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+ }\n+}\n+```\n+\n+`my_foo` を条件付きで 9 回描画したい場合は、次のいずれかを選んでください：\n+\n+```rust , ignore\n+// 1. 子要素を html 要素で囲む（推奨）。\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ <span>{my_foo}</span>\n+ }\n+ }\n+}\n+\n+// 2. for をネストした `html!` のトップレベルへ移す。\n+html! {\n+ if condition {\n+ { html! {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+ } }\n+ }\n+}\n+\n+// 3. イテレータと `collect::<Html>()` でリストを組み立てる。\n+html! {\n+ if condition {\n+ { (0..9).map(|_| html!({my_foo})).collect::<Html>() }\n+ }\n+}\n+```\n+\n+同じ規則は `match` のアーム本体、`while` の本体、外側の `for` の本体にも当てはまります。\n+\n :::\n \n </TabItem>\ndiff --git a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx\nindex 1dd65ef3665..f1b58782fb6 100644\n--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx\n+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx\n@@ -156,3 +156,42 @@ html! {\n 单元素 arm 可以省略大括号。含多个子节点或 `let` 绑定的 arm 需要大括号。\n \n `match` 支持所有标准 Rust 模式，包括 OR 模式（`A | B`）、解构和 `if` 守卫。穷尽性由 Rust 编译器检查。\n+\n+## `if` / `match` 体内部的循环\n+\n+`if` / `else if` / `else` / `match` 分支体内部的 `for`、`while`、`loop` 与 `html!` 顶层位置的规则相同，但有一个例外：如果循环体可以被 Rust 完整解析（内部任何位置都没有 html 元素），宏会把这个循环视为 Rust 语句而不是 html 控制流。\n+\n+最常见的触发情形是循环体里只有一个裸 `{expr}` 块：\n+\n+```rust , ignore\n+// 可以编译。for 在最外层，被解析为 html-`for`。\n+html! {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+}\n+\n+// 无法编译。for 在 `if` 内部，被解析为 Rust 语句；\n+// 之后 rustc 会报告循环体返回的类型不是 `()`。\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+ }\n+}\n+```\n+\n+把子节点用 html 元素包起来即可保留 html-`for` 行为：\n+\n+```rust , ignore\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ <span>{my_foo}</span>\n+ }\n+ }\n+}\n+```\n+\n+完整的解决方案集合请参见[列表](./lists.mdx)。\ndiff --git a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\nindex 35a17177329..8b6e5837a5e 100644\n--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\n+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\n@@ -97,6 +97,63 @@ let mut rendered = Vec::new();\n - 在末尾加上 `;`，使其成为前置的表达式语句：`<Type>::method(...);`。返回值会被丢弃。\n - 用 `{...}` 包起来，将返回值作为节点使用：`{ <Type>::method(...) }`。\n \n+:::\n+\n+:::caution 在 `if` / `match` / `while` / 外层 `for` 内部使用 `{expr}` 作为 `for` 循环体\n+\n+如果 `for` 循环体只包含一个裸 `{expr}` 块，在 `html!` 的**最外层**位置可以正常工作，每次迭代渲染一个节点；但同样的代码嵌套在 `if` / `match` 分支 / `while` / 另一个 `for` 体内时会被拒绝，并报告 `mismatched types: expected (), found T`。这两个位置使用的解析策略不同：嵌套位置会先尝试把循环解析为 Rust 语句。如果循环体能完全被 Rust 解析（裸 `{expr}` 块就是这种情况），它就不再被视为 html 控制流。\n+\n+```rust , ignore\n+// 可以编译：for 位于最外层。\n+html! {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+}\n+\n+// 无法编译：for 嵌套在 `if` 内部。\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+ }\n+}\n+```\n+\n+要在条件成立时把 `my_foo` 渲染 9 次，请选择以下任一方式：\n+\n+```rust , ignore\n+// 1. 用 html 元素包裹子节点（推荐）。\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ <span>{my_foo}</span>\n+ }\n+ }\n+}\n+\n+// 2. 把 for 放进嵌套的 `html!` 顶层。\n+html! {\n+ if condition {\n+ { html! {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+ } }\n+ }\n+}\n+\n+// 3. 用迭代器配合 `collect::<Html>()` 构建列表。\n+html! {\n+ if condition {\n+ { (0..9).map(|_| html!({my_foo})).collect::<Html>() }\n+ }\n+}\n+```\n+\n+同样的规则也适用于 `match` 分支、`while` 循环体以及外层 `for` 的循环体。\n+\n :::\n \n </TabItem>\ndiff --git a/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx b/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx\nindex b758ffd7b09..8f52272bd63 100644\n--- a/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx\n+++ b/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx\n@@ -156,3 +156,42 @@ html! {\n 單元素 arm 可以省略大括號。含多個子節點或 `let` 綁定的 arm 需要大括號。\n \n `match` 支援所有標準 Rust 模式，包括 OR 模式（`A | B`）、解構和 `if` 守衛。窮舉性由 Rust 編譯器檢查。\n+\n+## `if` / `match` 主體內部的迴圈\n+\n+`if` / `else if` / `else` / `match` 分支主體內部的 `for`、`while`、`loop` 與 `html!` 最外層位置的規則相同，但有一個例外：如果迴圈主體可以被 Rust 完整剖析（內部任何位置都沒有 html 元素），巨集會把這個迴圈視為 Rust 陳述式而不是 html 控制流。\n+\n+最常見的觸發情形是迴圈主體裡只有一個裸 `{expr}` 區塊：\n+\n+```rust , ignore\n+// 可以編譯。for 在最外層，被解析為 html-`for`。\n+html! {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+}\n+\n+// 無法編譯。for 在 `if` 內部，被解析為 Rust 陳述式；\n+// 之後 rustc 會回報迴圈主體傳回的型別不是 `()`。\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+ }\n+}\n+```\n+\n+把子節點用 html 元素包起來即可保留 html-`for` 行為：\n+\n+```rust , ignore\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ <span>{my_foo}</span>\n+ }\n+ }\n+}\n+```\n+\n+完整的解決方法集合請參見[清單](./lists.mdx)。\ndiff --git a/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx b/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\nindex 8bde1886279..c74cc8cc292 100644\n--- a/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\n+++ b/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\n@@ -97,6 +97,63 @@ let mut rendered = Vec::new();\n - 在結尾加上 `;`，讓它成為前置的運算式陳述式：`<Type>::method(...);`。傳回值會被丟棄。\n - 用 `{...}` 包起來，將傳回值當作節點使用：`{ <Type>::method(...) }`。\n \n+:::\n+\n+:::caution 在 `if` / `match` / `while` / 外層 `for` 內部使用 `{expr}` 作為 `for` 迴圈主體\n+\n+如果 `for` 迴圈主體只包含一個裸 `{expr}` 區塊，在 `html!` 的**最外層**位置可以正常運作，每次迭代會渲染一個節點；但同樣的程式碼嵌套在 `if` / `match` 分支 / `while` / 另一個 `for` 主體內時會被拒絕，並回報 `mismatched types: expected (), found T`。這兩個位置使用不同的剖析策略：嵌套位置會先嘗試將迴圈解析為 Rust 陳述式。如果迴圈主體能完全被 Rust 剖析（裸 `{expr}` 區塊就是這種情況），它就不再被視為 html 控制流。\n+\n+```rust , ignore\n+// 可以編譯：for 位於最外層。\n+html! {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+}\n+\n+// 無法編譯：for 嵌套在 `if` 內部。\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+ }\n+}\n+```\n+\n+要在條件成立時把 `my_foo` 渲染 9 次，請選擇以下任一方式：\n+\n+```rust , ignore\n+// 1. 用 html 元素包裹子節點（建議做法）。\n+html! {\n+ if condition {\n+ for _ in 0..9 {\n+ <span>{my_foo}</span>\n+ }\n+ }\n+}\n+\n+// 2. 把 for 放進巢狀 `html!` 的最外層。\n+html! {\n+ if condition {\n+ { html! {\n+ for _ in 0..9 {\n+ {my_foo}\n+ }\n+ } }\n+ }\n+}\n+\n+// 3. 使用迭代器搭配 `collect::<Html>()` 建構清單。\n+html! {\n+ if condition {\n+ { (0..9).map(|_| html!({my_foo})).collect::<Html>() }\n+ }\n+}\n+```\n+\n+同樣的規則也適用於 `match` 分支、`while` 迴圈主體以及外層 `for` 的迴圈主體。\n+\n :::\n \n </TabItem>\n"},"changed_files":{"kind":"list like","value":["packages/yew-macro/src/html_tree/mod.rs","packages/yew-macro/tests/html_macro/for-pass.rs","packages/yew-macro/tests/html_macro/imperative-preamble-fail.rs","packages/yew-macro/tests/html_macro/imperative-preamble-fail.stderr","packages/yew-macro/tests/html_macro/imperative-preamble-pass.rs","packages/yew/tests/html_for.rs","website/docs/concepts/html/conditional-rendering.mdx","website/docs/concepts/html/lists.mdx","website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx","website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx","website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx","website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx","website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx","website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx"],"string":"[\n \"packages/yew-macro/src/html_tree/mod.rs\",\n \"packages/yew-macro/tests/html_macro/for-pass.rs\",\n \"packages/yew-macro/tests/html_macro/imperative-preamble-fail.rs\",\n \"packages/yew-macro/tests/html_macro/imperative-preamble-fail.stderr\",\n \"packages/yew-macro/tests/html_macro/imperative-preamble-pass.rs\",\n \"packages/yew/tests/html_for.rs\",\n \"website/docs/concepts/html/conditional-rendering.mdx\",\n \"website/docs/concepts/html/lists.mdx\",\n \"website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx\",\n \"website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\",\n \"website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx\",\n \"website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\",\n \"website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/conditional-rendering.mdx\",\n \"website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[],"string":"[]","isConversational":false},"test_patch":{"kind":"string","value":"diff --git a/packages/yew-macro/tests/html_macro/for-pass.rs b/packages/yew-macro/tests/html_macro/for-pass.rs\nindex 4747a2cd8f0..6519fc8b0fb 100644\n--- a/packages/yew-macro/tests/html_macro/for-pass.rs\n+++ b/packages/yew-macro/tests/html_macro/for-pass.rs\n@@ -390,4 +390,110 @@ fn main() {\n 0\n }\n let _ = return_value_from_unbraced_arm();\n+\n+ // Imperative block-like preambles (`for`, `while`, `loop`, `{...}`) with a\n+ // trailing `;` parse as `Stmt::Expr(_, Some(_))` and are accepted as\n+ // preamble. The bare form (no `;`) is auto-detected by the preamble\n+ // parser; these test that the explicit `;` form keeps working too.\n+ {\n+ let mut sink: ::std::vec::Vec<::std::primitive::i32> = ::std::vec::Vec::new();\n+ _ = ::yew::html!{\n+ for x in 0..3_i32 {\n+ let mut acc: ::std::primitive::i32 = 0;\n+ for i in 0..x {\n+ acc += i;\n+ };\n+ sink.push(acc);\n+ <span>{acc}</span>\n+ }\n+ };\n+ _ = sink;\n+ }\n+ {\n+ let mut sink: ::std::vec::Vec<::std::primitive::i32> = ::std::vec::Vec::new();\n+ _ = ::yew::html!{\n+ for _x in 0..3_i32 {\n+ let mut counter: ::std::primitive::i32 = 0;\n+ while counter < 3 {\n+ counter += 1;\n+ };\n+ sink.push(counter);\n+ <span>{counter}</span>\n+ }\n+ };\n+ _ = sink;\n+ }\n+ {\n+ let mut sink: ::std::vec::Vec<::std::primitive::i32> = ::std::vec::Vec::new();\n+ _ = ::yew::html!{\n+ for _x in 0..2_i32 {\n+ let mut n: ::std::primitive::i32 = 0;\n+ loop {\n+ n += 1;\n+ if n > 2 { break; }\n+ };\n+ sink.push(n);\n+ <span>{n}</span>\n+ }\n+ };\n+ _ = sink;\n+ }\n+ {\n+ let mut sink: ::std::vec::Vec<::std::primitive::i32> = ::std::vec::Vec::new();\n+ _ = ::yew::html!{\n+ for x in 0..3_i32 {\n+ {\n+ sink.push(x * 10);\n+ };\n+ <span>{x}</span>\n+ }\n+ };\n+ _ = sink;\n+ }\n+\n+ // Same pattern in a braced match arm preamble.\n+ _ = ::yew::html!{\n+ match 1_i32 {\n+ 0 => <span>{\"zero\"}</span>,\n+ _ => {\n+ let mut acc: ::std::primitive::i32 = 0;\n+ for i in 0..3_i32 {\n+ acc += i;\n+ };\n+ <span>{acc}</span>\n+ }\n+ }\n+ };\n+\n+ // Same pattern in a `while` body preamble.\n+ {\n+ let mut counter: ::std::primitive::i32 = 0;\n+ _ = ::yew::html!{\n+ while counter < 2 {\n+ let mut acc: ::std::primitive::i32 = 0;\n+ for i in 0..counter {\n+ acc += i;\n+ };\n+ counter += 1;\n+ <span>{acc}</span>\n+ }\n+ };\n+ _ = counter;\n+ }\n+\n+ // The `let _ = ...;` form also works, for users who prefer it.\n+ {\n+ let mut sink: ::std::vec::Vec<::std::primitive::i32> = ::std::vec::Vec::new();\n+ _ = ::yew::html!{\n+ for x in 0..3_i32 {\n+ let mut acc: ::std::primitive::i32 = 0;\n+ let _ = for i in 0..x {\n+ acc += i;\n+ };\n+ sink.push(acc);\n+ <span>{acc}</span>\n+ }\n+ };\n+ _ = sink;\n+ }\n }\ndiff --git a/packages/yew-macro/tests/html_macro/imperative-preamble-fail.rs b/packages/yew-macro/tests/html_macro/imperative-preamble-fail.rs\ndeleted file mode 100644\nindex b7c63ab6646..00000000000\n--- a/packages/yew-macro/tests/html_macro/imperative-preamble-fail.rs\n+++ /dev/null\n@@ -1,70 +0,0 @@\n-// Tests for the diagnostic emitted when a block-like Rust expression\n-// (`for`, `while`, `loop`, `{...}`) appears in preamble position. These\n-// expressions auto-terminate as statements per Rust grammar, so a trailing\n-// `;` is not folded into the `Stmt`. The preamble parser rejects them\n-// (matching `Stmt::Expr(_, None)`) and they would otherwise fall through\n-// to the html-control-flow parser, where the body's `()` value fails to\n-// convert to `VNode`. The diagnostic surfaces the pitfall at the right\n-// span and points at the `let _ = ...;` workaround.\n-\n-fn main() {\n- // Imperative `for` in a `for` body preamble.\n- _ = ::yew::html! {\n- for x in 0..3_u32 {\n- let mut acc: u32 = 0;\n- for i in 0..x {\n- acc += i;\n- }\n- <span>{acc}</span>\n- }\n- };\n-\n- // Imperative `while` in a `for` body preamble.\n- _ = ::yew::html! {\n- for _x in 0..3_u32 {\n- let mut counter: u32 = 0;\n- while counter < 5 {\n- counter += 1;\n- }\n- <span>{counter}</span>\n- }\n- };\n-\n- // Imperative `loop` in a `for` body preamble.\n- _ = ::yew::html! {\n- for _x in 0..3_u32 {\n- let mut n: u32 = 0;\n- loop {\n- n += 1;\n- if n > 3 { break; }\n- }\n- <span>{n}</span>\n- }\n- };\n-\n- // Imperative `for` in a `while` body preamble.\n- _ = ::yew::html! {\n- while false {\n- let mut acc: u32 = 0;\n- for i in 0..3_u32 {\n- acc += i;\n- }\n- <span>{acc}</span>\n- }\n- };\n-\n- // Imperative `for` in a braced `match` arm preamble.\n- _ = ::yew::html! {\n- match 0_u32 {\n- 0 => {\n- let mut acc: u32 = 0;\n- for i in 0..3_u32 {\n- acc += i;\n- }\n- <span>{acc}</span>\n- }\n- _ => <span>{\"other\"}</span>,\n- }\n- };\n-\n-}\ndiff --git a/packages/yew-macro/tests/html_macro/imperative-preamble-fail.stderr b/packages/yew-macro/tests/html_macro/imperative-preamble-fail.stderr\ndeleted file mode 100644\nindex 3b6b2077350..00000000000\n--- a/packages/yew-macro/tests/html_macro/imperative-preamble-fail.stderr\n+++ /dev/null\n@@ -1,55 +0,0 @@\n-error: this `for` block is fully Rust-parseable, so it is parsed as html-for here, but its body cannot produce any html nodes\n-\n- = help: to run a Rust `for` here for side effects only, bind it with `let _ = ...;` so the parser sees a Rust statement: `let _ = for ... { ... };`\n-\n- --> tests/html_macro/imperative-preamble-fail.rs:15:13\n- |\n-15 | / for i in 0..x {\n-16 | | acc += i;\n-17 | | }\n- | |_____________^\n-\n-error: this `while` block is fully Rust-parseable, so it is parsed as html-while here, but its body cannot produce any html nodes\n-\n- = help: to run a Rust `while` here for side effects only, bind it with `let _ = ...;` so the parser sees a Rust statement: `let _ = while ... { ... };`\n-\n- --> tests/html_macro/imperative-preamble-fail.rs:26:13\n- |\n-26 | / while counter < 5 {\n-27 | | counter += 1;\n-28 | | }\n- | |_____________^\n-\n-error: this `loop` block is fully Rust-parseable, so it is parsed as html-loop here, but its body cannot produce any html nodes\n-\n- = help: to run a Rust `loop` here for side effects only, bind it with `let _ = ...;` so the parser sees a Rust statement: `let _ = loop ... { ... };`\n-\n- --> tests/html_macro/imperative-preamble-fail.rs:37:13\n- |\n-37 | / loop {\n-38 | | n += 1;\n-39 | | if n > 3 { break; }\n-40 | | }\n- | |_____________^\n-\n-error: this `for` block is fully Rust-parseable, so it is parsed as html-for here, but its body cannot produce any html nodes\n-\n- = help: to run a Rust `for` here for side effects only, bind it with `let _ = ...;` so the parser sees a Rust statement: `let _ = for ... { ... };`\n-\n- --> tests/html_macro/imperative-preamble-fail.rs:49:13\n- |\n-49 | / for i in 0..3_u32 {\n-50 | | acc += i;\n-51 | | }\n- | |_____________^\n-\n-error: this `for` block is fully Rust-parseable, so it is parsed as html-for here, but its body cannot produce any html nodes\n-\n- = help: to run a Rust `for` here for side effects only, bind it with `let _ = ...;` so the parser sees a Rust statement: `let _ = for ... { ... };`\n-\n- --> tests/html_macro/imperative-preamble-fail.rs:61:17\n- |\n-61 | / for i in 0..3_u32 {\n-62 | | acc += i;\n-63 | | }\n- | |_________________^\ndiff --git a/packages/yew-macro/tests/html_macro/imperative-preamble-pass.rs b/packages/yew-macro/tests/html_macro/imperative-preamble-pass.rs\nnew file mode 100644\nindex 00000000000..0eecb66a70e\n--- /dev/null\n+++ b/packages/yew-macro/tests/html_macro/imperative-preamble-pass.rs\n@@ -0,0 +1,178 @@\n+// Imperative `for`, `while`, and `loop` blocks in preamble position are\n+// detected as Rust statements when the entire expression is Rust-parseable\n+// (no html elements anywhere inside). The user does not need to add a\n+// trailing `;` or wrap the loop in `let _ = ...;`.\n+\n+fn main() {\n+ // Imperative `for` in a `for` body preamble.\n+ {\n+ let mut tally: ::std::vec::Vec<u32> = ::std::vec::Vec::new();\n+ _ = ::yew::html! {\n+ for x in 0..3_u32 {\n+ let mut acc: u32 = 0;\n+ for i in 0..x {\n+ acc += i;\n+ }\n+ tally.push(acc);\n+ <span>{acc}</span>\n+ }\n+ };\n+ ::std::assert_eq!(tally, ::std::vec![0, 0, 1]);\n+ }\n+\n+ // Imperative `while` in a `for` body preamble.\n+ {\n+ let mut tally: ::std::vec::Vec<u32> = ::std::vec::Vec::new();\n+ _ = ::yew::html! {\n+ for _x in 0..3_u32 {\n+ let mut counter: u32 = 0;\n+ while counter < 5 {\n+ counter += 1;\n+ }\n+ tally.push(counter);\n+ <span>{counter}</span>\n+ }\n+ };\n+ ::std::assert_eq!(tally, ::std::vec![5, 5, 5]);\n+ }\n+\n+ // Imperative `loop` in a `for` body preamble.\n+ {\n+ let mut tally: ::std::vec::Vec<u32> = ::std::vec::Vec::new();\n+ _ = ::yew::html! {\n+ for _x in 0..3_u32 {\n+ let mut n: u32 = 0;\n+ loop {\n+ n += 1;\n+ if n > 3 { break; }\n+ }\n+ tally.push(n);\n+ <span>{n}</span>\n+ }\n+ };\n+ ::std::assert_eq!(tally, ::std::vec![4, 4, 4]);\n+ }\n+\n+ // Imperative `for` in a `while` body preamble.\n+ {\n+ let mut counter: u32 = 0;\n+ let mut tally: ::std::vec::Vec<u32> = ::std::vec::Vec::new();\n+ _ = ::yew::html! {\n+ while counter < 3 {\n+ let mut acc: u32 = 0;\n+ for i in 0..3_u32 {\n+ acc += i;\n+ }\n+ tally.push(acc);\n+ counter += 1;\n+ <span>{acc}</span>\n+ }\n+ };\n+ ::std::assert_eq!(tally, ::std::vec![3, 3, 3]);\n+ }\n+\n+ // Imperative `for` in a braced `match` arm preamble.\n+ {\n+ let mut tally: ::std::vec::Vec<u32> = ::std::vec::Vec::new();\n+ _ = ::yew::html! {\n+ match 0_u32 {\n+ 0 => {\n+ let mut acc: u32 = 0;\n+ for i in 0..3_u32 {\n+ acc += i;\n+ }\n+ tally.push(acc);\n+ <span>{acc}</span>\n+ }\n+ _ => <span>{\"other\"}</span>,\n+ }\n+ };\n+ ::std::assert_eq!(tally, ::std::vec![3]);\n+ }\n+\n+ // Labeled imperative `for` (fully Rust-parseable).\n+ {\n+ let mut tally: ::std::vec::Vec<u32> = ::std::vec::Vec::new();\n+ _ = ::yew::html! {\n+ for x in 0..3_u32 {\n+ let mut acc: u32 = 0;\n+ 'inner: for i in 0..10_u32 {\n+ if i > x { break 'inner; }\n+ acc += i;\n+ }\n+ tally.push(acc);\n+ <span>{acc}</span>\n+ }\n+ };\n+ ::std::assert_eq!(tally, ::std::vec![0, 1, 3]);\n+ }\n+\n+ // Imperative `for` followed by another preamble statement, then html.\n+ {\n+ let mut tally: ::std::vec::Vec<u32> = ::std::vec::Vec::new();\n+ _ = ::yew::html! {\n+ for x in 0..3_u32 {\n+ let mut acc: u32 = 0;\n+ for i in 0..x {\n+ acc += i;\n+ }\n+ let label = acc * 10;\n+ tally.push(label);\n+ <span>{label}</span>\n+ }\n+ };\n+ ::std::assert_eq!(tally, ::std::vec![0, 0, 10]);\n+ }\n+\n+ // Several imperative loops back to back in the same preamble.\n+ {\n+ let mut tally: ::std::vec::Vec<u32> = ::std::vec::Vec::new();\n+ _ = ::yew::html! {\n+ for x in 0..2_u32 {\n+ let mut acc: u32 = 0;\n+ for i in 0..x {\n+ acc += i;\n+ }\n+ let mut bonus: u32 = 0;\n+ while bonus < 2 {\n+ bonus += 1;\n+ }\n+ tally.push(acc + bonus);\n+ <span>{acc + bonus}</span>\n+ }\n+ };\n+ ::std::assert_eq!(tally, ::std::vec![2, 2]);\n+ }\n+\n+ // The trailing-`;` form still works (regression).\n+ {\n+ let mut tally: ::std::vec::Vec<u32> = ::std::vec::Vec::new();\n+ _ = ::yew::html! {\n+ for x in 0..3_u32 {\n+ let mut acc: u32 = 0;\n+ for i in 0..x {\n+ acc += i;\n+ };\n+ tally.push(acc);\n+ <span>{acc}</span>\n+ }\n+ };\n+ ::std::assert_eq!(tally, ::std::vec![0, 0, 1]);\n+ }\n+\n+ // The `let _ = ...;` form still works (regression).\n+ {\n+ let mut tally: ::std::vec::Vec<u32> = ::std::vec::Vec::new();\n+ _ = ::yew::html! {\n+ for x in 0..3_u32 {\n+ let mut acc: u32 = 0;\n+ let _ = for i in 0..x {\n+ acc += i;\n+ };\n+ tally.push(acc);\n+ <span>{acc}</span>\n+ }\n+ };\n+ ::std::assert_eq!(tally, ::std::vec![0, 0, 1]);\n+ }\n+}\ndiff --git a/packages/yew/tests/html_for.rs b/packages/yew/tests/html_for.rs\nindex 6b6309437c0..66cea198e1b 100644\n--- a/packages/yew/tests/html_for.rs\n+++ b/packages/yew/tests/html_for.rs\n@@ -343,3 +343,79 @@ async fn for_break_workaround_with_braced_arm() {\n \"<span>0</span><span>1</span><span>2</span>\"\n );\n }\n+\n+#[wasm_bindgen_test]\n+async fn for_imperative_inner_for_runs_as_preamble() {\n+ // A bare imperative `for` (no trailing `;`) inside an html-`for` body\n+ // is auto-detected as a preamble Rust statement, not html-control-flow.\n+ // Each outer iteration runs the inner side-effect loop and then emits\n+ // a single `<span>` with the accumulated value.\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"result\">\n+ for x in 0..3_u32 {\n+ let mut acc: u32 = 0;\n+ for i in 0..=x {\n+ acc += i;\n+ }\n+ <span>{acc}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>0</span><span>1</span><span>3</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_imperative_inner_while_runs_as_preamble() {\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"result\">\n+ for _x in 0..2_u32 {\n+ let mut counter: u32 = 0;\n+ while counter < 3 {\n+ counter += 1;\n+ }\n+ <span>{counter}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>3</span><span>3</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_imperative_inner_loop_runs_as_preamble() {\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"result\">\n+ for x in 1..=3_u32 {\n+ let mut n: u32 = 0;\n+ loop {\n+ n += 1;\n+ if n >= x {\n+ break;\n+ }\n+ }\n+ <span>{n}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>1</span><span>2</span><span>3</span>\"\n+ );\n+}\n"},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86297,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4124,"string":"4,124"},"task_type":{"kind":"string","value":"issue_to_patch"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: while, break/continue/return, and preamble statements in html!"},"pr_body":{"kind":"string","value":"#### Description\r\n\r\na spiritual followup of #4118\r\n\r\n#### Checklist\r\n\r\n- [x] I have reviewed my own code\r\n- [x] I have added tests\r\n\r\n"},"base_sha":{"kind":"string","value":"28219ae16e748a0511d79855b701d365bf122ad3"},"head_sha":{"kind":"string","value":"b9fe62a55487fae23ac5aa8047bd8c6892c33107"},"gold_diff":{"kind":"string","value":"diff --git a/packages/yew-macro/src/html_tree/html_for.rs b/packages/yew-macro/src/html_tree/html_for.rs\nindex 006b1204f8e..7979e133795 100644\n--- a/packages/yew-macro/src/html_tree/html_for.rs\n+++ b/packages/yew-macro/src/html_tree/html_for.rs\n@@ -1,28 +1,18 @@\n-use proc_macro2::{Ident, TokenStream};\n+use proc_macro2::TokenStream;\n use quote::{ToTokens, quote};\n use syn::buffer::Cursor;\n use syn::parse::{Parse, ParseStream};\n-use syn::spanned::Spanned;\n use syn::token::{For, In};\n-use syn::{Expr, Local, Pat, Stmt, Token, braced};\n+use syn::{Expr, Pat, Stmt, braced};\n \n-use super::{HtmlChildrenTree, ToNodeIterator};\n+use super::HtmlChildrenTree;\n+use super::html_loop::{emit_loop, parse_loop_body};\n use crate::PeekValue;\n-use crate::html_tree::HtmlTree;\n-\n-/// Determines if an expression is guaranteed to always return the same value anywhere.\n-fn is_contextless_pure(expr: &Expr) -> bool {\n- match expr {\n- Expr::Lit(_) => true,\n- Expr::Path(path) => path.path.get_ident().is_none(),\n- _ => false,\n- }\n-}\n \n pub struct HtmlFor {\n pat: Pat,\n iter: Expr,\n- let_stmts: Vec<Local>,\n+ stmts: Vec<Stmt>,\n body: HtmlChildrenTree,\n deprecations: TokenStream,\n }\n@@ -44,39 +34,12 @@ impl Parse for HtmlFor {\n let body_stream;\n braced!(body_stream in input);\n \n- let mut let_stmts = Vec::new();\n- while body_stream.peek(Token![let]) {\n- let stmt: Stmt = body_stream.parse()?;\n- match stmt {\n- Stmt::Local(local) => let_stmts.push(local),\n- _ => unreachable!(\"peeked Token![let] but parsed non-local statement\"),\n- }\n- }\n-\n- let body = HtmlChildrenTree::parse_delimited_with_nodes(&body_stream)?;\n- let deprecations = super::check_unnecessary_fragment(&body);\n- // TODO: more concise code by using if-let guards (MSRV 1.95)\n- for child in body.0.iter() {\n- let HtmlTree::Element(element) = child else {\n- continue;\n- };\n-\n- let Some(key) = &element.props.special.key else {\n- continue;\n- };\n+ let (stmts, body, deprecations) = parse_loop_body(&body_stream, \"for\")?;\n \n- if is_contextless_pure(&key.value) {\n- return Err(syn::Error::new(\n- key.value.span(),\n- \"duplicate key for a node in a `for`-loop\\nthis will create elements with \\\n- duplicate keys if the loop iterates more than once\",\n- ));\n- }\n- }\n Ok(Self {\n pat,\n iter,\n- let_stmts,\n+ stmts,\n body,\n deprecations,\n })\n@@ -88,57 +51,11 @@ impl ToTokens for HtmlFor {\n let Self {\n pat,\n iter,\n- let_stmts,\n+ stmts,\n body,\n deprecations,\n } = self;\n- let acc = Ident::new(\"__yew_v\", iter.span());\n-\n- let alloc_opt = body\n- .size_hint()\n- .filter(|&size| size > 1) // explicitly reserving space for 1 more element is redundant\n- .map(|size| quote!( #acc.reserve(#size) ));\n-\n- let vlist_gen = match body.fully_keyed() {\n- Some(true) => quote! {\n- ::yew::virtual_dom::VList::__macro_new(\n- #acc,\n- ::std::option::Option::None,\n- ::yew::virtual_dom::FullyKeyedState::KnownFullyKeyed\n- )\n- },\n- Some(false) => quote! {\n- ::yew::virtual_dom::VList::__macro_new(\n- #acc,\n- ::std::option::Option::None,\n- ::yew::virtual_dom::FullyKeyedState::KnownMissingKeys\n- )\n- },\n- None => quote! {\n- ::yew::virtual_dom::VList::with_children(#acc, ::std::option::Option::None)\n- },\n- };\n-\n- let body = body\n- .0\n- .iter()\n- .map(|child| match child.to_node_iterator_stream() {\n- Some(child) => {\n- quote!( #acc.extend(#child) )\n- }\n- _ => {\n- quote!( #acc.push(::std::convert::Into::into(#child)) )\n- }\n- });\n-\n- tokens.extend(quote!({\n- #deprecations\n- let mut #acc = ::std::vec::Vec::<::yew::virtual_dom::VNode>::new();\n- ::std::iter::Iterator::for_each(\n- ::std::iter::IntoIterator::into_iter(#iter),\n- |#pat| { #(#let_stmts)* #alloc_opt; #(#body);* }\n- );\n- #vlist_gen\n- }))\n+ let header = quote!(for #pat in #iter);\n+ tokens.extend(emit_loop(header, stmts, body, deprecations));\n }\n }\ndiff --git a/packages/yew-macro/src/html_tree/html_loop.rs b/packages/yew-macro/src/html_tree/html_loop.rs\nnew file mode 100644\nindex 00000000000..b4a925e1904\n--- /dev/null\n+++ b/packages/yew-macro/src/html_tree/html_loop.rs\n@@ -0,0 +1,131 @@\n+use proc_macro2::{Ident, Span, TokenStream};\n+use quote::quote;\n+use syn::parse::ParseStream;\n+use syn::spanned::Spanned;\n+use syn::{Expr, Stmt};\n+\n+use super::{\n+ HtmlChildrenTree, HtmlTree, ToNodeIterator, parse_preamble_stmts, stmts_have_divergent,\n+};\n+\n+/// Determines if an expression is guaranteed to always return the same value anywhere.\n+pub(super) fn is_contextless_pure(expr: &Expr) -> bool {\n+ match expr {\n+ Expr::Lit(_) => true,\n+ Expr::Path(path) => path.path.get_ident().is_none(),\n+ _ => false,\n+ }\n+}\n+\n+/// Parse leading Rust statements from a loop body, then the remaining children.\n+/// Also runs duplicate-key detection keyed to `loop_kind` (e.g. \"for\", \"while\").\n+pub(super) fn parse_loop_body(\n+ body_stream: ParseStream,\n+ loop_kind: &str,\n+) -> syn::Result<(Vec<Stmt>, HtmlChildrenTree, TokenStream)> {\n+ let stmts = parse_preamble_stmts(body_stream)?;\n+\n+ let body = HtmlChildrenTree::parse_delimited_with_nodes(body_stream)?;\n+ let deprecations = super::check_unnecessary_fragment(&body);\n+ // TODO: more concise code by using if-let guards (MSRV 1.95)\n+ for child in body.0.iter() {\n+ let HtmlTree::Element(element) = child else {\n+ continue;\n+ };\n+\n+ let Some(key) = &element.props.special.key else {\n+ continue;\n+ };\n+\n+ if is_contextless_pure(&key.value) {\n+ return Err(syn::Error::new(\n+ key.value.span(),\n+ format!(\n+ \"duplicate key for a node in a `{loop_kind}`-loop\\nthis will create elements \\\n+ with duplicate keys if the loop iterates more than once\"\n+ ),\n+ ));\n+ }\n+ }\n+\n+ Ok((stmts, body, deprecations))\n+}\n+\n+/// Emit a loop that accumulates its body children into a `VList`.\n+///\n+/// `loop_header` is the native Rust loop syntax without its body, e.g.\n+/// `for #pat in #iter` or `while #cond`.\n+pub(super) fn emit_loop(\n+ loop_header: TokenStream,\n+ stmts: &[Stmt],\n+ body: &HtmlChildrenTree,\n+ deprecations: &TokenStream,\n+) -> TokenStream {\n+ let acc = Ident::new(\"__yew_v\", Span::mixed_site());\n+\n+ let alloc_opt = body\n+ .size_hint()\n+ .filter(|&size| size > 1) // explicitly reserving space for 1 more element is redundant\n+ .map(|size| quote!( #acc.reserve(#size) ));\n+\n+ let vlist_gen = match body.fully_keyed() {\n+ Some(true) => quote! {\n+ ::yew::virtual_dom::VList::__macro_new(\n+ #acc,\n+ ::std::option::Option::None,\n+ ::yew::virtual_dom::FullyKeyedState::KnownFullyKeyed\n+ )\n+ },\n+ Some(false) => quote! {\n+ ::yew::virtual_dom::VList::__macro_new(\n+ #acc,\n+ ::std::option::Option::None,\n+ ::yew::virtual_dom::FullyKeyedState::KnownMissingKeys\n+ )\n+ },\n+ None => quote! {\n+ ::yew::virtual_dom::VList::with_children(#acc, ::std::option::Option::None)\n+ },\n+ };\n+\n+ let body_streams = body.0.iter().map(|child| match child {\n+ HtmlTree::Break(_) | HtmlTree::Continue(_) | HtmlTree::Return(_) => quote!( #child ),\n+ _ => match child.to_node_iterator_stream() {\n+ Some(stream) => quote!( #acc.extend(#stream) ),\n+ _ => quote!( #acc.push(::std::convert::Into::into(#child)) ),\n+ },\n+ });\n+\n+ let has_top_level_divergent = body.0.iter().any(|c| {\n+ matches!(\n+ c,\n+ HtmlTree::Break(_) | HtmlTree::Continue(_) | HtmlTree::Return(_)\n+ )\n+ }) || stmts_have_divergent(stmts);\n+\n+ // Nest in an inner block when divergent, so `#![allow(unreachable_code)]`\n+ // lands in an inner expression block (accepted everywhere) rather than in\n+ // an if-branch or match-arm position where it would be rejected.\n+ if has_top_level_divergent {\n+ quote!({\n+ #deprecations\n+ {\n+ #![allow(unreachable_code)]\n+ let mut #acc = ::std::vec::Vec::<::yew::virtual_dom::VNode>::new();\n+ #loop_header {\n+ #(#stmts)* #alloc_opt; #(#body_streams);*\n+ }\n+ #vlist_gen\n+ }\n+ })\n+ } else {\n+ quote!({\n+ #deprecations\n+ let mut #acc = ::std::vec::Vec::<::yew::virtual_dom::VNode>::new();\n+ #loop_header {\n+ #(#stmts)* #alloc_opt; #(#body_streams);*\n+ }\n+ #vlist_gen\n+ })\n+ }\n+}\ndiff --git a/packages/yew-macro/src/html_tree/html_match.rs b/packages/yew-macro/src/html_tree/html_match.rs\nindex c3bda8083c1..e94c4daf9ea 100644\n--- a/packages/yew-macro/src/html_tree/html_match.rs\n+++ b/packages/yew-macro/src/html_tree/html_match.rs\n@@ -3,11 +3,11 @@ use quote::{ToTokens, quote, quote_spanned};\n use syn::buffer::Cursor;\n use syn::parse::{Parse, ParseStream};\n use syn::spanned::Spanned;\n-use syn::{Expr, Local, Pat, Stmt, Token, braced, token};\n+use syn::{Expr, Pat, Stmt, Token, braced, token};\n \n-use super::HtmlChildrenTree;\n use super::html_block::html_macro_call_span;\n use super::html_node::HtmlNode;\n+use super::{HtmlChildrenTree, parse_preamble_stmts, stmts_have_divergent};\n use crate::PeekValue;\n \n pub struct HtmlMatch {\n@@ -28,7 +28,7 @@ struct HtmlMatchArm {\n enum HtmlMatchArmBody {\n Braced {\n brace: token::Brace,\n- let_stmts: Vec<Local>,\n+ stmts: Vec<Stmt>,\n children: HtmlChildrenTree,\n deprecations: TokenStream,\n },\n@@ -107,19 +107,12 @@ impl Parse for HtmlMatchArm {\n let mut body = if input.cursor().group(Delimiter::Brace).is_some() {\n let content;\n let brace = braced!(content in input);\n- let mut let_stmts = Vec::new();\n- while content.peek(Token![let]) {\n- let stmt: Stmt = content.parse()?;\n- match stmt {\n- Stmt::Local(local) => let_stmts.push(local),\n- _ => unreachable!(\"peeked Token![let] but parsed non-local statement\"),\n- }\n- }\n+ let stmts = parse_preamble_stmts(&content)?;\n let children = HtmlChildrenTree::parse_delimited_with_nodes(&content)?;\n let deprecations = super::check_unnecessary_fragment(&children);\n HtmlMatchArmBody::Braced {\n brace,\n- let_stmts,\n+ stmts,\n children,\n deprecations,\n }\n@@ -144,6 +137,29 @@ impl Parse for HtmlMatchArm {\n \n let comma: Option<Token![,]> = input.parse()?;\n \n+ // An unbraced `break`/`continue`/`return` body followed by more tokens\n+ // past the optional comma is almost always an attempt to give the\n+ // keyword an HTML value, which Rust does not accept as an expression.\n+ // Without this check the next-arm parser runs on the trailing `<...>`\n+ // and fails inside `Pat::parse` with a misleading \"expected `>`\".\n+ if comma.is_none() && !input.is_empty() {\n+ if let HtmlMatchArmBody::Unbraced { tree, .. } = &body {\n+ if matches!(\n+ &**tree,\n+ super::HtmlTree::Break(_)\n+ | super::HtmlTree::Continue(_)\n+ | super::HtmlTree::Return(_)\n+ ) {\n+ return Err(syn::Error::new(\n+ input.span(),\n+ \"`break`, `continue`, and `return` in a match arm cannot be followed by \\\n+ HTML as their value. Wrap the arm body in braces, e.g. `_ => { return \\\n+ ::yew::html!(<span/>) }`.\",\n+ ));\n+ }\n+ }\n+ }\n+\n Ok(HtmlMatchArm {\n pat,\n guard,\n@@ -159,29 +175,50 @@ impl ToTokens for HtmlMatchArmBody {\n match self {\n Self::Braced {\n brace,\n- let_stmts,\n+ stmts,\n children,\n deprecations,\n } => {\n+ // Match-arm body blocks reject inner attributes directly, so we\n+ // nest in an inner expression block that accepts them.\n+ let allow_unreachable =\n+ stmts_have_divergent(stmts).then(|| quote!(#![allow(unreachable_code)]));\n tokens.extend(quote_spanned! {brace.span.span()=>\n {\n #deprecations\n- #(#let_stmts)*\n- ::yew::virtual_dom::VNode::VList(::std::rc::Rc::new(\n- ::yew::virtual_dom::VList::with_children(\n- #children, ::std::option::Option::None\n- )\n- ))\n+ {\n+ #allow_unreachable\n+ #(#stmts)*\n+ ::yew::virtual_dom::VNode::VList(::std::rc::Rc::new(\n+ ::yew::virtual_dom::VList::with_children(\n+ #children, ::std::option::Option::None\n+ )\n+ ))\n+ }\n }\n });\n }\n Self::Unbraced { tree, deprecations } => {\n- tokens.extend(quote_spanned! {tree.span()=>\n- {\n- #deprecations\n- ::std::convert::Into::<::yew::virtual_dom::VNode>::into(#tree)\n- }\n- });\n+ if matches!(\n+ tree.as_ref(),\n+ super::HtmlTree::Break(_)\n+ | super::HtmlTree::Continue(_)\n+ | super::HtmlTree::Return(_)\n+ ) {\n+ tokens.extend(quote_spanned! {tree.span()=>\n+ {\n+ #deprecations\n+ #tree\n+ }\n+ });\n+ } else {\n+ tokens.extend(quote_spanned! {tree.span()=>\n+ {\n+ #deprecations\n+ ::std::convert::Into::<::yew::virtual_dom::VNode>::into(#tree)\n+ }\n+ });\n+ }\n }\n }\n }\ndiff --git a/packages/yew-macro/src/html_tree/html_while.rs b/packages/yew-macro/src/html_tree/html_while.rs\nnew file mode 100644\nindex 00000000000..68f7f50fe72\n--- /dev/null\n+++ b/packages/yew-macro/src/html_tree/html_while.rs\n@@ -0,0 +1,72 @@\n+use proc_macro2::TokenStream;\n+use quote::{ToTokens, quote};\n+use syn::buffer::Cursor;\n+use syn::parse::{Parse, ParseStream};\n+use syn::spanned::Spanned;\n+use syn::token::While;\n+use syn::{Expr, Stmt, braced};\n+\n+use super::HtmlChildrenTree;\n+use super::html_loop::{emit_loop, parse_loop_body};\n+use crate::PeekValue;\n+\n+pub struct HtmlWhile {\n+ cond: Box<Expr>,\n+ stmts: Vec<Stmt>,\n+ body: HtmlChildrenTree,\n+ deprecations: TokenStream,\n+}\n+\n+impl PeekValue<()> for HtmlWhile {\n+ fn peek(cursor: Cursor) -> Option<()> {\n+ let (ident, _) = cursor.ident()?;\n+ (ident == \"while\").then_some(())\n+ }\n+}\n+\n+impl Parse for HtmlWhile {\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\n+ While::parse(input)?;\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\n+ match &*cond {\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"missing condition for `while` expression\",\n+ ));\n+ }\n+ _ => {}\n+ }\n+ if input.is_empty() {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"this `while` expression has a condition, but no block\",\n+ ));\n+ }\n+\n+ let body_stream;\n+ braced!(body_stream in input);\n+\n+ let (stmts, body, deprecations) = parse_loop_body(&body_stream, \"while\")?;\n+\n+ Ok(Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ })\n+ }\n+}\n+\n+impl ToTokens for HtmlWhile {\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\n+ let Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ } = self;\n+ let header = quote!(while #cond);\n+ tokens.extend(emit_loop(header, stmts, body, deprecations));\n+ }\n+}\ndiff --git a/packages/yew-macro/src/html_tree/mod.rs b/packages/yew-macro/src/html_tree/mod.rs\nindex 2000c1e428d..c2f6e626676 100644\n--- a/packages/yew-macro/src/html_tree/mod.rs\n+++ b/packages/yew-macro/src/html_tree/mod.rs\n@@ -2,6 +2,7 @@ use proc_macro2::{Delimiter, Ident, Span, TokenStream};\n use quote::{ToTokens, quote, quote_spanned};\n use syn::buffer::Cursor;\n use syn::ext::IdentExt;\n+use syn::parse::discouraged::Speculative;\n use syn::parse::{Parse, ParseStream};\n use syn::spanned::Spanned;\n use syn::{Token, braced, token};\n@@ -16,8 +17,10 @@ mod html_for;\n mod html_if;\n mod html_iterable;\n mod html_list;\n+mod html_loop;\n mod html_match;\n mod html_node;\n+mod html_while;\n mod lint;\n mod tag;\n \n@@ -34,6 +37,7 @@ use tag::TagTokens;\n use self::html_block::BlockContent;\n use self::html_for::HtmlFor;\n use self::html_match::HtmlMatch;\n+use self::html_while::HtmlWhile;\n \n pub enum HtmlType {\n Block,\n@@ -42,7 +46,11 @@ pub enum HtmlType {\n Element,\n If,\n For,\n+ While,\n Match,\n+ Break,\n+ Continue,\n+ Return,\n Empty,\n }\n \n@@ -53,8 +61,12 @@ pub enum HtmlTree {\n Element(Box<HtmlElement>),\n If(Box<HtmlIf>),\n For(Box<HtmlFor>),\n+ While(Box<HtmlWhile>),\n Match(Box<HtmlMatch>),\n Node(Box<HtmlNode>),\n+ Break(Box<syn::ExprBreak>),\n+ Continue(Box<syn::ExprContinue>),\n+ Return(Box<syn::ExprReturn>),\n Empty,\n }\n \n@@ -70,7 +82,29 @@ impl Parse for HtmlTree {\n HtmlType::List => Self::List(Box::new(input.parse()?)),\n HtmlType::If => Self::If(Box::new(input.parse()?)),\n HtmlType::For => Self::For(Box::new(input.parse()?)),\n+ HtmlType::While => Self::While(Box::new(input.parse()?)),\n HtmlType::Match => Self::Match(Box::new(input.parse()?)),\n+ HtmlType::Break => {\n+ let expr = parse_break(input)?;\n+ while input.peek(Token![;]) {\n+ let _: Token![;] = input.parse()?;\n+ }\n+ Self::Break(Box::new(expr))\n+ }\n+ HtmlType::Continue => {\n+ let expr = parse_continue(input)?;\n+ while input.peek(Token![;]) {\n+ let _: Token![;] = input.parse()?;\n+ }\n+ Self::Continue(Box::new(expr))\n+ }\n+ HtmlType::Return => {\n+ let expr = parse_return(input)?;\n+ while input.peek(Token![;]) {\n+ let _: Token![;] = input.parse()?;\n+ }\n+ Self::Return(Box::new(expr))\n+ }\n })\n }\n }\n@@ -102,8 +136,20 @@ impl HtmlTree {\n Some(HtmlType::If)\n } else if HtmlFor::peek(cursor).is_some() {\n Some(HtmlType::For)\n+ } else if HtmlWhile::peek(cursor).is_some() {\n+ Some(HtmlType::While)\n } else if HtmlMatch::peek(cursor).is_some() {\n Some(HtmlType::Match)\n+ } else if cursor.ident().map(|(i, _)| i == \"break\").unwrap_or(false) {\n+ Some(HtmlType::Break)\n+ } else if cursor\n+ .ident()\n+ .map(|(i, _)| i == \"continue\")\n+ .unwrap_or(false)\n+ {\n+ Some(HtmlType::Continue)\n+ } else if cursor.ident().map(|(i, _)| i == \"return\").unwrap_or(false) {\n+ Some(HtmlType::Return)\n } else if input.peek(Token![<]) {\n let _lt: Token![<] = input.parse().ok()?;\n \n@@ -152,8 +198,12 @@ impl ToTokens for HtmlTree {\n Self::Block(block) => block.to_tokens(tokens),\n Self::If(block) => block.to_tokens(tokens),\n Self::For(block) => block.to_tokens(tokens),\n+ Self::While(block) => block.to_tokens(tokens),\n Self::Match(block) => block.to_tokens(tokens),\n Self::Node(node) => node.to_tokens(tokens),\n+ Self::Break(expr) => expr.to_tokens(tokens),\n+ Self::Continue(expr) => expr.to_tokens(tokens),\n+ Self::Return(expr) => expr.to_tokens(tokens),\n }\n }\n }\n@@ -287,7 +337,14 @@ impl HtmlChildrenTree {\n pub fn to_build_vec_token_stream(&self) -> TokenStream {\n let Self(children) = self;\n \n- if self.only_single_node_children() {\n+ let has_divergent = children.iter().any(|c| {\n+ matches!(\n+ c,\n+ HtmlTree::Break(_) | HtmlTree::Continue(_) | HtmlTree::Return(_)\n+ )\n+ });\n+\n+ if !has_divergent && self.only_single_node_children() {\n // optimize for the common case where all children are single nodes (only using literal\n // html).\n let children_into = children\n@@ -299,24 +356,28 @@ impl HtmlChildrenTree {\n }\n \n let vec_ident = Ident::new(\"__yew_v\", Span::mixed_site());\n- let add_children_streams =\n- children\n- .iter()\n- .map(|child| match child.to_node_iterator_stream() {\n- Some(node_iterator_stream) => {\n- quote! {\n- ::std::iter::Extend::extend(&mut #vec_ident, #node_iterator_stream);\n- }\n+ let add_children_streams = children.iter().map(|child| match child {\n+ HtmlTree::Break(_) | HtmlTree::Continue(_) | HtmlTree::Return(_) => {\n+ quote!( #child; )\n+ }\n+ _ => match child.to_node_iterator_stream() {\n+ Some(node_iterator_stream) => {\n+ quote! {\n+ ::std::iter::Extend::extend(&mut #vec_ident, #node_iterator_stream);\n }\n- _ => {\n- quote_spanned! {child.span()=>\n- #vec_ident.push(::std::convert::Into::into(#child));\n- }\n+ }\n+ _ => {\n+ quote_spanned! {child.span()=>\n+ #vec_ident.push(::std::convert::Into::into(#child));\n }\n- });\n+ }\n+ },\n+ });\n \n+ let allow_unreachable = has_divergent.then(|| quote!( #![allow(unreachable_code)] ));\n quote! {\n {\n+ #allow_unreachable\n let mut #vec_ident = ::std::vec::Vec::new();\n #(#add_children_streams)*\n #vec_ident\n@@ -412,7 +473,17 @@ impl HtmlChildrenTree {\n }\n \n pub fn size_hint(&self) -> Option<usize> {\n- self.only_single_node_children().then_some(self.0.len())\n+ self.only_single_node_children().then(|| {\n+ self.0\n+ .iter()\n+ .filter(|c| {\n+ !matches!(\n+ c,\n+ HtmlTree::Break(_) | HtmlTree::Continue(_) | HtmlTree::Return(_)\n+ )\n+ })\n+ .count()\n+ })\n }\n \n pub fn fully_keyed(&self) -> Option<bool> {\n@@ -447,7 +518,14 @@ impl HtmlChildrenTree {\n HtmlNode::Expression(_) => None,\n };\n }\n- HtmlTree::If(_) | HtmlTree::For(_) | HtmlTree::Match(_) | HtmlTree::Empty => {\n+ HtmlTree::If(_)\n+ | HtmlTree::For(_)\n+ | HtmlTree::While(_)\n+ | HtmlTree::Match(_)\n+ | HtmlTree::Break(_)\n+ | HtmlTree::Continue(_)\n+ | HtmlTree::Return(_)\n+ | HtmlTree::Empty => {\n return Some(false);\n }\n }\n@@ -464,7 +542,7 @@ impl ToTokens for HtmlChildrenTree {\n \n pub struct HtmlRootBraced {\n brace: token::Brace,\n- let_stmts: Vec<syn::Local>,\n+ stmts: Vec<syn::Stmt>,\n children: HtmlChildrenTree,\n deprecations: TokenStream,\n }\n@@ -480,27 +558,172 @@ impl Parse for HtmlRootBraced {\n let content;\n let brace = braced!(content in input);\n \n- let mut let_stmts = Vec::new();\n- while content.peek(Token![let]) {\n- let stmt: syn::Stmt = content.parse()?;\n- match stmt {\n- syn::Stmt::Local(local) => let_stmts.push(local),\n- _ => unreachable!(\"peeked Token![let] but parsed non-local statement\"),\n- }\n- }\n+ let stmts = parse_preamble_stmts(&content)?;\n \n let children = HtmlChildrenTree::parse_delimited_with_nodes(&content)?;\n let deprecations = check_unnecessary_fragment(&children);\n \n Ok(HtmlRootBraced {\n brace,\n- let_stmts,\n+ stmts,\n children,\n deprecations,\n })\n }\n }\n \n+/// Parse leading Rust statements as a preamble: `let` bindings, items, macro\n+/// invocations terminated by `;`, and expression statements terminated by `;`\n+/// (including `break`/`continue`/`return`, with or without labels).\n+///\n+/// Bare expressions (no trailing `;`) are left in the stream for html parsing.\n+/// A forked parse is used to test each candidate statement without committing\n+/// to it, which lets us fall through cleanly whenever the next token run is\n+/// not Rust-parseable (e.g. an `<element/>` or `if cond { <node/> }` that the\n+/// Rust expression grammar rejects).\n+///\n+/// One pitfall: block-like Rust expressions (`for`, `while`, `loop`, `{...}`)\n+/// auto-terminate as statements per Rust grammar, so a trailing `;` is not\n+/// folded into the `Stmt`. Such expressions in preamble position parse as\n+/// `Stmt::Expr(_, None)` and fall through to the html-control-flow parser.\n+/// When the entire expression is Rust-parseable (no html elements anywhere\n+/// inside), the user almost certainly wrote an imperative loop/block, not an\n+/// html-emitting one - we surface a help message pointing at the\n+/// `let _ = ...;` workaround.\n+pub(super) fn parse_preamble_stmts(input: ParseStream) -> syn::Result<Vec<syn::Stmt>> {\n+ let mut stmts = Vec::new();\n+ loop {\n+ let fork = input.fork();\n+ let is_preamble = match fork.parse::<syn::Stmt>() {\n+ Ok(syn::Stmt::Local(_)) => true,\n+ Ok(syn::Stmt::Item(_)) => true,\n+ Ok(syn::Stmt::Expr(_, Some(_))) => true,\n+ Ok(syn::Stmt::Macro(m)) => m.semi_token.is_some(),\n+ Ok(syn::Stmt::Expr(expr, None)) => {\n+ if let Some(kind) = imperative_blocklike_kind(&expr) {\n+ proc_macro_error::emit_error!(\n+ expr,\n+ \"this `{}` block is fully Rust-parseable, so it is parsed as html-{} \\\n+ here, but its body cannot produce any html nodes\",\n+ kind, kind;\n+ help = \"to run a Rust `{}` here for side effects only, bind it with \\\n+ `let _ = ...;` so the parser sees a Rust statement: \\\n+ `let _ = {} ... {{ ... }};`\",\n+ kind, kind\n+ );\n+ }\n+ false\n+ }\n+ _ => false,\n+ };\n+ if !is_preamble {\n+ break;\n+ }\n+ let stmt: syn::Stmt = input.parse()?;\n+ stmts.push(stmt);\n+ }\n+ Ok(stmts)\n+}\n+\n+/// Block-like Rust expressions whose appearance in preamble position\n+/// (`Stmt::Expr(_, None)`, fully Rust-parseable) almost always indicates\n+/// imperative intent rather than html-emission.\n+///\n+/// Excluded:\n+/// - `if` / `match`: their bodies frequently contain plain expressions that produce\n+/// VNode-convertible values, where the html-control-flow form is genuinely intended.\n+/// - bare `{...}` blocks: the canonical html-block-as-child syntax, e.g. `{ render(item) }` and\n+/// `{\"text\"}`, parses as `Stmt::Expr(ExprBlock, None)` and would generate a flood of false\n+/// positives.\n+fn imperative_blocklike_kind(expr: &syn::Expr) -> Option<&'static str> {\n+ match expr {\n+ syn::Expr::ForLoop(_) => Some(\"for\"),\n+ syn::Expr::While(_) => Some(\"while\"),\n+ syn::Expr::Loop(_) => Some(\"loop\"),\n+ _ => None,\n+ }\n+}\n+\n+/// Parse `break [label] [value]` forgivingly: first try syn's full\n+/// `ExprBreak::parse` (via a fork so we don't commit a bad state), and if that\n+/// fails because the value position starts with `<` (html) or another\n+/// non-expression token, fall back to the keyword + optional lifetime label.\n+/// This lets `break` / `break 'outer` / `break val` / `break 'outer val` all\n+/// work without also eating html children.\n+pub(super) fn parse_break(input: syn::parse::ParseStream) -> syn::Result<syn::ExprBreak> {\n+ let fork = input.fork();\n+ if let Ok(expr) = fork.parse::<syn::ExprBreak>() {\n+ input.advance_to(&fork);\n+ return Ok(expr);\n+ }\n+ let break_token: Token![break] = input.parse()?;\n+ let label: Option<syn::Lifetime> = if input.peek(syn::Lifetime) {\n+ Some(input.parse()?)\n+ } else {\n+ None\n+ };\n+ Ok(syn::ExprBreak {\n+ attrs: Vec::new(),\n+ break_token,\n+ label,\n+ expr: None,\n+ })\n+}\n+\n+/// Parse `continue [label]` with the same fork-and-fallback strategy as\n+/// [`parse_break`].\n+pub(super) fn parse_continue(input: syn::parse::ParseStream) -> syn::Result<syn::ExprContinue> {\n+ let fork = input.fork();\n+ if let Ok(expr) = fork.parse::<syn::ExprContinue>() {\n+ input.advance_to(&fork);\n+ return Ok(expr);\n+ }\n+ let continue_token: Token![continue] = input.parse()?;\n+ let label: Option<syn::Lifetime> = if input.peek(syn::Lifetime) {\n+ Some(input.parse()?)\n+ } else {\n+ None\n+ };\n+ Ok(syn::ExprContinue {\n+ attrs: Vec::new(),\n+ continue_token,\n+ label,\n+ })\n+}\n+\n+/// Parse `return [value]` with the same fork-and-fallback strategy as\n+/// [`parse_break`]. The fallback emits a bare `return` (no value), leaving\n+/// anything that follows — notably `<span>` or other html — for the children\n+/// parser.\n+pub(super) fn parse_return(input: syn::parse::ParseStream) -> syn::Result<syn::ExprReturn> {\n+ let fork = input.fork();\n+ if let Ok(expr) = fork.parse::<syn::ExprReturn>() {\n+ input.advance_to(&fork);\n+ return Ok(expr);\n+ }\n+ let return_token: Token![return] = input.parse()?;\n+ Ok(syn::ExprReturn {\n+ attrs: Vec::new(),\n+ return_token,\n+ expr: None,\n+ })\n+}\n+\n+/// Whether any statement is a top-level divergent expression (`break`,\n+/// `continue`, or `return`). Callers that emit code after the statements need\n+/// an `#[allow(unreachable_code)]` when this is true.\n+pub(super) fn stmts_have_divergent(stmts: &[syn::Stmt]) -> bool {\n+ stmts.iter().any(|stmt| {\n+ matches!(\n+ stmt,\n+ syn::Stmt::Expr(\n+ syn::Expr::Break(_) | syn::Expr::Continue(_) | syn::Expr::Return(_),\n+ _,\n+ )\n+ )\n+ })\n+}\n+\n pub(super) fn deprecated_call(span: Span, note: &str) -> TokenStream {\n quote_spanned! {span=>\n {\n@@ -530,18 +753,28 @@ impl ToTokens for HtmlRootBraced {\n fn to_tokens(&self, tokens: &mut TokenStream) {\n let Self {\n brace,\n- let_stmts,\n+ stmts,\n children,\n deprecations,\n } = self;\n \n+ // Inner attributes are rejected on if-branch and match-arm blocks\n+ // directly, so we always nest in an inner expression block. The inner\n+ // attribute goes on that inner block, which Rust accepts everywhere.\n+ let allow_unreachable =\n+ stmts_have_divergent(stmts).then(|| quote!(#![allow(unreachable_code)]));\n tokens.extend(quote_spanned! {brace.span.span()=>\n {\n #deprecations\n- #(#let_stmts)*\n- ::yew::virtual_dom::VNode::VList(::std::rc::Rc::new(\n- ::yew::virtual_dom::VList::with_children(#children, ::std::option::Option::None)\n- ))\n+ {\n+ #allow_unreachable\n+ #(#stmts)*\n+ ::yew::virtual_dom::VNode::VList(::std::rc::Rc::new(\n+ ::yew::virtual_dom::VList::with_children(\n+ #children, ::std::option::Option::None\n+ )\n+ ))\n+ }\n }\n });\n }\ndiff --git a/website/docs/concepts/html/lists.mdx b/website/docs/concepts/html/lists.mdx\nindex abb2ce30da6..7111aa90a9e 100644\n--- a/website/docs/concepts/html/lists.mdx\n+++ b/website/docs/concepts/html/lists.mdx\n@@ -7,13 +7,13 @@ import TabItem from '@theme/TabItem'\n \n ## Iterators\n \n-There are 3 ways to build HTML from iterators:\n+There are 4 ways to build HTML from iterators:\n \n <Tabs>\n <TabItem value=\"`for` loops\" label=\"`for` loops\">\n-The main approach is to use for loops, the same for loops that already exist in Rust, but with 2 key differences:\n-1. Unlike standard for loops which can't return anything, for loops in `html!` are converted to a list of nodes;\n-2. Diverging expressions, i.e. `break`, `continue` are not allowed in the body of for loops in `html!`.\n+The main approach is to use for loops, the same for loops that already exist in Rust, with one\n+key difference: unlike standard for loops which can't return anything, for loops in `html!` are\n+converted to a list of nodes.\n \n ```rust\n use yew::prelude::*;\n@@ -25,7 +25,10 @@ html! {\n };\n ```\n \n-`for` loop bodies also support `let` bindings before the html children:\n+`for` loop bodies accept Rust statements before the html children. Any\n+terminated statement works: `let` bindings, expression statements ending in\n+`;`, item definitions (`fn`, `struct`, `use`, ...), and macro invocations with\n+`;`.\n \n ```rust , ignore\n use yew::prelude::*;\n@@ -37,6 +40,155 @@ html! {\n <div class={class}>{label}</div>\n }\n };\n+```\n+\n+`break` and `continue` work as in ordinary Rust loops and affect the emitted node list.\n+`continue` skips the current iteration without producing a node, `break` stops iteration early:\n+\n+```rust\n+use yew::prelude::*;\n+\n+html! {\n+ for i in 0..10 {\n+ if i % 2 == 0 {\n+ continue\n+ }\n+ if i > 7 {\n+ break\n+ }\n+ <span>{i}</span>\n+ }\n+};\n+```\n+\n+`break` and `continue` are also available directly as match arms, whether\n+braced or unbraced:\n+\n+```rust\n+use yew::prelude::*;\n+\n+html! {\n+ for i in 0..10 {\n+ match i {\n+ 0 => continue,\n+ 8.. => break,\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+};\n+```\n+\n+Loop labels are supported. `break 'label` and `continue 'label` target a\n+labeled loop defined in the surrounding Rust code, letting you exit an\n+enclosing loop from inside the macro:\n+\n+```rust , ignore\n+use yew::prelude::*;\n+\n+let mut rendered = Vec::new();\n+'outer: for section in sections {\n+ rendered.push(html! {\n+ for item in section.items {\n+ if should_stop(&item) {\n+ break 'outer;\n+ }\n+ <span>{item.name}</span>\n+ }\n+ });\n+}\n+```\n+\n+:::note Qualified paths\n+\n+A bare qualified-path expression like `<Type>::method(...)` collides with the\n+`<Type>` element open tag and is rejected. Two ways out:\n+\n+- Add a trailing `;` and it becomes an expression statement in the preamble:\n+ `<Type>::method(...);`. The return value is discarded.\n+- Wrap it in `{...}` to use the return value as a node:\n+ `{ <Type>::method(...) }`.\n+\n+:::\n+\n+:::note Imperative loops in the preamble\n+\n+Block-like Rust expressions (`for`, `while`, `loop`, `{...}`) auto-terminate as\n+statements in Rust grammar - a trailing `;` is not folded into the statement.\n+A bare imperative loop in a preamble:\n+\n+```rust , ignore\n+html! {\n+ for item in items.iter() {\n+ let mut by_han = BTreeMap::new();\n+ for src in &item.sources { // imperative side-effect loop\n+ by_han.entry(src.han_nom.clone()).or_default().push(src);\n+ }\n+ <div>{render(by_han)}</div>\n+ }\n+}\n+```\n+\n+is parsed as html-`for` (emitting children) instead of as a Rust statement,\n+and its body's `()` value cannot be converted to a `VNode`. Bind it with\n+`let _ = ...;` so the parser sees a `Stmt::Local`:\n+\n+```rust , ignore\n+html! {\n+ for item in items.iter() {\n+ let mut by_han = BTreeMap::new();\n+ let _ = for src in &item.sources {\n+ by_han.entry(src.han_nom.clone()).or_default().push(src);\n+ };\n+ <div>{render(by_han)}</div>\n+ }\n+}\n+```\n+\n+The same applies to imperative `while`, `loop`, and bare-block `{...}`\n+statements. `match` and `if` are not subject to this collision because their\n+html-control-flow forms naturally accept the same body shapes as their\n+imperative use.\n+\n+:::\n+\n+ </TabItem>\n+ <TabItem value=\"`while` loops\" label=\"`while` loops\">\n+`while` and `while let` loops work the same way as `for`, producing a list of nodes from their\n+body. All the statement forms accepted by `for` bodies (let bindings, expression statements,\n+items, macros) are also accepted here, along with `if` blocks and `break`/`continue`.\n+\n+```rust\n+use yew::prelude::*;\n+\n+let mut items = vec![\"a\", \"b\", \"c\", \"skip\", \"d\"].into_iter();\n+\n+html! {\n+ while let Some(item) = items.next() {\n+ if item == \"skip\" {\n+ continue\n+ }\n+ if item.is_empty() {\n+ break\n+ }\n+ <span>{item}</span>\n+ }\n+};\n+```\n+\n+A plain `while` with a condition works too:\n+\n+```rust\n+use yew::prelude::*;\n+\n+let mut counter: i32 = 0;\n+\n+html! {\n+ while counter < 5 {\n+ let current = counter;\n+ counter += 1;\n+ <span>{current}</span>\n+ }\n+};\n ```\n \n </TabItem>\ndiff --git a/website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx b/website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\nindex fdfc25dc5f6..fae271b25c4 100644\n--- a/website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\n+++ b/website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\n@@ -7,13 +7,11 @@ import TabItem from '@theme/TabItem'\n \n ## イテレータ\n \n-イテレータから HTML を構築する方法は 3 つあります：\n+イテレータから HTML を構築する方法は 4 つあります：\n \n <Tabs>\n <TabItem value=\"`for` loops\" label=\"`for` ループ\">\n-主なアプローチは for ループを使用することです。これは Rust に既に存在する for ループと同じですが、2 つの重要な違いがあります：\n-1. 通常の for ループは何も返せませんが、`html!` 内の for ループはノードのリストに変換されます。\n-2. `break`、`continue` などの発散式は `html!` 内の for ループの本体では許可されていません。\n+主なアプローチは for ループを使用することです。これは Rust に既に存在する for ループと同じですが、1 つの重要な違いがあります：通常の for ループは何も返せませんが、`html!` 内の for ループはノードのリストに変換されます。\n \n ```rust\n use yew::prelude::*;\n@@ -25,7 +23,7 @@ html! {\n };\n ```\n \n-`for` ループ本体では、html 子要素の前に `let` バインディングも使用できます：\n+`for` ループ本体では、html 子要素の前に Rust の文を置くことができます。終端子を持つ文であれば何でも動作します：`let` バインディング、`;` で終わる式文、アイテム定義（`fn`、`struct`、`use` など）、`;` 付きのマクロ呼び出しです。\n \n ```rust , ignore\n use yew::prelude::*;\n@@ -37,6 +35,106 @@ html! {\n <div class={class}>{label}</div>\n }\n };\n+```\n+\n+`break` と `continue` は通常の Rust のループと同様に動作し、出力されるノードリストに影響します。\n+`continue` は現在の反復でノードを生成せずにスキップし、`break` は反復を早期に終了します：\n+\n+```rust\n+use yew::prelude::*;\n+\n+html! {\n+ for i in 0..10 {\n+ if i % 2 == 0 {\n+ continue\n+ }\n+ if i > 7 {\n+ break\n+ }\n+ <span>{i}</span>\n+ }\n+};\n+```\n+\n+`break` と `continue` は、波括弧付きでも波括弧なしでも、match アームの本体としてそのまま使えます：\n+\n+```rust\n+use yew::prelude::*;\n+\n+html! {\n+ for i in 0..10 {\n+ match i {\n+ 0 => continue,\n+ 8.. => break,\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+};\n+```\n+\n+ループラベルもサポートされています。`break 'label` や `continue 'label` は、マクロを囲む Rust コードで定義されたラベル付きループを対象にでき、マクロの内側から外側のループを抜けることができます：\n+\n+```rust , ignore\n+use yew::prelude::*;\n+\n+let mut rendered = Vec::new();\n+'outer: for section in sections {\n+ rendered.push(html! {\n+ for item in section.items {\n+ if should_stop(&item) {\n+ break 'outer;\n+ }\n+ <span>{item.name}</span>\n+ }\n+ });\n+}\n+```\n+\n+:::note 限定パス\n+\n+`<Type>::method(...)` のような裸の限定パス式は `<Type>` という要素開始タグと衝突し、受け付けられません。回避方法は 2 つあります：\n+\n+- 末尾に `;` を付けてプリアンブルの式文にします：`<Type>::method(...);`。戻り値は破棄されます。\n+- `{...}` で囲んで戻り値をノードとして使います：`{ <Type>::method(...) }`。\n+\n+:::\n+\n+ </TabItem>\n+ <TabItem value=\"`while` loops\" label=\"`while` ループ\">\n+`while` および `while let` ループは `for` と同じように動作し、本体からノードのリストを生成します。`for` 本体で受け付けられるすべての文の形式（let バインディング、式文、アイテム、マクロ）がここでも受け付けられ、`if` ブロックと `break` / `continue` も使えます。\n+\n+```rust\n+use yew::prelude::*;\n+\n+let mut items = vec![\"a\", \"b\", \"c\", \"skip\", \"d\"].into_iter();\n+\n+html! {\n+ while let Some(item) = items.next() {\n+ if item == \"skip\" {\n+ continue\n+ }\n+ if item.is_empty() {\n+ break\n+ }\n+ <span>{item}</span>\n+ }\n+};\n+```\n+\n+条件付きの通常の `while` も使用できます：\n+\n+```rust\n+use yew::prelude::*;\n+\n+let mut counter: i32 = 0;\n+\n+html! {\n+ while counter < 5 {\n+ let current = counter;\n+ counter += 1;\n+ <span>{current}</span>\n+ }\n+};\n ```\n \n </TabItem>\ndiff --git a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\nindex 7cd4ec9459b..35a17177329 100644\n--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\n+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\n@@ -7,13 +7,11 @@ import TabItem from '@theme/TabItem'\n \n ## 迭代器\n \n-从迭代器构建 HTML 有 3 种方法：\n+从迭代器构建 HTML 有 4 种方法：\n \n <Tabs>\n <TabItem value=\"`for` loops\" label=\"`for` 循环\">\n-主要方法是使用 for 循环，与 Rust 中已有的 for 循环相同，但有 2 个关键区别：\n-1. 与标准 for 循环不能返回任何内容不同，`html!` 中的 for 循环会被转换为节点列表；\n-2. 发散表达式，即 `break`、`continue` 在 `html!` 中的 for 循环体内是不允许的。\n+主要方法是使用 for 循环，与 Rust 中已有的 for 循环相同，但有一个关键区别：与标准 for 循环不能返回任何内容不同，`html!` 中的 for 循环会被转换为节点列表。\n \n ```rust\n use yew::prelude::*;\n@@ -25,7 +23,7 @@ html! {\n };\n ```\n \n-`for` 循环体也支持在 html 子节点前使用 `let` 绑定：\n+`for` 循环体支持在 html 子节点前书写 Rust 语句。任何带终止符的语句都可以：`let` 绑定、以 `;` 结尾的表达式语句、项定义（`fn`、`struct`、`use` 等）以及带 `;` 的宏调用。\n \n ```rust , ignore\n use yew::prelude::*;\n@@ -37,6 +35,106 @@ html! {\n <div class={class}>{label}</div>\n }\n };\n+```\n+\n+`break` 和 `continue` 的作用与普通 Rust 循环相同，会影响生成的节点列表。\n+`continue` 会跳过当前迭代而不产生节点，`break` 会提前结束迭代：\n+\n+```rust\n+use yew::prelude::*;\n+\n+html! {\n+ for i in 0..10 {\n+ if i % 2 == 0 {\n+ continue\n+ }\n+ if i > 7 {\n+ break\n+ }\n+ <span>{i}</span>\n+ }\n+};\n+```\n+\n+`break` 和 `continue` 也可以直接作为 match 分支使用，无论带花括号还是不带：\n+\n+```rust\n+use yew::prelude::*;\n+\n+html! {\n+ for i in 0..10 {\n+ match i {\n+ 0 => continue,\n+ 8.. => break,\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+};\n+```\n+\n+循环标签也受支持。`break 'label` 和 `continue 'label` 可以作用于宏外部 Rust 代码中定义的带标签的循环，让你能从宏内部退出外层循环：\n+\n+```rust , ignore\n+use yew::prelude::*;\n+\n+let mut rendered = Vec::new();\n+'outer: for section in sections {\n+ rendered.push(html! {\n+ for item in section.items {\n+ if should_stop(&item) {\n+ break 'outer;\n+ }\n+ <span>{item.name}</span>\n+ }\n+ });\n+}\n+```\n+\n+:::note 限定路径\n+\n+像 `<Type>::method(...)` 这样的裸限定路径表达式会与 `<Type>` 元素起始标签冲突，因此会被拒绝。有两种解决方法：\n+\n+- 在末尾加上 `;`，使其成为前置的表达式语句：`<Type>::method(...);`。返回值会被丢弃。\n+- 用 `{...}` 包起来，将返回值作为节点使用：`{ <Type>::method(...) }`。\n+\n+:::\n+\n+ </TabItem>\n+ <TabItem value=\"`while` loops\" label=\"`while` 循环\">\n+`while` 和 `while let` 循环的工作方式与 `for` 相同，也会从循环体中生成节点列表。`for` 循环体中支持的所有语句形式（let 绑定、表达式语句、项、宏）在这里同样可用，外加 `if` 块和 `break` / `continue`。\n+\n+```rust\n+use yew::prelude::*;\n+\n+let mut items = vec![\"a\", \"b\", \"c\", \"skip\", \"d\"].into_iter();\n+\n+html! {\n+ while let Some(item) = items.next() {\n+ if item == \"skip\" {\n+ continue\n+ }\n+ if item.is_empty() {\n+ break\n+ }\n+ <span>{item}</span>\n+ }\n+};\n+```\n+\n+带条件的普通 `while` 也可以使用：\n+\n+```rust\n+use yew::prelude::*;\n+\n+let mut counter: i32 = 0;\n+\n+html! {\n+ while counter < 5 {\n+ let current = counter;\n+ counter += 1;\n+ <span>{current}</span>\n+ }\n+};\n ```\n \n </TabItem>\ndiff --git a/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx b/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\nindex b2114e57bbc..8bde1886279 100644\n--- a/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\n+++ b/website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\n@@ -7,13 +7,11 @@ import TabItem from '@theme/TabItem'\n \n ## 迭代器\n \n-從迭代器建立 HTML 有 3 種方法：\n+從迭代器建立 HTML 有 4 種方法：\n \n <Tabs>\n <TabItem value=\"`for` loops\" label=\"`for` 迴圈\">\n-主要方法是使用 for 迴圈，與 Rust 中已有的 for 迴圈相同，但有 2 個關鍵區別：\n-1. 與標準 for 迴圈不能傳回任何內容不同，`html!` 中的 for 迴圈會被轉換為節點清單；\n-2. 發散運算式，即 `break`、`continue` 在 `html!` 中的 for 迴圈主體內是不允許的。\n+主要方法是使用 for 迴圈，與 Rust 中已有的 for 迴圈相同，但有一個關鍵區別：與標準 for 迴圈不能傳回任何內容不同，`html!` 中的 for 迴圈會被轉換為節點清單。\n \n ```rust\n use yew::prelude::*;\n@@ -25,7 +23,7 @@ html! {\n };\n ```\n \n-`for` 迴圈主體也支援在 html 子節點前使用 `let` 綁定：\n+`for` 迴圈主體支援在 html 子節點前書寫 Rust 陳述式。任何帶終止符號的陳述式都可以：`let` 綁定、以 `;` 結尾的運算式陳述式、項目定義（`fn`、`struct`、`use` 等）以及帶 `;` 的巨集呼叫。\n \n ```rust , ignore\n use yew::prelude::*;\n@@ -37,6 +35,106 @@ html! {\n <div class={class}>{label}</div>\n }\n };\n+```\n+\n+`break` 和 `continue` 的作用與一般 Rust 迴圈相同，會影響生成的節點清單。\n+`continue` 會跳過目前迭代而不產生節點，`break` 會提前終止迭代：\n+\n+```rust\n+use yew::prelude::*;\n+\n+html! {\n+ for i in 0..10 {\n+ if i % 2 == 0 {\n+ continue\n+ }\n+ if i > 7 {\n+ break\n+ }\n+ <span>{i}</span>\n+ }\n+};\n+```\n+\n+`break` 和 `continue` 也可以直接作為 match 分支使用，無論帶大括號或不帶：\n+\n+```rust\n+use yew::prelude::*;\n+\n+html! {\n+ for i in 0..10 {\n+ match i {\n+ 0 => continue,\n+ 8.. => break,\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+};\n+```\n+\n+迴圈標籤也受支援。`break 'label` 和 `continue 'label` 可以作用於巨集外部 Rust 程式碼中定義的帶標籤迴圈，讓你能從巨集內部跳出外層迴圈：\n+\n+```rust , ignore\n+use yew::prelude::*;\n+\n+let mut rendered = Vec::new();\n+'outer: for section in sections {\n+ rendered.push(html! {\n+ for item in section.items {\n+ if should_stop(&item) {\n+ break 'outer;\n+ }\n+ <span>{item.name}</span>\n+ }\n+ });\n+}\n+```\n+\n+:::note 限定路徑\n+\n+像 `<Type>::method(...)` 這樣的裸限定路徑運算式會與 `<Type>` 元素起始標籤衝突，因此會被拒絕。有兩種解決方式：\n+\n+- 在結尾加上 `;`，讓它成為前置的運算式陳述式：`<Type>::method(...);`。傳回值會被丟棄。\n+- 用 `{...}` 包起來，將傳回值當作節點使用：`{ <Type>::method(...) }`。\n+\n+:::\n+\n+ </TabItem>\n+ <TabItem value=\"`while` loops\" label=\"`while` 迴圈\">\n+`while` 和 `while let` 迴圈的運作方式與 `for` 相同，也會從迴圈主體中生成節點清單。`for` 迴圈主體中支援的所有陳述式形式（let 綁定、運算式陳述式、項目、巨集）在這裡同樣可用，此外還有 `if` 區塊以及 `break` / `continue`。\n+\n+```rust\n+use yew::prelude::*;\n+\n+let mut items = vec![\"a\", \"b\", \"c\", \"skip\", \"d\"].into_iter();\n+\n+html! {\n+ while let Some(item) = items.next() {\n+ if item == \"skip\" {\n+ continue\n+ }\n+ if item.is_empty() {\n+ break\n+ }\n+ <span>{item}</span>\n+ }\n+};\n+```\n+\n+帶條件的一般 `while` 也可以使用：\n+\n+```rust\n+use yew::prelude::*;\n+\n+let mut counter: i32 = 0;\n+\n+html! {\n+ while counter < 5 {\n+ let current = counter;\n+ counter += 1;\n+ <span>{current}</span>\n+ }\n+};\n ```\n \n </TabItem>\n"},"changed_files":{"kind":"list like","value":["packages/yew-macro/src/html_tree/html_for.rs","packages/yew-macro/src/html_tree/html_loop.rs","packages/yew-macro/src/html_tree/html_match.rs","packages/yew-macro/src/html_tree/html_while.rs","packages/yew-macro/src/html_tree/mod.rs","packages/yew-macro/tests/html_macro/for-fail.rs","packages/yew-macro/tests/html_macro/for-fail.stderr","packages/yew-macro/tests/html_macro/for-pass.rs","packages/yew-macro/tests/html_macro/html-match-fail.rs","packages/yew-macro/tests/html_macro/html-match-fail.stderr","packages/yew-macro/tests/html_macro/imperative-preamble-fail.rs","packages/yew-macro/tests/html_macro/imperative-preamble-fail.stderr","packages/yew-macro/tests/html_macro/while-fail.rs","packages/yew-macro/tests/html_macro/while-fail.stderr","packages/yew-macro/tests/html_macro/while-pass.rs","packages/yew/tests/html_for.rs","packages/yew/tests/html_while.rs","website/docs/concepts/html/lists.mdx","website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx","website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx","website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx"],"string":"[\n \"packages/yew-macro/src/html_tree/html_for.rs\",\n \"packages/yew-macro/src/html_tree/html_loop.rs\",\n \"packages/yew-macro/src/html_tree/html_match.rs\",\n \"packages/yew-macro/src/html_tree/html_while.rs\",\n \"packages/yew-macro/src/html_tree/mod.rs\",\n \"packages/yew-macro/tests/html_macro/for-fail.rs\",\n \"packages/yew-macro/tests/html_macro/for-fail.stderr\",\n \"packages/yew-macro/tests/html_macro/for-pass.rs\",\n \"packages/yew-macro/tests/html_macro/html-match-fail.rs\",\n \"packages/yew-macro/tests/html_macro/html-match-fail.stderr\",\n \"packages/yew-macro/tests/html_macro/imperative-preamble-fail.rs\",\n \"packages/yew-macro/tests/html_macro/imperative-preamble-fail.stderr\",\n \"packages/yew-macro/tests/html_macro/while-fail.rs\",\n \"packages/yew-macro/tests/html_macro/while-fail.stderr\",\n \"packages/yew-macro/tests/html_macro/while-pass.rs\",\n \"packages/yew/tests/html_for.rs\",\n \"packages/yew/tests/html_while.rs\",\n \"website/docs/concepts/html/lists.mdx\",\n \"website/i18n/ja/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\",\n \"website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\",\n \"website/i18n/zh-Hant/docusaurus-plugin-content-docs/current/concepts/html/lists.mdx\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"I have seen this in the previous extension too. Is there a deeper meaning behind only allowing `let` statements and nothing else, most notably expression statements?\n\nI suppose a [QualifiedPathInExpression](https://doc.rust-lang.org/reference/paths.html#railroad-QualifiedPathInExpression) would be ambiguous. Rust allows constructs such as `<Type>::method` and `<Type as Trait>::method` for explicit inherent methods and trait methods. I suppose these would be edge cases to look out for.\n\nA `return` expression might also be somewhat ambiguous.\n\nDefining local items, macros, calling functions and operators, opening a block though all seem fine?","path":"packages/yew-macro/src/html_tree/html_while.rs","hunk":"@@ -0,0 +1,145 @@\n+use proc_macro2::{Ident, TokenStream};\n+use quote::{ToTokens, quote};\n+use syn::buffer::Cursor;\n+use syn::parse::{Parse, ParseStream};\n+use syn::spanned::Spanned;\n+use syn::token::While;\n+use syn::{Expr, Local, Stmt, Token, braced};\n+\n+use super::{HtmlChildrenTree, ToNodeIterator};\n+use crate::PeekValue;\n+use crate::html_tree::HtmlTree;\n+use crate::html_tree::html_for::is_contextless_pure;\n+\n+pub struct HtmlWhile {\n+ cond: Box<Expr>,\n+ let_stmts: Vec<Local>,\n+ body: HtmlChildrenTree,\n+ deprecations: TokenStream,\n+}\n+\n+impl PeekValue<()> for HtmlWhile {\n+ fn peek(cursor: Cursor) -> Option<()> {\n+ let (ident, _) = cursor.ident()?;\n+ (ident == \"while\").then_some(())\n+ }\n+}\n+\n+impl Parse for HtmlWhile {\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\n+ While::parse(input)?;\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\n+ match &*cond {\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"missing condition for `while` expression\",\n+ ));\n+ }\n+ _ => {}\n+ }\n+ if input.is_empty() {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"this `while` expression has a condition, but no block\",\n+ ));\n+ }\n+\n+ let body_stream;\n+ braced!(body_stream in input);\n+\n+ let mut let_stmts = Vec::new();\n+ while body_stream.peek(Token![let]) {","resolving_sha":"b9fe62a55487fae23ac5aa8047bd8c6892c33107","resolving_diff":"diff --git a/packages/yew-macro/src/html_tree/html_while.rs b/packages/yew-macro/src/html_tree/html_while.rs\nnew file mode 100644\nindex 00000000000..68f7f50fe72\n--- /dev/null\n+++ b/packages/yew-macro/src/html_tree/html_while.rs\n@@ -0,0 +1,72 @@\n+use proc_macro2::TokenStream;\n+use quote::{ToTokens, quote};\n+use syn::buffer::Cursor;\n+use syn::parse::{Parse, ParseStream};\n+use syn::spanned::Spanned;\n+use syn::token::While;\n+use syn::{Expr, Stmt, braced};\n+\n+use super::HtmlChildrenTree;\n+use super::html_loop::{emit_loop, parse_loop_body};\n+use crate::PeekValue;\n+\n+pub struct HtmlWhile {\n+ cond: Box<Expr>,\n+ stmts: Vec<Stmt>,\n+ body: HtmlChildrenTree,\n+ deprecations: TokenStream,\n+}\n+\n+impl PeekValue<()> for HtmlWhile {\n+ fn peek(cursor: Cursor) -> Option<()> {\n+ let (ident, _) = cursor.ident()?;\n+ (ident == \"while\").then_some(())\n+ }\n+}\n+\n+impl Parse for HtmlWhile {\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\n+ While::parse(input)?;\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\n+ match &*cond {\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"missing condition for `while` expression\",\n+ ));\n+ }\n+ _ => {}\n+ }\n+ if input.is_empty() {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"this `while` expression has a condition, but no block\",\n+ ));\n+ }\n+\n+ let body_stream;\n+ braced!(body_stream in input);\n+\n+ let (stmts, body, deprecations) = parse_loop_body(&body_stream, \"while\")?;\n+\n+ Ok(Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ })\n+ }\n+}\n+\n+impl ToTokens for HtmlWhile {\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\n+ let Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ } = self;\n+ let header = quote!(while #cond);\n+ tokens.extend(emit_loop(header, stmts, body, deprecations));\n+ }\n+}\n"},{"comment":"Which of the two options is meant to be produced for the loop below?\n\n```\nhtml! {\n for i in [1, 2] {\n <a></a>\n <i></i>\n }\n}\n```\n\nOption 1\n```\nhtml! {\n <a></a>\n <i></i>\n <a></a>\n <i></i>\n}\n```\n\nOption 2\n```\nhtml! {\n <>\n <a></a>\n <i></i>\n </>\n <>\n <a></a>\n <i></i>\n </>\n}\n```","path":"packages/yew-macro/src/html_tree/html_while.rs","hunk":"@@ -0,0 +1,145 @@\n+use proc_macro2::{Ident, TokenStream};\n+use quote::{ToTokens, quote};\n+use syn::buffer::Cursor;\n+use syn::parse::{Parse, ParseStream};\n+use syn::spanned::Spanned;\n+use syn::token::While;\n+use syn::{Expr, Local, Stmt, Token, braced};\n+\n+use super::{HtmlChildrenTree, ToNodeIterator};\n+use crate::PeekValue;\n+use crate::html_tree::HtmlTree;\n+use crate::html_tree::html_for::is_contextless_pure;\n+\n+pub struct HtmlWhile {\n+ cond: Box<Expr>,\n+ let_stmts: Vec<Local>,\n+ body: HtmlChildrenTree,\n+ deprecations: TokenStream,\n+}\n+\n+impl PeekValue<()> for HtmlWhile {\n+ fn peek(cursor: Cursor) -> Option<()> {\n+ let (ident, _) = cursor.ident()?;\n+ (ident == \"while\").then_some(())\n+ }\n+}\n+\n+impl Parse for HtmlWhile {\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\n+ While::parse(input)?;\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\n+ match &*cond {\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"missing condition for `while` expression\",\n+ ));\n+ }\n+ _ => {}\n+ }\n+ if input.is_empty() {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"this `while` expression has a condition, but no block\",\n+ ));\n+ }\n+\n+ let body_stream;\n+ braced!(body_stream in input);\n+\n+ let mut let_stmts = Vec::new();\n+ while body_stream.peek(Token![let]) {\n+ let stmt: Stmt = body_stream.parse()?;\n+ match stmt {\n+ Stmt::Local(local) => let_stmts.push(local),\n+ _ => unreachable!(\"peeked Token![let] but parsed non-local statement\"),\n+ }\n+ }\n+\n+ let body = HtmlChildrenTree::parse_delimited_with_nodes(&body_stream)?;\n+ let deprecations = super::check_unnecessary_fragment(&body);\n+ // TODO: more concise code by using if-let guards (MSRV 1.95)\n+ for child in body.0.iter() {\n+ let HtmlTree::Element(element) = child else {\n+ continue;\n+ };\n+\n+ let Some(key) = &element.props.special.key else {\n+ continue;\n+ };\n+\n+ if is_contextless_pure(&key.value) {\n+ return Err(syn::Error::new(\n+ key.value.span(),\n+ \"duplicate key for a node in a `while`-loop\\nthis will create elements with \\\n+ duplicate keys if the loop iterates more than once\",\n+ ));\n+ }\n+ }\n+ Ok(Self {\n+ cond,\n+ let_stmts,\n+ body,\n+ deprecations,\n+ })\n+ }\n+}\n+\n+impl ToTokens for HtmlWhile {\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\n+ let Self {\n+ cond,\n+ let_stmts,\n+ body,\n+ deprecations,\n+ } = self;\n+ let acc = Ident::new(\"__yew_v\", cond.span());\n+\n+ let alloc_opt = body\n+ .size_hint()\n+ .filter(|&size| size > 1) // explicitly reserving space for 1 more element is redundant\n+ .map(|size| quote!( #acc.reserve(#size) ));\n+\n+ let vlist_gen = match body.fully_keyed() {\n+ Some(true) => quote! {\n+ ::yew::virtual_dom::VList::__macro_new(\n+ #acc,\n+ ::std::option::Option::None,\n+ ::yew::virtual_dom::FullyKeyedState::KnownFullyKeyed\n+ )\n+ },\n+ Some(false) => quote! {\n+ ::yew::virtual_dom::VList::__macro_new(\n+ #acc,\n+ ::std::option::Option::None,\n+ ::yew::virtual_dom::FullyKeyedState::KnownMissingKeys\n+ )\n+ },\n+ None => quote! {\n+ ::yew::virtual_dom::VList::with_children(#acc, ::std::option::Option::None)\n+ },\n+ };\n+\n+ let body = body\n+ .0\n+ .iter()\n+ .map(|child| match child.to_node_iterator_stream() {\n+ Some(child) => {\n+ quote!( #acc.extend(#child) )\n+ }\n+ _ => {\n+ quote!( #acc.push(::std::convert::Into::into(#child)) )","resolving_sha":"b9fe62a55487fae23ac5aa8047bd8c6892c33107","resolving_diff":"diff --git a/packages/yew-macro/src/html_tree/html_while.rs b/packages/yew-macro/src/html_tree/html_while.rs\nnew file mode 100644\nindex 00000000000..68f7f50fe72\n--- /dev/null\n+++ b/packages/yew-macro/src/html_tree/html_while.rs\n@@ -0,0 +1,72 @@\n+use proc_macro2::TokenStream;\n+use quote::{ToTokens, quote};\n+use syn::buffer::Cursor;\n+use syn::parse::{Parse, ParseStream};\n+use syn::spanned::Spanned;\n+use syn::token::While;\n+use syn::{Expr, Stmt, braced};\n+\n+use super::HtmlChildrenTree;\n+use super::html_loop::{emit_loop, parse_loop_body};\n+use crate::PeekValue;\n+\n+pub struct HtmlWhile {\n+ cond: Box<Expr>,\n+ stmts: Vec<Stmt>,\n+ body: HtmlChildrenTree,\n+ deprecations: TokenStream,\n+}\n+\n+impl PeekValue<()> for HtmlWhile {\n+ fn peek(cursor: Cursor) -> Option<()> {\n+ let (ident, _) = cursor.ident()?;\n+ (ident == \"while\").then_some(())\n+ }\n+}\n+\n+impl Parse for HtmlWhile {\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\n+ While::parse(input)?;\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\n+ match &*cond {\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"missing condition for `while` expression\",\n+ ));\n+ }\n+ _ => {}\n+ }\n+ if input.is_empty() {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"this `while` expression has a condition, but no block\",\n+ ));\n+ }\n+\n+ let body_stream;\n+ braced!(body_stream in input);\n+\n+ let (stmts, body, deprecations) = parse_loop_body(&body_stream, \"while\")?;\n+\n+ Ok(Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ })\n+ }\n+}\n+\n+impl ToTokens for HtmlWhile {\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\n+ let Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ } = self;\n+ let header = quote!(while #cond);\n+ tokens.extend(emit_loop(header, stmts, body, deprecations));\n+ }\n+}\n"}],"string":"[\n {\n \"comment\": \"I have seen this in the previous extension too. Is there a deeper meaning behind only allowing `let` statements and nothing else, most notably expression statements?\\n\\nI suppose a [QualifiedPathInExpression](https://doc.rust-lang.org/reference/paths.html#railroad-QualifiedPathInExpression) would be ambiguous. Rust allows constructs such as `<Type>::method` and `<Type as Trait>::method` for explicit inherent methods and trait methods. I suppose these would be edge cases to look out for.\\n\\nA `return` expression might also be somewhat ambiguous.\\n\\nDefining local items, macros, calling functions and operators, opening a block though all seem fine?\",\n \"path\": \"packages/yew-macro/src/html_tree/html_while.rs\",\n \"hunk\": \"@@ -0,0 +1,145 @@\\n+use proc_macro2::{Ident, TokenStream};\\n+use quote::{ToTokens, quote};\\n+use syn::buffer::Cursor;\\n+use syn::parse::{Parse, ParseStream};\\n+use syn::spanned::Spanned;\\n+use syn::token::While;\\n+use syn::{Expr, Local, Stmt, Token, braced};\\n+\\n+use super::{HtmlChildrenTree, ToNodeIterator};\\n+use crate::PeekValue;\\n+use crate::html_tree::HtmlTree;\\n+use crate::html_tree::html_for::is_contextless_pure;\\n+\\n+pub struct HtmlWhile {\\n+ cond: Box<Expr>,\\n+ let_stmts: Vec<Local>,\\n+ body: HtmlChildrenTree,\\n+ deprecations: TokenStream,\\n+}\\n+\\n+impl PeekValue<()> for HtmlWhile {\\n+ fn peek(cursor: Cursor) -> Option<()> {\\n+ let (ident, _) = cursor.ident()?;\\n+ (ident == \\\"while\\\").then_some(())\\n+ }\\n+}\\n+\\n+impl Parse for HtmlWhile {\\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\\n+ While::parse(input)?;\\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\\n+ match &*cond {\\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"missing condition for `while` expression\\\",\\n+ ));\\n+ }\\n+ _ => {}\\n+ }\\n+ if input.is_empty() {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"this `while` expression has a condition, but no block\\\",\\n+ ));\\n+ }\\n+\\n+ let body_stream;\\n+ braced!(body_stream in input);\\n+\\n+ let mut let_stmts = Vec::new();\\n+ while body_stream.peek(Token![let]) {\",\n \"resolving_sha\": \"b9fe62a55487fae23ac5aa8047bd8c6892c33107\",\n \"resolving_diff\": \"diff --git a/packages/yew-macro/src/html_tree/html_while.rs b/packages/yew-macro/src/html_tree/html_while.rs\\nnew file mode 100644\\nindex 00000000000..68f7f50fe72\\n--- /dev/null\\n+++ b/packages/yew-macro/src/html_tree/html_while.rs\\n@@ -0,0 +1,72 @@\\n+use proc_macro2::TokenStream;\\n+use quote::{ToTokens, quote};\\n+use syn::buffer::Cursor;\\n+use syn::parse::{Parse, ParseStream};\\n+use syn::spanned::Spanned;\\n+use syn::token::While;\\n+use syn::{Expr, Stmt, braced};\\n+\\n+use super::HtmlChildrenTree;\\n+use super::html_loop::{emit_loop, parse_loop_body};\\n+use crate::PeekValue;\\n+\\n+pub struct HtmlWhile {\\n+ cond: Box<Expr>,\\n+ stmts: Vec<Stmt>,\\n+ body: HtmlChildrenTree,\\n+ deprecations: TokenStream,\\n+}\\n+\\n+impl PeekValue<()> for HtmlWhile {\\n+ fn peek(cursor: Cursor) -> Option<()> {\\n+ let (ident, _) = cursor.ident()?;\\n+ (ident == \\\"while\\\").then_some(())\\n+ }\\n+}\\n+\\n+impl Parse for HtmlWhile {\\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\\n+ While::parse(input)?;\\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\\n+ match &*cond {\\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"missing condition for `while` expression\\\",\\n+ ));\\n+ }\\n+ _ => {}\\n+ }\\n+ if input.is_empty() {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"this `while` expression has a condition, but no block\\\",\\n+ ));\\n+ }\\n+\\n+ let body_stream;\\n+ braced!(body_stream in input);\\n+\\n+ let (stmts, body, deprecations) = parse_loop_body(&body_stream, \\\"while\\\")?;\\n+\\n+ Ok(Self {\\n+ cond,\\n+ stmts,\\n+ body,\\n+ deprecations,\\n+ })\\n+ }\\n+}\\n+\\n+impl ToTokens for HtmlWhile {\\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\\n+ let Self {\\n+ cond,\\n+ stmts,\\n+ body,\\n+ deprecations,\\n+ } = self;\\n+ let header = quote!(while #cond);\\n+ tokens.extend(emit_loop(header, stmts, body, deprecations));\\n+ }\\n+}\\n\"\n },\n {\n \"comment\": \"Which of the two options is meant to be produced for the loop below?\\n\\n```\\nhtml! {\\n for i in [1, 2] {\\n <a></a>\\n <i></i>\\n }\\n}\\n```\\n\\nOption 1\\n```\\nhtml! {\\n <a></a>\\n <i></i>\\n <a></a>\\n <i></i>\\n}\\n```\\n\\nOption 2\\n```\\nhtml! {\\n <>\\n <a></a>\\n <i></i>\\n </>\\n <>\\n <a></a>\\n <i></i>\\n </>\\n}\\n```\",\n \"path\": \"packages/yew-macro/src/html_tree/html_while.rs\",\n \"hunk\": \"@@ -0,0 +1,145 @@\\n+use proc_macro2::{Ident, TokenStream};\\n+use quote::{ToTokens, quote};\\n+use syn::buffer::Cursor;\\n+use syn::parse::{Parse, ParseStream};\\n+use syn::spanned::Spanned;\\n+use syn::token::While;\\n+use syn::{Expr, Local, Stmt, Token, braced};\\n+\\n+use super::{HtmlChildrenTree, ToNodeIterator};\\n+use crate::PeekValue;\\n+use crate::html_tree::HtmlTree;\\n+use crate::html_tree::html_for::is_contextless_pure;\\n+\\n+pub struct HtmlWhile {\\n+ cond: Box<Expr>,\\n+ let_stmts: Vec<Local>,\\n+ body: HtmlChildrenTree,\\n+ deprecations: TokenStream,\\n+}\\n+\\n+impl PeekValue<()> for HtmlWhile {\\n+ fn peek(cursor: Cursor) -> Option<()> {\\n+ let (ident, _) = cursor.ident()?;\\n+ (ident == \\\"while\\\").then_some(())\\n+ }\\n+}\\n+\\n+impl Parse for HtmlWhile {\\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\\n+ While::parse(input)?;\\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\\n+ match &*cond {\\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"missing condition for `while` expression\\\",\\n+ ));\\n+ }\\n+ _ => {}\\n+ }\\n+ if input.is_empty() {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"this `while` expression has a condition, but no block\\\",\\n+ ));\\n+ }\\n+\\n+ let body_stream;\\n+ braced!(body_stream in input);\\n+\\n+ let mut let_stmts = Vec::new();\\n+ while body_stream.peek(Token![let]) {\\n+ let stmt: Stmt = body_stream.parse()?;\\n+ match stmt {\\n+ Stmt::Local(local) => let_stmts.push(local),\\n+ _ => unreachable!(\\\"peeked Token![let] but parsed non-local statement\\\"),\\n+ }\\n+ }\\n+\\n+ let body = HtmlChildrenTree::parse_delimited_with_nodes(&body_stream)?;\\n+ let deprecations = super::check_unnecessary_fragment(&body);\\n+ // TODO: more concise code by using if-let guards (MSRV 1.95)\\n+ for child in body.0.iter() {\\n+ let HtmlTree::Element(element) = child else {\\n+ continue;\\n+ };\\n+\\n+ let Some(key) = &element.props.special.key else {\\n+ continue;\\n+ };\\n+\\n+ if is_contextless_pure(&key.value) {\\n+ return Err(syn::Error::new(\\n+ key.value.span(),\\n+ \\\"duplicate key for a node in a `while`-loop\\\\nthis will create elements with \\\\\\n+ duplicate keys if the loop iterates more than once\\\",\\n+ ));\\n+ }\\n+ }\\n+ Ok(Self {\\n+ cond,\\n+ let_stmts,\\n+ body,\\n+ deprecations,\\n+ })\\n+ }\\n+}\\n+\\n+impl ToTokens for HtmlWhile {\\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\\n+ let Self {\\n+ cond,\\n+ let_stmts,\\n+ body,\\n+ deprecations,\\n+ } = self;\\n+ let acc = Ident::new(\\\"__yew_v\\\", cond.span());\\n+\\n+ let alloc_opt = body\\n+ .size_hint()\\n+ .filter(|&size| size > 1) // explicitly reserving space for 1 more element is redundant\\n+ .map(|size| quote!( #acc.reserve(#size) ));\\n+\\n+ let vlist_gen = match body.fully_keyed() {\\n+ Some(true) => quote! {\\n+ ::yew::virtual_dom::VList::__macro_new(\\n+ #acc,\\n+ ::std::option::Option::None,\\n+ ::yew::virtual_dom::FullyKeyedState::KnownFullyKeyed\\n+ )\\n+ },\\n+ Some(false) => quote! {\\n+ ::yew::virtual_dom::VList::__macro_new(\\n+ #acc,\\n+ ::std::option::Option::None,\\n+ ::yew::virtual_dom::FullyKeyedState::KnownMissingKeys\\n+ )\\n+ },\\n+ None => quote! {\\n+ ::yew::virtual_dom::VList::with_children(#acc, ::std::option::Option::None)\\n+ },\\n+ };\\n+\\n+ let body = body\\n+ .0\\n+ .iter()\\n+ .map(|child| match child.to_node_iterator_stream() {\\n+ Some(child) => {\\n+ quote!( #acc.extend(#child) )\\n+ }\\n+ _ => {\\n+ quote!( #acc.push(::std::convert::Into::into(#child)) )\",\n \"resolving_sha\": \"b9fe62a55487fae23ac5aa8047bd8c6892c33107\",\n \"resolving_diff\": \"diff --git a/packages/yew-macro/src/html_tree/html_while.rs b/packages/yew-macro/src/html_tree/html_while.rs\\nnew file mode 100644\\nindex 00000000000..68f7f50fe72\\n--- /dev/null\\n+++ b/packages/yew-macro/src/html_tree/html_while.rs\\n@@ -0,0 +1,72 @@\\n+use proc_macro2::TokenStream;\\n+use quote::{ToTokens, quote};\\n+use syn::buffer::Cursor;\\n+use syn::parse::{Parse, ParseStream};\\n+use syn::spanned::Spanned;\\n+use syn::token::While;\\n+use syn::{Expr, Stmt, braced};\\n+\\n+use super::HtmlChildrenTree;\\n+use super::html_loop::{emit_loop, parse_loop_body};\\n+use crate::PeekValue;\\n+\\n+pub struct HtmlWhile {\\n+ cond: Box<Expr>,\\n+ stmts: Vec<Stmt>,\\n+ body: HtmlChildrenTree,\\n+ deprecations: TokenStream,\\n+}\\n+\\n+impl PeekValue<()> for HtmlWhile {\\n+ fn peek(cursor: Cursor) -> Option<()> {\\n+ let (ident, _) = cursor.ident()?;\\n+ (ident == \\\"while\\\").then_some(())\\n+ }\\n+}\\n+\\n+impl Parse for HtmlWhile {\\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\\n+ While::parse(input)?;\\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\\n+ match &*cond {\\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"missing condition for `while` expression\\\",\\n+ ));\\n+ }\\n+ _ => {}\\n+ }\\n+ if input.is_empty() {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"this `while` expression has a condition, but no block\\\",\\n+ ));\\n+ }\\n+\\n+ let body_stream;\\n+ braced!(body_stream in input);\\n+\\n+ let (stmts, body, deprecations) = parse_loop_body(&body_stream, \\\"while\\\")?;\\n+\\n+ Ok(Self {\\n+ cond,\\n+ stmts,\\n+ body,\\n+ deprecations,\\n+ })\\n+ }\\n+}\\n+\\n+impl ToTokens for HtmlWhile {\\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\\n+ let Self {\\n+ cond,\\n+ stmts,\\n+ body,\\n+ deprecations,\\n+ } = self;\\n+ let header = quote!(while #cond);\\n+ tokens.extend(emit_loop(header, stmts, body, deprecations));\\n+ }\\n+}\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":"diff --git a/packages/yew-macro/tests/html_macro/for-fail.rs b/packages/yew-macro/tests/html_macro/for-fail.rs\nindex e40eece597b..19b04c5c75b 100644\n--- a/packages/yew-macro/tests/html_macro/for-fail.rs\n+++ b/packages/yew-macro/tests/html_macro/for-fail.rs\n@@ -10,10 +10,6 @@ fn main() {\n <span>{x}</span>\n }};\n \n- _ = ::yew::html!{for _ in 0 .. 10 {\n- <span>{break}</span>\n- }};\n-\n _ = ::yew::html!{for _ in 0 .. 10 {\n <div key=\"duplicate\" />\n }};\ndiff --git a/packages/yew-macro/tests/html_macro/for-fail.stderr b/packages/yew-macro/tests/html_macro/for-fail.stderr\nindex e0f8c8b943f..46d27f5556e 100644\n--- a/packages/yew-macro/tests/html_macro/for-fail.stderr\n+++ b/packages/yew-macro/tests/html_macro/for-fail.stderr\n@@ -24,36 +24,25 @@ error: unexpected end of input, expected curly braces\n \n error: duplicate key for a node in a `for`-loop\n this will create elements with duplicate keys if the loop iterates more than once\n- --> tests/html_macro/for-fail.rs:18:18\n+ --> tests/html_macro/for-fail.rs:14:18\n |\n-18 | <div key=\"duplicate\" />\n+14 | <div key=\"duplicate\" />\n | ^^^^^^^^^^^\n \n error: duplicate key for a node in a `for`-loop\n this will create elements with duplicate keys if the loop iterates more than once\n- --> tests/html_macro/for-fail.rs:22:19\n+ --> tests/html_macro/for-fail.rs:18:19\n |\n-22 | <div key={smth::KEY} />\n+18 | <div key={smth::KEY} />\n | ^^^^\n \n-error[E0267]: `break` inside of a closure\n- --> tests/html_macro/for-fail.rs:14:16\n- |\n-13 | _ = ::yew::html!{for _ in 0 .. 10 {\n- | _________-\n-14 | | <span>{break}</span>\n- | | ^^^^^ cannot `break` inside of a closure\n-15 | | }};\n- | |______- enclosing closure\n-\n error[E0308]: mismatched types\n --> tests/html_macro/for-fail.rs:9:26\n |\n 9 | _ = ::yew::html!{for (x, y) in 0 .. 10 {\n- | ^^^^^^\n+ | ^^^^^^ ------- this is an iterator with items of type `{integer}`\n | |\n | expected integer, found `(_, _)`\n- | expected due to this\n |\n = note: expected type `{integer}`\n found tuple `(_, _)`\ndiff --git a/packages/yew-macro/tests/html_macro/for-pass.rs b/packages/yew-macro/tests/html_macro/for-pass.rs\nindex 69b315f04f9..4747a2cd8f0 100644\n--- a/packages/yew-macro/tests/html_macro/for-pass.rs\n+++ b/packages/yew-macro/tests/html_macro/for-pass.rs\n@@ -118,4 +118,276 @@ fn main() {\n <hr/>\n }\n };\n+\n+ // break in for loop\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ if i > 5 {\n+ break\n+ }\n+ <span>{i}</span>\n+ }\n+ };\n+\n+ // continue in for loop\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ if i % 2 == 0 {\n+ continue\n+ }\n+ <span>{i}</span>\n+ }\n+ };\n+\n+ // break with trailing semicolon\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ if i > 5 {\n+ break;\n+ }\n+ <span>{i}</span>\n+ }\n+ };\n+\n+ // continue with trailing semicolon\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ if i % 2 == 0 {\n+ continue;\n+ }\n+ <span>{i}</span>\n+ }\n+ };\n+\n+ // unbraced match arm with break\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ match i {\n+ 0 => break,\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+ };\n+\n+ // unbraced match arm with continue\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ match i {\n+ 0 => continue,\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+ };\n+\n+ // braced match arm with break\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ match i {\n+ 0 => { break },\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+ };\n+\n+ // break/continue in a for body must not emit `unreachable_code` warnings even\n+ // under `#[deny(unreachable_code)]`.\n+ #[deny(unreachable_code)]\n+ fn break_continue_no_warn() {\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ if i > 5 {\n+ break;\n+ }\n+ if i % 2 == 0 {\n+ continue;\n+ }\n+ <span>{i}</span>\n+ }\n+ };\n+ }\n+ break_continue_no_warn();\n+\n+ // Expression statement in loop body preamble (`.method(..);` for side effects).\n+ _ = ::yew::html!{\n+ for i in 0..5 {\n+ let counter = ::std::cell::Cell::new(i);\n+ counter.set(i * 2);\n+ <span>{counter.get()}</span>\n+ }\n+ };\n+\n+ // Compound-assignment expression statement in loop body preamble.\n+ {\n+ let mut total: ::std::primitive::i32 = 0;\n+ _ = ::yew::html!{\n+ for i in 0..5 {\n+ let current = i;\n+ total += current;\n+ <span>{current}</span>\n+ }\n+ };\n+ _ = total;\n+ }\n+\n+ // Local fn item in loop body preamble.\n+ _ = ::yew::html!{\n+ for i in 0..5 {\n+ fn double(x: ::std::primitive::i32) -> ::std::primitive::i32 { x * 2 }\n+ let v = double(i);\n+ <span>{v}</span>\n+ }\n+ };\n+\n+ // Macro statement in loop body preamble (with `;`).\n+ _ = ::yew::html!{\n+ for _i in 0..1 {\n+ ::std::stringify!(debug_marker);\n+ <span>{\"ok\"}</span>\n+ }\n+ };\n+\n+ // Mixed interleaving: let / expr-stmt / let / html.\n+ {\n+ let mut acc: ::std::primitive::i32 = 0;\n+ _ = ::yew::html!{\n+ for i in 0..3 {\n+ let x = i;\n+ acc += x;\n+ let y = x + 1;\n+ <span>{y}</span>\n+ }\n+ };\n+ _ = acc;\n+ }\n+\n+ // Labeled `break` targeting an enclosing labeled loop in user code.\n+ {\n+ let mut outer_hit: ::std::primitive::i32 = 0;\n+ 'outer: for _ in 0..3 {\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ if i > 2 {\n+ break 'outer;\n+ }\n+ <span>{i}</span>\n+ }\n+ };\n+ outer_hit += 1;\n+ }\n+ _ = outer_hit;\n+ }\n+\n+ // Labeled `continue` targeting an enclosing labeled loop in user code.\n+ {\n+ let mut outer_hit: ::std::primitive::i32 = 0;\n+ 'outer: for _ in 0..3 {\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ if i > 2 {\n+ continue 'outer;\n+ }\n+ <span>{i}</span>\n+ }\n+ };\n+ outer_hit += 1;\n+ }\n+ _ = outer_hit;\n+ }\n+\n+ // Labeled `break 'outer` without a trailing `;` (body-top position).\n+ {\n+ let mut outer_hit: ::std::primitive::i32 = 0;\n+ 'outer: for _ in 0..3 {\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ if i > 2 {\n+ break 'outer\n+ }\n+ <span>{i}</span>\n+ }\n+ };\n+ outer_hit += 1;\n+ }\n+ _ = outer_hit;\n+ }\n+\n+ // Labeled `continue 'outer` without a trailing `;` (body-top position).\n+ {\n+ let mut outer_hit: ::std::primitive::i32 = 0;\n+ 'outer: for _ in 0..3 {\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ if i > 2 {\n+ continue 'outer\n+ }\n+ <span>{i}</span>\n+ }\n+ };\n+ outer_hit += 1;\n+ }\n+ _ = outer_hit;\n+ }\n+\n+ // Bare `return` (no value, no trailing `;`) at body top. Returns `()` from main.\n+ fn bare_return_at_body_top() {\n+ _ = ::yew::html!{\n+ for _ in 0..1 {\n+ return\n+ <span>{\"unreachable\"}</span>\n+ }\n+ };\n+ }\n+ bare_return_at_body_top();\n+\n+ // Bare `return` in unbraced match arm.\n+ fn return_in_unbraced_match_arm() {\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ match i {\n+ 3 => return,\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+ };\n+ }\n+ return_in_unbraced_match_arm();\n+\n+ // Bare `return` in braced match arm.\n+ fn return_in_braced_match_arm() {\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ match i {\n+ 3 => { return },\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+ };\n+ }\n+ return_in_braced_match_arm();\n+\n+ // `return` with a value in preamble position (statement form with `;`).\n+ fn return_value_from_preamble() -> ::std::primitive::i32 {\n+ _ = ::yew::html!{\n+ for i in 0..3 {\n+ return i;\n+ <span>{i}</span>\n+ }\n+ };\n+ 0\n+ }\n+ let _ = return_value_from_preamble();\n+\n+ // `return` with a value in unbraced match arm (value part of ExprReturn).\n+ fn return_value_from_unbraced_arm() -> ::std::primitive::i32 {\n+ _ = ::yew::html!{\n+ for i in 0..10 {\n+ match i {\n+ 3 => return i,\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+ };\n+ 0\n+ }\n+ let _ = return_value_from_unbraced_arm();\n }\ndiff --git a/packages/yew-macro/tests/html_macro/html-match-fail.rs b/packages/yew-macro/tests/html_macro/html-match-fail.rs\nindex f300d7e3f10..a69577a9d9d 100644\n--- a/packages/yew-macro/tests/html_macro/html-match-fail.rs\n+++ b/packages/yew-macro/tests/html_macro/html-match-fail.rs\n@@ -9,4 +9,44 @@ fn main() {\n \n // Empty match (no arms)\n html! { match 42 {} };\n+\n+ // `break` followed by HTML in an unbraced arm. Rust doesn't accept `<span/>`\n+ // as an expression so it can't be a break value; user must wrap in braces.\n+ let _ = html! {\n+ for _ in 0..1 {\n+ match () {\n+ () => break <span/>,\n+ }\n+ }\n+ };\n+\n+ // Same pattern with `continue`.\n+ let _ = html! {\n+ for _ in 0..1 {\n+ match () {\n+ () => continue <div/>,\n+ }\n+ }\n+ };\n+\n+ // Same pattern with `return`.\n+ fn return_html() -> Html {\n+ html! {\n+ for _ in 0..1 {\n+ match () {\n+ () => return <p/>,\n+ }\n+ }\n+ }\n+ }\n+ let _ = return_html;\n+\n+ // Final arm without trailing comma.\n+ let _ = html! {\n+ for _ in 0..1 {\n+ match () {\n+ () => break <div/>\n+ }\n+ }\n+ };\n }\ndiff --git a/packages/yew-macro/tests/html_macro/html-match-fail.stderr b/packages/yew-macro/tests/html_macro/html-match-fail.stderr\nindex ff8dda5d8a0..e0f865d152a 100644\n--- a/packages/yew-macro/tests/html_macro/html-match-fail.stderr\n+++ b/packages/yew-macro/tests/html_macro/html-match-fail.stderr\n@@ -15,3 +15,27 @@ error: `match` expression must have at least one arm\n |\n 11 | html! { match 42 {} };\n | ^^\n+\n+error: `break`, `continue`, and `return` in a match arm cannot be followed by HTML as their value. Wrap the arm body in braces, e.g. `_ => { return ::yew::html!(<span/>) }`.\n+ --> tests/html_macro/html-match-fail.rs:18:29\n+ |\n+18 | () => break <span/>,\n+ | ^\n+\n+error: `break`, `continue`, and `return` in a match arm cannot be followed by HTML as their value. Wrap the arm body in braces, e.g. `_ => { return ::yew::html!(<span/>) }`.\n+ --> tests/html_macro/html-match-fail.rs:27:32\n+ |\n+27 | () => continue <div/>,\n+ | ^\n+\n+error: `break`, `continue`, and `return` in a match arm cannot be followed by HTML as their value. Wrap the arm body in braces, e.g. `_ => { return ::yew::html!(<span/>) }`.\n+ --> tests/html_macro/html-match-fail.rs:37:34\n+ |\n+37 | () => return <p/>,\n+ | ^\n+\n+error: `break`, `continue`, and `return` in a match arm cannot be followed by HTML as their value. Wrap the arm body in braces, e.g. `_ => { return ::yew::html!(<span/>) }`.\n+ --> tests/html_macro/html-match-fail.rs:48:29\n+ |\n+48 | () => break <div/>\n+ | ^\ndiff --git a/packages/yew-macro/tests/html_macro/imperative-preamble-fail.rs b/packages/yew-macro/tests/html_macro/imperative-preamble-fail.rs\nnew file mode 100644\nindex 00000000000..b7c63ab6646\n--- /dev/null\n+++ b/packages/yew-macro/tests/html_macro/imperative-preamble-fail.rs\n@@ -0,0 +1,70 @@\n+// Tests for the diagnostic emitted when a block-like Rust expression\n+// (`for`, `while`, `loop`, `{...}`) appears in preamble position. These\n+// expressions auto-terminate as statements per Rust grammar, so a trailing\n+// `;` is not folded into the `Stmt`. The preamble parser rejects them\n+// (matching `Stmt::Expr(_, None)`) and they would otherwise fall through\n+// to the html-control-flow parser, where the body's `()` value fails to\n+// convert to `VNode`. The diagnostic surfaces the pitfall at the right\n+// span and points at the `let _ = ...;` workaround.\n+\n+fn main() {\n+ // Imperative `for` in a `for` body preamble.\n+ _ = ::yew::html! {\n+ for x in 0..3_u32 {\n+ let mut acc: u32 = 0;\n+ for i in 0..x {\n+ acc += i;\n+ }\n+ <span>{acc}</span>\n+ }\n+ };\n+\n+ // Imperative `while` in a `for` body preamble.\n+ _ = ::yew::html! {\n+ for _x in 0..3_u32 {\n+ let mut counter: u32 = 0;\n+ while counter < 5 {\n+ counter += 1;\n+ }\n+ <span>{counter}</span>\n+ }\n+ };\n+\n+ // Imperative `loop` in a `for` body preamble.\n+ _ = ::yew::html! {\n+ for _x in 0..3_u32 {\n+ let mut n: u32 = 0;\n+ loop {\n+ n += 1;\n+ if n > 3 { break; }\n+ }\n+ <span>{n}</span>\n+ }\n+ };\n+\n+ // Imperative `for` in a `while` body preamble.\n+ _ = ::yew::html! {\n+ while false {\n+ let mut acc: u32 = 0;\n+ for i in 0..3_u32 {\n+ acc += i;\n+ }\n+ <span>{acc}</span>\n+ }\n+ };\n+\n+ // Imperative `for` in a braced `match` arm preamble.\n+ _ = ::yew::html! {\n+ match 0_u32 {\n+ 0 => {\n+ let mut acc: u32 = 0;\n+ for i in 0..3_u32 {\n+ acc += i;\n+ }\n+ <span>{acc}</span>\n+ }\n+ _ => <span>{\"other\"}</span>,\n+ }\n+ };\n+\n+}\ndiff --git a/packages/yew-macro/tests/html_macro/imperative-preamble-fail.stderr b/packages/yew-macro/tests/html_macro/imperative-preamble-fail.stderr\nnew file mode 100644\nindex 00000000000..3b6b2077350\n--- /dev/null\n+++ b/packages/yew-macro/tests/html_macro/imperative-preamble-fail.stderr\n@@ -0,0 +1,55 @@\n+error: this `for` block is fully Rust-parseable, so it is parsed as html-for here, but its body cannot produce any html nodes\n+\n+ = help: to run a Rust `for` here for side effects only, bind it with `let _ = ...;` so the parser sees a Rust statement: `let _ = for ... { ... };`\n+\n+ --> tests/html_macro/imperative-preamble-fail.rs:15:13\n+ |\n+15 | / for i in 0..x {\n+16 | | acc += i;\n+17 | | }\n+ | |_____________^\n+\n+error: this `while` block is fully Rust-parseable, so it is parsed as html-while here, but its body cannot produce any html nodes\n+\n+ = help: to run a Rust `while` here for side effects only, bind it with `let _ = ...;` so the parser sees a Rust statement: `let _ = while ... { ... };`\n+\n+ --> tests/html_macro/imperative-preamble-fail.rs:26:13\n+ |\n+26 | / while counter < 5 {\n+27 | | counter += 1;\n+28 | | }\n+ | |_____________^\n+\n+error: this `loop` block is fully Rust-parseable, so it is parsed as html-loop here, but its body cannot produce any html nodes\n+\n+ = help: to run a Rust `loop` here for side effects only, bind it with `let _ = ...;` so the parser sees a Rust statement: `let _ = loop ... { ... };`\n+\n+ --> tests/html_macro/imperative-preamble-fail.rs:37:13\n+ |\n+37 | / loop {\n+38 | | n += 1;\n+39 | | if n > 3 { break; }\n+40 | | }\n+ | |_____________^\n+\n+error: this `for` block is fully Rust-parseable, so it is parsed as html-for here, but its body cannot produce any html nodes\n+\n+ = help: to run a Rust `for` here for side effects only, bind it with `let _ = ...;` so the parser sees a Rust statement: `let _ = for ... { ... };`\n+\n+ --> tests/html_macro/imperative-preamble-fail.rs:49:13\n+ |\n+49 | / for i in 0..3_u32 {\n+50 | | acc += i;\n+51 | | }\n+ | |_____________^\n+\n+error: this `for` block is fully Rust-parseable, so it is parsed as html-for here, but its body cannot produce any html nodes\n+\n+ = help: to run a Rust `for` here for side effects only, bind it with `let _ = ...;` so the parser sees a Rust statement: `let _ = for ... { ... };`\n+\n+ --> tests/html_macro/imperative-preamble-fail.rs:61:17\n+ |\n+61 | / for i in 0..3_u32 {\n+62 | | acc += i;\n+63 | | }\n+ | |_________________^\ndiff --git a/packages/yew-macro/tests/html_macro/while-fail.rs b/packages/yew-macro/tests/html_macro/while-fail.rs\nnew file mode 100644\nindex 00000000000..bb79634eddd\n--- /dev/null\n+++ b/packages/yew-macro/tests/html_macro/while-fail.rs\n@@ -0,0 +1,17 @@\n+mod smth {\n+ const KEY: u32 = 42;\n+}\n+\n+fn main() {\n+ _ = ::yew::html!{while};\n+ _ = ::yew::html!{while true};\n+ _ = ::yew::html!{while {} { <div/> }};\n+\n+ _ = ::yew::html!{while true {\n+ <div key=\"duplicate\" />\n+ }};\n+\n+ _ = ::yew::html!{while true {\n+ <div key={smth::KEY} />\n+ }};\n+}\ndiff --git a/packages/yew-macro/tests/html_macro/while-fail.stderr b/packages/yew-macro/tests/html_macro/while-fail.stderr\nnew file mode 100644\nindex 00000000000..04db05c91a8\n--- /dev/null\n+++ b/packages/yew-macro/tests/html_macro/while-fail.stderr\n@@ -0,0 +1,33 @@\n+error: unexpected end of input, expected an expression\n+ --> tests/html_macro/while-fail.rs:6:9\n+ |\n+6 | _ = ::yew::html!{while};\n+ | ^^^^^^^^^^^^^^^^^^^\n+ |\n+ = note: this error originates in the macro `::yew::html` (in Nightly builds, run with -Z macro-backtrace for more info)\n+\n+error: this `while` expression has a condition, but no block\n+ --> tests/html_macro/while-fail.rs:7:28\n+ |\n+7 | _ = ::yew::html!{while true};\n+ | ^^^^\n+\n+error: missing condition for `while` expression\n+ --> tests/html_macro/while-fail.rs:8:28\n+ |\n+8 | _ = ::yew::html!{while {} { <div/> }};\n+ | ^^\n+\n+error: duplicate key for a node in a `while`-loop\n+ this will create elements with duplicate keys if the loop iterates more than once\n+ --> tests/html_macro/while-fail.rs:11:18\n+ |\n+11 | <div key=\"duplicate\" />\n+ | ^^^^^^^^^^^\n+\n+error: duplicate key for a node in a `while`-loop\n+ this will create elements with duplicate keys if the loop iterates more than once\n+ --> tests/html_macro/while-fail.rs:15:19\n+ |\n+15 | <div key={smth::KEY} />\n+ | ^^^^\ndiff --git a/packages/yew-macro/tests/html_macro/while-pass.rs b/packages/yew-macro/tests/html_macro/while-pass.rs\nnew file mode 100644\nindex 00000000000..11e010a404f\n--- /dev/null\n+++ b/packages/yew-macro/tests/html_macro/while-pass.rs\n@@ -0,0 +1,388 @@\n+#![no_implicit_prelude]\n+\n+// Shadow primitives\n+#[allow(non_camel_case_types)]\n+pub struct bool;\n+#[allow(non_camel_case_types)]\n+pub struct char;\n+#[allow(non_camel_case_types)]\n+pub struct f32;\n+#[allow(non_camel_case_types)]\n+pub struct f64;\n+#[allow(non_camel_case_types)]\n+pub struct i128;\n+#[allow(non_camel_case_types)]\n+pub struct i16;\n+#[allow(non_camel_case_types)]\n+pub struct i32;\n+#[allow(non_camel_case_types)]\n+pub struct i64;\n+#[allow(non_camel_case_types)]\n+pub struct i8;\n+#[allow(non_camel_case_types)]\n+pub struct isize;\n+#[allow(non_camel_case_types)]\n+pub struct str;\n+#[allow(non_camel_case_types)]\n+pub struct u128;\n+#[allow(non_camel_case_types)]\n+pub struct u16;\n+#[allow(non_camel_case_types)]\n+pub struct u32;\n+#[allow(non_camel_case_types)]\n+pub struct u64;\n+#[allow(non_camel_case_types)]\n+pub struct u8;\n+#[allow(non_camel_case_types)]\n+pub struct usize;\n+\n+fn main() {\n+ // Basic while with counter bumped via a let-bound post-increment block\n+ _ = {\n+ let mut i: ::std::primitive::i32 = 0;\n+ ::yew::html! {\n+ while i < 5 {\n+ let current = { let c = i; i += 1; c };\n+ <span>{current}</span>\n+ }\n+ }\n+ };\n+\n+ // while let destructuring an iterator\n+ _ = {\n+ let mut it = ::std::iter::IntoIterator::into_iter(0..5);\n+ ::yew::html! {\n+ while let ::std::option::Option::Some(v) = ::std::iter::Iterator::next(&mut it) {\n+ <span>{v}</span>\n+ }\n+ }\n+ };\n+\n+ // while let with pattern destructuring\n+ _ = {\n+ let mut it = ::std::iter::IntoIterator::into_iter([(1, \"a\"), (2, \"b\")]);\n+ ::yew::html! {\n+ while let ::std::option::Option::Some((n, s)) = ::std::iter::Iterator::next(&mut it) {\n+ <span>{n}</span>\n+ <span>{s}</span>\n+ }\n+ }\n+ };\n+\n+ // Multiple let bindings before nodes\n+ _ = {\n+ let mut i: ::std::primitive::i32 = 0;\n+ ::yew::html! {\n+ while i < 5 {\n+ let current = { let c = i; i += 1; c };\n+ let doubled = current * 2;\n+ let label = \"item\";\n+ <span>{label}</span>\n+ <span>{doubled}</span>\n+ }\n+ }\n+ };\n+\n+ // Let binding with explicit type annotation\n+ _ = {\n+ let mut i: ::std::primitive::i32 = 0;\n+ ::yew::html! {\n+ while i < 5 {\n+ let x: ::std::primitive::i32 = { let c = i * 3; i += 1; c };\n+ <span>{x}</span>\n+ }\n+ }\n+ };\n+\n+ // break in while\n+ _ = {\n+ let mut i: ::std::primitive::i32 = 0;\n+ ::yew::html! {\n+ while i < 100 {\n+ let current = { let c = i; i += 1; c };\n+ if current > 5 {\n+ break\n+ }\n+ <span>{current}</span>\n+ }\n+ }\n+ };\n+\n+ // continue in while\n+ _ = {\n+ let mut i: ::std::primitive::i32 = 0;\n+ ::yew::html! {\n+ while i < 10 {\n+ let current = { let c = i; i += 1; c };\n+ if current % 2 == 0 {\n+ continue\n+ }\n+ <span>{current}</span>\n+ }\n+ }\n+ };\n+\n+ // while-let with break and continue\n+ _ = {\n+ let mut it = ::std::iter::IntoIterator::into_iter(0..10);\n+ ::yew::html! {\n+ while let ::std::option::Option::Some(v) = ::std::iter::Iterator::next(&mut it) {\n+ if v >= 6 {\n+ break\n+ }\n+ if v % 2 == 0 {\n+ continue\n+ }\n+ <span>{v}</span>\n+ }\n+ }\n+ };\n+\n+ // Nested for inside while\n+ _ = {\n+ let mut i: ::std::primitive::i32 = 0;\n+ ::yew::html! {\n+ while i < 3 {\n+ let row = { let c = i; i += 1; c };\n+ for col in 0..3 {\n+ <span>{row}</span>\n+ <span>{col}</span>\n+ }\n+ }\n+ }\n+ };\n+\n+ // break with trailing semicolon\n+ _ = {\n+ let mut i: ::std::primitive::i32 = 0;\n+ ::yew::html! {\n+ while i < 100 {\n+ let current = { let c = i; i += 1; c };\n+ if current > 5 {\n+ break;\n+ }\n+ <span>{current}</span>\n+ }\n+ }\n+ };\n+\n+ // continue with trailing semicolon\n+ _ = {\n+ let mut i: ::std::primitive::i32 = 0;\n+ ::yew::html! {\n+ while i < 10 {\n+ let current = { let c = i; i += 1; c };\n+ if current % 2 == 0 {\n+ continue;\n+ }\n+ <span>{current}</span>\n+ }\n+ }\n+ };\n+\n+ // unbraced match arm with break\n+ _ = {\n+ let mut it = ::std::iter::IntoIterator::into_iter(0..10);\n+ ::yew::html! {\n+ while let ::std::option::Option::Some(v) = ::std::iter::Iterator::next(&mut it) {\n+ match v {\n+ 0 => break,\n+ _ => <span>{v}</span>,\n+ }\n+ }\n+ }\n+ };\n+\n+ // unbraced match arm with continue\n+ _ = {\n+ let mut it = ::std::iter::IntoIterator::into_iter(0..10);\n+ ::yew::html! {\n+ while let ::std::option::Option::Some(v) = ::std::iter::Iterator::next(&mut it) {\n+ match v {\n+ 0 => continue,\n+ _ => <span>{v}</span>,\n+ }\n+ }\n+ }\n+ };\n+\n+ // break/continue in a while body must not emit `unreachable_code` warnings even\n+ // under `#[deny(unreachable_code)]`.\n+ #[deny(unreachable_code)]\n+ fn break_continue_no_warn() {\n+ let mut i: ::std::primitive::i32 = 0;\n+ _ = ::yew::html! {\n+ while i < 100 {\n+ let current = { let c = i; i += 1; c };\n+ if current > 5 {\n+ break;\n+ }\n+ if current % 2 == 0 {\n+ continue;\n+ }\n+ <span>{current}</span>\n+ }\n+ };\n+ }\n+ break_continue_no_warn();\n+\n+ // Expression statement in while body: post-increment without the let-block hack.\n+ _ = {\n+ let mut i: ::std::primitive::i32 = 0;\n+ ::yew::html! {\n+ while i < 5 {\n+ let current = i;\n+ i += 1;\n+ <span>{current}</span>\n+ }\n+ }\n+ };\n+\n+ // Local fn item + expr-stmt + let, interleaved in while body preamble.\n+ {\n+ let mut i: ::std::primitive::i32 = 0;\n+ let mut total: ::std::primitive::i32 = 0;\n+ _ = ::yew::html! {\n+ while i < 3 {\n+ fn square(x: ::std::primitive::i32) -> ::std::primitive::i32 { x * x }\n+ let sq = square(i);\n+ total += sq;\n+ i += 1;\n+ <span>{sq}</span>\n+ }\n+ };\n+ _ = total;\n+ }\n+\n+ // Macro statement in while body preamble.\n+ _ = {\n+ let mut i: ::std::primitive::i32 = 0;\n+ ::yew::html! {\n+ while i < 1 {\n+ ::std::stringify!(debug_marker);\n+ i += 1;\n+ <span>{i}</span>\n+ }\n+ }\n+ };\n+\n+ // Labeled `break` targeting an enclosing labeled loop in user code.\n+ 'outer: loop {\n+ let mut i: ::std::primitive::i32 = 0;\n+ _ = ::yew::html! {\n+ while i < 100 {\n+ let current = i;\n+ i += 1;\n+ if current > 2 {\n+ break 'outer;\n+ }\n+ <span>{current}</span>\n+ }\n+ };\n+ break;\n+ }\n+\n+ // Labeled `break 'outer` without a trailing `;` (body-top position).\n+ 'outer: loop {\n+ let mut i: ::std::primitive::i32 = 0;\n+ _ = ::yew::html! {\n+ while i < 100 {\n+ let current = i;\n+ i += 1;\n+ if current > 2 {\n+ break 'outer\n+ }\n+ <span>{current}</span>\n+ }\n+ };\n+ break;\n+ }\n+\n+ // Labeled `continue 'outer` without a trailing `;` inside a while body.\n+ {\n+ let mut outer_hit: ::std::primitive::i32 = 0;\n+ 'outer: for _ in 0..3 {\n+ let mut i: ::std::primitive::i32 = 0;\n+ _ = ::yew::html! {\n+ while i < 10 {\n+ let current = i;\n+ i += 1;\n+ if current > 2 {\n+ continue 'outer\n+ }\n+ <span>{current}</span>\n+ }\n+ };\n+ outer_hit += 1;\n+ }\n+ _ = outer_hit;\n+ }\n+\n+ // Bare `return` (no value, no `;`) at body top.\n+ fn bare_return_at_body_top() {\n+ let mut it = ::std::iter::IntoIterator::into_iter(0..1);\n+ _ = ::yew::html! {\n+ while let ::std::option::Option::Some(_) = ::std::iter::Iterator::next(&mut it) {\n+ return\n+ <span>{\"unreachable\"}</span>\n+ }\n+ };\n+ }\n+ bare_return_at_body_top();\n+\n+ // Bare `return` in unbraced match arm (inside while-let).\n+ fn return_in_unbraced_match_arm() {\n+ let mut it = ::std::iter::IntoIterator::into_iter(0..10);\n+ _ = ::yew::html! {\n+ while let ::std::option::Option::Some(v) = ::std::iter::Iterator::next(&mut it) {\n+ match v {\n+ 3 => return,\n+ _ => <span>{v}</span>,\n+ }\n+ }\n+ };\n+ }\n+ return_in_unbraced_match_arm();\n+\n+ // Bare `return` in braced match arm.\n+ fn return_in_braced_match_arm() {\n+ let mut it = ::std::iter::IntoIterator::into_iter(0..10);\n+ _ = ::yew::html! {\n+ while let ::std::option::Option::Some(v) = ::std::iter::Iterator::next(&mut it) {\n+ match v {\n+ 3 => { return },\n+ _ => <span>{v}</span>,\n+ }\n+ }\n+ };\n+ }\n+ return_in_braced_match_arm();\n+\n+ // `return` with a value in preamble position.\n+ fn return_value_from_preamble() -> ::std::primitive::i32 {\n+ let mut it = ::std::iter::IntoIterator::into_iter(0..3);\n+ _ = ::yew::html! {\n+ while let ::std::option::Option::Some(current) = ::std::iter::Iterator::next(&mut it) {\n+ return current;\n+ <span>{current}</span>\n+ }\n+ };\n+ 0\n+ }\n+ let _ = return_value_from_preamble();\n+\n+ // `return` with a value in unbraced match arm.\n+ fn return_value_from_unbraced_arm() -> ::std::primitive::i32 {\n+ let mut it = ::std::iter::IntoIterator::into_iter(0..10);\n+ _ = ::yew::html! {\n+ while let ::std::option::Option::Some(v) = ::std::iter::Iterator::next(&mut it) {\n+ match v {\n+ 3 => return v,\n+ _ => <span>{v}</span>,\n+ }\n+ }\n+ };\n+ 0\n+ }\n+ let _ = return_value_from_unbraced_arm();\n+}\ndiff --git a/packages/yew/tests/html_for.rs b/packages/yew/tests/html_for.rs\nnew file mode 100644\nindex 00000000000..6b6309437c0\n--- /dev/null\n+++ b/packages/yew/tests/html_for.rs\n@@ -0,0 +1,345 @@\n+#![cfg(all(target_arch = \"wasm32\", not(target_os = \"wasi\")))]\n+\n+mod common;\n+\n+use common::obtain_result;\n+use wasm_bindgen_test::*;\n+use yew::prelude::*;\n+use yew::scheduler;\n+\n+wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);\n+\n+async fn render_and_read<C: BaseComponent<Properties = ()>>() -> String {\n+ yew::Renderer::<C>::with_root(gloo::utils::document().get_element_by_id(\"output\").unwrap())\n+ .render();\n+ scheduler::flush().await;\n+ obtain_result()\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_break_emits_prefix() {\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"result\">\n+ for i in 0..10 {\n+ if i > 5 {\n+ break\n+ }\n+ <span>{i}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>0</span><span>1</span><span>2</span><span>3</span><span>4</span><span>5</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_continue_skips_matching() {\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"result\">\n+ for i in 0..6 {\n+ if i % 2 == 0 {\n+ continue\n+ }\n+ <span>{i}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>1</span><span>3</span><span>5</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_break_and_continue_together() {\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"result\">\n+ for i in 0..100 {\n+ if i >= 8 {\n+ break\n+ }\n+ if i % 3 == 0 {\n+ continue\n+ }\n+ <span>{i}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>1</span><span>2</span><span>4</span><span>5</span><span>7</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_break_with_trailing_semi() {\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"result\">\n+ for i in 0..10 {\n+ if i > 2 {\n+ break;\n+ }\n+ <span>{i}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>0</span><span>1</span><span>2</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_continue_with_trailing_semi() {\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"result\">\n+ for i in 0..6 {\n+ if i % 2 == 0 {\n+ continue;\n+ }\n+ <span>{i}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>1</span><span>3</span><span>5</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_match_arm_break() {\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"result\">\n+ for i in 0..10 {\n+ match i {\n+ 3 => break,\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>0</span><span>1</span><span>2</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_match_arm_continue() {\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"result\">\n+ for i in 0..6 {\n+ match i % 2 {\n+ 0 => continue,\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>1</span><span>3</span><span>5</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_labeled_break_crosses_macro() {\n+ // Demonstrates `break 'outer` inside an html! `for` body terminates the\n+ // enclosing labeled Rust `for` loop, not just the macro's inner iteration.\n+ //\n+ // If labels didn't cross the macro boundary, `break 'outer` would break\n+ // the macro's inner for and `rows_completed` would count every row.\n+ // With working labeled break, the first inner `break 'outer` aborts the\n+ // outer Rust `for`, so post-html! increment never runs.\n+ #[component]\n+ fn App() -> Html {\n+ let mut rows_completed = 0;\n+ 'outer: for _row in 0..3 {\n+ let _ = html! {\n+ for col in 0..10 {\n+ if col >= 1 {\n+ break 'outer;\n+ }\n+ <span>{col}</span>\n+ }\n+ };\n+ rows_completed += 1;\n+ }\n+ html! {\n+ <div id=\"result\">{ format!(\"rows_completed={rows_completed}\") }</div>\n+ }\n+ }\n+\n+ assert_eq!(render_and_read::<App>().await, \"rows_completed=0\");\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_labeled_break_no_semi() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut rows_completed = 0;\n+ 'outer: for _row in 0..3 {\n+ let _ = html! {\n+ for col in 0..10 {\n+ if col >= 1 {\n+ break 'outer\n+ }\n+ <span>{col}</span>\n+ }\n+ };\n+ rows_completed += 1;\n+ }\n+ html! {\n+ <div id=\"result\">{ format!(\"rows_completed={rows_completed}\") }</div>\n+ }\n+ }\n+\n+ assert_eq!(render_and_read::<App>().await, \"rows_completed=0\");\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_labeled_continue_no_semi() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut rows_skipped = 0;\n+ 'outer: for row in 0..3 {\n+ let _ = html! {\n+ for col in 0..10 {\n+ if row == 1 {\n+ continue 'outer\n+ }\n+ <span>{col}</span>\n+ }\n+ };\n+ if row == 1 {\n+ rows_skipped += 1;\n+ }\n+ }\n+ html! {\n+ <div id=\"result\">{ format!(\"rows_skipped={rows_skipped}\") }</div>\n+ }\n+ }\n+\n+ // Row 1's inner `continue 'outer` skips over `rows_skipped += 1;`, so\n+ // the counter stays at 0 — proving the label crossed the macro boundary.\n+ assert_eq!(render_and_read::<App>().await, \"rows_skipped=0\");\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_return_exits_component() {\n+ // `return` inside an html! body returns from the enclosing function. The\n+ // component function therefore yields the inner `html! { <p .../> }`\n+ // instead of the outer `<div>` fragment, and the \"never\" span is dead\n+ // code. Verifies bare `return val;` semantics in a for-body preamble.\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"original\">\n+ for _ in 0..1 {\n+ return html!{ <p id=\"result\">{\"returned\"}</p> };\n+ <span>{\"never\"}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(render_and_read::<App>().await, \"returned\");\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_return_in_unbraced_match_arm() {\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"original\">\n+ for i in 0..10 {\n+ match i {\n+ 3 => return html!{ <p id=\"result\">{format!(\"stopped at {i}\")}</p> },\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(render_and_read::<App>().await, \"stopped at 3\");\n+}\n+\n+// `break <html-element/>`, `continue <html-element/>`, and `return <html-element/>`\n+// in an unbraced match arm are compile errors (see html-match-fail.rs). The\n+// documented workaround is to wrap the arm body in braces and use `html!(...)`\n+// to produce the value. The tests below verify the workaround compiles and\n+// renders correctly.\n+#[wasm_bindgen_test]\n+async fn for_return_html_workaround_with_braced_arm() {\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"original\">\n+ for i in 0..10 {\n+ match i {\n+ 3 => { return html!(<p id=\"result\">{format!(\"stopped at {i}\")}</p>) }\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(render_and_read::<App>().await, \"stopped at 3\");\n+}\n+\n+#[wasm_bindgen_test]\n+async fn for_break_workaround_with_braced_arm() {\n+ // Breaking the loop doesn't need a value; the workaround for users who\n+ // tried `break <html/>` is just a braced `{ break }` arm.\n+ #[component]\n+ fn App() -> Html {\n+ html! {\n+ <div id=\"result\">\n+ for i in 0..10 {\n+ match i {\n+ 3 => { break }\n+ _ => <span>{i}</span>,\n+ }\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>0</span><span>1</span><span>2</span>\"\n+ );\n+}\ndiff --git a/packages/yew/tests/html_while.rs b/packages/yew/tests/html_while.rs\nnew file mode 100644\nindex 00000000000..b2408e58e1a\n--- /dev/null\n+++ b/packages/yew/tests/html_while.rs\n@@ -0,0 +1,364 @@\n+#![cfg(all(target_arch = \"wasm32\", not(target_os = \"wasi\")))]\n+\n+mod common;\n+\n+use common::obtain_result;\n+use wasm_bindgen_test::*;\n+use yew::prelude::*;\n+use yew::scheduler;\n+\n+wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);\n+\n+async fn render_and_read<C: BaseComponent<Properties = ()>>() -> String {\n+ yew::Renderer::<C>::with_root(gloo::utils::document().get_element_by_id(\"output\").unwrap())\n+ .render();\n+ scheduler::flush().await;\n+ obtain_result()\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_iterates_until_false() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut i: i32 = 0;\n+ html! {\n+ <div id=\"result\">\n+ while i < 5 {\n+ let current = { let c = i; i += 1; c };\n+ <span>{current}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>0</span><span>1</span><span>2</span><span>3</span><span>4</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_break_exits_early() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut i: i32 = 0;\n+ html! {\n+ <div id=\"result\">\n+ while i < 100 {\n+ let current = { let c = i; i += 1; c };\n+ if current > 5 {\n+ break\n+ }\n+ <span>{current}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>0</span><span>1</span><span>2</span><span>3</span><span>4</span><span>5</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_continue_skips_matching() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut i: i32 = 0;\n+ html! {\n+ <div id=\"result\">\n+ while i < 6 {\n+ let current = { let c = i; i += 1; c };\n+ if current % 2 == 0 {\n+ continue\n+ }\n+ <span>{current}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>1</span><span>3</span><span>5</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_let_iterates_option_some() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut it = (0..4).into_iter();\n+ html! {\n+ <div id=\"result\">\n+ while let Some(v) = it.next() {\n+ <span>{v}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>0</span><span>1</span><span>2</span><span>3</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_let_break_and_continue_together() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut it = (0..100).into_iter();\n+ html! {\n+ <div id=\"result\">\n+ while let Some(v) = it.next() {\n+ if v >= 8 {\n+ break\n+ }\n+ if v % 3 == 0 {\n+ continue\n+ }\n+ <span>{v}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>1</span><span>2</span><span>4</span><span>5</span><span>7</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_break_with_trailing_semi() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut i: i32 = 0;\n+ html! {\n+ <div id=\"result\">\n+ while i < 100 {\n+ let current = { let c = i; i += 1; c };\n+ if current > 2 {\n+ break;\n+ }\n+ <span>{current}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>0</span><span>1</span><span>2</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_continue_with_trailing_semi() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut i: i32 = 0;\n+ html! {\n+ <div id=\"result\">\n+ while i < 6 {\n+ let current = { let c = i; i += 1; c };\n+ if current % 2 == 0 {\n+ continue;\n+ }\n+ <span>{current}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>1</span><span>3</span><span>5</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_let_match_arm_break() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut it = (0..10).into_iter();\n+ html! {\n+ <div id=\"result\">\n+ while let Some(v) = it.next() {\n+ match v {\n+ 3 => break,\n+ _ => <span>{v}</span>,\n+ }\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>0</span><span>1</span><span>2</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_let_match_arm_continue() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut it = (0..6).into_iter();\n+ html! {\n+ <div id=\"result\">\n+ while let Some(v) = it.next() {\n+ match v % 2 {\n+ 0 => continue,\n+ _ => <span>{v}</span>,\n+ }\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>1</span><span>3</span><span>5</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_expr_stmt_preamble_increments() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut i: i32 = 0;\n+ html! {\n+ <div id=\"result\">\n+ while i < 4 {\n+ let current = i;\n+ i += 1;\n+ <span>{current}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(\n+ render_and_read::<App>().await,\n+ \"<span>0</span><span>1</span><span>2</span><span>3</span>\"\n+ );\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_labeled_break_no_semi() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut rows_completed = 0;\n+ 'outer: for _row in 0..3 {\n+ let mut i: i32 = 0;\n+ let _ = html! {\n+ while i < 10 {\n+ let current = i;\n+ i += 1;\n+ if current >= 1 {\n+ break 'outer\n+ }\n+ <span>{current}</span>\n+ }\n+ };\n+ rows_completed += 1;\n+ }\n+ html! {\n+ <div id=\"result\">{ format!(\"rows_completed={rows_completed}\") }</div>\n+ }\n+ }\n+\n+ assert_eq!(render_and_read::<App>().await, \"rows_completed=0\");\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_labeled_continue_no_semi() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut rows_skipped = 0;\n+ 'outer: for row in 0..3 {\n+ let mut i: i32 = 0;\n+ let _ = html! {\n+ while i < 2 {\n+ let current = i;\n+ i += 1;\n+ if row == 1 {\n+ continue 'outer\n+ }\n+ <span>{current}</span>\n+ }\n+ };\n+ if row == 1 {\n+ rows_skipped += 1;\n+ }\n+ }\n+ html! {\n+ <div id=\"result\">{ format!(\"rows_skipped={rows_skipped}\") }</div>\n+ }\n+ }\n+\n+ assert_eq!(render_and_read::<App>().await, \"rows_skipped=0\");\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_return_exits_component() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut it = (0..1).into_iter();\n+ html! {\n+ <div id=\"original\">\n+ while let Some(_) = it.next() {\n+ return html!{ <p id=\"result\">{\"returned\"}</p> };\n+ <span>{\"never\"}</span>\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(render_and_read::<App>().await, \"returned\");\n+}\n+\n+#[wasm_bindgen_test]\n+async fn while_return_in_unbraced_match_arm() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut it = (0..10).into_iter();\n+ html! {\n+ <div id=\"original\">\n+ while let Some(v) = it.next() {\n+ match v {\n+ 3 => return html!{ <p id=\"result\">{format!(\"stopped at {v}\")}</p> },\n+ _ => <span>{v}</span>,\n+ }\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(render_and_read::<App>().await, \"stopped at 3\");\n+}\n+\n+// Counterpart to `for_return_html_workaround_with_braced_arm`: verifies the\n+// braced-arm workaround works under `while let` too.\n+#[wasm_bindgen_test]\n+async fn while_return_html_workaround_with_braced_arm() {\n+ #[component]\n+ fn App() -> Html {\n+ let mut it = (0..10).into_iter();\n+ html! {\n+ <div id=\"original\">\n+ while let Some(v) = it.next() {\n+ match v {\n+ 3 => { return html!(<p id=\"result\">{format!(\"stopped at {v}\")}</p>) }\n+ _ => <span>{v}</span>,\n+ }\n+ }\n+ </div>\n+ }\n+ }\n+\n+ assert_eq!(render_and_read::<App>().await, \"stopped at 3\");\n+}\n"},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86298,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4124,"string":"4,124"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: while, break/continue/return, and preamble statements in html!"},"pr_body":{"kind":"string","value":"I have seen this in the previous extension too. Is there a deeper meaning behind only allowing `let` statements and nothing else, most notably expression statements?\n\nI suppose a [QualifiedPathInExpression](https://doc.rust-lang.org/reference/paths.html#railroad-QualifiedPathInExpression) would be ambiguous. Rust allows constructs such as `<Type>::method` and `<Type as Trait>::method` for explicit inherent methods and trait methods. I suppose these would be edge cases to look out for.\n\nA `return` expression might also be somewhat ambiguous.\n\nDefining local items, macros, calling functions and operators, opening a block though all seem fine?"},"base_sha":{"kind":"string","value":"28219ae16e748a0511d79855b701d365bf122ad3"},"head_sha":{"kind":"string","value":"b9fe62a55487fae23ac5aa8047bd8c6892c33107"},"gold_diff":{"kind":"string","value":"diff --git a/packages/yew-macro/src/html_tree/html_while.rs b/packages/yew-macro/src/html_tree/html_while.rs\nnew file mode 100644\nindex 00000000000..68f7f50fe72\n--- /dev/null\n+++ b/packages/yew-macro/src/html_tree/html_while.rs\n@@ -0,0 +1,72 @@\n+use proc_macro2::TokenStream;\n+use quote::{ToTokens, quote};\n+use syn::buffer::Cursor;\n+use syn::parse::{Parse, ParseStream};\n+use syn::spanned::Spanned;\n+use syn::token::While;\n+use syn::{Expr, Stmt, braced};\n+\n+use super::HtmlChildrenTree;\n+use super::html_loop::{emit_loop, parse_loop_body};\n+use crate::PeekValue;\n+\n+pub struct HtmlWhile {\n+ cond: Box<Expr>,\n+ stmts: Vec<Stmt>,\n+ body: HtmlChildrenTree,\n+ deprecations: TokenStream,\n+}\n+\n+impl PeekValue<()> for HtmlWhile {\n+ fn peek(cursor: Cursor) -> Option<()> {\n+ let (ident, _) = cursor.ident()?;\n+ (ident == \"while\").then_some(())\n+ }\n+}\n+\n+impl Parse for HtmlWhile {\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\n+ While::parse(input)?;\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\n+ match &*cond {\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"missing condition for `while` expression\",\n+ ));\n+ }\n+ _ => {}\n+ }\n+ if input.is_empty() {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"this `while` expression has a condition, but no block\",\n+ ));\n+ }\n+\n+ let body_stream;\n+ braced!(body_stream in input);\n+\n+ let (stmts, body, deprecations) = parse_loop_body(&body_stream, \"while\")?;\n+\n+ Ok(Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ })\n+ }\n+}\n+\n+impl ToTokens for HtmlWhile {\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\n+ let Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ } = self;\n+ let header = quote!(while #cond);\n+ tokens.extend(emit_loop(header, stmts, body, deprecations));\n+ }\n+}\n"},"changed_files":{"kind":"list like","value":["packages/yew-macro/src/html_tree/html_while.rs"],"string":"[\n \"packages/yew-macro/src/html_tree/html_while.rs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"I have seen this in the previous extension too. Is there a deeper meaning behind only allowing `let` statements and nothing else, most notably expression statements?\n\nI suppose a [QualifiedPathInExpression](https://doc.rust-lang.org/reference/paths.html#railroad-QualifiedPathInExpression) would be ambiguous. Rust allows constructs such as `<Type>::method` and `<Type as Trait>::method` for explicit inherent methods and trait methods. I suppose these would be edge cases to look out for.\n\nA `return` expression might also be somewhat ambiguous.\n\nDefining local items, macros, calling functions and operators, opening a block though all seem fine?","path":"packages/yew-macro/src/html_tree/html_while.rs","hunk":"@@ -0,0 +1,145 @@\n+use proc_macro2::{Ident, TokenStream};\n+use quote::{ToTokens, quote};\n+use syn::buffer::Cursor;\n+use syn::parse::{Parse, ParseStream};\n+use syn::spanned::Spanned;\n+use syn::token::While;\n+use syn::{Expr, Local, Stmt, Token, braced};\n+\n+use super::{HtmlChildrenTree, ToNodeIterator};\n+use crate::PeekValue;\n+use crate::html_tree::HtmlTree;\n+use crate::html_tree::html_for::is_contextless_pure;\n+\n+pub struct HtmlWhile {\n+ cond: Box<Expr>,\n+ let_stmts: Vec<Local>,\n+ body: HtmlChildrenTree,\n+ deprecations: TokenStream,\n+}\n+\n+impl PeekValue<()> for HtmlWhile {\n+ fn peek(cursor: Cursor) -> Option<()> {\n+ let (ident, _) = cursor.ident()?;\n+ (ident == \"while\").then_some(())\n+ }\n+}\n+\n+impl Parse for HtmlWhile {\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\n+ While::parse(input)?;\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\n+ match &*cond {\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"missing condition for `while` expression\",\n+ ));\n+ }\n+ _ => {}\n+ }\n+ if input.is_empty() {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"this `while` expression has a condition, but no block\",\n+ ));\n+ }\n+\n+ let body_stream;\n+ braced!(body_stream in input);\n+\n+ let mut let_stmts = Vec::new();\n+ while body_stream.peek(Token![let]) {","resolving_sha":"b9fe62a55487fae23ac5aa8047bd8c6892c33107","resolving_diff":"diff --git a/packages/yew-macro/src/html_tree/html_while.rs b/packages/yew-macro/src/html_tree/html_while.rs\nnew file mode 100644\nindex 00000000000..68f7f50fe72\n--- /dev/null\n+++ b/packages/yew-macro/src/html_tree/html_while.rs\n@@ -0,0 +1,72 @@\n+use proc_macro2::TokenStream;\n+use quote::{ToTokens, quote};\n+use syn::buffer::Cursor;\n+use syn::parse::{Parse, ParseStream};\n+use syn::spanned::Spanned;\n+use syn::token::While;\n+use syn::{Expr, Stmt, braced};\n+\n+use super::HtmlChildrenTree;\n+use super::html_loop::{emit_loop, parse_loop_body};\n+use crate::PeekValue;\n+\n+pub struct HtmlWhile {\n+ cond: Box<Expr>,\n+ stmts: Vec<Stmt>,\n+ body: HtmlChildrenTree,\n+ deprecations: TokenStream,\n+}\n+\n+impl PeekValue<()> for HtmlWhile {\n+ fn peek(cursor: Cursor) -> Option<()> {\n+ let (ident, _) = cursor.ident()?;\n+ (ident == \"while\").then_some(())\n+ }\n+}\n+\n+impl Parse for HtmlWhile {\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\n+ While::parse(input)?;\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\n+ match &*cond {\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"missing condition for `while` expression\",\n+ ));\n+ }\n+ _ => {}\n+ }\n+ if input.is_empty() {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"this `while` expression has a condition, but no block\",\n+ ));\n+ }\n+\n+ let body_stream;\n+ braced!(body_stream in input);\n+\n+ let (stmts, body, deprecations) = parse_loop_body(&body_stream, \"while\")?;\n+\n+ Ok(Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ })\n+ }\n+}\n+\n+impl ToTokens for HtmlWhile {\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\n+ let Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ } = self;\n+ let header = quote!(while #cond);\n+ tokens.extend(emit_loop(header, stmts, body, deprecations));\n+ }\n+}\n"}],"string":"[\n {\n \"comment\": \"I have seen this in the previous extension too. Is there a deeper meaning behind only allowing `let` statements and nothing else, most notably expression statements?\\n\\nI suppose a [QualifiedPathInExpression](https://doc.rust-lang.org/reference/paths.html#railroad-QualifiedPathInExpression) would be ambiguous. Rust allows constructs such as `<Type>::method` and `<Type as Trait>::method` for explicit inherent methods and trait methods. I suppose these would be edge cases to look out for.\\n\\nA `return` expression might also be somewhat ambiguous.\\n\\nDefining local items, macros, calling functions and operators, opening a block though all seem fine?\",\n \"path\": \"packages/yew-macro/src/html_tree/html_while.rs\",\n \"hunk\": \"@@ -0,0 +1,145 @@\\n+use proc_macro2::{Ident, TokenStream};\\n+use quote::{ToTokens, quote};\\n+use syn::buffer::Cursor;\\n+use syn::parse::{Parse, ParseStream};\\n+use syn::spanned::Spanned;\\n+use syn::token::While;\\n+use syn::{Expr, Local, Stmt, Token, braced};\\n+\\n+use super::{HtmlChildrenTree, ToNodeIterator};\\n+use crate::PeekValue;\\n+use crate::html_tree::HtmlTree;\\n+use crate::html_tree::html_for::is_contextless_pure;\\n+\\n+pub struct HtmlWhile {\\n+ cond: Box<Expr>,\\n+ let_stmts: Vec<Local>,\\n+ body: HtmlChildrenTree,\\n+ deprecations: TokenStream,\\n+}\\n+\\n+impl PeekValue<()> for HtmlWhile {\\n+ fn peek(cursor: Cursor) -> Option<()> {\\n+ let (ident, _) = cursor.ident()?;\\n+ (ident == \\\"while\\\").then_some(())\\n+ }\\n+}\\n+\\n+impl Parse for HtmlWhile {\\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\\n+ While::parse(input)?;\\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\\n+ match &*cond {\\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"missing condition for `while` expression\\\",\\n+ ));\\n+ }\\n+ _ => {}\\n+ }\\n+ if input.is_empty() {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"this `while` expression has a condition, but no block\\\",\\n+ ));\\n+ }\\n+\\n+ let body_stream;\\n+ braced!(body_stream in input);\\n+\\n+ let mut let_stmts = Vec::new();\\n+ while body_stream.peek(Token![let]) {\",\n \"resolving_sha\": \"b9fe62a55487fae23ac5aa8047bd8c6892c33107\",\n \"resolving_diff\": \"diff --git a/packages/yew-macro/src/html_tree/html_while.rs b/packages/yew-macro/src/html_tree/html_while.rs\\nnew file mode 100644\\nindex 00000000000..68f7f50fe72\\n--- /dev/null\\n+++ b/packages/yew-macro/src/html_tree/html_while.rs\\n@@ -0,0 +1,72 @@\\n+use proc_macro2::TokenStream;\\n+use quote::{ToTokens, quote};\\n+use syn::buffer::Cursor;\\n+use syn::parse::{Parse, ParseStream};\\n+use syn::spanned::Spanned;\\n+use syn::token::While;\\n+use syn::{Expr, Stmt, braced};\\n+\\n+use super::HtmlChildrenTree;\\n+use super::html_loop::{emit_loop, parse_loop_body};\\n+use crate::PeekValue;\\n+\\n+pub struct HtmlWhile {\\n+ cond: Box<Expr>,\\n+ stmts: Vec<Stmt>,\\n+ body: HtmlChildrenTree,\\n+ deprecations: TokenStream,\\n+}\\n+\\n+impl PeekValue<()> for HtmlWhile {\\n+ fn peek(cursor: Cursor) -> Option<()> {\\n+ let (ident, _) = cursor.ident()?;\\n+ (ident == \\\"while\\\").then_some(())\\n+ }\\n+}\\n+\\n+impl Parse for HtmlWhile {\\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\\n+ While::parse(input)?;\\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\\n+ match &*cond {\\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"missing condition for `while` expression\\\",\\n+ ));\\n+ }\\n+ _ => {}\\n+ }\\n+ if input.is_empty() {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"this `while` expression has a condition, but no block\\\",\\n+ ));\\n+ }\\n+\\n+ let body_stream;\\n+ braced!(body_stream in input);\\n+\\n+ let (stmts, body, deprecations) = parse_loop_body(&body_stream, \\\"while\\\")?;\\n+\\n+ Ok(Self {\\n+ cond,\\n+ stmts,\\n+ body,\\n+ deprecations,\\n+ })\\n+ }\\n+}\\n+\\n+impl ToTokens for HtmlWhile {\\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\\n+ let Self {\\n+ cond,\\n+ stmts,\\n+ body,\\n+ deprecations,\\n+ } = self;\\n+ let header = quote!(while #cond);\\n+ tokens.extend(emit_loop(header, stmts, body, deprecations));\\n+ }\\n+}\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":86299,"cells":{"repo":{"kind":"string","value":"yewstack/yew"},"pr_number":{"kind":"number","value":4124,"string":"4,124"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: while, break/continue/return, and preamble statements in html!"},"pr_body":{"kind":"string","value":"Which of the two options is meant to be produced for the loop below?\n\n```\nhtml! {\n for i in [1, 2] {\n <a></a>\n <i></i>\n }\n}\n```\n\nOption 1\n```\nhtml! {\n <a></a>\n <i></i>\n <a></a>\n <i></i>\n}\n```\n\nOption 2\n```\nhtml! {\n <>\n <a></a>\n <i></i>\n </>\n <>\n <a></a>\n <i></i>\n </>\n}\n```"},"base_sha":{"kind":"string","value":"28219ae16e748a0511d79855b701d365bf122ad3"},"head_sha":{"kind":"string","value":"b9fe62a55487fae23ac5aa8047bd8c6892c33107"},"gold_diff":{"kind":"string","value":"diff --git a/packages/yew-macro/src/html_tree/html_while.rs b/packages/yew-macro/src/html_tree/html_while.rs\nnew file mode 100644\nindex 00000000000..68f7f50fe72\n--- /dev/null\n+++ b/packages/yew-macro/src/html_tree/html_while.rs\n@@ -0,0 +1,72 @@\n+use proc_macro2::TokenStream;\n+use quote::{ToTokens, quote};\n+use syn::buffer::Cursor;\n+use syn::parse::{Parse, ParseStream};\n+use syn::spanned::Spanned;\n+use syn::token::While;\n+use syn::{Expr, Stmt, braced};\n+\n+use super::HtmlChildrenTree;\n+use super::html_loop::{emit_loop, parse_loop_body};\n+use crate::PeekValue;\n+\n+pub struct HtmlWhile {\n+ cond: Box<Expr>,\n+ stmts: Vec<Stmt>,\n+ body: HtmlChildrenTree,\n+ deprecations: TokenStream,\n+}\n+\n+impl PeekValue<()> for HtmlWhile {\n+ fn peek(cursor: Cursor) -> Option<()> {\n+ let (ident, _) = cursor.ident()?;\n+ (ident == \"while\").then_some(())\n+ }\n+}\n+\n+impl Parse for HtmlWhile {\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\n+ While::parse(input)?;\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\n+ match &*cond {\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"missing condition for `while` expression\",\n+ ));\n+ }\n+ _ => {}\n+ }\n+ if input.is_empty() {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"this `while` expression has a condition, but no block\",\n+ ));\n+ }\n+\n+ let body_stream;\n+ braced!(body_stream in input);\n+\n+ let (stmts, body, deprecations) = parse_loop_body(&body_stream, \"while\")?;\n+\n+ Ok(Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ })\n+ }\n+}\n+\n+impl ToTokens for HtmlWhile {\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\n+ let Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ } = self;\n+ let header = quote!(while #cond);\n+ tokens.extend(emit_loop(header, stmts, body, deprecations));\n+ }\n+}\n"},"changed_files":{"kind":"list like","value":["packages/yew-macro/src/html_tree/html_while.rs"],"string":"[\n \"packages/yew-macro/src/html_tree/html_while.rs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"Which of the two options is meant to be produced for the loop below?\n\n```\nhtml! {\n for i in [1, 2] {\n <a></a>\n <i></i>\n }\n}\n```\n\nOption 1\n```\nhtml! {\n <a></a>\n <i></i>\n <a></a>\n <i></i>\n}\n```\n\nOption 2\n```\nhtml! {\n <>\n <a></a>\n <i></i>\n </>\n <>\n <a></a>\n <i></i>\n </>\n}\n```","path":"packages/yew-macro/src/html_tree/html_while.rs","hunk":"@@ -0,0 +1,145 @@\n+use proc_macro2::{Ident, TokenStream};\n+use quote::{ToTokens, quote};\n+use syn::buffer::Cursor;\n+use syn::parse::{Parse, ParseStream};\n+use syn::spanned::Spanned;\n+use syn::token::While;\n+use syn::{Expr, Local, Stmt, Token, braced};\n+\n+use super::{HtmlChildrenTree, ToNodeIterator};\n+use crate::PeekValue;\n+use crate::html_tree::HtmlTree;\n+use crate::html_tree::html_for::is_contextless_pure;\n+\n+pub struct HtmlWhile {\n+ cond: Box<Expr>,\n+ let_stmts: Vec<Local>,\n+ body: HtmlChildrenTree,\n+ deprecations: TokenStream,\n+}\n+\n+impl PeekValue<()> for HtmlWhile {\n+ fn peek(cursor: Cursor) -> Option<()> {\n+ let (ident, _) = cursor.ident()?;\n+ (ident == \"while\").then_some(())\n+ }\n+}\n+\n+impl Parse for HtmlWhile {\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\n+ While::parse(input)?;\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\n+ match &*cond {\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"missing condition for `while` expression\",\n+ ));\n+ }\n+ _ => {}\n+ }\n+ if input.is_empty() {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"this `while` expression has a condition, but no block\",\n+ ));\n+ }\n+\n+ let body_stream;\n+ braced!(body_stream in input);\n+\n+ let mut let_stmts = Vec::new();\n+ while body_stream.peek(Token![let]) {\n+ let stmt: Stmt = body_stream.parse()?;\n+ match stmt {\n+ Stmt::Local(local) => let_stmts.push(local),\n+ _ => unreachable!(\"peeked Token![let] but parsed non-local statement\"),\n+ }\n+ }\n+\n+ let body = HtmlChildrenTree::parse_delimited_with_nodes(&body_stream)?;\n+ let deprecations = super::check_unnecessary_fragment(&body);\n+ // TODO: more concise code by using if-let guards (MSRV 1.95)\n+ for child in body.0.iter() {\n+ let HtmlTree::Element(element) = child else {\n+ continue;\n+ };\n+\n+ let Some(key) = &element.props.special.key else {\n+ continue;\n+ };\n+\n+ if is_contextless_pure(&key.value) {\n+ return Err(syn::Error::new(\n+ key.value.span(),\n+ \"duplicate key for a node in a `while`-loop\\nthis will create elements with \\\n+ duplicate keys if the loop iterates more than once\",\n+ ));\n+ }\n+ }\n+ Ok(Self {\n+ cond,\n+ let_stmts,\n+ body,\n+ deprecations,\n+ })\n+ }\n+}\n+\n+impl ToTokens for HtmlWhile {\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\n+ let Self {\n+ cond,\n+ let_stmts,\n+ body,\n+ deprecations,\n+ } = self;\n+ let acc = Ident::new(\"__yew_v\", cond.span());\n+\n+ let alloc_opt = body\n+ .size_hint()\n+ .filter(|&size| size > 1) // explicitly reserving space for 1 more element is redundant\n+ .map(|size| quote!( #acc.reserve(#size) ));\n+\n+ let vlist_gen = match body.fully_keyed() {\n+ Some(true) => quote! {\n+ ::yew::virtual_dom::VList::__macro_new(\n+ #acc,\n+ ::std::option::Option::None,\n+ ::yew::virtual_dom::FullyKeyedState::KnownFullyKeyed\n+ )\n+ },\n+ Some(false) => quote! {\n+ ::yew::virtual_dom::VList::__macro_new(\n+ #acc,\n+ ::std::option::Option::None,\n+ ::yew::virtual_dom::FullyKeyedState::KnownMissingKeys\n+ )\n+ },\n+ None => quote! {\n+ ::yew::virtual_dom::VList::with_children(#acc, ::std::option::Option::None)\n+ },\n+ };\n+\n+ let body = body\n+ .0\n+ .iter()\n+ .map(|child| match child.to_node_iterator_stream() {\n+ Some(child) => {\n+ quote!( #acc.extend(#child) )\n+ }\n+ _ => {\n+ quote!( #acc.push(::std::convert::Into::into(#child)) )","resolving_sha":"b9fe62a55487fae23ac5aa8047bd8c6892c33107","resolving_diff":"diff --git a/packages/yew-macro/src/html_tree/html_while.rs b/packages/yew-macro/src/html_tree/html_while.rs\nnew file mode 100644\nindex 00000000000..68f7f50fe72\n--- /dev/null\n+++ b/packages/yew-macro/src/html_tree/html_while.rs\n@@ -0,0 +1,72 @@\n+use proc_macro2::TokenStream;\n+use quote::{ToTokens, quote};\n+use syn::buffer::Cursor;\n+use syn::parse::{Parse, ParseStream};\n+use syn::spanned::Spanned;\n+use syn::token::While;\n+use syn::{Expr, Stmt, braced};\n+\n+use super::HtmlChildrenTree;\n+use super::html_loop::{emit_loop, parse_loop_body};\n+use crate::PeekValue;\n+\n+pub struct HtmlWhile {\n+ cond: Box<Expr>,\n+ stmts: Vec<Stmt>,\n+ body: HtmlChildrenTree,\n+ deprecations: TokenStream,\n+}\n+\n+impl PeekValue<()> for HtmlWhile {\n+ fn peek(cursor: Cursor) -> Option<()> {\n+ let (ident, _) = cursor.ident()?;\n+ (ident == \"while\").then_some(())\n+ }\n+}\n+\n+impl Parse for HtmlWhile {\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\n+ While::parse(input)?;\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\n+ match &*cond {\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"missing condition for `while` expression\",\n+ ));\n+ }\n+ _ => {}\n+ }\n+ if input.is_empty() {\n+ return Err(syn::Error::new(\n+ cond.span(),\n+ \"this `while` expression has a condition, but no block\",\n+ ));\n+ }\n+\n+ let body_stream;\n+ braced!(body_stream in input);\n+\n+ let (stmts, body, deprecations) = parse_loop_body(&body_stream, \"while\")?;\n+\n+ Ok(Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ })\n+ }\n+}\n+\n+impl ToTokens for HtmlWhile {\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\n+ let Self {\n+ cond,\n+ stmts,\n+ body,\n+ deprecations,\n+ } = self;\n+ let header = quote!(while #cond);\n+ tokens.extend(emit_loop(header, stmts, body, deprecations));\n+ }\n+}\n"}],"string":"[\n {\n \"comment\": \"Which of the two options is meant to be produced for the loop below?\\n\\n```\\nhtml! {\\n for i in [1, 2] {\\n <a></a>\\n <i></i>\\n }\\n}\\n```\\n\\nOption 1\\n```\\nhtml! {\\n <a></a>\\n <i></i>\\n <a></a>\\n <i></i>\\n}\\n```\\n\\nOption 2\\n```\\nhtml! {\\n <>\\n <a></a>\\n <i></i>\\n </>\\n <>\\n <a></a>\\n <i></i>\\n </>\\n}\\n```\",\n \"path\": \"packages/yew-macro/src/html_tree/html_while.rs\",\n \"hunk\": \"@@ -0,0 +1,145 @@\\n+use proc_macro2::{Ident, TokenStream};\\n+use quote::{ToTokens, quote};\\n+use syn::buffer::Cursor;\\n+use syn::parse::{Parse, ParseStream};\\n+use syn::spanned::Spanned;\\n+use syn::token::While;\\n+use syn::{Expr, Local, Stmt, Token, braced};\\n+\\n+use super::{HtmlChildrenTree, ToNodeIterator};\\n+use crate::PeekValue;\\n+use crate::html_tree::HtmlTree;\\n+use crate::html_tree::html_for::is_contextless_pure;\\n+\\n+pub struct HtmlWhile {\\n+ cond: Box<Expr>,\\n+ let_stmts: Vec<Local>,\\n+ body: HtmlChildrenTree,\\n+ deprecations: TokenStream,\\n+}\\n+\\n+impl PeekValue<()> for HtmlWhile {\\n+ fn peek(cursor: Cursor) -> Option<()> {\\n+ let (ident, _) = cursor.ident()?;\\n+ (ident == \\\"while\\\").then_some(())\\n+ }\\n+}\\n+\\n+impl Parse for HtmlWhile {\\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\\n+ While::parse(input)?;\\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\\n+ match &*cond {\\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"missing condition for `while` expression\\\",\\n+ ));\\n+ }\\n+ _ => {}\\n+ }\\n+ if input.is_empty() {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"this `while` expression has a condition, but no block\\\",\\n+ ));\\n+ }\\n+\\n+ let body_stream;\\n+ braced!(body_stream in input);\\n+\\n+ let mut let_stmts = Vec::new();\\n+ while body_stream.peek(Token![let]) {\\n+ let stmt: Stmt = body_stream.parse()?;\\n+ match stmt {\\n+ Stmt::Local(local) => let_stmts.push(local),\\n+ _ => unreachable!(\\\"peeked Token![let] but parsed non-local statement\\\"),\\n+ }\\n+ }\\n+\\n+ let body = HtmlChildrenTree::parse_delimited_with_nodes(&body_stream)?;\\n+ let deprecations = super::check_unnecessary_fragment(&body);\\n+ // TODO: more concise code by using if-let guards (MSRV 1.95)\\n+ for child in body.0.iter() {\\n+ let HtmlTree::Element(element) = child else {\\n+ continue;\\n+ };\\n+\\n+ let Some(key) = &element.props.special.key else {\\n+ continue;\\n+ };\\n+\\n+ if is_contextless_pure(&key.value) {\\n+ return Err(syn::Error::new(\\n+ key.value.span(),\\n+ \\\"duplicate key for a node in a `while`-loop\\\\nthis will create elements with \\\\\\n+ duplicate keys if the loop iterates more than once\\\",\\n+ ));\\n+ }\\n+ }\\n+ Ok(Self {\\n+ cond,\\n+ let_stmts,\\n+ body,\\n+ deprecations,\\n+ })\\n+ }\\n+}\\n+\\n+impl ToTokens for HtmlWhile {\\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\\n+ let Self {\\n+ cond,\\n+ let_stmts,\\n+ body,\\n+ deprecations,\\n+ } = self;\\n+ let acc = Ident::new(\\\"__yew_v\\\", cond.span());\\n+\\n+ let alloc_opt = body\\n+ .size_hint()\\n+ .filter(|&size| size > 1) // explicitly reserving space for 1 more element is redundant\\n+ .map(|size| quote!( #acc.reserve(#size) ));\\n+\\n+ let vlist_gen = match body.fully_keyed() {\\n+ Some(true) => quote! {\\n+ ::yew::virtual_dom::VList::__macro_new(\\n+ #acc,\\n+ ::std::option::Option::None,\\n+ ::yew::virtual_dom::FullyKeyedState::KnownFullyKeyed\\n+ )\\n+ },\\n+ Some(false) => quote! {\\n+ ::yew::virtual_dom::VList::__macro_new(\\n+ #acc,\\n+ ::std::option::Option::None,\\n+ ::yew::virtual_dom::FullyKeyedState::KnownMissingKeys\\n+ )\\n+ },\\n+ None => quote! {\\n+ ::yew::virtual_dom::VList::with_children(#acc, ::std::option::Option::None)\\n+ },\\n+ };\\n+\\n+ let body = body\\n+ .0\\n+ .iter()\\n+ .map(|child| match child.to_node_iterator_stream() {\\n+ Some(child) => {\\n+ quote!( #acc.extend(#child) )\\n+ }\\n+ _ => {\\n+ quote!( #acc.push(::std::convert::Into::into(#child)) )\",\n \"resolving_sha\": \"b9fe62a55487fae23ac5aa8047bd8c6892c33107\",\n \"resolving_diff\": \"diff --git a/packages/yew-macro/src/html_tree/html_while.rs b/packages/yew-macro/src/html_tree/html_while.rs\\nnew file mode 100644\\nindex 00000000000..68f7f50fe72\\n--- /dev/null\\n+++ b/packages/yew-macro/src/html_tree/html_while.rs\\n@@ -0,0 +1,72 @@\\n+use proc_macro2::TokenStream;\\n+use quote::{ToTokens, quote};\\n+use syn::buffer::Cursor;\\n+use syn::parse::{Parse, ParseStream};\\n+use syn::spanned::Spanned;\\n+use syn::token::While;\\n+use syn::{Expr, Stmt, braced};\\n+\\n+use super::HtmlChildrenTree;\\n+use super::html_loop::{emit_loop, parse_loop_body};\\n+use crate::PeekValue;\\n+\\n+pub struct HtmlWhile {\\n+ cond: Box<Expr>,\\n+ stmts: Vec<Stmt>,\\n+ body: HtmlChildrenTree,\\n+ deprecations: TokenStream,\\n+}\\n+\\n+impl PeekValue<()> for HtmlWhile {\\n+ fn peek(cursor: Cursor) -> Option<()> {\\n+ let (ident, _) = cursor.ident()?;\\n+ (ident == \\\"while\\\").then_some(())\\n+ }\\n+}\\n+\\n+impl Parse for HtmlWhile {\\n+ fn parse(input: ParseStream) -> syn::Result<Self> {\\n+ While::parse(input)?;\\n+ let cond = Box::new(input.call(Expr::parse_without_eager_brace)?);\\n+ match &*cond {\\n+ Expr::Block(syn::ExprBlock { block, .. }) if block.stmts.is_empty() => {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"missing condition for `while` expression\\\",\\n+ ));\\n+ }\\n+ _ => {}\\n+ }\\n+ if input.is_empty() {\\n+ return Err(syn::Error::new(\\n+ cond.span(),\\n+ \\\"this `while` expression has a condition, but no block\\\",\\n+ ));\\n+ }\\n+\\n+ let body_stream;\\n+ braced!(body_stream in input);\\n+\\n+ let (stmts, body, deprecations) = parse_loop_body(&body_stream, \\\"while\\\")?;\\n+\\n+ Ok(Self {\\n+ cond,\\n+ stmts,\\n+ body,\\n+ deprecations,\\n+ })\\n+ }\\n+}\\n+\\n+impl ToTokens for HtmlWhile {\\n+ fn to_tokens(&self, tokens: &mut TokenStream) {\\n+ let Self {\\n+ cond,\\n+ stmts,\\n+ body,\\n+ deprecations,\\n+ } = self;\\n+ let header = quote!(while #cond);\\n+ tokens.extend(emit_loop(header, stmts, body, deprecations));\\n+ }\\n+}\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}}],"truncated":false,"partial":false},"paginationData":{"pageIndex":862,"numItemsPerPage":100,"numTotalItems":87912,"offset":86200,"length":100}},"jwt":"eyJhbGciOiJFZERTQSIsImtpZCI6Im1sR1pFYktIVHRVSGRhX1RRdEczQ0N1S3k5ME9Qd25DNHY5elRjM3FVYzgifQ.eyJyZWFkIjp0cnVlLCJwZXJtaXNzaW9ucyI6eyJyZXBvLmNvbnRlbnQucmVhZCI6dHJ1ZX0sImlhdCI6MTc4MzIwODIzOSwianRpIjoiNmRiYTU4OTUtZjU1MC00ODEyLThmZDMtNTVhN2Q3ZmFkZmFmIiwic3ViIjoiL2RhdGFzZXRzL1BvdGF0b0hEL2dpdGh1Yi1wci1yZXNvbHZlIiwiZXhwIjoxNzgzMjExODM5LCJpc3MiOiJodHRwczovL2h1Z2dpbmdmYWNlLmNvIn0.D82PBRs3Ltlrg4WWHLxwzIBbfuyODNNYK_t8mqDXgGzNWEO2CctU9B4gr3--1mP6C2o7P9c4i_FZlpNKP8N-AA","displayUrls":true,"splitSizeSummaries":[{"config":"default","split":"train","numRows":87912,"numBytesParquet":1412740926}]},"discussionsStats":{"closed":0,"open":0,"total":0},"fullWidth":true,"hasGatedAccess":true,"hasFullAccess":true,"isEmbedded":false,"savedQueries":{"community":[],"user":[]}}">
repo stringlengths 5 53 | pr_number int32 1 321k | task_type stringclasses 2
values | issue_text stringlengths 0 81.2k | pr_title stringlengths 1 319 | pr_body stringlengths 0 105k | base_sha stringlengths 40 40 | head_sha stringlengths 40 40 | gold_diff stringlengths 0 202M | changed_files listlengths 0 100 | review_threads listlengths 0 100 | test_patch stringlengths 0 23.4M | merged bool 1
class |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
yangshun/tech-interview-handbook | 697 | issue_to_patch | fix: update the broken hyperlink for "Master the sliding window technique" on arrays | In arrays section, there's a leetcode reference for **_Master the sliding window technique_**. Currently, the [existing link](https://discuss.leetcode.com/topic/30941/here-is-a-10-line-template-that-can-solve-most-substring-problems) redirects to https://leetcode.com/discuss/post/topic/30941/ which is broken. This patc... | 2eaec046173493e79b79189aa50e97535199b0cc | 2647ec25a74ad1ddda7bdc35d94284b72f5acb4d | diff --git a/apps/website/contents/algorithms/array.md b/apps/website/contents/algorithms/array.md
index c65ad37406..e63e367382 100644
--- a/apps/website/contents/algorithms/array.md
+++ b/apps/website/contents/algorithms/array.md
@@ -82,7 +82,7 @@ Note that because both arrays and strings are sequences (a string is an... | [
"apps/website/contents/algorithms/array.md"
] | [] | true | ||
yangshun/tech-interview-handbook | 693 | issue_to_patch | fix: created a margin between buttons | I was using the handbook in my phone and noticed a small frontend issue between two buttons, they were overlapping a little.
**BEFORE**
**AFTER**
 {
</div>
<div className="margin-top--lg text--center"... | [
"apps/website/src/pages/index.js"
] | [] | true | ||
yangshun/tech-interview-handbook | 668 | issue_to_patch | [contents] update user count to 1,000,000 users | ## Description
As previously mentioned in #667, this PR now matches the user count on the documentation with the numbers displayed on the website itself. Leaving the other two issues to be fixed upon further discussion. | 94e3807c7299a9d387edd592e3f0031983d4f141 | 8e869fd3a7ea3c8463a6aa96fe8115df7fc448fc | diff --git a/README.md b/README.md
index e842e72ce9..b82baa6a8a 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@
## What is this?
-Not everyone has the time to do a few hundred LeetCode questions. Here are _free and curated_ technical interview preparation materials for busy engineers, brought to you by me... | [
"README.md"
] | [] | true | ||
yangshun/tech-interview-handbook | 666 | issue_to_patch | Bug: Contribute your success stories/testimonials not working
## Bug Description:
As could be seen in the pinned issue #255 and the website itself under the **Success stories** Section on the main page, the link to [open a pull request](https://github.com/yangshun/tech-interview-handbook/edit/master/website/src/data... | [fix] update hyperlink for "Open a pull request!" on home page | This PR should close #665, I have changed the hyperlink for the text `Open a pull request!` specificially in [this file](https://github.com/yangshun/tech-interview-handbook/blob/main/apps/website/src/pages/index.js) from this [invalid link](https://github.com/yangshun/tech-interview-handbook/edit/master/website/src/dat... | b60673b2c8071409ff44460f86dd51029ea315b9 | c92edc1ec419bd25bf0d405bfd1a4030c85db1d7 | diff --git a/apps/website/src/pages/index.js b/apps/website/src/pages/index.js
index ffa213bef6..2cbf97c773 100755
--- a/apps/website/src/pages/index.js
+++ b/apps/website/src/pages/index.js
@@ -745,7 +745,7 @@ function SuccessStoriesSection() {
<p className="margin-vert--lg text--center">
Would you... | [
"apps/website/src/pages/index.js"
] | [] | true | |
yangshun/tech-interview-handbook | 639 | issue_to_patch | contents: add linked list implementation in C++ | Add `std::list` as the linked list implementation in C++. | 3365eda7775f94b2da75cde801cf9a50b6d2ce12 | 9dd6b181187e54daf15603d7581962103555f565 | diff --git a/apps/website/contents/algorithms/linked-list.md b/apps/website/contents/algorithms/linked-list.md
index b5429f0e23..38dd9d7eda 100644
--- a/apps/website/contents/algorithms/linked-list.md
+++ b/apps/website/contents/algorithms/linked-list.md
@@ -62,7 +62,7 @@ Out of the common languages, only Java provides... | [
"apps/website/contents/algorithms/linked-list.md"
] | [] | true | ||
yangshun/tech-interview-handbook | 33 | issue_to_patch | Add resume tips section | Fixes #29 | 621472ecb6bb929372683190bf4a79cfb3b3139b | 292550fda2c89f53792080115ea2d642b6e91aac | diff --git a/front-end/interview-questions.md b/front-end/interview-questions.md
index 40851c15bc..d1bc3a0b0b 100644
--- a/front-end/interview-questions.md
+++ b/front-end/interview-questions.md
@@ -154,7 +154,7 @@ Note: The `async` and `defer` attributes are ignored for scripts that have no
Putting `<link>`s in th... | [
"front-end/interview-questions.md",
"non-technical/resume.md"
] | [] | true | ||
yangshun/tech-interview-handbook | 632 | issue_to_patch | [content] fix typo on Self Introduction page | Updated text on self introduction page to match references to it further down in the breakdown section.
| 3365eda7775f94b2da75cde801cf9a50b6d2ce12 | f49bf81d137c0db5f1c6b39ba8beb7318cd5454b | diff --git a/apps/website/contents/self-introduction.md b/apps/website/contents/self-introduction.md
index 880737a77b..a512dd3fee 100644
--- a/apps/website/contents/self-introduction.md
+++ b/apps/website/contents/self-introduction.md
@@ -84,7 +84,7 @@ Having an elevator pitch on hand is a great way to create a network... | [
"apps/website/contents/self-introduction.md"
] | [] | true | ||
yangshun/tech-interview-handbook | 659 | issue_to_patch | [contents] add periods where necessary | 02826f04efe5016fc0b0b06b0863588a2df29049 | 21a1636c9faea07781f3b6948748d3cb79a9a53a | diff --git a/apps/website/contents/behavioral-interview-rubrics.md b/apps/website/contents/behavioral-interview-rubrics.md
index 28306524bd..d1064b6125 100644
--- a/apps/website/contents/behavioral-interview-rubrics.md
+++ b/apps/website/contents/behavioral-interview-rubrics.md
@@ -110,7 +110,7 @@ Example Responses:
E... | [
"apps/website/contents/behavioral-interview-rubrics.md",
"apps/website/contents/software-engineering-interview-guide.md"
] | [] | true | |||
yangshun/tech-interview-handbook | 654 | issue_to_patch | link is not working for (Master the Coding Interview: Data Structures + Algorithms)
Hi , when i click on this link :
https://fxo.co/DQpY
for :
Master the Coding Interview: Data Structures + Algorithms course
inside this page :
https://www.techinterviewhandbook.org/algorithms/study-cheatsheet/
it shows :
We a... | update Udemy course link | fixes #649
updated the broken link "https://fxo.co/DQpY" to "https://www.udemy.com/course/master-the-coding-interview-data-structures-algorithms/?couponCode=ST18MT62524"
| 3365eda7775f94b2da75cde801cf9a50b6d2ce12 | bac9369bc2bbba226257b0f117e1b26a1c636d01 | diff --git a/apps/website/contents/_courses/AlgorithmCourses.md b/apps/website/contents/_courses/AlgorithmCourses.md
index 1c1a12e1b6..82a8be5889 100644
--- a/apps/website/contents/_courses/AlgorithmCourses.md
+++ b/apps/website/contents/_courses/AlgorithmCourses.md
@@ -6,6 +6,6 @@ AlgoMonster aims to help you ace the ... | [
"apps/website/contents/_courses/AlgorithmCourses.md"
] | [] | true | |
yangshun/tech-interview-handbook | 664 | issue_to_patch | Typo: In the Coding interview preparation section
The typo is to be found in the **Coding interview preparation** section, specifically in the **_Step-by-step how to prepare_** section.
Under the heading: [What is a Software Engineering coding interview?](https://www.techinterviewhandbook.org/coding-interview-prep... | [fix] Correct typo from 'access' to 'assess' in interview description (#663) | ## Description:
This PR fixes a typo in the coding interview description, where "access" was mistakenly used instead of "assess."
The correction improves clarity in the sentence about assessing competencies during interviews.
Closes:
## Closes #663. | 54b87968615691204d344872005c4eb5505fd904 | 78690ecbab5bd30e6dfe4970cb8e1d34e5c85ea0 | diff --git a/apps/website/contents/coding-interview-prep.md b/apps/website/contents/coding-interview-prep.md
index 75de5d863b..9802da9098 100644
--- a/apps/website/contents/coding-interview-prep.md
+++ b/apps/website/contents/coding-interview-prep.md
@@ -32,7 +32,7 @@ If you have decided to embark on the arduous proces... | [
"apps/website/contents/coding-interview-prep.md"
] | [] | true | |
yangshun/tech-interview-handbook | 30 | issue_to_patch | Added Elevator Pitch section | aabf8917705e06b78f9dd4e3bf135488de4c631c | 2e0ef94fc7dce671bb40c194c56a7307392c2f67 | diff --git a/non-technical/self-introduction.md b/non-technical/self-introduction.md
index 30a95e1d22..510b089a06 100644
--- a/non-technical/self-introduction.md
+++ b/non-technical/self-introduction.md
@@ -5,6 +5,23 @@ You can rephrase the question like this:
"Tell me about your journey into tech. How did you get i... | [
"non-technical/self-introduction.md"
] | [
{
"comment": "Is this line meant to be have a deeper indentation or should it be on the same level as \"Tell them some highlights...\"?",
"path": "non-technical/self-introduction.md",
"hunk": "@@ -5,6 +5,23 @@ You can rephrase the question like this:\n \n \"Tell me about your journey into tech. How did ... | true | |||
yangshun/tech-interview-handbook | 651 | issue_to_patch | contents: fix typo in resume.md | Replace `"` with `:` | a6359e337bc515f6a846b9712238456232e6033f | 570a09f7f59aa59ca8d91b14f0969ea447fab249 | diff --git a/apps/website/contents/resume.md b/apps/website/contents/resume.md
index 3e5fddfff4..5650f7a7ea 100644
--- a/apps/website/contents/resume.md
+++ b/apps/website/contents/resume.md
@@ -124,7 +124,7 @@ Ensure you do these:
#### Write a headline for your resume summary
-Instead of writing "Professional Sum... | [
"apps/website/contents/resume.md"
] | [] | true | ||
yangshun/tech-interview-handbook | 648 | issue_to_patch | [resumes][fix] fix missing [add review]/[sign in to comment] buttons | When screen width is between lg to xl, the button is hidden | 0801d64457440e66dbe07e54e76b4c48fe8bb7dc | 9a0c832fcc647fa5f74f86fce4e98e8169f6dab7 | diff --git a/apps/portal/src/pages/resumes/[resumeId].tsx b/apps/portal/src/pages/resumes/[resumeId].tsx
index 1b36c53df3..a8f7cb16ca 100644
--- a/apps/portal/src/pages/resumes/[resumeId].tsx
+++ b/apps/portal/src/pages/resumes/[resumeId].tsx
@@ -377,7 +377,7 @@ export default function ResumeReviewPage() {
... | [
"apps/portal/src/pages/resumes/[resumeId].tsx"
] | [] | true | ||
yangshun/tech-interview-handbook | 641 | issue_to_patch | Add system design in a hurry | Adding (free!) System Design in a Hurry to the list of resources. | 7a0ed2a997b3be8093e198834532fb9b3a5c89a7 | 7abf4bd4805217494223456868aa9d7e8b8f2595 | diff --git a/apps/website/contents/system-design.md b/apps/website/contents/system-design.md
index 625a2a8177..dc477492ed 100644
--- a/apps/website/contents/system-design.md
+++ b/apps/website/contents/system-design.md
@@ -48,6 +48,7 @@ System design content is still work-in-progress, but the following are some reso
#... | [
"apps/website/contents/system-design.md"
] | [] | true | ||
yangshun/tech-interview-handbook | 637 | issue_to_patch | contents(career): update High Growth Engineer URL to new domain | I recently updated https://careercutler.substack.com/ to be https://read.highgrowthengineer.com/
This PR updates to the new domain.
Note: The original redirects to the new one, but it will be better to use the new one. | c0703662ca0b9c250abd599f976cb7cb3eb7b7be | dc32d59bf2381761460547ea1323e93a7074cc48 | diff --git a/apps/website/contents/career-growth.md b/apps/website/contents/career-growth.md
index 415c78ab85..a74afb64d1 100644
--- a/apps/website/contents/career-growth.md
+++ b/apps/website/contents/career-growth.md
@@ -3,13 +3,13 @@ id: career-growth
title: 📈 Career growth
---
-_The following page is written i... | [
"apps/website/contents/career-growth.md"
] | [] | true | ||
yangshun/tech-interview-handbook | 636 | issue_to_patch | contents: add Codemia.io list of mock interview resource | 90e56e4ea2064d35562f9ae65d73b68dfed7d35e | e7dbccf07ebbe44f05d86a1aa37460cecf7e4837 | diff --git a/apps/website/contents/mock-interviews.md b/apps/website/contents/mock-interviews.md
index 8a756ad428..c4e22e7206 100644
--- a/apps/website/contents/mock-interviews.md
+++ b/apps/website/contents/mock-interviews.md
@@ -54,3 +54,9 @@ What makes Meetapro stand out?
- Expert interviewers: Veterans from FAANG ... | [
"apps/website/contents/mock-interviews.md"
] | [] | true | |||
yangshun/tech-interview-handbook | 622 | issue_to_patch | contents: Add Misc > Career Growth Page | Spoke with @yangshun: We can add a "Career Growth" page under Misc which points to some of the top resources for engineers to grow in their careers.
I curated the resources that will be most relevant and I can personally attest to from the [Path to Senior Engineer Handbook](https://github.com/jordan-cutler/path-to-s... | 5e5ab8f3b4fd31cbe1c90156bf21a268f34659e6 | e5d5b83de56cfeac10c9bd4fd53154c6824dba58 | diff --git a/.gitignore b/.gitignore
index fbd741f5ec..15559a2bb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.idea
.DS_Store
node_modules
.turbo
@@ -19,4 +20,4 @@ public/dist
!.yarn/sdks
!.yarn/versions
-tsconfig.tsbuildinfo
\ No newline at end of file
+tsconfig.tsbuildinfo
diff --git a/apps/websi... | [
".gitignore",
"apps/website/contents/career-growth.md",
"apps/website/sidebars.js"
] | [
{
"comment": "Viewable from: https://www.techinterviewhandbook.org/software-engineering-interview-guide/\r\n\r\n\r\n",
"path": "apps/website/sidebars.js",
"hunk... | true | ||
yangshun/tech-interview-handbook | 625 | issue_to_patch | contents(beyond): add Hungry Minds and myself to LinkedIn resources | Thanks for creating this awesome list!
Adding in my newsletter and LinkedIn content profile, thanks! | efee8c7fdab13c327ca6d6a244c41a8730901dc5 | 32a97d2f39a0dca6359fed0cf59994b6ef810507 | diff --git a/apps/website/contents/career-growth.md b/apps/website/contents/career-growth.md
index 95d34c3db9..415c78ab85 100644
--- a/apps/website/contents/career-growth.md
+++ b/apps/website/contents/career-growth.md
@@ -19,6 +19,7 @@ After being hired, it's crucial to focus on your career growth so you don't stag
-... | [
"apps/website/contents/career-growth.md"
] | [] | true | ||
yangshun/tech-interview-handbook | 624 | issue_to_patch | contents(beyond): add 16x Engineer | Add 16x Engineer created by myself: https://16x.engineer/
It is a website dedicated to resources on Software Engineer Career and Personal Growth, with a focus on Asia and Singapore tech industry.
Since there is no dedicated website category, I have parked in under newsletter (the website does have its own newslet... | 497b8f6bc053e57e4ffbe218e5578e3f714ee60c | aa145e44cd76cb401bb4c9551caeedcbce885a5f | diff --git a/apps/website/contents/career-growth.md b/apps/website/contents/career-growth.md
index 8ddc2bcc61..95d34c3db9 100644
--- a/apps/website/contents/career-growth.md
+++ b/apps/website/contents/career-growth.md
@@ -21,6 +21,7 @@ After being hired, it's crucial to focus on your career growth so you don't stag
-... | [
"apps/website/contents/career-growth.md"
] | [] | true | ||
yangshun/tech-interview-handbook | 618 | issue_to_patch | contents(sd): add System Design Newsletter | - Add weekly newsletter on system design | 11995a2c6c745b529ac46eb46a784a28e62e4bf6 | 48af3c322c13224b7eba0071f75750de712f2669 | diff --git a/apps/website/contents/system-design.md b/apps/website/contents/system-design.md
index 56a43eda21..625a2a8177 100644
--- a/apps/website/contents/system-design.md
+++ b/apps/website/contents/system-design.md
@@ -48,6 +48,7 @@ System design content is still work-in-progress, but the following are some reso
#... | [
"apps/website/contents/system-design.md"
] | [] | true | ||
yangshun/tech-interview-handbook | 617 | issue_to_patch | Update resume.md | Added some extra tips for resume review section around tailoring resume for each job role for better chances. | fdbec1fbc2c72f425787e2d7d9b32bf733acfe9f | 0101f78e94296c0c97f486283d561a7aee5305d3 | diff --git a/apps/website/contents/resume.md b/apps/website/contents/resume.md
index 7885ed8e2d..cb113fca54 100644
--- a/apps/website/contents/resume.md
+++ b/apps/website/contents/resume.md
@@ -333,7 +333,8 @@ If you are willing to spend some money we recommend [FAANG Tech Leads' Resume Re
### 2. Test readability w... | [
"apps/website/contents/resume.md"
] | [] | true | ||
yangshun/tech-interview-handbook | 616 | issue_to_patch | Update Repository to Reflect Twitter's New Name
Twitter has undergone a name change and is now known as "X." To ensure the repository accurately reflects this update, I'm opening this issue and creating a related pull request (PR).
Also In Website it is Twitter not X or X (Twitter)
![image](https://github.com/ya... | misc: change "Twitter" to "X (Twitter)" | Changing Name of Twitter to X (Twitter)
This fixes https://github.com/yangshun/tech-interview-handbook/issues/615 | ed6605b476676656b872b72d13656188cf6807eb | 73ab75cc2218696323116884be01f7d3c7856436 | diff --git a/README.md b/README.md
index 4939dc21aa..e842e72ce9 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
<a href="https://www.techinterviewhandbook.org/">Read on the website</a>
</h3>
<p>
- Join/follow us on <a href="https://discord.gg/usMqNaPczq" target="_blank">Discord</a> | <a href="https... | [
"README.md"
] | [] | true | |
yangshun/tech-interview-handbook | 609 | issue_to_patch | contents(queue): fix typo in queue content | Fixed a typo in the "Things to look out for during interviews" section. It previously stated that enqueue had a time complexity issue in languages without built-in Queue classes using arrays. It's actually the dequeue operation that's O(n) due to front removal and shifting of elements. Fixing this small typo for clarit... | 5f2111af16010fc219d4afc7cc222b435e524a80 | 4256e98c75c8303639e0c74dbc062648b90503a7 | diff --git a/apps/website/contents/algorithms/queue.md b/apps/website/contents/algorithms/queue.md
index 63d64287b3..7341992f31 100644
--- a/apps/website/contents/algorithms/queue.md
+++ b/apps/website/contents/algorithms/queue.md
@@ -55,7 +55,7 @@ Breadth-first search is commonly implemented using queues.
## Things... | [
"apps/website/contents/algorithms/queue.md"
] | [] | true | ||
yarrick/iodine | 120 | issue_to_patch | Answer NXDOMAIN for _.xxx.yyy.top.domain | When a DNS query name is too long, it is split into multiple domain components. However, recursive DNS servers that implement QNAME minimization may query each subdomain individually without revealing the full name. As part of this behavior, they often send a preliminary query for a hostname like "_" before attempting... | 3fcd128cbfb612628bfe01131133c45bf7007a61 | 076ec9f77439ace72024e55e61e20884758f4296 | diff --git a/src/dns.c b/src/dns.c
index 22d9ef42..9721f3e2 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -390,6 +390,71 @@ int dns_encode_a_response(char *buf, size_t buflen, struct query *q)
return len;
}
+int dns_encode_nxdomain(char *buf, size_t buflen, struct query *q, const char *zone)
+{
+ char rnamebuf[256];
+... | [
"src/dns.c",
"src/dns.h",
"src/iodined.c",
"src/windows.h"
] | [
{
"comment": "Can you link https://datatracker.ietf.org/doc/html/rfc7816 (qname minimisation)",
"path": "src/iodined.c",
"hunk": "@@ -1719,6 +1740,17 @@ tunnel_dns(int tun_fd, int dns_fd, struct dnsfd *dns_fds, int bind_fd)\n \t\t\treturn 0;\n \t\t}\n \n+\t\t/* Handle A-type query for _.***.topdomain. ... | true | ||
yarrick/iodine | 120 | comment_to_fix | Answer NXDOMAIN for _.xxx.yyy.top.domain | Can you link https://datatracker.ietf.org/doc/html/rfc7816 (qname minimisation) | 3fcd128cbfb612628bfe01131133c45bf7007a61 | 076ec9f77439ace72024e55e61e20884758f4296 | diff --git a/src/iodined.c b/src/iodined.c
index f2d1dc56..6b6d1a48 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -1597,6 +1597,27 @@ handle_a_request(int dns_fd, struct query *q, int fakeip)
}
}
+static void
+handle_underscore_request(int dns_fd, struct query *q, const char *topdomain)
+{
+ char buf[64*1024];... | [
"src/iodined.c"
] | [
{
"comment": "Can you link https://datatracker.ietf.org/doc/html/rfc7816 (qname minimisation)",
"path": "src/iodined.c",
"hunk": "@@ -1719,6 +1740,17 @@ tunnel_dns(int tun_fd, int dns_fd, struct dnsfd *dns_fds, int bind_fd)\n \t\t\treturn 0;\n \t\t}\n \n+\t\t/* Handle A-type query for _.***.topdomain. ... | true | ||
yarrick/iodine | 120 | comment_to_fix | Answer NXDOMAIN for _.xxx.yyy.top.domain | Not matching the encode function name (also dns was changed to ens?) | 3fcd128cbfb612628bfe01131133c45bf7007a61 | 076ec9f77439ace72024e55e61e20884758f4296 | diff --git a/src/iodined.c b/src/iodined.c
index f2d1dc56..6b6d1a48 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -1597,6 +1597,27 @@ handle_a_request(int dns_fd, struct query *q, int fakeip)
}
}
+static void
+handle_underscore_request(int dns_fd, struct query *q, const char *topdomain)
+{
+ char buf[64*1024];... | [
"src/iodined.c"
] | [
{
"comment": "Not matching the encode function name (also dns was changed to ens?)",
"path": "src/iodined.c",
"hunk": "@@ -1597,6 +1597,27 @@ handle_a_request(int dns_fd, struct query *q, int fakeip)\n \t}\n }\n \n+static void\n+handle_underscore_request(int dns_fd, struct query *q, const char *topdomai... | true | ||
yarrick/iodine | 120 | comment_to_fix | Answer NXDOMAIN for _.xxx.yyy.top.domain | Instead of just "A reply" add something more specific (also in warn log below) | 3fcd128cbfb612628bfe01131133c45bf7007a61 | 076ec9f77439ace72024e55e61e20884758f4296 | diff --git a/src/iodined.c b/src/iodined.c
index f2d1dc56..6b6d1a48 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -1597,6 +1597,27 @@ handle_a_request(int dns_fd, struct query *q, int fakeip)
}
}
+static void
+handle_underscore_request(int dns_fd, struct query *q, const char *topdomain)
+{
+ char buf[64*1024];... | [
"src/iodined.c"
] | [
{
"comment": "Instead of just \"A reply\" add something more specific (also in warn log below)",
"path": "src/iodined.c",
"hunk": "@@ -1597,6 +1597,27 @@ handle_a_request(int dns_fd, struct query *q, int fakeip)\n \t}\n }\n \n+static void\n+handle_underscore_request(int dns_fd, struct query *q, const ch... | true | ||
yarrick/iodine | 120 | comment_to_fix | Answer NXDOMAIN for _.xxx.yyy.top.domain | is this extra scope needed?
The `startp` pointer could be declared earlier - also name it more descriptively (soa_start?). Declare variables before the code starts. | 3fcd128cbfb612628bfe01131133c45bf7007a61 | 076ec9f77439ace72024e55e61e20884758f4296 | diff --git a/src/dns.c b/src/dns.c
index 22d9ef42..9721f3e2 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -390,6 +390,71 @@ int dns_encode_a_response(char *buf, size_t buflen, struct query *q)
return len;
}
+int dns_encode_nxdomain(char *buf, size_t buflen, struct query *q, const char *zone)
+{
+ char rnamebuf[256];
+... | [
"src/dns.c"
] | [
{
"comment": "is this extra scope needed?\r\nThe `startp` pointer could be declared earlier - also name it more descriptively (soa_start?). Declare variables before the code starts.",
"path": "src/dns.c",
"hunk": "@@ -390,6 +390,73 @@ int dns_encode_a_response(char *buf, size_t buflen, struct query *q)\... | true | ||
yarrick/iodine | 120 | comment_to_fix | Answer NXDOMAIN for _.xxx.yyy.top.domain | Translate incluiremos | 3fcd128cbfb612628bfe01131133c45bf7007a61 | 076ec9f77439ace72024e55e61e20884758f4296 | diff --git a/src/dns.c b/src/dns.c
index 22d9ef42..9721f3e2 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -390,6 +390,71 @@ int dns_encode_a_response(char *buf, size_t buflen, struct query *q)
return len;
}
+int dns_encode_nxdomain(char *buf, size_t buflen, struct query *q, const char *zone)
+{
+ char rnamebuf[256];
+... | [
"src/dns.c"
] | [
{
"comment": "Translate incluiremos ",
"path": "src/dns.c",
"hunk": "@@ -390,6 +390,73 @@ int dns_encode_a_response(char *buf, size_t buflen, struct query *q)\n \treturn len;\n }\n \n+int dns_encode_nxdomain(char *buf, size_t buflen, struct query *q, const char *zone)\n+{\n+ char rnamebuf[256];\n+ ... | true | ||
yarrick/iodine | 120 | comment_to_fix | Answer NXDOMAIN for _.xxx.yyy.top.domain | T_SOA needs a define in windows.h | 3fcd128cbfb612628bfe01131133c45bf7007a61 | 076ec9f77439ace72024e55e61e20884758f4296 | diff --git a/src/dns.c b/src/dns.c
index 22d9ef42..9721f3e2 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -390,6 +390,71 @@ int dns_encode_a_response(char *buf, size_t buflen, struct query *q)
return len;
}
+int dns_encode_nxdomain(char *buf, size_t buflen, struct query *q, const char *zone)
+{
+ char rnamebuf[256];
+... | [
"src/dns.c"
] | [
{
"comment": "T_SOA needs a define in windows.h",
"path": "src/dns.c",
"hunk": "@@ -390,6 +390,71 @@ int dns_encode_a_response(char *buf, size_t buflen, struct query *q)\n \treturn len;\n }\n \n+int dns_encode_nxdomain(char *buf, size_t buflen, struct query *q, const char *zone)\n+{\n+\tchar rnamebuf[25... | true | ||
yarrick/iodine | 121 | issue_to_patch | Allow longer nameservers. | IPv6 nameservers can be significantly longer than 16 characters in length. For example, `2001:0db8:85a3:0000:0000:8a2e:0370:7334` is 39 characters long, and certain syntax elements (e.g. zone indices) can make them even longer.
This patch allows up to 256 characters for the nameserver, which is large enough to conta... | 63c386d0f84d2480975f23b943239a973768de12 | 1b4c14edbaf0dfaa1719f7c066e1a841900e2ea1 | diff --git a/src/util.c b/src/util.c
index e34858c6..b9d7f6b0 100644
--- a/src/util.c
+++ b/src/util.c
@@ -21,10 +21,10 @@
char *get_resolvconf_addr(void)
{
- static char addr[16];
+ static char addr[257];
char *rv = NULL;
#ifndef WINDOWS32
- char buf[80];
+ char buf[257];
FILE *fp;
#ifdef ANDROID
fp = pope... | [
"src/util.c"
] | [] | true | ||
yarrick/iodine | 109 | issue_to_patch | Fixed strict clipping memsize size_t to 32bit only on 64bit platforms | @yarrick, bug only on 64bit iodine builds.
C-cast not memsize as intended. Perhaps when `datalen` was rewritten from `unsigned` to `size_t`, they forgot to fix C-cast in `CHECKLEN(x)` macro. | 2b659726936804ac4e3ef5fe9989adf8fd9dd538 | 405a38ca937acc5675bfb1ec2ccb48693ea4e8cb | diff --git a/src/dns.c b/src/dns.c
index dd6e313b..22d9ef42 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -47,7 +47,7 @@
int dnsc_use_edns0 = 1;
-#define CHECKLEN(x) if (buflen < (x) + (unsigned)(p-buf)) return 0
+#define CHECKLEN(x) if (buflen < (x) + (size_t)(p-buf)) return 0
int dns_encode(char *buf, size_t bu... | [
"src/dns.c"
] | [] | true | ||
yarrick/iodine | 101 | issue_to_patch | get_addr() should return -1 in case of error
Subject says it all:
getaddrinfo() returns positive values in case of errors. These get returned
to the caller:
res = getaddrinfo(host, portnum, &hints, &addr);
if (res == 0) {
int addrlen = addr->ai_addrlen;
/* Grab f... | common: get_addr should return -1 on error | Closes #96
1. Update `get_addr()` to always return -1 on error
2. Add test to ensure the error value is returned when host, port, flags, or result struct are invalid | 68b0a7b16e214f0b50a6a849fc30756d580b480a | ae43de2a8cfb3537596c5813d11b756d0c5533e3 | diff --git a/src/common.c b/src/common.c
index 8d2fec0d..e7d49c37 100644
--- a/src/common.c
+++ b/src/common.c
@@ -142,6 +142,7 @@ get_addr(char *host, int port, int addr_family, int flags, struct sockaddr_stora
struct addrinfo hints, *addr;
int res;
char portnum[8];
+ int addrlen;
memset(portnum, 0, sizeof(p... | [
"src/common.c",
"tests/common.c"
] | [
{
"comment": "This declaration is now mixed in the code, which is not allowed on older C compilers. Can you move the addrlen variable to the top, or add a new scope?",
"path": "src/common.c",
"hunk": "@@ -158,14 +158,15 @@ get_addr(char *host, int port, int addr_family, int flags, struct sockaddr_stora\... | diff --git a/tests/common.c b/tests/common.c
index 87fe3307..14050518 100644
--- a/tests/common.c
+++ b/tests/common.c
@@ -280,6 +280,28 @@ START_TEST(test_parse_format_ipv4_mapped_ipv6)
}
END_TEST
+START_TEST(test_get_addr_err)
+{
+ char *host = "192.168.2.10";
+ struct sockaddr_storage addr;
+ int addr_len;
+ int... | true |
yarrick/iodine | 101 | comment_to_fix | common: get_addr should return -1 on error | This declaration is now mixed in the code, which is not allowed on older C compilers. Can you move the addrlen variable to the top, or add a new scope? | 68b0a7b16e214f0b50a6a849fc30756d580b480a | ae43de2a8cfb3537596c5813d11b756d0c5533e3 | diff --git a/src/common.c b/src/common.c
index 8d2fec0d..e7d49c37 100644
--- a/src/common.c
+++ b/src/common.c
@@ -142,6 +142,7 @@ get_addr(char *host, int port, int addr_family, int flags, struct sockaddr_stora
struct addrinfo hints, *addr;
int res;
char portnum[8];
+ int addrlen;
memset(portnum, 0, sizeof(p... | [
"src/common.c"
] | [
{
"comment": "This declaration is now mixed in the code, which is not allowed on older C compilers. Can you move the addrlen variable to the top, or add a new scope?",
"path": "src/common.c",
"hunk": "@@ -158,14 +158,15 @@ get_addr(char *host, int port, int addr_family, int flags, struct sockaddr_stora\... | true | ||
yarrick/iodine | 95 | issue_to_patch | Haiku fixes | We might soon finally get a working tun/tap driver, so let's make sure this builds! | b82bc776b36b727f593f98e43cbd306a9f6358fc | 39c3154a770f187d01ec666fc80d8234968a630c | diff --git a/src/common.c b/src/common.c
index 37ae48dc..a1475795 100644
--- a/src/common.c
+++ b/src/common.c
@@ -57,7 +57,7 @@
const unsigned char raw_header[RAW_HDR_LEN] = { 0x10, 0xd1, 0x9e, 0x00 };
/* daemon(3) exists only in 4.4BSD or later, and in GNU libc */
-#if !defined(ANDROID) && !defined(WINDOWS32) && ... | [
"src/common.c",
"src/osflags"
] | [] | true | ||
yarrick/iodine | 93 | issue_to_patch | src/osflags: fully fix cross-compilation | Cross-compilation was only partially fixed by https://github.com/yarrick/iodine/commit/024481c94b97ef37981621cdc38f8b20f8919418 as selinux was still enabled depending on host file existence | b82bc776b36b727f593f98e43cbd306a9f6358fc | a5d71d076168f8ad1e7dd30b35f1569f180f429c | diff --git a/src/osflags b/src/osflags
index 9a437bdc..39ca5fa5 100755
--- a/src/osflags
+++ b/src/osflags
@@ -20,7 +20,7 @@ link)
;;
Linux)
FLAGS="";
- [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux";
+ "$PKG_CONFIG" --exists libselinux && FLAGS="$FLAGS $($PKG_CONFIG --libs libselinux)"... | [
"src/osflags"
] | [] | true | ||
yarrick/iodine | 86 | issue_to_patch | Build Issue on FreeBSD: tzsetwall() is deprecated, use tzset() instead. | I am currently attempting to update the iodine package on FreeBSD to version 0.8.0. However, there is a bug that I have encountered where tzset is incorrectly set to tzsetwall. To fix this issue, I have submitted a pull request to address the problem.
/usr/ports/net/iodine/work/iodine-0.8.0/src/iodined.c:2757: warni... | 6145eeab738c45dc66958f590f6439fbf3c401f2 | 9262863caedac6fa1691371da0be60c9a4c6a5a3 | diff --git a/src/iodined.c b/src/iodined.c
index f9555161..f2d1dc56 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -2754,7 +2754,7 @@ main(int argc, char **argv)
do_pidfile(pidfile);
#ifdef FREEBSD
- tzsetwall();
+ tzset();
#endif
#ifndef WINDOWS32
openlog(__progname, LOG_NDELAY, LOG_DAEMON);
| [
"src/iodined.c"
] | [] | true | ||
yarrick/iodine | 61 | issue_to_patch | Cannot `make` on macOS
Hi, I'm on MacOS 11.4 (Big Sur) (M1) and I can't compile iodine.
I get the following error:
```
iodine % make
/bin/sh: line 0: cd: src: No such file or directory
/bin/sh: line 0: cd: src: No such file or directory
/bin/sh: line 0: cd: src: No such file or directory
/bin/sh: line 0: cd... | Use `make -C <dir>` instead of (cd <dir> && make) | * fixes the build for some people #57
* cleaner and more idiomatic
Fix #57 | 25867f20b488cd39ead7aafdf5589433dea521e9 | c74618ae9ec3a1ee170fc79253ab1bfbbbfd8ce6 | diff --git a/Makefile b/Makefile
index 4a2d5a25..e0b5f036 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ RM_FLAGS=-f
TARGETOS = `uname`
all:
- @(cd src && $(MAKE) TARGETOS=$(TARGETOS) all)
+ @$(MAKE) -C src TARGETOS=$(TARGETOS) all
install: all
$(MKDIR) $(MKDIR_FLAGS) $(DESTDIR)$(sbindir)
@@ -41,12 +41... | [
"Makefile"
] | [] | true | |
yarrick/iodine | 55 | issue_to_patch | Add github CI action for Windows | Creating pull request only to trigger CI | 8afcf4fb8d6fd4369eb6248ed953d61200ffd3e5 | d00eba8df263322dc83fa08ba66815cfc0967edc | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 00000000..49ec6f90
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,25 @@
+name: windows
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ build:
+
+ runs-o... | [
".github/workflows/windows.yml"
] | [] | true | ||
yarrick/iodine | 36 | issue_to_patch | documentation: make it clear, what incompleteness `-b` has | AXFR does not pass through iodine (sounds reasonable). So we should
recommend in the README.md to keep the original dns server in front and forward from that to iodined, if zone transfers are required. | 8e14f18282dea137f1f4d574f5f52c6bfa2f1c34 | be0735d7c7560acff08284b4d25a320bda36b778 | diff --git a/README.md b/README.md
index 32614b14..d867fcfd 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,9 @@ and a server with a public IP address to run `iodined` on. If this server
already runs a DNS program, change its listening port and then use `iodined`'s
`-b` option to let `iodined` forward the DNS req... | [
"README.md"
] | [] | true | ||
yarrick/iodine | 35 | issue_to_patch | Define searchpath for route with macro | Allows it to be easily overridden using the compiler commmandline.
Just like IFCONFIGPATH.
Would remove the need to patch the source for the Nix package manager on MacOS: https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/iodine/default.nix#L13 | 67643ee99686795e1158100f6fce62d494f3acec | d2f671bdc7fb95dcccc16277edddc7425729279d | diff --git a/src/tun.c b/src/tun.c
index c05a5911..9429cb12 100644
--- a/src/tun.c
+++ b/src/tun.c
@@ -39,6 +39,10 @@
#define IFCONFIGPATH "PATH=/sbin:/bin "
#endif
+#ifndef ROUTEPATH
+#define ROUTEPATH "PATH=/sbin:/bin "
+#endif
+
#ifdef WINDOWS32
#include "windows.h"
#include <winioctl.h>
@@ -629,7 +633,7 @@ t... | [
"src/tun.c"
] | [] | true | ||
yarrick/iodine | 28 | issue_to_patch | client.c: don't produce an useless strncat usage warning | 27e5d6fadd997ff167c70a431d41adae26428d41 | b406009c6d899c2bf5322cca645902cb18e3f389 | diff --git a/src/client.c b/src/client.c
index 7f336542..a122996a 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1290,8 +1290,8 @@ send_upenctest(int fd, const char *s)
buf[3] = b32_5to8((rand_seed ) & 0x1f);
rand_seed++;
- strncat(buf, s, 512);
- strncat(buf, ".", 512);
+ strncat(buf, s, 128);
+ strncat(buf, "... | [
"src/client.c"
] | [] | true | |||
yarrick/iodine | 22 | issue_to_patch | protect options from replay attack | Trying to determine why long-running sessions inexplicably become slow, I ran tcpdump and found unsolicited DNS queries beginning with the letter N were severely reducing the downstream fragment size.
When using carrier-grade DNS, the server is especially vulnerable to replay attacks that abuse the options commands (D... | 8e15a73a77c9973270d8aaf86a1cb683d28fbea5 | a96e2e7a693fb04479ef94c6c9f690053ca56c68 | diff --git a/src/iodined.c b/src/iodined.c
index 2e6f7bf8..608d84ee 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -263,6 +263,19 @@ check_authenticated_user_and_ip(int userid, struct query *q)
return 0;
}
+static int
+check_authenticated_user_and_ip_and_options(int userid, struct query *q)
+{
+ int res = check... | [
"src/iodined.c",
"src/user.c",
"src/user.h"
] | [] | true | ||
yarrick/iodine | 26 | issue_to_patch | Add android build files to .gitignore | The build files from make cross-android are not included in the .gitignore file. | 006ffa619e0e6c1599d3caa213ad883320900391 | 9f48fc01a50a9e5e293bd85b643532164d1ea7db | diff --git a/.gitignore b/.gitignore
index f264a833..748c8581 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
/src/base64u.c
/src/base64u.h
/tests/test
+*.o.d
+/src/obj/local/*/iodine
+/src/libs/*/iodine
| [
".gitignore"
] | [] | true | ||
yarrick/iodine | 25 | issue_to_patch | check error returned by dns_decode | before this commit, sending "GET / HTTP/1.1" to server will cause uninitialized variable access. | 006ffa619e0e6c1599d3caa213ad883320900391 | 122ac1a25d7a506aacfe71687254dea8e0311ad8 | diff --git a/src/iodined.c b/src/iodined.c
index 339db6fd..a227b752 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -2068,7 +2068,7 @@ read_dns(int fd, struct dnsfd *dns_fds, int tun_fd, struct query *q)
if (raw_decode(packet, r, q, fd, dns_fds, tun_fd)) {
return 0;
}
- if (dns_decode(NULL, 0, q, QR_QUERY,... | [
"src/iodined.c"
] | [] | true | ||
yarrick/iodine | 23 | issue_to_patch | Fix -4 and -6 flags | This allows you to run iodined if the autodetected IP for and address family you aren't using is invalid. This occurs for instance if you disable IPV6, e.g on with the following `sysctl` options on Linux:
```
net.ipv6.conf.all.disable_ipv6 = 1
net.ipv6.conf.default.disable_ipv6 = 1
net.ipv6.conf.lo.disable_ipv6 =... | 8e15a73a77c9973270d8aaf86a1cb683d28fbea5 | 1ad7c05b928b9fb581bc8a50d804241a498daa92 | diff --git a/src/iodined.c b/src/iodined.c
index 2e6f7bf8..c213ec60 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -1844,10 +1844,10 @@ tunnel(int tun_fd, struct dnsfd *dns_fds, int bind_fd, int max_idle_time)
if (FD_ISSET(tun_fd, &fds)) {
tunnel_tun(tun_fd, dns_fds);
}
- if (FD_ISSET(dns_fds->v4fd, &... | [
"src/iodined.c"
] | [] | true | ||
yarrick/iodine | 12 | issue_to_patch | Support utun devices on Mac OS X. | As of 10.6, OS X has native tunnel devices. They are implemented as
sockets rather than character devices, but otherwise they appear to
behave the same as Free/OpenBSD tunnels.
'-d utunX' will tell iodine to use a utun device. For backward
compatibility, we'll continue to default to the old tuntap devices for
now.
Th... | 11606497941c4ad13724c53b406fad57a2913475 | b38b2ca7c5189d4664adedb2e5e4554437963bc0 | diff --git a/src/tun.c b/src/tun.c
index 1196ce2e..44bb2207 100644
--- a/src/tun.c
+++ b/src/tun.c
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2006-2014 Erik Ekman <yarrick@kryo.se>,
* 2006-2009 Bjorn Andersson <flex@kryo.se>
+ * 2013 Peter Sagerson <psagers.github@ignorare.net>
*
* Permission to use, copy, modify, and... | [
"src/tun.c"
] | [] | true | ||
yarrick/iodine | 20 | issue_to_patch | Add support for socket activation by ipv6 socket | iodined may accept ipv4 and ipv6 sockets via socket activation, we need to figure out type of sockets received from systemd.
| 36df8dc16ba7e21b514aa025e81b21ae3e81594a | 2edb879845b900a04b05ec555bdbde19f81c4a92 | diff --git a/doc/iodine-server.socket b/doc/iodine-server.socket
index d6c57b8c..485181f7 100644
--- a/doc/iodine-server.socket
+++ b/doc/iodine-server.socket
@@ -3,6 +3,8 @@ Description=Iodine socket
[Socket]
ListenDatagram=53
+ListenDatagram=0.0.0.0:53
+BindIPv6Only=ipv6-only
[Install]
WantedBy=sockets.target... | [
"doc/iodine-server.socket",
"src/iodined.c"
] | [] | true | ||
yarrick/iodine | 19 | issue_to_patch | Fix compilation with systemd>=230 and systemd versions without compat-libs | This fixes https://dev.kryo.se/iodine/ticket/123
Be advised though that I have only tested this on Archlinux with systemd package version 229-3.
| 482d005d11b69b13693228b7d84530bc8f65109f | 7b1df75e3aad8a9a01cbbf2f2ff377cbc5a1ea4b | diff --git a/src/osflags b/src/osflags
index 6af11aa1..eb01101b 100755
--- a/src/osflags
+++ b/src/osflags
@@ -20,6 +20,7 @@ link)
FLAGS="";
[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux";
[ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS $(pkg-config --libs libsystemd-daemon)";
+ ... | [
"src/osflags"
] | [] | true | ||
yarrick/iodine | 15 | issue_to_patch | Document utunX. | 1f51bab2a3f09d13505d6e569b6e3c685f8fdfd2 | 840155ca9aed2330540f6874cf95e8c5f852ff79 | diff --git a/README.md b/README.md
index 5ef7446e..51bc0538 100644
--- a/README.md
+++ b/README.md
@@ -162,6 +162,10 @@ supported request types, for example:
The reply should look like garbled text in all these cases.
+#### Mac OS X
+On Mac OS X 10.6 and later, iodine supports the native utun devices built into
+t... | [
"README.md",
"man/iodine.8"
] | [] | true | |||
yarrick/iodine | 10 | issue_to_patch | Revamping the README file | Hi,
I tried to make the README file more readable from the browser, without harming the raw-text readability.
It could also use some re-structuring, but I should work on my next patch instead (having proper authenticated encryption instead of this custom MD5-based solution).
Best,
Nicolas
| cea498e7107670c342d95d07bee44de2c0ccd902 | 81d932703b1368d1e6a083435ae0c3bc95635af3 | diff --git a/README b/README.md
similarity index 53%
rename from README
rename to README.md
index cfc8ede6..033545ce 100644
--- a/README
+++ b/README.md
@@ -1,130 +1,136 @@
+iodine - <http://code.kryo.se/iodine>
+=====================================
-iodine - http://code.kryo.se/iodine
-
-***************************... | [
"README.md"
] | [] | true | ||
yarrick/iodine | 9 | issue_to_patch | osflags: use pkg-config for systemd support | Recent versions of systemd don't ship with libsystemd-daemon.so anymore,
but instead use libsystemd.so for everything. This is obviously
problematic for using the same LDFLAGS on old systemd and new systemd.
So, they also ship compatability pkgconfig files, which use the old
names but return the new library. So, the mo... | b4c3656c3ccb5b819f86951588f742b8d0ff682b | cc4bc22447d15deacf44bc1d369621a63c934427 | diff --git a/src/osflags b/src/osflags
index 9eda8f04..0f8a26c8 100755
--- a/src/osflags
+++ b/src/osflags
@@ -19,7 +19,7 @@ link)
Linux)
FLAGS="";
[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux";
- [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -lsystemd-daemon";
+ [ -e /usr/... | [
"src/osflags"
] | [] | true | ||
yarrick/iodine | 2 | issue_to_patch | Fix gcc warning -Wsizeof-pointer-memaccess | iodined.c: In function ‘write_dns_nameenc’:
iodined.c:2030:23: attention : argument to ‘sizeof’ in ‘memset’ call is the same
expression as the destination; did you mean to provide an explicit length? [-Wsizeof-pointer-memaccess]
memset(buf, 0, sizeof(buf));
sizeof buf will just give the size of the pointer, while bu... | 59dbaf2b50828f0d74d8964028866f9977620382 | 64ff684754528632c4d4908d5fa2b78c40f60212 | diff --git a/src/iodined.c b/src/iodined.c
index b3b0607d..8fcbe00c 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -2023,7 +2023,7 @@ write_dns_nameenc(char *buf, size_t buflen, char *data, int datalen, char downen
space = MIN(0xFF, buflen) - 4 - 2;
/* -1 encoding type, -3 ".xy", -2 for safety */
- memset(buf,... | [
"src/iodined.c"
] | [] | true | ||
yarrick/iodine | 1 | issue_to_patch | Hi yarrick, i have a bugfix for Mountain Lion. | after update to OSX 10.8 I've gotten these error:
route: writing to routing socket: Can't assign requested address
add net 192.168.99.2: gateway 192.168.99.2: Can't assign requested address
This change fix that!
I didn't test this version on other operating systems.
Best greetings,
Philipp
| d9d4c1dba621b062e46f0f7d152ca28bf75ca947 | e1e438497a83dbe6800212a0e5cb632907d1b3d9 | diff --git a/src/tun.c b/src/tun.c
index cbc54904..65bde17a 100644
--- a/src/tun.c
+++ b/src/tun.c
@@ -475,15 +475,19 @@ tun_setip(const char *ip, const char *other_ip, int netbits)
fprintf(stderr, "Setting IP of %s to %s\n", if_name, ip);
#ifndef LINUX
+ struct in_addr netip;
+ netip.s_addr = inet_addr(ip);
+ ne... | [
"src/tun.c"
] | [] | true | ||
yarrick/iodine | 4 | issue_to_patch | Add socket activation for systemd, with a option to stop on idle | Systemd support socket passing on activation. While the goal is to make sure every can be started in almost any order, it also permit to have on demand start.
This series of patches implement systemd support using the library provided by systemd ( and proper autodetection on build time, so someone not wanting the cod... | 59dbaf2b50828f0d74d8964028866f9977620382 | abd276ed9e7ca868616954b41f67a0b99a67a4c3 | diff --git a/doc/iodine-server.service b/doc/iodine-server.service
new file mode 100644
index 00000000..64d2eccb
--- /dev/null
+++ b/doc/iodine-server.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Iodine Server
+After=local-fs.target network.target
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/iodine-server
+ExecStart=... | [
"doc/iodine-server.service",
"doc/iodine-server.socket",
"man/iodine.8",
"src/iodined.c",
"src/osflags"
] | [] | true | ||
yarrick/iodine | 3 | issue_to_patch | add gitignore file | 59dbaf2b50828f0d74d8964028866f9977620382 | bded6a015bc1776db247cde0174535047be43a80 | diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..2fd8533c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+bin/*
+*.o
+src/base64u.c
+src/base64u.h
| [
".gitignore"
] | [] | true | |||
yatli/fvim | 264 | issue_to_patch | Fix blank UI with neovim 0.92 | See bug #263.
neovim 0.92 added this to the `grid_line` event. This appears to be useful for the TUI only, so for now let's just fix the pattern matching. | 2e4087de785da82e7140524e45b20bb53b6b073e | 70c4c53f71b3d0b7064974c24dcfe8ab94be694a | diff --git a/def.fs b/def.fs
index c874f88..fc5ae82 100644
--- a/def.fs
+++ b/def.fs
@@ -218,6 +218,7 @@ type GridLine =
row: int
col_start: int
cells: GridCell[]
+ wrap: bool
}
[<Struct>]
@@ -624,8 +625,11 @@ let parse_grid_cell (x: obj) =
let parse_grid_line (x: obj) =
... | [
"def.fs"
] | [] | true | ||
yatli/fvim | 231 | issue_to_patch | Fix for bad Windows shell integration | the setup process doesn't integrate with the shell properly.
trying to open with the context menu gives this error dialog
i found the problem, after a bit.
the registry value it gives ends up havi... | b836b56bd0a0a16cf0921afcb468269b3648603b | baa6fbe7d4f96bdc320115923741788a6513813b | diff --git a/shell.fs b/shell.fs
index 0de35ca..16515f0 100644
--- a/shell.fs
+++ b/shell.fs
@@ -81,7 +81,7 @@ let private win32RegisterFileAssociation() =
_edit.SetValue("", "Open with FVim")
_edit.SetValue("Icon", fvicon)
use command = _edit.CreateSubKey("command")
- ... | [
"shell.fs"
] | [] | true | ||
yatli/fvim | 237 | issue_to_patch | create .app on apple silicon (m1)
Hi, I tried your app and found out that it's intel binary :(
Building the app myself was not a problem, but how do i get it into /Applications/ in a FVim.app ? | pack.sh Adding support to build for apple sillicon | copy pasted the function from x64
fixes https://github.com/yatli/fvim/issues/236 | b836b56bd0a0a16cf0921afcb468269b3648603b | f229f8ea97c166ebcfbe6c1e7725e2587dc3e459 | diff --git a/pack.sh b/pack.sh
index dbcd7ed..779e437 100755
--- a/pack.sh
+++ b/pack.sh
@@ -68,6 +68,33 @@ function pack-linux-arm64()
mv {*.deb,*.rpm} publish/
}
+function pack-osx.11.0-arm64()
+{
+ rm -rf ./*.app
+ rm -f ./*.zip
+
+ pushd $PKG_ROOT
+ cd ..
+ mv publish fvim_pkg
+ mkdir -p p... | [
"pack.sh"
] | [] | true | |
yatli/fvim | 202 | issue_to_patch | Initial support for keyboard layouts | 7f017394f0255b23a88616a6347ade53954dddc1 | d70d90af830ea7976e4ed67161490f8f699475ad | diff --git a/input.fs b/input.fs
index 185029f..f8a8c16 100644
--- a/input.fs
+++ b/input.fs
@@ -70,6 +70,8 @@ let (|HasFlag|_|) (flag: KeyModifiers) (x: KeyModifiers) =
if x.HasFlag flag then Some() else None
let (|NoFlag|_|) (flag: KeyModifiers) (x: KeyModifiers) =
if x.HasFlag flag then None else Some()
+... | [
"input.fs"
] | [] | true | |||
yatli/fvim | 208 | issue_to_patch | Fix tiny typo in README.md | Was checking this out and playing around by copying some of the bits from the readme into my config and noticed a tiny typo so thought I would PR to save you some time 🙏 | b144d1ed304052e2ede30aaa9b7e75813776f64e | 82440e6d94abd9d57fc78a929f8567756427b2ac | diff --git a/README.md b/README.md
index cac65a9..8b36549 100644
--- a/README.md
+++ b/README.md
@@ -130,7 +130,7 @@ FVimFontHintLevel 'full'
FVimFontLigature v:true
FVimFontLineHeight '+1.0' " can be 'default', '14.0', '-1.0' etc.
FVimFontSubpixel v:true
-FVimFontNoBuiltInSymbols v:true " Disable built-in Nerd font... | [
"README.md"
] | [] | true | ||
yatli/fvim | 207 | issue_to_patch | FVim startup script has trouble with environment variable values with spaces
I was not able to start FVim at all, it claimed `nvim` was not in the path. I think I tracked this down to the `fvim-osx-launcher` file in `/Applications/FVim.app/Contents/MacOS`
The bash snippet in there can't deal with spaces in environ... | Make launcher script behave more nicely with big environments and environment variables with spaces | This PR fixes #206 , using Bash dark magic to split up the login environment better, and moving $PATH to the start of the environment variables to overcome what appears to be environment truncation when launching the Avalonia framework. | 98c40364e2ab3df96d3e2736de1f3410ef180055 | 3b9100645482c0b38c4b72162b72770eb430b6ba | diff --git a/lib/fvim-osx-launcher b/lib/fvim-osx-launcher
index 9a06ca7..51a927f 100644
--- a/lib/fvim-osx-launcher
+++ b/lib/fvim-osx-launcher
@@ -1,12 +1,21 @@
#!/usr/bin/env bash
ENVVARS=""
+set -f
+IFS=$'\n'
for VAR in `$SHELL --login -c /usr/bin/env`
do
if [[ $VAR == *"="* ]]
then
- ENVVARS="$ENVVARS... | [
"lib/fvim-osx-launcher"
] | [] | true | |
yatli/fvim | 194 | issue_to_patch | Cleanup Todos in input.fs | Took a swing at cleaning up a couple of TODOs found in the `input.fs` file. | 646a86f2fa06205df75d17594aea0aa972f322dc | 52948481cf6548fce535476cc753f6a40f11b32f | diff --git a/input.fs b/input.fs
index 48856fc..721a8e8 100644
--- a/input.fs
+++ b/input.fs
@@ -218,8 +218,7 @@ let (|Mouse|Special|Normal|ImeEvent|TextInput|Unrecognized|) (x: InputEvent) =
| Key(_, Key.Add) -> Special("kPlus")
| Key(_, Key.Subtract) ... | [
"input.fs"
] | [
{
"comment": "This looks to be covered by line 187.",
"path": "input.fs",
"hunk": "@@ -218,8 +218,7 @@ let (|Mouse|Special|Normal|ImeEvent|TextInput|Unrecognized|) (x: InputEvent) =\n | Key(_, Key.Add) -> Special(\"kPlus\")\n | Key(_, Key.Subtract) ... | true | ||
yatli/fvim | 192 | issue_to_patch | Updated path of fvim.ico to include parent dir | 646a86f2fa06205df75d17594aea0aa972f322dc | e9ef4b7da795bd2b885551f9aaa2e74dca836322 | diff --git a/fvim.fsproj b/fvim.fsproj
index bc72c28..ac34013 100644
--- a/fvim.fsproj
+++ b/fvim.fsproj
@@ -4,10 +4,10 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyName>FVim</AssemblyName>
<Prefer32Bit>false</Prefer32Bit>
- <ApplicationIcon>fvim.ico</ApplicationIcon>
+ <Application... | [
"fvim.fsproj"
] | [] | true | |||
yatli/fvim | 189 | issue_to_patch | Ime | de0777fd3f14f1603bea590ddd9931b98fa70bba | 78ff162c7e1315bfaa883acd85930caf62a7ff77 | diff --git a/README.md b/README.md
index 7cd643c..50f07da 100644
--- a/README.md
+++ b/README.md
@@ -53,8 +53,13 @@ Cross platform Neovim front-end UI, built with [F#](https://fsharp.org/) + [Aval
Try these bindings (note, fvim-specific settings only work in `ginit.vim`, not `init.vim`!):
```vimL
if exists('g:fvim_l... | [
"README.md",
"ViewModels/GridViewModel.fs",
"Views/Grid.xaml",
"Views/Grid.xaml.fs",
"fvim.fsproj",
"fvim_avalonia.fsproj",
"model.fs",
"states.fs",
"ui.fs"
] | [] | true | |||
yatli/fvim | 175 | issue_to_patch | Mention .NET SDK 3.1.404 is required for build | Since some parts of the new syntax (say, `uint`) are used here, the project cannot be built using an older SDK. | 82dd51347cc3a5ea859e2372a27c9c49084f2f78 | 66dea9f39c6a30de054e84eaf68dfdbeb7f0cebc | diff --git a/README.md b/README.md
index 61450fc..7d21e27 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Cross platform Neovim front-end UI, built with [F#](https://fsharp.org/) + [Aval
- Arch Linux: [Install via AUR](https://aur.archlinux.org/packages/fvim/)
- RPM-based distributions: `rpm -ivh fv... | [
"README.md"
] | [] | true | ||
yatli/fvim | 163 | issue_to_patch | Glyphrun | 4e152b366d68a92c6c2b2198259819be3b42713b | fcfe1890f6f48f467b3c38c91d6016412de41704 | diff --git a/.gitignore b/.gitignore
index f7af67d..d45b0d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ desktop.ini
*.zip
native/**/build
.ccls-cache
+
+.fake
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index d887356..201ae54 100644
--- a/.vscode/launch.json
+++ ... | [
".gitignore",
".vscode/launch.json",
".vscode/tasks.json",
"Fonts/nerd.ttf",
"Views/Cursor.xaml.fs",
"Views/Editor.xaml.fs",
"Views/MainWindow.xaml.fs",
"def.fs",
"fvim.fsproj",
"states.fs",
"ui.fs",
"wcwidth.fs"
] | [] | true | |||
yatli/fvim | 129 | issue_to_patch | Performance improvements | This is looking good.
4K @ 60fps without jittering.
Need to test compatibility with all platforms to see if the caching mechanism works. | d39ee8b60dafbefc9b5f31942b81d522cce72cf5 | 4356c18249dc01f5a1cc37a1aa1e450c9fd0f037 | diff --git a/Program.fs b/Program.fs
index f5da66d..4c165a1 100644
--- a/Program.fs
+++ b/Program.fs
@@ -122,7 +122,7 @@ let main(args: string[]) =
| Ok() -> 0
| Error ex ->
// TODO should yield so that the crash info can propagate back
- FVim.log.trace "main" "displaying crash dialog"
+ FVim.log.trace... | [
"Program.fs",
"ViewModels/EditorViewModel.fs",
"Views/Cursor.xaml.fs",
"Views/Editor.xaml.fs",
"Views/MainWindow.xaml",
"Views/MainWindow.xaml.fs",
"Views/PopupMenu.xaml.fs",
"log.fs",
"model.fs",
"neovim.fs",
"profiling/trace.nettrace",
"profiling/trace.speedscope.json",
"shell.fs",
"stat... | [] | true | ||
yatli/fvim | 127 | issue_to_patch | Clean up CFBundleDocumentTypes | Apple has the concept of Uniform Type Identifiers[1] which allows to associate an app to a bunch of file-types at once. This commit add the `public.text` TUI to the Info.plist file and removes unneeded declarations. I didn't test all of them, but they can be added as needed
[1]: https://developer.apple.com/library/a... | 7565393f2c19f9a837e79c623f8bd668a9ecedae | 736473a7d4e15940d1c0770865e21cfa85bf31d8 | diff --git a/lib/Info.plist b/lib/Info.plist
index 6ba30ea..6b6fede 100644
--- a/lib/Info.plist
+++ b/lib/Info.plist
@@ -16,1061 +16,195 @@
<string>True</string>
<key>CFBundleDocumentTypes</key>
<array>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>vim</string>
- ... | [
"lib/Info.plist"
] | [] | true | ||
yatli/fvim | 119 | issue_to_patch | bg transparency | 769a7ac88b7b296db251231536fc8190af9a1ede | f3ad7adff5fbd7f9b330bd9fb86f87ee41907e1a | diff --git a/README.md b/README.md
index 81e7de2..924ae7b 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,11 @@ FVimCursorSmoothBlink v:true
FVimBackgroundComposition 'acrylic' " 'none', 'blur' or 'acrylic'
FVimBackgroundOpacity 0.85 " value between 0 and 1, default bg opacity.
FVimBackgroundAltOpac... | [
"README.md",
"ViewModels/EditorViewModel.fs",
"ViewModels/MainWindowViewModel.fs",
"Views/Editor.xaml",
"Views/Editor.xaml.fs",
"Views/MainWindow.xaml",
"Views/MainWindow.xaml.fs",
"model.fs",
"states.fs",
"theme.fs",
"ui.fs"
] | [] | true | |||
yatli/fvim | 113 | issue_to_patch | Bump MessagePack.ImmutableCollection from 1.7.3.7 to 1.9.3 | Bumps [MessagePack.ImmutableCollection](https://github.com/neuecc/MessagePack-CSharp) from 1.7.3.7 to 1.9.3.
<details>
<summary>Release notes</summary>
*Sourced from [MessagePack.ImmutableCollection's releases](https://github.com/neuecc/MessagePack-CSharp/releases).*
> ## v1.9.3
> ## Changes
>
> 🔒 **Security fixe... | 83a779851ada77ea2857895a02843735793858c4 | e1ef30abdd27152774c28190a47f964a5676eb3d | diff --git a/fvim.fsproj b/fvim.fsproj
index 0b045ce..887d0b5 100644
--- a/fvim.fsproj
+++ b/fvim.fsproj
@@ -92,7 +92,7 @@
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="1.4.6.2" />
<PackageReference Include="MessagePack" Version="1.7.3.7" />
<PackageReference Include="MessagePack.... | [
"fvim.fsproj"
] | [] | true | ||
yatli/fvim | 114 | issue_to_patch | Bump MessagePack from 1.7.3.7 to 1.9.3 | Bumps [MessagePack](https://github.com/neuecc/MessagePack-CSharp) from 1.7.3.7 to 1.9.3.
<details>
<summary>Release notes</summary>
*Sourced from [MessagePack's releases](https://github.com/neuecc/MessagePack-CSharp/releases).*
> ## v1.9.3
> ## Changes
>
> 🔒 **Security fixes are included in this release**. Read m... | 83a779851ada77ea2857895a02843735793858c4 | b804b85a3c1ba3671f662cc87beddb4b1526ce6a | diff --git a/fvim.fsproj b/fvim.fsproj
index 0b045ce..ab6e415 100644
--- a/fvim.fsproj
+++ b/fvim.fsproj
@@ -90,7 +90,7 @@
</PackageReference>
<PackageReference Include="HarfBuzzSharp" Version="1.4.6.2" />
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="1.4.6.2" />
- <PackageRefe... | [
"fvim.fsproj"
] | [] | true | ||
yatli/fvim | 74 | issue_to_patch | Background composition | TODO
-------
- [x] Custom titlebar ( #83 )
- [x] ~~background transparency without blur~~ (Moved to #95)
- [x] ~~background picture?~~ (Moved to #95)
- [x] font overflow
- [x] ~~custom titlebar buttons not reliable~~ (Moved to #94)
- [x] keep last states in fvim config file so that the startup process is smoot... | 99357d8bc7331f78ec98b6bcd780095d92eebf3f | f4e1ed54a927f5d7037e41a091d75fe806ad5cad | diff --git a/.gitignore b/.gitignore
index 596304e..f7af67d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ desktop.ini
*.deb
*.app
*.zip
+native/**/build
+.ccls-cache
diff --git a/Program.fs b/Program.fs
index b5b9ffa..e8f969b 100644
--- a/Program.fs
+++ b/Program.fs
@@ -16,6 +16,7 @@ open System
open S... | [
".gitignore",
"Program.fs",
"ViewModels/EditorViewModel.fs",
"ViewModels/MainWindowViewModel.fs",
"Views/Editor.xaml",
"Views/Editor.xaml.fs",
"Views/MainWindow.xaml",
"Views/MainWindow.xaml.fs",
"config.fs",
"lib/libfvim-ext.dylib",
"model.fs",
"native/osx/CMakeLists.txt",
"native/osx/compi... | [] | true | ||
yatli/fvim | 83 | issue_to_patch | Custom titlebar | f19607b17e3550159dc1ecd4adbc1c8718809ef1 | bacca86560c8c1b7b8b4d4052adc09d6229986c9 | diff --git a/DesignTime/EditorSampleData.fs b/DesignTime/EditorSampleData.fs
new file mode 100644
index 0000000..e875ad9
--- /dev/null
+++ b/DesignTime/EditorSampleData.fs
@@ -0,0 +1,10 @@
+namespace FVim
+
+open Avalonia.Media
+open Avalonia.Controls
+open Avalonia.Media.Imaging
+
+type EditorSampleData() =
+ memb... | [
"DesignTime/EditorSampleData.fs",
"DesignTime/MainWindowSampleData.fs",
"DesignTime/TitleBarSampleData.fs",
"ViewModels/EditorViewModel.fs",
"ViewModels/MainWindowViewModel.fs",
"ViewModels/PopupMenuViewModel.fs",
"ViewModels/ThemableViewModelBase.fs",
"ViewModels/TitleBarViewModel.fs",
"Views/Edito... | [] | true | |||
yatli/fvim | 79 | issue_to_patch | multigrid | 2fda01238fb3e97a3638a100e4b48bad9233d611 | 0dfe162d7e0e84f27c3f02ee3a8974e10580922a | diff --git a/App.xaml.fs b/App.xaml.fs
index 61e908e..d1865c2 100644
--- a/App.xaml.fs
+++ b/App.xaml.fs
@@ -1,7 +1,27 @@
namespace FVim
open Avalonia
+open Avalonia.Controls
+open Avalonia.Controls.Templates
open Avalonia.Markup.Xaml
+open System
+
+type IViewModelContainer =
+ abstract Target: obj
+
+type Vi... | [
"App.xaml.fs",
"Program.fs",
"Properties/launchSettings.json",
"ViewModels/CompletionItemViewModel.fs",
"ViewModels/CursorViewModel.fs",
"ViewModels/EditorViewModel.fs",
"ViewModels/MainWindowViewModel.fs",
"ViewModels/PopupMenuViewModel.fs",
"ViewModels/ViewModelBase.fs",
"Views/Cursor.xaml.fs",
... | [] | true | |||
yatli/fvim | 78 | issue_to_patch | Crash report | 2fda01238fb3e97a3638a100e4b48bad9233d611 | 68066787e0cd40a40a094456e8b0be4c40cda297 | diff --git a/Assets/error.png b/Assets/error.png
new file mode 100644
index 0000000..9d4f19c
Binary files /dev/null and b/Assets/error.png differ
diff --git a/Assets/error.xcf b/Assets/error.xcf
new file mode 100644
index 0000000..a5a8635
Binary files /dev/null and b/Assets/error.xcf differ
diff --git a/DesignTime/Cras... | [
"Assets/error.png",
"Assets/error.xcf",
"DesignTime/CrashReportSampleData.fs",
"Program.fs",
"ViewModels/CrashReportViewModel.fs",
"Views/CrashReport.xaml",
"Views/CrashReport.xaml.fs",
"fvim.fsproj"
] | [] | true | |||
yatli/fvim | 56 | issue_to_patch | Implement rpm packaging | Should generate an rpm package alongside the deb linux package. Currently the rpm generation has been tested, but not the resulting rpm itself. | a3265a7bdbd1389453252d8bb91a8e5e1c3f6e3b | 757329232caf6895fb79fc7b6098548f0f03b37f | diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e0a644f..295e765 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -44,7 +44,7 @@ jobs:
inputs:
targetType: 'inline'
script: |
- sudo apt-get install ruby ruby-dev rubygems build-essential
+ sudo apt-get install ru... | [
"azure-pipelines.yml",
"pack.sh"
] | [] | true | ||
yatli/fvim | 55 | issue_to_patch | Improve linux installation instructions #52 | Added a couple options in the Linux install instructions section to hopefully cover more cases. | 17b59dd4bfcdcd1466db083cdfef96724bd5ae79 | d49d3b715e52ae1fb903401d7b823b69a9c09137 | diff --git a/README.md b/README.md
index cdf89eb..c6e39bb 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,13 @@ Cross platform Neovim front-end UI, built with [F#](https://fsharp.org/) + [Aval
- For Windows 7, use the `win7-x64` package.
- For Windows 10, use the `win-x64` package -- this version has faster start... | [
"README.md"
] | [] | true | ||
yatli/fvim | 53 | issue_to_patch | Popupmenu | 5bc307001d3d4dd497e4066ffbd61fc3fb8b7c0b | de6246110c0b3084fc49550f9df37dad9ab1b7d0 | diff --git a/Assets/intellisense/Class_16x.png b/Assets/intellisense/Class_16x.png
new file mode 100644
index 0000000..5ea87b3
Binary files /dev/null and b/Assets/intellisense/Class_16x.png differ
diff --git a/Assets/intellisense/ColorPalette_16x.png b/Assets/intellisense/ColorPalette_16x.png
new file mode 100644
index... | [
"Assets/intellisense/Class_16x.png",
"Assets/intellisense/ColorPalette_16x.png",
"Assets/intellisense/Constant_16x.png",
"Assets/intellisense/Dimension_16x.png",
"Assets/intellisense/EnumItem_16x.png",
"Assets/intellisense/Enumerator_16x.png",
"Assets/intellisense/Event_16x.png",
"Assets/intellisense/... | [] | true | |||
yatli/fvim | 49 | issue_to_patch | workaround #48 | 0324dec7a72bf4f44723cdfd306cde42d0a5da09 | e465da6d6d98883712e248788184666cee5b07ef | diff --git a/neovim/neovim.model.fs b/neovim/neovim.model.fs
index 00b769d..9aa06d7 100644
--- a/neovim/neovim.model.fs
+++ b/neovim/neovim.model.fs
@@ -258,6 +258,7 @@ module ModelImpl =
match x with
| ImeEvent -> _imeArmed <- true
| TextInput _ -> ()
+ | Unrecogniz... | [
"neovim/neovim.model.fs"
] | [] | true | |||
yatli/fvim | 17 | issue_to_patch | Avalonia nightly | f322303fe1300e88c08c4ce63ecc1cad7f7d8d85 | fbaa0699d7a20f007ba2bd0343cd541a7bddd6e9 | diff --git a/Program.fs b/Program.fs
index 4a86e39..f54683f 100644
--- a/Program.fs
+++ b/Program.fs
@@ -4,6 +4,7 @@ open Avalonia
open Avalonia.Logging.Serilog
open System.Reflection
open FSharp.Data
+open Avalonia.ReactiveUI
module Program =
@@ -18,12 +19,11 @@ module Program =
AppBuilder
... | [
"Program.fs",
"ViewModels/EditorViewModel.fs",
"Views/Cursor.xaml",
"Views/Cursor.xaml.fs",
"Views/Editor.xaml.fs",
"Views/MainWindow.xaml.fs",
"fvim.fsproj",
"neovim/neovim.model.fs",
"pack.ps1",
"ui.fs"
] | [] | true | |||
yatli/fvim | 13 | issue_to_patch | Changed default font weight to Normal, and made <C-l> not special | The way that <C-l> is handled is kinda brute, I guess a better solution could be send the key combinations through after they were handled as special inputs. | 03c43af3da2095f5477484facae2e50aa1df3821 | 9872196d07887a7f68696f8737733cca10178117 | diff --git a/ViewModels/EditorViewModel.fs b/ViewModels/EditorViewModel.fs
index a698f2f..3a54def 100644
--- a/ViewModels/EditorViewModel.fs
+++ b/ViewModels/EditorViewModel.fs
@@ -98,7 +98,7 @@ and EditorViewModel(GridId: int, ?parent: EditorViewModel, ?_gridsize: GridSize,
| None -... | [
"ViewModels/EditorViewModel.fs",
"fvim.fsproj.user",
"neovim/neovim.model.fs",
"ui.fs"
] | [] | true | ||
yewstack/yew | 4,167 | issue_to_patch | kill version-sensitive URL/version maintenance with a build-time placeholder plugin
## Problem
The getting-started and tutorial pages (and other docs) hard-code the **yew version** in
several spots that must be hand-updated on every release and are easy to miss:
1. **docs.rs API links** pinned to a version. e.g. `ht... | chore(website): version-aware docs URLs via remark plugin | Resolves #4166
| 47d4082d301d495c3c97fc9ed5cb18ffffaa3198 | e9287308554c11e1615c3ce650da1f8d3294b10b | diff --git a/website/docs/concepts/function-components/hooks/introduction.mdx b/website/docs/concepts/function-components/hooks/introduction.mdx
index 240dd02b8c8..636e7073f3a 100644
--- a/website/docs/concepts/function-components/hooks/introduction.mdx
+++ b/website/docs/concepts/function-components/hooks/introduction... | [
"website/docs/concepts/function-components/hooks/introduction.mdx",
"website/docs/getting-started/build-a-sample-app.mdx",
"website/docusaurus.config.js",
"website/src/remark/yewVersionUrls.core.js",
"website/src/remark/yewVersionUrls.js",
"website/src/remark/yewVersionUrls.test.js",
"website/versioned_... | [] | diff --git a/website/src/remark/yewVersionUrls.test.js b/website/src/remark/yewVersionUrls.test.js
new file mode 100644
index 00000000000..1c077be209a
--- /dev/null
+++ b/website/src/remark/yewVersionUrls.test.js
@@ -0,0 +1,105 @@
+// Standalone unit test for the yew-version remark logic.
+// Run with: `node src/remark... | true |
yewstack/yew | 4,141 | issue_to_patch | Yew.rs tutorial has outdated wasm-bindgen-futures pattern
This is about:
- [ ] A typo
- [ ] Inaccurate/misleading documentation (e.g. technically incorrect advice)
- [ ] Undocumented code
- [x] Outdated documentation
- [ ] Other
**Problem**
This is an excerpt from the tutorial, after tellinng new users to add `wasm... | docs: tutorial: update outdated fetching data section | #### Description
Fetching data section of the tutorial page still mentioned using `wasm-bindgen-futures::spawn_local`. Updated the docs and examples to use `yew::platform::spawn_local` and the `use_future` hook instead.
**note: for translation purpose I did used LLM (Codex | GPT-5.4)**
<!-- Please include a summ... | a259eae6821621ba6afe88512e231fc7eb079ec7 | 174cb75692750a4f1f9315b441199abdcd569188 | diff --git a/website/docs/tutorial/index.mdx b/website/docs/tutorial/index.mdx
index 5cefaf1b9d1..9387781c78c 100644
--- a/website/docs/tutorial/index.mdx
+++ b/website/docs/tutorial/index.mdx
@@ -459,18 +459,15 @@ videos list from an external source. For this we will need to add the following
For making the fetch c... | [
"website/docs/tutorial/index.mdx",
"website/i18n/ja/docusaurus-plugin-content-docs/current/tutorial/index.mdx",
"website/i18n/ja/docusaurus-plugin-content-docs/version-0.22/tutorial/index.mdx",
"website/i18n/ja/docusaurus-plugin-content-docs/version-0.23/tutorial/index.mdx",
"website/i18n/zh-Hans/docusaurus... | [] | true | |
yewstack/yew | 4,158 | issue_to_patch | <img src> re-downloaded on hydration because all attributes are unconditionally re-applied
**Problem**
During SSR hydration, Yew unconditionally re-applies every attribute to the already rendered DOM element. For attributes like src on `<img>`, setting the attribute again even to the same value - causes the browser to... | add hydrate_set(Attributes) and hydrate(trait Apply) methods | #### Description
Introduce an optimized hydration path for DOM attributes - skip unnecessary set_attribute calls when SSR has already written the correct value.
Fixes #4157
#### Checklist
- [x] I have reviewed my own code
- [x] I have added tests
| 65972c34fe8c18e6961c9473c572c71e03de43d5 | c39803edc34799571b92d3f9601d66d64af62f82 | diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml
index 629e50f9ccc..a83f1e8e74e 100644
--- a/packages/yew/Cargo.toml
+++ b/packages/yew/Cargo.toml
@@ -92,7 +92,13 @@ trybuild = { workspace = true }
[dev-dependencies.web-sys]
workspace = true
-features = ["ShadowRootInit", "ShadowRootMode", "HtmlButton... | [
"packages/yew/Cargo.toml",
"packages/yew/src/dom_bundle/btag/attributes.rs",
"packages/yew/src/dom_bundle/btag/mod.rs",
"packages/yew/tests/hydration.rs"
] | [] | diff --git a/packages/yew/tests/hydration.rs b/packages/yew/tests/hydration.rs
index 63ca2144edd..7fb1488ed28 100644
--- a/packages/yew/tests/hydration.rs
+++ b/packages/yew/tests/hydration.rs
@@ -1,6 +1,7 @@
#![cfg(feature = "hydration")]
#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))]
+use std::cell... | true |
yewstack/yew | 4,163 | issue_to_patch | chore(deps): bump the cargo-deps group across 1 directory with 18 updates | Bumps the cargo-deps group with 18 updates in the / directory:
| Package | From | To |
| --- | --- | --- |
| [tokio](https://github.com/tokio-rs/tokio) | `1.51.0` | `1.52.3` |
| [clap](https://github.com/clap-rs/clap) | `4.6.0` | `4.6.1` |
| [serde_json](https://github.com/serde-rs/json) | `1.0.149` | `1.0.150` |
| [l... | 53bb20c90a192d5efd81a5eef2639bce95219146 | 42fa537c2252ecb6db204c6d1ee6923720a6b78f | diff --git a/Cargo.lock b/Cargo.lock
index 39976d09500..61fdaceef1f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -372,7 +372,7 @@ version = "0.0.1"
dependencies = [
"chrono",
"futures 0.3.32",
- "gloo-net 0.7.0",
+ "gloo-net",
"yew",
]
@@ -399,9 +399,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954... | [
"Cargo.lock",
"Cargo.toml",
"examples/axum_ssr_router/Cargo.toml",
"examples/password_strength/Cargo.toml",
"examples/simple_ssr/Cargo.toml",
"packages/yew-link/Cargo.toml",
"packages/yew/Cargo.toml",
"tools/benchmark-ssr/Cargo.toml"
] | [] | true | ||
yewstack/yew | 4,164 | issue_to_patch | fix: make simple_ssr SSR fetch reliable in CI | see commit message | 830db95a54af3b685211ac7349e7276383c9565f | c425d48af21003c6f3f9c7438a36f95420259a51 | diff --git a/examples/simple_ssr/src/lib.rs b/examples/simple_ssr/src/lib.rs
index 8611b7c0cf9..1d9dc775c83 100644
--- a/examples/simple_ssr/src/lib.rs
+++ b/examples/simple_ssr/src/lib.rs
@@ -9,8 +9,17 @@ struct UuidResponse {
#[cfg(feature = "ssr")]
async fn fetch_uuid() -> Uuid {
- // reqwest works for both n... | [
"examples/simple_ssr/src/lib.rs"
] | [] | true | ||
yewstack/yew | 4,162 | issue_to_patch | chore(deps): bump git2 to 0.21 and adapt changelog tool | exposed by a dependabot PR. this is un-blocks the PR.
| 6292cbe275cd82fb015ad8bbcd2fc163e7bd854b | e3afb668f059f304bf12e83574d0a60cfe1a3996 | diff --git a/Cargo.lock b/Cargo.lock
index 9072a7e731d..39976d09500 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1572,17 +1572,14 @@ dependencies = [
[[package]]
name = "git2"
-version = "0.20.4"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b88256088d75a56f8ecf... | [
"Cargo.lock",
"tools/changelog/Cargo.toml",
"tools/changelog/src/get_latest_version.rs"
] | [] | diff --git a/tools/changelog/src/get_latest_version.rs b/tools/changelog/src/get_latest_version.rs
index 89fe646e625..91883b529f2 100644
--- a/tools/changelog/src/get_latest_version.rs
+++ b/tools/changelog/src/get_latest_version.rs
@@ -12,7 +12,7 @@ pub fn get_latest_version(package: &YewPackage) -> Result<Version> {
... | true | |
yewstack/yew | 4,151 | issue_to_patch | chore(deps): bump postcss from 8.5.6 to 8.5.13 in /website | Bumps [postcss](https://github.com/postcss/postcss) from 8.5.6 to 8.5.13.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/postcss/postcss/releases">postcss's releases</a>.</em></p>
<blockquote>
<h2>8.5.13</h2>
<ul>
<li>Fixed <code>postcss-scss</code> commend regression.</li>
<... | d4e5e9f3a82e81e97041f53e0cc7e6bb1796cd48 | 5de1a63bc69d99f390dbd2713b08dad6f18c08e7 | diff --git a/website/package-lock.json b/website/package-lock.json
index a3ef604410b..a5dd6d91937 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -14047,9 +14047,9 @@
}
},
"node_modules/postcss": {
- "version": "8.5.6",
- "resolved": "https:... | [
"website/package-lock.json"
] | [] | true | ||
yewstack/yew | 4,161 | issue_to_patch | chore(deps): bump crate-ci/typos from 1.44.0 to 1.47.0 | Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.44.0 to 1.47.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/crate-ci/typos/releases">crate-ci/typos's releases</a>.</em></p>
<blockquote>
<h2>v1.47.0</h2>
<h2>[1.47.0] - 2026-05-29</h2>
<h3>Features</h3>
<ul>... | 65972c34fe8c18e6961c9473c572c71e03de43d5 | 0cd3a50f581f9fb0254c0317f47e0d7cfc37dd4c | diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml
index c7514f9a79f..d608767dde2 100644
--- a/.github/workflows/main-checks.yml
+++ b/.github/workflows/main-checks.yml
@@ -20,7 +20,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Check spelling
- uses: cra... | [
".github/workflows/main-checks.yml"
] | [] | true | ||
yewstack/yew | 4,145 | issue_to_patch | modernize example code with preamble statements
#4124 opened up opportunities to more compact coding styles.
`html!` invocations in example crates and website code snippets can benefit from some refactoring. | refactor: inline to html! callsite | #### Description
eliminated a bunch of functions that return Html and were only used once in some `html!` callsite
Fixes #4144
#### Checklist
- [x] I have reviewed my own code
| c28846c3e8c837d90ab8b4bc35377e317520d7c1 | 623ee28732ab08f4a9919218afc482be57abea71 | diff --git a/examples/actix_ssr_router/src/lib.rs b/examples/actix_ssr_router/src/lib.rs
index 913510c7dfc..0f039a5964c 100644
--- a/examples/actix_ssr_router/src/lib.rs
+++ b/examples/actix_ssr_router/src/lib.rs
@@ -115,27 +115,7 @@ fn render_post(post: &content::Post) -> Html {
}
};
- let view_cont... | [
"examples/actix_ssr_router/src/lib.rs",
"examples/axum_ssr_router/src/lib.rs",
"examples/boids/src/boid.rs",
"examples/boids/src/simulation.rs",
"examples/file_upload/src/main.rs",
"examples/function_router/src/pages/post.rs",
"examples/function_router/src/pages/post_list.rs",
"examples/game_of_life/s... | [] | true | |
yewstack/yew | 4,155 | issue_to_patch | chore: bump nanoid to 0.5 and propagate getrandom wasm_js | #### Description
Bumps `nanoid` to `0.5` in `examples/function_memory_game` and adds the `getrandom_03` workspace dep so the `wasm_js` Cargo feature is activated for the transitive `getrandom 0.3` brought in by nanoid 0.5's `rand 0.9`.
##### Why this is needed
`nanoid 0.5` swaps its `rand 0.8` dep for `rand 0.... | b50f17f8e2a1fc677765727a54adec0941fca6a2 | 0349c27e670a05ca5c9dc1b68e899dda4e88cc1a | diff --git a/Cargo.lock b/Cargo.lock
index 83793809cde..9072a7e731d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1374,6 +1374,7 @@ dependencies = [
name = "function_memory_game"
version = "0.1.0"
dependencies = [
+ "getrandom 0.3.4",
"getrandom 0.4.2",
"gloo",
"nanoid",
@@ -2574,7 +2575,7 @@ version = "0.9.1"
... | [
"Cargo.lock",
"examples/function_memory_game/Cargo.toml"
] | [] | true | ||
yewstack/yew | 4,013 | issue_to_patch | Feature soundness is a chore to deal with
**Problem**
The feature soundness lints are useful but clippy is not very helpful when determining the correct visibilities and features. At least sometimes I don't understand immediately why clippy is allowing some things but not others. Take for example [this clippy run](ht... | ci: replace hand-maintained feature-soundness scripts with cargo-hack | #### Description
~~98 combinations from the full powerset might be unrealistic for CI~~
~~that's why there's `--exclude-features test,serde,not_browser_env`. These features don't gate any code paths~~
~~This then results in 14 clippy invocations are identical to what the old scripts ran, but now auto-discovere... | 19b1869ebda5202944d6251243130b6f3303789b | fa72abde4b85914ee0e57ea1930f14459c164a8c | diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index f9901ac0cdc..62ef8c6fa46 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -38,13 +38,25 @@ jobs:
with:
save-if: ${{ github.ref == 'refs/heads/master' }}
+ - uses: taiki-e/install-acti... | [
".github/workflows/clippy.yml",
"Makefile.toml",
"ci/feature-soundness-release.sh",
"ci/feature-soundness.sh",
"packages/yew/Makefile.toml"
] | [] | true | |
yewstack/yew | 4,154 | issue_to_patch | chore: update NO_TRUNK_EXAMPLES for renamed SSR examples | #### Description
PR #4027 renamed the `ssr_router` example to `axum_ssr_router` and added a new `actix_ssr_router`, but `NO_TRUNK_EXAMPLES` in `tools/build-examples/src/lib.rs` still listed the old `ssr_router`. As a result the size-cmp job iterates over both new SSR examples (which have no `Trunk.toml`), `is_wasm_o... | c28846c3e8c837d90ab8b4bc35377e317520d7c1 | c91179372a3899f9e44ae95d383c06224e4b8b72 | diff --git a/tools/build-examples/src/lib.rs b/tools/build-examples/src/lib.rs
index 65b5ab6e6cb..90f6afd782a 100644
--- a/tools/build-examples/src/lib.rs
+++ b/tools/build-examples/src/lib.rs
@@ -5,7 +5,12 @@ use serde::Deserialize;
use toml::Table;
/// Examples that don't use Trunk for building
-pub const NO_TRUN... | [
"tools/build-examples/src/lib.rs"
] | [] | true | ||
yewstack/yew | 4,152 | issue_to_patch | Validate attribute names | #### Description
Attribute names are written to the HTML in SSR without escaping (no such escaping is part of the HTML spec). This means they need to be validated to avoid surprises when they are parsed back in the browser.
Note that in normal usage, Rust identifiers always form valid attribute names. To catch br... | d4e5e9f3a82e81e97041f53e0cc7e6bb1796cd48 | 9abb23ceba58beec44400a37949b4b03be24288c | diff --git a/packages/yew-macro/src/html_tree/html_element.rs b/packages/yew-macro/src/html_tree/html_element.rs
index c2f7607d04d..d3444d568ff 100644
--- a/packages/yew-macro/src/html_tree/html_element.rs
+++ b/packages/yew-macro/src/html_tree/html_element.rs
@@ -204,6 +204,15 @@ impl ToTokens for HtmlElement {
... | [
"packages/yew-macro/src/html_tree/html_element.rs",
"packages/yew-macro/tests/html_macro/node-fail.rs",
"packages/yew-macro/tests/html_macro/node-fail.stderr",
"packages/yew-macro/tests/html_macro_test.rs",
"packages/yew/src/dom_bundle/btag/attributes.rs",
"packages/yew/src/virtual_dom/mod.rs",
"package... | [
{
"comment": "is this cut short?",
"path": "packages/yew-macro/src/html_tree/html_element.rs",
"hunk": "@@ -373,19 +406,26 @@ impl ToTokens for HtmlElement {\n };\n quote! { #value }\n });\n+ let to_attributes = if all_attr_names_ssr... | diff --git a/packages/yew-macro/tests/html_macro/node-fail.rs b/packages/yew-macro/tests/html_macro/node-fail.rs
index 588722bd273..ab67bafbd9d 100644
--- a/packages/yew-macro/tests/html_macro/node-fail.rs
+++ b/packages/yew-macro/tests/html_macro/node-fail.rs
@@ -1,3 +1,4 @@
+#![allow(uncommon_codepoints)]
use yew::p... | true | |
yewstack/yew | 4,152 | comment_to_fix | Validate attribute names | is this cut short? | d4e5e9f3a82e81e97041f53e0cc7e6bb1796cd48 | 9abb23ceba58beec44400a37949b4b03be24288c | diff --git a/packages/yew-macro/src/html_tree/html_element.rs b/packages/yew-macro/src/html_tree/html_element.rs
index c2f7607d04d..d3444d568ff 100644
--- a/packages/yew-macro/src/html_tree/html_element.rs
+++ b/packages/yew-macro/src/html_tree/html_element.rs
@@ -204,6 +204,15 @@ impl ToTokens for HtmlElement {
... | [
"packages/yew-macro/src/html_tree/html_element.rs"
] | [
{
"comment": "is this cut short?",
"path": "packages/yew-macro/src/html_tree/html_element.rs",
"hunk": "@@ -373,19 +406,26 @@ impl ToTokens for HtmlElement {\n };\n quote! { #value }\n });\n+ let to_attributes = if all_attr_names_ssr... | true | ||
yewstack/yew | 4,146 | issue_to_patch | feat: auto-detect imperative for/while/loop in preamble | #### Description
First off, the final diagnostics patch in [b9fe62a](https://github.com/yewstack/yew/pull/4124/commits/b9fe62a55487fae23ac5aa8047bd8c6892c33107) in #4124 seems unnecessary. Either `let _ = for {...}` or a trailing comma (`for {...};`) seems to do the same job and the latter should have definitely be ... | d4e5e9f3a82e81e97041f53e0cc7e6bb1796cd48 | e611fb0d5c90582ec76b28704ec2a83b4cd46881 | diff --git a/packages/yew-macro/src/html_tree/mod.rs b/packages/yew-macro/src/html_tree/mod.rs
index c2f6e626676..1ee2297c94c 100644
--- a/packages/yew-macro/src/html_tree/mod.rs
+++ b/packages/yew-macro/src/html_tree/mod.rs
@@ -582,14 +582,17 @@ impl Parse for HtmlRootBraced {
/// not Rust-parseable (e.g. an `<elemen... | [
"packages/yew-macro/src/html_tree/mod.rs",
"packages/yew-macro/tests/html_macro/for-pass.rs",
"packages/yew-macro/tests/html_macro/imperative-preamble-fail.rs",
"packages/yew-macro/tests/html_macro/imperative-preamble-fail.stderr",
"packages/yew-macro/tests/html_macro/imperative-preamble-pass.rs",
"packag... | [] | diff --git a/packages/yew-macro/tests/html_macro/for-pass.rs b/packages/yew-macro/tests/html_macro/for-pass.rs
index 4747a2cd8f0..6519fc8b0fb 100644
--- a/packages/yew-macro/tests/html_macro/for-pass.rs
+++ b/packages/yew-macro/tests/html_macro/for-pass.rs
@@ -390,4 +390,110 @@ fn main() {
0
}
let _ ... | true | |
yewstack/yew | 4,124 | issue_to_patch | feat: while, break/continue/return, and preamble statements in html! | #### Description
a spiritual followup of #4118
#### Checklist
- [x] I have reviewed my own code
- [x] I have added tests
| 28219ae16e748a0511d79855b701d365bf122ad3 | b9fe62a55487fae23ac5aa8047bd8c6892c33107 | diff --git a/packages/yew-macro/src/html_tree/html_for.rs b/packages/yew-macro/src/html_tree/html_for.rs
index 006b1204f8e..7979e133795 100644
--- a/packages/yew-macro/src/html_tree/html_for.rs
+++ b/packages/yew-macro/src/html_tree/html_for.rs
@@ -1,28 +1,18 @@
-use proc_macro2::{Ident, TokenStream};
+use proc_macro2:... | [
"packages/yew-macro/src/html_tree/html_for.rs",
"packages/yew-macro/src/html_tree/html_loop.rs",
"packages/yew-macro/src/html_tree/html_match.rs",
"packages/yew-macro/src/html_tree/html_while.rs",
"packages/yew-macro/src/html_tree/mod.rs",
"packages/yew-macro/tests/html_macro/for-fail.rs",
"packages/yew... | [
{
"comment": "I have seen this in the previous extension too. Is there a deeper meaning behind only allowing `let` statements and nothing else, most notably expression statements?\n\nI suppose a [QualifiedPathInExpression](https://doc.rust-lang.org/reference/paths.html#railroad-QualifiedPathInExpression) would ... | diff --git a/packages/yew-macro/tests/html_macro/for-fail.rs b/packages/yew-macro/tests/html_macro/for-fail.rs
index e40eece597b..19b04c5c75b 100644
--- a/packages/yew-macro/tests/html_macro/for-fail.rs
+++ b/packages/yew-macro/tests/html_macro/for-fail.rs
@@ -10,10 +10,6 @@ fn main() {
<span>{x}</span>
}... | true | |
yewstack/yew | 4,124 | comment_to_fix | feat: while, break/continue/return, and preamble statements in html! | I have seen this in the previous extension too. Is there a deeper meaning behind only allowing `let` statements and nothing else, most notably expression statements?
I suppose a [QualifiedPathInExpression](https://doc.rust-lang.org/reference/paths.html#railroad-QualifiedPathInExpression) would be ambiguous. Rust allow... | 28219ae16e748a0511d79855b701d365bf122ad3 | b9fe62a55487fae23ac5aa8047bd8c6892c33107 | diff --git a/packages/yew-macro/src/html_tree/html_while.rs b/packages/yew-macro/src/html_tree/html_while.rs
new file mode 100644
index 00000000000..68f7f50fe72
--- /dev/null
+++ b/packages/yew-macro/src/html_tree/html_while.rs
@@ -0,0 +1,72 @@
+use proc_macro2::TokenStream;
+use quote::{ToTokens, quote};
+use syn::buf... | [
"packages/yew-macro/src/html_tree/html_while.rs"
] | [
{
"comment": "I have seen this in the previous extension too. Is there a deeper meaning behind only allowing `let` statements and nothing else, most notably expression statements?\n\nI suppose a [QualifiedPathInExpression](https://doc.rust-lang.org/reference/paths.html#railroad-QualifiedPathInExpression) would ... | true | ||
yewstack/yew | 4,124 | comment_to_fix | feat: while, break/continue/return, and preamble statements in html! | Which of the two options is meant to be produced for the loop below?
```
html! {
for i in [1, 2] {
<a></a>
<i></i>
}
}
```
Option 1
```
html! {
<a></a>
<i></i>
<a></a>
<i></i>
}
```
Option 2
```
html! {
<>
<a></a>
<i></i>
</>
<>
<a></a>
<i></i>
</>
}
``` | 28219ae16e748a0511d79855b701d365bf122ad3 | b9fe62a55487fae23ac5aa8047bd8c6892c33107 | diff --git a/packages/yew-macro/src/html_tree/html_while.rs b/packages/yew-macro/src/html_tree/html_while.rs
new file mode 100644
index 00000000000..68f7f50fe72
--- /dev/null
+++ b/packages/yew-macro/src/html_tree/html_while.rs
@@ -0,0 +1,72 @@
+use proc_macro2::TokenStream;
+use quote::{ToTokens, quote};
+use syn::buf... | [
"packages/yew-macro/src/html_tree/html_while.rs"
] | [
{
"comment": "Which of the two options is meant to be produced for the loop below?\n\n```\nhtml! {\n for i in [1, 2] {\n <a></a>\n <i></i>\n }\n}\n```\n\nOption 1\n```\nhtml! {\n <a></a>\n <i></i>\n <a></a>\n <i></i>\n}\n```\n\nOption 2\n```\nhtml! {\n <>\n <a></a>\n <i></i>\n </>\n <>\n ... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.