build(config): Update .editorconfig and .gitattributes files

guanguans · guanguans · commit c5a5c3d75657 · 2025-05-08T16:39:23.000+08:00
- Modify .editorconfig to unify coding styles across files
- Specify end_of_line and indent sizes for various file types
- Add rules for new file types like .go and .bat
- Adjust max_line_length for markdown files in .editorconfig
- Enhance .gitattributes for line ending consistency and merge conflict resolution
diff --git a/.editorconfig b/.editorconfig
@@ -1,19 +1,34 @@
+# This file is for unifying the coding style for different editors and IDEs.
+# More information at https://editorconfig.org
+# https://github.com/laravel/laravel/blob/12.x/.editorconfig
+# https://github.com/symfony/symfony/blob/7.3/.editorconfig
+# https://github.com/yiisoft/yii2/blob/master/.editorconfig
+
 root = true
 
 [*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
 charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
 trim_trailing_whitespace = true
-insert_final_newline = false
 
-[*.{vue,js,scss}]
-indent_size = 2
-insert_final_newline = true
+[COMMIT_EDITMSG]
+max_line_length = 0
+
+[*.bat]
+end_of_line = crlf
+
+[*.go]
+indent_style = tab
 
 [*.md]
 trim_trailing_whitespace = false
+max_line_length = 80
+
+[*.{yml,yml.dist,yaml,yaml.dist,xml,xml.dist}]
+indent_size = 2
 
-[*.{yml,yaml,xml,xml.dist}]
+[*.{html,css,scss,js,ts,vue,jsx,tsx}]
 indent_size = 2
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1 @@
+# https://github.com/symfony/symfony/blob/7.3/.git-blame-ignore-revs
diff --git a/.gitattributes b/.gitattributes
@@ -1,34 +1,56 @@
 # Path-based git attributes
 # https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
+# https://github.com/cakephp/app/blob/5.x/.gitattributes
+# https://github.com/laravel/framework/blob/12.x/.gitattributes
+# https://github.com/yiisoft/yii2/blob/master/.gitattributes
 
+# Define the line ending behavior of the different file extensions
+# Set default behavior, in case users don't have core.autocrlf set.
+* text=auto eol=lf
+
+# Declare files that will always have CRLF line endings on checkout.
+*.bat   eol=crlf
+
+# blade 模板文件使用 html diff 高亮
+*.blade.php   diff=html
+
+# Avoid merge conflicts in CHANGELOG
+/CHANGELOG.md     merge=union
+/CHANGELOG-*.md   merge=union
+
+# neon、stub、xml.dist 文件指定 linguist 语言类型
+*.neon.dist   linguist-language=neon
+*.stub        linguist-language=php
+*.xml.dist    linguist-language=xml
+
+# Denote all files that are truly binary and should not be modified.
+*.png    binary
+*.jpg    binary
+*.jpeg   binary
+*.gif    binary
+*.phar   binary
+*.mp4    binary
+
+# Remove files for archives generated using `git archive`
 # Ignore all test and documentation with "export-ignore".
-.build/                            export-ignore
-.chglog/                           export-ignore
-.github/                           export-ignore
-baselines/                         export-ignore
-#benchmarks/                        export-ignore
-bin/                               export-ignore
-docs/                              export-ignore
-examples/                          export-ignore
-#src/                               export-ignore
-tests/                             export-ignore
-vendor/                            export-ignore
-vendor-bin/                        export-ignore
-.editorconfig                      export-ignore
-.gitattributes                     export-ignore
-.gitignore                         export-ignore
-.lintmdrc                          export-ignore
-.php-cs-fixer.php                  export-ignore
-_ide_helper.php                    export-ignore
-CHANGELOG.md                       export-ignore
-composer.json                      export-ignore
-composer.lock                      export-ignore
-composer-dependency-analyser.php   export-ignore
-composer-updater                   export-ignore
-LICENSE                            export-ignore
-monorepo-builder.php               export-ignore
-phpstan.neon                       export-ignore
-phpunit.xml.dist                   export-ignore
-README.md                          export-ignore
-rector.php                         export-ignore
-tests.php                          export-ignore
+/.*/           export-ignore
+/baselines/    export-ignore
+/benchmarks/   export-ignore
+#/docs/         export-ignore
+#/examples/     export-ignore
+/tests/        export-ignore
+/vendor-bin/   export-ignore
+/vendor/       export-ignore
+
+/.*                                 export-ignore
+/CHANGELOG-*.md                     export-ignore
+/CHANGELOG.md                       export-ignore
+/composer-dependency-analyser.php   export-ignore
+/composer-updater                   export-ignore
+/monorepo-builder.php               export-ignore
+/phpbench.json                      export-ignore
+/phpstan.neon                       export-ignore
+/phpunit.xml.dist                   export-ignore
+/rector-*.php                       export-ignore
+/rector.php                         export-ignore
+/tests.*                            export-ignore

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# https://github.com/symfony/symfony/blob/7.3/.git-blame-ignore-revs`