Upstream merge conflict#1
Draft
shahmoradi wants to merge 5939 commits into
Draft
Conversation
When looking at any source code lex file (e.g. in the doxygen internal documentation) we see that the counting of the line starts with `-1` and also the the first 2 lines have the same numbers as the lats 2 comment lines. Also some links between the "normal" documentation and the source code were not correct (the double line numbers were signaled when running the `chmcmd` html help compiler on doxygen internal documentation)
When having an undocumented enum value in e.g the doxygen_crawl list and other indices an anchor appears that does not exists. For the doxygen enum example this is illustrated by the `chmcmd` command (a replacement for `hhc`) by means of: ``` Error: Anchor examples/enum/html/class_enum___test.html#a8d096bc026dbb395991f02e3ca86eb1ca284b56694c3f4513699fc86ea30527b0 undefined; first use doxygen_crawl.html ```
- Rename @startmermaid to @mermaid. - Improve config docs. - Update doxmlparser.
You don't "adapt" the CREATE_SUBDIRS_LEVEL, you just set/edit/adjust/configure it. I think "adjust" works best.
Small documentation corrections for mermaid part
…but valid) position Add possibility of C++ attribute as well at the indicated place.
Update config.xml description of CREATE_SUBDIRS
Documentation corrections
[deps] Update SQLite to version 3.51.3
Incorrect line numbers in source code browser for lex files
…n_fence be slightly more compatible parsing fenced blocks for markdown
Fixes a GCC 16 warnings
…attr issue #12073 Doxygen is confused by [[nodiscard]] in unconventional (but valid) position
[libmscgen] Do not discard const qualifier from strstr()
Bumps [docker/login-action](https://github.com/docker/login-action) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@b45d80f...4907a6d) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Removed period sign (`.`) at end of description, a comma (`,`) or period sign will be automatically added by doxygen. Bring text more inline with other descriptions by adding `(` / `)` pair around text.
Remove double punctuation mark
…er/login-action-4.1.0 Bump docker/login-action from 4.0.0 to 4.1.0
Non existing anchors in "index" files
Not existing images generating doxygen chm documentation.
… into sebhub-improve-filename-matching
- Add TranslationManager singleton for managing translations - Add OptionTranslations class for config option translations - Add 8 language translation files (zh_CN, zh_TW, de, fr, ja, ko, es, ru) - Add Language menu in UI for manual language switching - Support system language auto-detection on startup - English fallback for unsupported languages - All 456 UI text elements now support i18n - Update CMakeLists.txt for translation file processing
- Add QT_VERSION check for QLibraryInfo::path() vs location() - Qt 6.0+ uses QLibraryInfo::path() - Qt 5 uses QLibraryInfo::location() - Fix language menu checkbox display - Clear old actions from action group before recreating menu - Prevents duplicate actions and ensures correct checkmark display
- Add retranslate() virtual method to Input base class and all derived classes - Implement retranslateUi() for MainWindow, Wizard, Expert, Step1-4 - Fix HTML help text refresh in Expert by tracking current help input - Add member variables for radio buttons in Step2, Step3, Step4 to support dynamic refresh - Add OptionTranslations::retranslate() to refresh config option translations - Add translations.qrc for embedding .qm files in executable - Add I18N_GUIDE.md documentation for internationalization development - Update CMakeLists.txt for translation resource compilation
…e 284) The CDATA section for IDL propget/propset description started with "Fur" immediately after the CDATA opener, making it invisible to the previous umlaut scan. Fixed: <![CDATA[Fur -> <![CDATA[Für Addresses comment #4433603740. Agent-Logs-Url: https://github.com/doxygen/doxygen/sessions/266f1df8-7f61-4b50-bc16-2e8525ecf47e Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>
- Fix GROUP_GRAPHS: change "禁用目录图" (disable directory graph) to "禁用组图" (disable group graph) — the \hidegroupgraph command is for group graphs, not directory graphs - Fix MATHJAX_RELPATH: correct extra indentation on <option> tag Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>
issue #12140 Concatenating pages with same name behaves different in V.1.15 and 1.17
…tion-quality fix: correct German umlauts and improve translation quality in config_de.xml
…tions translation: fix two errors in Simplified Chinese config_zh_CN.xml
* Improve Russian translation of configuration options - Fix IMPLICIT_DIR_DOCS: was describing docs for directories without any docs, but it's specifically about using README.md as directory description - Fix FORTRAN_COMMENT_AFTER: was incorrectly describing it as 'line expected after Fortran comment'; it actually controls comment start position in fixed-format Fortran (default 72) - Expand WARN_AS_ERROR: add missing FAIL_ON_WARNINGS_PRINT behavior details - Fix WARN_LINE_FORMAT: was describing tag replacement, but misses the 'cut and paste' purpose and default value example - Improve WARN_FORMAT: add missing $version field and FILE_VERSION_FILTER reference - Improve WARN_LOGFILE: add '-' means stdout detail and file-open failure behavior - Expand INPUT_FILTER: add important note about not adding/removing lines - Improve FILTER_PATTERNS: add format description and EXTENSION_MAPPING reference - Improve INPUT_ENCODING: add reference to INPUT_FILE_ENCODING - Fix INPUT_FILE_ENCODING: was oversimplified, now shows per-pattern format - Improve EXCLUDE: add note that relative paths are relative to doxygen run directory - Improve EXCLUDE_PATTERNS: add note about wildcards matching absolute path - Improve EXCLUDE_SYMBOLS: add examples (ANamespace, AClass::*, etc.) - Improve EXAMPLE_PATH: add \include command reference - Improve EXAMPLE_RECURSIVE: add \include and \dontinclude references - Improve IMAGE_PATH: add \image command reference - Improve FILTER_SOURCE_FILES: add SOURCE_BROWSER reference - Improve USE_MDFILE_AS_MAINPAGE: fix inaccurate description - Fix SOURCE_BROWSER: add note about VERBATIM_HEADERS interaction - Improve INLINE_SOURCES: add multi-line macros and list-initialized variables - Fix STRIP_CODE_COMMENTS: change 'Doxygen-specific' to 'special doc comment blocks'; add note that normal C/C++/Fortran comments remain visible - Fix REFERENCED_BY_RELATION: change 'calling' to 'referencing' (documented) - Improve SOURCE_TOOLTIPS: add description of what tooltip shows - Expand USE_HTAGS: add full usage instructions and prerequisites - Improve VERBATIM_HEADERS: add SOURCE_BROWSER cross-reference - Fix CLANG_ASSISTED_PARSING: add libclang CMake option mention - Fix CLANG_ADD_INC_PATHS: clarify it adds input file directory to include paths - Fix CLANG_OPTIONS: clarify these are compiler command line options - Fix CLANG_DATABASE_PATH: add compile_commands.json explanation - Improve ALPHABETICAL_INDEX: add recommendation for large projects - Fix IGNORE_PREFIX: clarify effect on index placement with example - Fix RECURSIVE: clarify it searches subdirectories - Fix SHOW_GROUPED_MEMB_INC: add 'order in which they appeared' detail Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * Fix FORTRAN_COMMENT_AFTER and ALPHABETICAL_INDEX Russian translations - FORTRAN_COMMENT_AFTER: replace 'adds automatic comments' with 'recognizes comments' — the option controls comment recognition position, not insertion - ALPHABETICAL_INDEX: replace 'modules' (модулей) with 'elements' (элементов) for consistency with the actual index content description Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * Fix 3 review issues in Russian translation - WARN_AS_ERROR: fix 'найденные до обнаружения ошибки' → 'все найденные предупреждения и ошибки' for FAIL_ON_WARNINGS description - WARN_LINE_FORMAT: fix wrong default value ($file:$line: → at line $line of file $file) matching the actual defval attribute - INPUT_FILTER: remove logical contradiction about stable output — clarify that stable output IS expected/required Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * Fix 3 review issues: WARN_AS_ERROR NO case, dollar signs in WARN_FORMAT, Markdown capitalization Agent-Logs-Url: https://github.com/doxygen/doxygen/sessions/c0d8efae-9d39-4f07-9d52-13a4e5988447 Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>
* Improve Japanese translations in config_ja.xml - PROJECT_NAME: Use more natural phrasing - PROJECT_ICON: Fix icon/logo terminology confusion - SHORT_NAMES: Improve clarity of readability description - JAVADOC_AUTOBRIEF/QT_AUTOBRIEF: Use 'つまり' instead of 'したがって' - NUM_PROC_THREADS: Better translation for 'effectively disabled' - EXTRACT_ALL: More natural phrasing for conditional clause - HIDE_UNDOC_*: Use '各種' instead of '様々な' (more formal) - WARNINGS/QUIET: Improve toggle/switch descriptions Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * Improve Japanese translations for Project and Build config options Enhanced naturalness and consistency of Japanese translations in config_ja.xml for configuration options in the Project and Build groups. Key improvements: - Consistent terminology: 概要説明/概要 for brief description, 未文書化 for undocumented, 特殊コマンド for special commands - Natural sentence flow: restructured conditional phrasing like なお for notes instead of 注意 - Cleaner word order: adjusted subject-verb structures for Japanese grammar - Removed redundancy: streamlined phrases like パフォーマンス問題 instead of パフォーマンスの問題 - Terminology consistency: 複合型 for compound (instead of コンパウンド) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * Improve Japanese translations for Messages, Input, Source_Browser, Index, and HTML config options Reviewed and improved 42 translations to be more natural and accurate: - Unified terminology: 文書化されていない → 未文書化 (undocumented) - Fixed awkward phrases: コード例のフラグメント → サンプルコードの断片 - Improved clarity: 逐語的なコピーを生成 → そのままコピーして出力 - Fixed translation errors: QHP_VIRTUAL_FOLDER was incorrectly translated - Improved particle usage and sentence flow throughout - Made technical terms more consistent: コンパウンド → 複合型 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * Improve Japanese translations for config options Fix and improve Japanese translations for LaTeX, RTF, Man, XML, Docbook, AutoGen, Sqlite3, PerlMod, Preprocessor, External, and Dot groups (42 options improved): - Fix mistranslation: 'save trees' -> 'save paper' (紙の節約) - Fix 'signals the behavior' -> 'controls the behavior' (制御します) - Fix GROUP_GRAPHS copy-paste error (ディレクトリグラフ -> グループグラフ) - Fix TAGFILES note: clarify that name does NOT include path - Improve GENERATE_XML/AUTOGEN_DEF/PERLMOD phrasing for clarity - Change 'コピーします' to '出力します' for XML_PROGRAMLISTING - Change 'ソースする' to '参照する' for MAN_LINKS - Improve GENERATE_LEGEND note clarity - Use 未文書化 for 'undocumented' consistently - Add (UML) abbreviation to UML_LOOK description - Change 'メッセージシーケンスダイアグラム' to 'チャート' for msc - Various minor improvements for naturalness and consistency Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>
…2147) * translation: fix Korean spelling 디렉토리 → 디렉터리 in config_ko.xml Replace all occurrences of the non-standard spelling '디렉토리' with the standard Korean spelling '디렉터리' (directory). This affects 56 occurrences throughout the file covering all configuration option groups. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * translation: improve Korean config translation quality - Replace non-standard '디렉토리' with standard '디렉터리' (56 occurrences) per the National Institute of Korean Language spelling standard - Fix grammatical error in PROJECT_ICON: '문서가 볼 때' → '문서를 표시할 때' - Replace awkward calque in PROJECT_BRIEF: '빠른 아이디어를 제공합니다' → '간략히 전달합니다' - Replace odd technical calque in OUTPUT_LANGUAGE: '상수 출력' → '고정 문자열 출력' Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>
Prepend an underscore to JavaScript variable names if a file starts with a digit.
…fig_es.xml) (#12139) Agent-Logs-Url: https://github.com/doxygen/doxygen/sessions/3b6ffbd2-d4e0-4c85-a2a3-fb01c8392ab3 Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>
During work on translations for the doxywizard the word `language` was also translated, this should not be the case it is here just meant as a placeholder and as such should be between backtics
…l Chinese in config_zh_TW.xml (#12150) * Convert config_zh_TW.xml to proper Traditional Chinese (Taiwan) - Fixed all Simplified Chinese characters to Traditional Chinese - Updated terminology to Taiwan-standard usage (e.g., 檔案 for files, 資料夾 for folders) - Improved grammar and phrasing to match Taiwan conventions - All 315 configuration options verified with configgen.py sync Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * translation(zh_TW): fix remaining Simplified Chinese characters in config_zh_TW.xml Fix residual Simplified Chinese characters that were missed in the initial conversion: 个→個, 则→則, 阅→閱, 义→義, 来→來, 并→並, 从→從, 该→該, 样→樣, 变→變, 层→層, 给→給, 两→兩, 见→見, 长→長, 规→規, 区→區, 报→報, 说→說, 由于→由於, 根据→根據, and many two-character compound phrases throughout the file. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * translation(zh_TW): fix remaining Simplified Chinese characters in config_zh_TW.xml Agent-Logs-Url: https://github.com/doxygen/doxygen/sessions/f527f437-f647-41fb-beab-c8f0dc08760b Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * Remove temporary verification file Agent-Logs-Url: https://github.com/doxygen/doxygen/sessions/f527f437-f647-41fb-beab-c8f0dc08760b Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>
fix: HTML docs for files starting with a digit
* Improve French accents and translation quality in config_fr.xml Agent-Logs-Url: https://github.com/doxygen/doxygen/sessions/eb08c8b1-c8a3-4d8a-a001-b0ab6ea28378 Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * Fix verb/PP disambiguation errors from code review Agent-Logs-Url: https://github.com/doxygen/doxygen/sessions/eb08c8b1-c8a3-4d8a-a001-b0ab6ea28378 Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * Fix incorrectly translated enum value name and Doxygen command reference Agent-Logs-Url: https://github.com/doxygen/doxygen/sessions/eb08c8b1-c8a3-4d8a-a001-b0ab6ea28378 Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * Fix remaining accents: icône, en-tête, représente, implémente, and 40+ more Agent-Logs-Url: https://github.com/doxygen/doxygen/sessions/49e9706f-a9f7-46cf-8c4d-1663dd1b8bf6 Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * Fix more accents: matières, mélanger, compatibilité, formaté, réservé, and more Agent-Logs-Url: https://github.com/doxygen/doxygen/sessions/80c7ce78-e878-426c-9605-735b2406aedd Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * Fix agreement errors: aide compressée, trouvé, basé sur CLI Agent-Logs-Url: https://github.com/doxygen/doxygen/sessions/80c7ce78-e878-426c-9605-735b2406aedd Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>
…12152) * Improve Spanish config translations: fix accents and content accuracy - Fix numerous missing accent marks (específica→especifica as verb, pequeño, óptimo, anónimo, todavía, característica, capítulo, fácilmente, límite, jerárquica, future tense verbs: colocarán, basará, ajustará, volcará, aumentará, recreará, modificará, omitirán, etc.) - Fix "como se específico" → "como se especificó" (past tense) - Fix SKIP_FUNCTION_MACROS: more accurate translation - Fix EXPAND_AS_DEFINED: add missing sentences about PREDEFINED tag - Fix CALL_GRAPH/CALLER_GRAPH: replace incorrect note with correct warning about increased run time - Fix MERMAID_RENDER_MODE: simplify inaccurate description Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * Fix Spanish translation accuracy in config_es.xml Corrected 20 translation errors found by comparing config_es.xml against the English source config.xml: - ALIASES: add missing warning about \{/\} conflicts and @{/@} recommendation - EXTENSION_MAPPING: add no_extension requires * in FILE_PATTERNS note - SIP_SUPPORT: replace completely outdated description - SHOW_GROUPED_MEMB_INC: fix incomplete description - SHOW_USED_FILES: add 'y estructuras' and missing second sentence - SHOW_FILES: replace wrong content (Quick Index/Folder Tree reference) - SHOW_NAMESPACES: replace wrong content (same pattern as SHOW_FILES) - EXCLUDE_PATTERNS: add note about absolute path wildcard matching - EXCLUDE_SYMBOLS: replace with correct description (qualified names, wildcards, examples) - EXAMPLE_PATH: add \include command cross-reference - EXAMPLE_PATTERNS: add 'If left blank all files are included' sentence - EXAMPLE_RECURSIVE: rewrite to reflect include/dontinclude independence from RECURSIVE - INLINE_SOURCES: fix factual error (macros/enums/list-init vars, not classes/namespaces) - CLANG_ASSISTED_PARSING: add template note and CMake availability note - CLANG_DATABASE_PATH: add -p equivalence, CLANG_OPTIONS note, CMake availability note - ALPHABETICAL_INDEX: replace outdated content referencing unrelated options - RTF_HYPERLINKS: fix factual error (WordPad does NOT support links) - LATEX_EMOJI_DIRECTORY: fix 'directorio de emoji predeterminado' -> LATEX_OUTPUT directory - ENUM_VALUES_PER_LINE: add note that value 0 suppresses overview section - LATEX_BIB_STYLE: add ieeetr example and BibTeX/cite references Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> * translation(es): fix three content gaps in DOT section of config_es.xml - INCLUDE_GRAPH: restore missing condition on ENABLE_PREPROCESSING and SEARCH_INCLUDES that must also be set to YES (was present in INCLUDED_BY_GRAPH but accidentally omitted here) - GENERATE_LEGEND: add missing \note that UML_LOOK must not be set for the legend page to apply - DOT_WRAP_THRESHOLD: add the missing 'significantly' qualifier and the heuristics sentence so users know lines are not hard-wrapped at the threshold Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>
Incorrect formatting of "language" with `EXTENSION_MAPPING`
…i18n docs - Replace <code>ext=XXX</code> with `ext=language` in all config_xx.xml files - Replace \c ext with `ext` in all config_xx.xml files - Restore translated 'language' word to untranslated `language` in backticks (affected: de=sprache/Sprache, es=lenguaje, ru=язык) - Matches the fix applied to src/config.xml in commit e7e59a3 Agent-Logs-Url: https://github.com/doxygen/doxygen/sessions/ced41f7e-c2c7-4078-96f6-2cbf84f5aa72 Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>
…vaScript if a source file starts with a number. In the PR #12149 a regression was introduce, it was not possible anymore to search for files that started with a number as also in the search terms (`term_encoding`) a `_` was added.
issue #12148 HTML output generated from C-project contains invalid JavaScript if a source file starts with a number.
…placeholder fix: use backticks for `language` placeholder in EXTENSION_MAPPING i18n docs
…ed in HTML page when including the md in a doxygen page Due to #7339 the text of the linked text was double mentioned (and also a `</a>` was added that shouldn't be there, had no effect as doxygen filters it out)
…n into albert-github-feature/issue_12113
issue #12155 Link names to internal anchors in a md file are duplicated in HTML page when including the md in a doxygen page
- Modified switchLanguage() to use QProcess::startDetached() to restart the application after saving the new language setting - Changed LanguageDialog button text from 'Select and Quit' to 'Select and Restart' to reflect the new behavior - This provides a better user experience as the application immediately restarts with the new language applied
Changed button text from 'Select and Quit' to 'Select and Restart' to match the new behavior of restarting the application after language selection. Updated translations: - Chinese (Simplified): 选择并重启 - Chinese (Traditional): 選擇並重啟 - Japanese: 選択して再起動 - Korean: 선택 후 재시작 - German: Auswählen und Neustart - French: Sélectionner et redémarrer - Russian: Выбрать и перезапустить - Spanish: Seleccionar y reiniciar
…ywizard The showing of just a backslash in the different output parts of the doxygen documentation, Doxyfile and doxywizard was incorrect (e.g. `(\\endiskip),` )
Incorrect handling of just a backslash in doxygen documentation / doxywizard
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Upstream merge conflict with the fork by @shahmoradi