-
Notifications
You must be signed in to change notification settings - Fork 5.3k
format/rsoc:clang format ignore migration #10828
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
|
|
||
| # files format check exclude path, please follow the instructions below to modify; | ||
| # If you need to exclude an entire folder, add the folder path in dir_path; | ||
| # If you need to exclude a file, add the path to the file in file_path. | ||
|
|
||
| # 从 .ignore_format.yml 迁移的规则 | ||
|
|
||
| /v85xx*/Libraries/CMSIS/ | ||
| /v85xx*/Libraries/VangoV85xx*_standard_peripheral/ |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
|
|
||
| # files format check exclude path, please follow the instructions below to modify; | ||
| # If you need to exclude an entire folder, add the folder path in dir_path; | ||
| # If you need to exclude a file, add the path to the file in file_path. | ||
|
|
||
| dir_path: | ||
| - Libraries/N32_Std_Driver | ||
|
|
||
| # 从 .ignore_format.yml 迁移的规则 | ||
| /Libraries/ |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,7 @@ | ||
|
|
||
| # files format check exclude path, please follow the instructions below to modify; | ||
| # If you need to exclude an entire folder, add the folder path in dir_path; | ||
| # If you need to exclude a file, add the path to the file in file_path. | ||
|
|
||
| file_path: | ||
|
|
||
|
|
||
| dir_path: | ||
| - Libraries | ||
| # 从 .ignore_format.yml 迁移的规则 | ||
| /Libraries/ |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
|
|
||
| # files format check exclude path, please follow the instructions below to modify; | ||
| # If you need to exclude an entire folder, add the folder path in dir_path; | ||
| # If you need to exclude a file, add the path to the file in file_path. | ||
|
|
||
| dir_path: | ||
| - bsp | ||
| # 从 .ignore_format.yml 迁移的规则 | ||
| /Libraries/ |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
|
|
||
| # files format check exclude path, please follow the instructions below to modify; | ||
| # If you need to exclude an entire folder, add the folder path in dir_path; | ||
| # If you need to exclude a file, add the path to the file in file_path. | ||
|
|
||
| # 从 .ignore_format.yml 迁移的规则 | ||
| /libraries/N32G45x_Firmware_Library/ |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
|
|
||
| # files format check exclude path, please follow the instructions below to modify; | ||
| # If you need to exclude an entire folder, add the folder path in dir_path; | ||
| # If you need to exclude a file, add the path to the file in file_path. | ||
|
|
||
| # 从 .ignore_format.yml 迁移的规则 | ||
| /Libraries/N32_Std_Driver/ |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
|
|
||
| # files format check exclude path, please follow the instructions below to modify; | ||
| # If you need to exclude an entire folder, add the folder path in dir_path; | ||
| # If you need to exclude a file, add the path to the file in file_path. | ||
|
|
||
| # 从 .ignore_format.yml 迁移的规则 | ||
| /imx/imxrt/imxrt1060-nxp-evk/board/board.c/ | ||
| /imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/ | ||
| /imx/imxrt/imxrt1060-nxp-evk/xip/ | ||
|
|
||
| /imx/imxrt/libraries/MIMXRT1060/ | ||
|
|
||
| /lpc/lpc55sxx/Libraries/LPC55*/ | ||
|
|
||
| /mcx/mcxa/Libraries/MCXA153/ | ||
| /mcx/mcxc/Libraries/MCXC444/ | ||
| /mcx/mcxn/Libraries/MCXN947/ |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,14 @@ | ||
| # clang-format ignore file | ||
| # .clang-format-ignore File Description: | ||
| # ---------------------------------------------------------------------------------------- | ||
| # 1. Used to specify which files or directories should be skipped by the clang-format tool. | ||
| # 2. Follows syntax rules similar to .gitignore. | ||
| # 3. Supports wildcard patterns and path matching. | ||
| # 4. clang-format will recursively apply the .clang-format-ignore rules. | ||
|
|
||
| # Renesas Vendor library | ||
| <<<<<<< HEAD | ||
| /**/ra/ | ||
| /**/ra_cfg/ | ||
| /**/ra_gen/ | ||
| /**/ra_gen/ | ||
| /libraries/bsp-template/ | ||
| /**/RTE/ | ||
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| # .clang-format-ignore File Description: | ||
| # ---------------------------------------------------------------------------------------- | ||
| # 1. Used to specify which files or directories should be skipped by the clang-format tool. | ||
| # 2. Follows syntax rules similar to .gitignore. | ||
| # 3. Supports wildcard patterns and path matching. | ||
| # 4. clang-format will recursively apply the .clang-format-ignore rules. | ||
|
|
||
|
|
||
| /common/rk_hal/ |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
|
|
||
| # files format check exclude path, please follow the instructions below to modify; | ||
| # If you need to exclude an entire folder, add the folder path in dir_path; | ||
| # If you need to exclude a file, add the path to the file in file_path. | ||
|
|
||
| # 从 .ignore_format.yml 迁移的规则 | ||
| # 忽略所有 STM32 HAL 库目录 | ||
| /libraries/STM32*_HAL/ | ||
|
|
||
| # 忽略所有 STM32 BSP 的 CubeMX 配置目录 | ||
| /stm32*/board/CubeMX_Config/ | ||
|
|
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里的冲突没处理好