Re: [Mesa-dev] [RFC mesa] Introduce .editorconfig
Hi Eric, On 18 July 2016 at 00:46, Eric Engestromwrote: > 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. > > This is a first draft, with settings from the mentioned emacs files, > augmented with what I could see was the current practice in various > submodules. > Note that it might not reflects the desired formatting. Please say so if > this is the case. I expect several of these .editorconfig files are in > this situation, so don't hesitate to just tell me "the current formatting > for X is wrong, we want to eventually match the project-wide formatting, > so don't create this .editorconfig". > > 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 > I believe the overall direction is that people are happy with these. Can you update the patch addressing the few comments and adding the tags ? Thanks Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [RFC mesa] Introduce .editorconfig
On 23.07.2016 22:04, Nicolai Hähnle wrote: > On 22.07.2016 17:09, Emil Velikov wrote: >> On 18 July 2016 at 00:46, Eric Engestromwrote: >>> >>> --- /dev/null >>> +++ b/src/mesa/drivers/dri/radeon/.editorconfig >>> @@ -0,0 +1,3 @@ >>> +# Coin toss? Leaving this one empty (ie. global rules) for now because >>> +# there are files with 3-spaces, 4-spaces and tab indentations. >>> +# Tell me what you'd prefer if not the 3-space style of the rest of >>> Mesa. >> IMHO having something is always better than none. So fwiw I'd just >> keep this file. > > Fine with me. FWIW, editorconfig supports different settings on a per-file basis. -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [RFC mesa] Introduce .editorconfig
On 22.07.2016 17:09, Emil Velikov wrote: On 18 July 2016 at 00:46, Eric Engestromwrote: 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. This is a first draft, with settings from the mentioned emacs files, augmented with what I could see was the current practice in various submodules. Note that it might not reflects the desired formatting. Please say so if this is the case. I expect several of these .editorconfig files are in this situation, so don't hesitate to just tell me "the current formatting for X is wrong, we want to eventually match the project-wide formatting, so don't create this .editorconfig". From a quick skim all I believe all of those are fine. We might need tab_width in the odd place (r600/radeonsi/fdno/haiku), but those are to be added by people who know the correct value. The Radeon ones use a tab width of 8. I assume that's just the default value. --- /dev/null +++ b/.editorconfig @@ -0,0 +1,40 @@ +# To use this config on you editor, follow the instructions on: +# http://editorconfig.org + +root = true + +[*] +charset = utf-8 +end_of_line = lf Agree with Jose on this one. While we don't have any \n\r instances in-tree, this will cause some annoying churn for out-of-tree code which depend on \n\r. +[{Makefile*,*.mk}] +indent_style = tab + +[*.py,SCons*] Do we want to use {} here, just like the Makefile(s) a couple of lines above ? Side note: we have a few python scripts which don't end with .py that we might(?) want to rename. +[*.{dsp,dsw,sln,vcproj}] We don't have any such files in-tree. Considering the above comment can we drop this ? --- /dev/null +++ b/src/mesa/drivers/dri/radeon/.editorconfig @@ -0,0 +1,3 @@ +# Coin toss? Leaving this one empty (ie. global rules) for now because +# there are files with 3-spaces, 4-spaces and tab indentations. +# Tell me what you'd prefer if not the 3-space style of the rest of Mesa. IMHO having something is always better than none. So fwiw I'd just keep this file. Fine with me. Cheers, Nicolai Thanks for going through and adding all of these :-) -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [RFC mesa] Introduce .editorconfig
On 18 July 2016 at 00:46, Eric Engestromwrote: > 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. > > This is a first draft, with settings from the mentioned emacs files, > augmented with what I could see was the current practice in various > submodules. > Note that it might not reflects the desired formatting. Please say so if > this is the case. I expect several of these .editorconfig files are in > this situation, so don't hesitate to just tell me "the current formatting > for X is wrong, we want to eventually match the project-wide formatting, > so don't create this .editorconfig". > From a quick skim all I believe all of those are fine. We might need tab_width in the odd place (r600/radeonsi/fdno/haiku), but those are to be added by people who know the correct value. > --- /dev/null > +++ b/.editorconfig > @@ -0,0 +1,40 @@ > +# To use this config on you editor, follow the instructions on: > +# http://editorconfig.org > + > +root = true > + > +[*] > +charset = utf-8 > +end_of_line = lf Agree with Jose on this one. While we don't have any \n\r instances in-tree, this will cause some annoying churn for out-of-tree code which depend on \n\r. > +[{Makefile*,*.mk}] > +indent_style = tab > + > +[*.py,SCons*] Do we want to use {} here, just like the Makefile(s) a couple of lines above ? Side note: we have a few python scripts which don't end with .py that we might(?) want to rename. > +[*.{dsp,dsw,sln,vcproj}] We don't have any such files in-tree. Considering the above comment can we drop this ? > --- /dev/null > +++ b/src/mesa/drivers/dri/radeon/.editorconfig > @@ -0,0 +1,3 @@ > +# Coin toss? Leaving this one empty (ie. global rules) for now because > +# there are files with 3-spaces, 4-spaces and tab indentations. > +# Tell me what you'd prefer if not the 3-space style of the rest of Mesa. IMHO having something is always better than none. So fwiw I'd just keep this file. Thanks for going through and adding all of these :-) -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [RFC mesa] Introduce .editorconfig
On 18/07/16 00:46, Eric Engestrom wrote: 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. This is a first draft, with settings from the mentioned emacs files, augmented with what I could see was the current practice in various submodules. Note that it might not reflects the desired formatting. Please say so if this is the case. I expect several of these .editorconfig files are in this situation, so don't hesitate to just tell me "the current formatting for X is wrong, we want to eventually match the project-wide formatting, so don't create this .editorconfig". 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 --- .editorconfig| 44 bin/.editorconfig| 3 ++ include/CL/.editorconfig | 3 ++ include/D3D9/.editorconfig | 2 ++ include/c11/.editorconfig| 3 ++ include/d3dadapter/.editorconfig | 3 ++ include/vulkan/.editorconfig | 3 ++ src/egl/drivers/haiku/.editorconfig | 2 ++ src/egl/wayland/.editorconfig| 2 ++ src/gallium/drivers/freedreno/.editorconfig | 2 ++ src/gallium/drivers/noop/.editorconfig | 2 ++ src/gallium/drivers/r300/.editorconfig | 3 ++ src/gallium/drivers/r600/.editorconfig | 2 ++ src/gallium/drivers/radeon/.editorconfig | 2 ++ src/gallium/drivers/radeonsi/.editorconfig | 2 ++ src/gallium/drivers/vc4/.editorconfig| 3 ++ src/gallium/drivers/vc4/kernel/.editorconfig | 2 ++ src/gallium/state_trackers/hgl/.editorconfig | 2 ++ src/gallium/state_trackers/nine/.editorconfig| 3 ++ src/gallium/state_trackers/xa/.editorconfig | 3 ++ src/gallium/targets/d3dadapter9/.editorconfig| 3 ++ src/gallium/targets/haiku-softpipe/.editorconfig | 2 ++ src/gallium/winsys/freedreno/drm/.editorconfig | 2 ++ src/gallium/winsys/nouveau/drm/.editorconfig | 2 ++ src/gallium/winsys/radeon/drm/.editorconfig | 3 ++ src/gallium/winsys/sw/hgl/.editorconfig | 2 ++ src/getopt/.editorconfig | 2 ++ src/gtest/.editorconfig | 3 ++ src/hgl/.editorconfig| 2 ++ src/mesa/drivers/dri/nouveau/.editorconfig | 2 ++ src/mesa/drivers/dri/radeon/.editorconfig| 2 ++ 31 files changed, 116 insertions(+) create mode 100644 .editorconfig create mode 100644 bin/.editorconfig create mode 100644 include/CL/.editorconfig create mode 100644 include/D3D9/.editorconfig create mode 100644 include/c11/.editorconfig create mode 100644 include/d3dadapter/.editorconfig create mode 100644 include/vulkan/.editorconfig create mode 100644 src/egl/drivers/haiku/.editorconfig create mode 100644 src/egl/wayland/.editorconfig create mode 100644 src/gallium/drivers/freedreno/.editorconfig create mode 100644 src/gallium/drivers/noop/.editorconfig create mode 100644 src/gallium/drivers/r300/.editorconfig create mode 100644 src/gallium/drivers/r600/.editorconfig create mode 100644 src/gallium/drivers/radeon/.editorconfig create mode 100644 src/gallium/drivers/radeonsi/.editorconfig create mode 100644 src/gallium/drivers/vc4/.editorconfig create mode 100644 src/gallium/drivers/vc4/kernel/.editorconfig create mode 100644 src/gallium/state_trackers/hgl/.editorconfig create mode 100644 src/gallium/state_trackers/nine/.editorconfig create mode 100644 src/gallium/state_trackers/xa/.editorconfig create mode 100644 src/gallium/targets/d3dadapter9/.editorconfig create mode 100644 src/gallium/targets/haiku-softpipe/.editorconfig create mode 100644 src/gallium/winsys/freedreno/drm/.editorconfig create mode 100644 src/gallium/winsys/nouveau/drm/.editorconfig create mode 100644 src/gallium/winsys/radeon/drm/.editorconfig create mode 100644 src/gallium/winsys/sw/hgl/.editorconfig create mode 100644 src/getopt/.editorconfig create mode 100644 src/gtest/.editorconfig create mode 100644 src/hgl/.editorconfig create mode 100644 src/mesa/drivers/dri/nouveau/.editorconfig create mode 100644 src/mesa/drivers/dri/radeon/.editorconfig diff --git
Re: [Mesa-dev] [RFC mesa] Introduce .editorconfig
On Sun, Jul 17, 2016 at 7:46 PM, Eric Engestromwrote: > diff --git a/src/gallium/drivers/freedreno/.editorconfig > b/src/gallium/drivers/freedreno/.editorconfig > new file mode 100644 > index 000..cc8e11f > --- /dev/null > +++ b/src/gallium/drivers/freedreno/.editorconfig > @@ -0,0 +1,2 @@ > +[*.{c,h}] > +indent_style = tab fyi, I guess also add: tab_width = 4 and not sure if there is a way to tell it to use k rules? But looks like a good idea to me, thanks :-) BR, -R ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [RFC mesa] Introduce .editorconfig
Eric Engestromwrites: > 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. It's too bad emacs doesn't just do editorconfig out of the box, but it makes sense to have something that other editors can easily handle (and that makes so much more sense than emacs files). For vc4, Reviewed-by: Eric Anholt signature.asc Description: PGP signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [RFC mesa] Introduce .editorconfig
On 18.07.2016 01:46, Eric Engestrom wrote: 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. This is a first draft, with settings from the mentioned emacs files, augmented with what I could see was the current practice in various submodules. Note that it might not reflects the desired formatting. Please say so if this is the case. I expect several of these .editorconfig files are in this situation, so don't hesitate to just tell me "the current formatting for X is wrong, we want to eventually match the project-wide formatting, so don't create this .editorconfig". 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. Makes sense to me, and Acked-by: Nicolai Hähnlefor the Radeon parts. (I don't think too many people care about src/mesa/drivers/dri/radeon anymore, so you might as well drop that one...) Cheers, Nicolai [0] https://lists.freedesktop.org/archives/mesa-dev/2016-June/121545.html [1] https://lists.freedesktop.org/archives/mesa-dev/2016-June/121639.html --- .editorconfig| 44 bin/.editorconfig| 3 ++ include/CL/.editorconfig | 3 ++ include/D3D9/.editorconfig | 2 ++ include/c11/.editorconfig| 3 ++ include/d3dadapter/.editorconfig | 3 ++ include/vulkan/.editorconfig | 3 ++ src/egl/drivers/haiku/.editorconfig | 2 ++ src/egl/wayland/.editorconfig| 2 ++ src/gallium/drivers/freedreno/.editorconfig | 2 ++ src/gallium/drivers/noop/.editorconfig | 2 ++ src/gallium/drivers/r300/.editorconfig | 3 ++ src/gallium/drivers/r600/.editorconfig | 2 ++ src/gallium/drivers/radeon/.editorconfig | 2 ++ src/gallium/drivers/radeonsi/.editorconfig | 2 ++ src/gallium/drivers/vc4/.editorconfig| 3 ++ src/gallium/drivers/vc4/kernel/.editorconfig | 2 ++ src/gallium/state_trackers/hgl/.editorconfig | 2 ++ src/gallium/state_trackers/nine/.editorconfig| 3 ++ src/gallium/state_trackers/xa/.editorconfig | 3 ++ src/gallium/targets/d3dadapter9/.editorconfig| 3 ++ src/gallium/targets/haiku-softpipe/.editorconfig | 2 ++ src/gallium/winsys/freedreno/drm/.editorconfig | 2 ++ src/gallium/winsys/nouveau/drm/.editorconfig | 2 ++ src/gallium/winsys/radeon/drm/.editorconfig | 3 ++ src/gallium/winsys/sw/hgl/.editorconfig | 2 ++ src/getopt/.editorconfig | 2 ++ src/gtest/.editorconfig | 3 ++ src/hgl/.editorconfig| 2 ++ src/mesa/drivers/dri/nouveau/.editorconfig | 2 ++ src/mesa/drivers/dri/radeon/.editorconfig| 2 ++ 31 files changed, 116 insertions(+) create mode 100644 .editorconfig create mode 100644 bin/.editorconfig create mode 100644 include/CL/.editorconfig create mode 100644 include/D3D9/.editorconfig create mode 100644 include/c11/.editorconfig create mode 100644 include/d3dadapter/.editorconfig create mode 100644 include/vulkan/.editorconfig create mode 100644 src/egl/drivers/haiku/.editorconfig create mode 100644 src/egl/wayland/.editorconfig create mode 100644 src/gallium/drivers/freedreno/.editorconfig create mode 100644 src/gallium/drivers/noop/.editorconfig create mode 100644 src/gallium/drivers/r300/.editorconfig create mode 100644 src/gallium/drivers/r600/.editorconfig create mode 100644 src/gallium/drivers/radeon/.editorconfig create mode 100644 src/gallium/drivers/radeonsi/.editorconfig create mode 100644 src/gallium/drivers/vc4/.editorconfig create mode 100644 src/gallium/drivers/vc4/kernel/.editorconfig create mode 100644 src/gallium/state_trackers/hgl/.editorconfig create mode 100644 src/gallium/state_trackers/nine/.editorconfig create mode 100644 src/gallium/state_trackers/xa/.editorconfig create mode 100644 src/gallium/targets/d3dadapter9/.editorconfig create mode 100644 src/gallium/targets/haiku-softpipe/.editorconfig create mode 100644 src/gallium/winsys/freedreno/drm/.editorconfig create mode 100644 src/gallium/winsys/nouveau/drm/.editorconfig create mode 100644 src/gallium/winsys/radeon/drm/.editorconfig create mode 100644 src/gallium/winsys/sw/hgl/.editorconfig create mode 100644 src/getopt/.editorconfig
[Mesa-dev] [RFC mesa] 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. This is a first draft, with settings from the mentioned emacs files, augmented with what I could see was the current practice in various submodules. Note that it might not reflects the desired formatting. Please say so if this is the case. I expect several of these .editorconfig files are in this situation, so don't hesitate to just tell me "the current formatting for X is wrong, we want to eventually match the project-wide formatting, so don't create this .editorconfig". 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 --- .editorconfig| 44 bin/.editorconfig| 3 ++ include/CL/.editorconfig | 3 ++ include/D3D9/.editorconfig | 2 ++ include/c11/.editorconfig| 3 ++ include/d3dadapter/.editorconfig | 3 ++ include/vulkan/.editorconfig | 3 ++ src/egl/drivers/haiku/.editorconfig | 2 ++ src/egl/wayland/.editorconfig| 2 ++ src/gallium/drivers/freedreno/.editorconfig | 2 ++ src/gallium/drivers/noop/.editorconfig | 2 ++ src/gallium/drivers/r300/.editorconfig | 3 ++ src/gallium/drivers/r600/.editorconfig | 2 ++ src/gallium/drivers/radeon/.editorconfig | 2 ++ src/gallium/drivers/radeonsi/.editorconfig | 2 ++ src/gallium/drivers/vc4/.editorconfig| 3 ++ src/gallium/drivers/vc4/kernel/.editorconfig | 2 ++ src/gallium/state_trackers/hgl/.editorconfig | 2 ++ src/gallium/state_trackers/nine/.editorconfig| 3 ++ src/gallium/state_trackers/xa/.editorconfig | 3 ++ src/gallium/targets/d3dadapter9/.editorconfig| 3 ++ src/gallium/targets/haiku-softpipe/.editorconfig | 2 ++ src/gallium/winsys/freedreno/drm/.editorconfig | 2 ++ src/gallium/winsys/nouveau/drm/.editorconfig | 2 ++ src/gallium/winsys/radeon/drm/.editorconfig | 3 ++ src/gallium/winsys/sw/hgl/.editorconfig | 2 ++ src/getopt/.editorconfig | 2 ++ src/gtest/.editorconfig | 3 ++ src/hgl/.editorconfig| 2 ++ src/mesa/drivers/dri/nouveau/.editorconfig | 2 ++ src/mesa/drivers/dri/radeon/.editorconfig| 2 ++ 31 files changed, 116 insertions(+) create mode 100644 .editorconfig create mode 100644 bin/.editorconfig create mode 100644 include/CL/.editorconfig create mode 100644 include/D3D9/.editorconfig create mode 100644 include/c11/.editorconfig create mode 100644 include/d3dadapter/.editorconfig create mode 100644 include/vulkan/.editorconfig create mode 100644 src/egl/drivers/haiku/.editorconfig create mode 100644 src/egl/wayland/.editorconfig create mode 100644 src/gallium/drivers/freedreno/.editorconfig create mode 100644 src/gallium/drivers/noop/.editorconfig create mode 100644 src/gallium/drivers/r300/.editorconfig create mode 100644 src/gallium/drivers/r600/.editorconfig create mode 100644 src/gallium/drivers/radeon/.editorconfig create mode 100644 src/gallium/drivers/radeonsi/.editorconfig create mode 100644 src/gallium/drivers/vc4/.editorconfig create mode 100644 src/gallium/drivers/vc4/kernel/.editorconfig create mode 100644 src/gallium/state_trackers/hgl/.editorconfig create mode 100644 src/gallium/state_trackers/nine/.editorconfig create mode 100644 src/gallium/state_trackers/xa/.editorconfig create mode 100644 src/gallium/targets/d3dadapter9/.editorconfig create mode 100644 src/gallium/targets/haiku-softpipe/.editorconfig create mode 100644 src/gallium/winsys/freedreno/drm/.editorconfig create mode 100644 src/gallium/winsys/nouveau/drm/.editorconfig create mode 100644 src/gallium/winsys/radeon/drm/.editorconfig create mode 100644 src/gallium/winsys/sw/hgl/.editorconfig create mode 100644 src/getopt/.editorconfig create mode 100644 src/gtest/.editorconfig create mode 100644 src/hgl/.editorconfig create mode 100644 src/mesa/drivers/dri/nouveau/.editorconfig create mode 100644 src/mesa/drivers/dri/radeon/.editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000..eeb0875 --- /dev/null +++ b/.editorconfig @@ -0,0