diff options
author | Eric Engestrom <eric@engestrom.ch> | 2016-08-30 21:02:18 +0100 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2016-08-31 17:06:54 -0700 |
commit | 3bd885d09cea6ecf19ddfd948c8dd74f5e3ea600 (patch) | |
tree | 0c02e91c24673553459195bf642ca1adc188c533 | |
parent | 509e2dbc105a04e8bc6ed292b921cbe27957a779 (diff) |
Introduce .editorconfig
A few weeks ago, Jose Fonseca suggested [0] we use .editorconfig files
to try and enforce the formatting of the code, to which Michel Dänzer
suggested [1] we start by importing the existing .dir-locals.el
settings. The first draft was discussed in the RFC [2].
These .editorconfig are a first step, one that has the advantage of
requiring little to no intervention from the devs once the settings
files are in place, but the settings are very limited. This does have
the advantage of applying while the code is being written.
This doesn't replace the need for more comprehensive formatting tools
such as clang-format & clang-tidy, but those reformat the code after
the fact.
[0] https://lists.freedesktop.org/archives/mesa-dev/2016-June/121545.html
[1] https://lists.freedesktop.org/archives/mesa-dev/2016-June/121639.html
[2] https://lists.freedesktop.org/archives/mesa-dev/2016-July/123431.html
Acked-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
28 files changed, 99 insertions, 0 deletions
diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..a8b8a88f5d --- /dev/null +++ b/.editorconfig @@ -0,0 +1,34 @@ +# To use this config on you editor, follow the instructions at: +# http://editorconfig.org + +root = true + +[*] +charset = utf-8 +insert_final_newline = true + +[*.{c,h,cpp,hpp,cc,hh}] +indent_style = space +indent_size = 3 + +[{Makefile*,*.mk}] +indent_style = tab + +[{*.py,SCons*}] +indent_style = space +indent_size = 4 + +[*.pl] +indent_style = space +indent_size = 4 + +[*.m4] +indent_style = space +indent_size = 2 + +[*.yml] +indent_style = space +indent_size = 2 + +[*.patch] +trim_trailing_whitespace = false diff --git a/bin/.editorconfig b/bin/.editorconfig new file mode 100644 index 0000000000..b9a948f405 --- /dev/null +++ b/bin/.editorconfig @@ -0,0 +1,3 @@ +[*.sh] +indent_style = space +indent_size = 2 diff --git a/include/D3D9/.editorconfig b/include/D3D9/.editorconfig new file mode 100644 index 0000000000..0dcc752e46 --- /dev/null +++ b/include/D3D9/.editorconfig @@ -0,0 +1,2 @@ +[*.h] +indent_style = tab diff --git a/include/c11/.editorconfig b/include/c11/.editorconfig new file mode 100644 index 0000000000..bdbea000b5 --- /dev/null +++ b/include/c11/.editorconfig @@ -0,0 +1,3 @@ +[*.h] +indent_style = space +indent_size = 4 diff --git a/include/d3dadapter/.editorconfig b/include/d3dadapter/.editorconfig new file mode 100644 index 0000000000..bdbea000b5 --- /dev/null +++ b/include/d3dadapter/.editorconfig @@ -0,0 +1,3 @@ +[*.h] +indent_style = space +indent_size = 4 diff --git a/include/vulkan/.editorconfig b/include/vulkan/.editorconfig new file mode 100644 index 0000000000..bdbea000b5 --- /dev/null +++ b/include/vulkan/.editorconfig @@ -0,0 +1,3 @@ +[*.h] +indent_style = space +indent_size = 4 diff --git a/src/egl/drivers/haiku/.editorconfig b/src/egl/drivers/haiku/.editorconfig new file mode 100644 index 0000000000..5ae8c6f76d --- /dev/null +++ b/src/egl/drivers/haiku/.editorconfig @@ -0,0 +1,2 @@ +[*.cpp] +indent_style = tab diff --git a/src/egl/wayland/.editorconfig b/src/egl/wayland/.editorconfig new file mode 100644 index 0000000000..cc8e11ffd6 --- /dev/null +++ b/src/egl/wayland/.editorconfig @@ -0,0 +1,2 @@ +[*.{c,h}] +indent_style = tab diff --git a/src/gallium/drivers/freedreno/.editorconfig b/src/gallium/drivers/freedreno/.editorconfig new file mode 100644 index 0000000000..cc8e11ffd6 --- /dev/null +++ b/src/gallium/drivers/freedreno/.editorconfig @@ -0,0 +1,2 @@ +[*.{c,h}] +indent_style = tab diff --git a/src/gallium/drivers/r300/.editorconfig b/src/gallium/drivers/r300/.editorconfig new file mode 100644 index 0000000000..7b12a40ca0 --- /dev/null +++ b/src/gallium/drivers/r300/.editorconfig @@ -0,0 +1,3 @@ +[*.{c,h}] +indent_style = space +indent_size = 4 diff --git a/src/gallium/drivers/r600/.editorconfig b/src/gallium/drivers/r600/.editorconfig new file mode 100644 index 0000000000..cc8e11ffd6 --- /dev/null +++ b/src/gallium/drivers/r600/.editorconfig @@ -0,0 +1,2 @@ +[*.{c,h}] +indent_style = tab diff --git a/src/gallium/drivers/radeon/.editorconfig b/src/gallium/drivers/radeon/.editorconfig new file mode 100644 index 0000000000..cc8e11ffd6 --- /dev/null +++ b/src/gallium/drivers/radeon/.editorconfig @@ -0,0 +1,2 @@ +[*.{c,h}] +indent_style = tab diff --git a/src/gallium/drivers/radeonsi/.editorconfig b/src/gallium/drivers/radeonsi/.editorconfig new file mode 100644 index 0000000000..cc8e11ffd6 --- /dev/null +++ b/src/gallium/drivers/radeonsi/.editorconfig @@ -0,0 +1,2 @@ +[*.{c,h}] +indent_style = tab diff --git a/src/gallium/drivers/vc4/.editorconfig b/src/gallium/drivers/vc4/.editorconfig new file mode 100644 index 0000000000..f3d8c47915 --- /dev/null +++ b/src/gallium/drivers/vc4/.editorconfig @@ -0,0 +1,3 @@ +[*.{c,h}] +indent_style = space +indent_size = 8 diff --git a/src/gallium/drivers/vc4/kernel/.editorconfig b/src/gallium/drivers/vc4/kernel/.editorconfig new file mode 100644 index 0000000000..cc8e11ffd6 --- /dev/null +++ b/src/gallium/drivers/vc4/kernel/.editorconfig @@ -0,0 +1,2 @@ +[*.{c,h}] +indent_style = tab diff --git a/src/gallium/state_trackers/hgl/.editorconfig b/src/gallium/state_trackers/hgl/.editorconfig new file mode 100644 index 0000000000..f391def61c --- /dev/null +++ b/src/gallium/state_trackers/hgl/.editorconfig @@ -0,0 +1,2 @@ +[*.{c,h,cpp,hpp}] +indent_style = tab diff --git a/src/gallium/state_trackers/nine/.editorconfig b/src/gallium/state_trackers/nine/.editorconfig new file mode 100644 index 0000000000..7b12a40ca0 --- /dev/null +++ b/src/gallium/state_trackers/nine/.editorconfig @@ -0,0 +1,3 @@ +[*.{c,h}] +indent_style = space +indent_size = 4 diff --git a/src/gallium/state_trackers/xa/.editorconfig b/src/gallium/state_trackers/xa/.editorconfig new file mode 100644 index 0000000000..7b12a40ca0 --- /dev/null +++ b/src/gallium/state_trackers/xa/.editorconfig @@ -0,0 +1,3 @@ +[*.{c,h}] +indent_style = space +indent_size = 4 diff --git a/src/gallium/targets/d3dadapter9/.editorconfig b/src/gallium/targets/d3dadapter9/.editorconfig new file mode 100644 index 0000000000..7b12a40ca0 --- /dev/null +++ b/src/gallium/targets/d3dadapter9/.editorconfig @@ -0,0 +1,3 @@ +[*.{c,h}] +indent_style = space +indent_size = 4 diff --git a/src/gallium/targets/haiku-softpipe/.editorconfig b/src/gallium/targets/haiku-softpipe/.editorconfig new file mode 100644 index 0000000000..f391def61c --- /dev/null +++ b/src/gallium/targets/haiku-softpipe/.editorconfig @@ -0,0 +1,2 @@ +[*.{c,h,cpp,hpp}] +indent_style = tab diff --git a/src/gallium/winsys/freedreno/drm/.editorconfig b/src/gallium/winsys/freedreno/drm/.editorconfig new file mode 100644 index 0000000000..cc8e11ffd6 --- /dev/null +++ b/src/gallium/winsys/freedreno/drm/.editorconfig @@ -0,0 +1,2 @@ +[*.{c,h}] +indent_style = tab diff --git a/src/gallium/winsys/nouveau/drm/.editorconfig b/src/gallium/winsys/nouveau/drm/.editorconfig new file mode 100644 index 0000000000..cc8e11ffd6 --- /dev/null +++ b/src/gallium/winsys/nouveau/drm/.editorconfig @@ -0,0 +1,2 @@ +[*.{c,h}] +indent_style = tab diff --git a/src/gallium/winsys/radeon/drm/.editorconfig b/src/gallium/winsys/radeon/drm/.editorconfig new file mode 100644 index 0000000000..7b12a40ca0 --- /dev/null +++ b/src/gallium/winsys/radeon/drm/.editorconfig @@ -0,0 +1,3 @@ +[*.{c,h}] +indent_style = space +indent_size = 4 diff --git a/src/gallium/winsys/sw/hgl/.editorconfig b/src/gallium/winsys/sw/hgl/.editorconfig new file mode 100644 index 0000000000..cc8e11ffd6 --- /dev/null +++ b/src/gallium/winsys/sw/hgl/.editorconfig @@ -0,0 +1,2 @@ +[*.{c,h}] +indent_style = tab diff --git a/src/getopt/.editorconfig b/src/getopt/.editorconfig new file mode 100644 index 0000000000..cc8e11ffd6 --- /dev/null +++ b/src/getopt/.editorconfig @@ -0,0 +1,2 @@ +[*.{c,h}] +indent_style = tab diff --git a/src/gtest/.editorconfig b/src/gtest/.editorconfig new file mode 100644 index 0000000000..0880bacaac --- /dev/null +++ b/src/gtest/.editorconfig @@ -0,0 +1,3 @@ +[*.{cc,h}] +indent_style = space +indent_size = 2 diff --git a/src/hgl/.editorconfig b/src/hgl/.editorconfig new file mode 100644 index 0000000000..0a01d20a29 --- /dev/null +++ b/src/hgl/.editorconfig @@ -0,0 +1,2 @@ +[*.{cpp,h}] +indent_style = tab diff --git a/src/mesa/drivers/dri/nouveau/.editorconfig b/src/mesa/drivers/dri/nouveau/.editorconfig new file mode 100644 index 0000000000..cc8e11ffd6 --- /dev/null +++ b/src/mesa/drivers/dri/nouveau/.editorconfig @@ -0,0 +1,2 @@ +[*.{c,h}] +indent_style = tab |