diff mbox

[PATCHv5,PING^4] Vimrc config with GNU formatting

Message ID 5478B057.7030908@samsung.com
State New
Headers show

Commit Message

Yury Gribov Nov. 28, 2014, 5:26 p.m. UTC 
On 11/06/2014 01:31 PM, Yury Gribov wrote:
> On 10/21/2014 07:24 PM, Yury Gribov wrote:
>> On 10/13/2014 02:26 PM, Yury Gribov wrote:
>>> On 10/02/2014 09:14 PM, Yury Gribov wrote:
>>>> On 09/17/2014 09:08 PM, Yury Gribov wrote:
>>>>  > On 09/16/2014 08:38 PM, Yury Gribov wrote:
>>>>  >> Hi all,
>>>>  >>
>>>>  >> This is the third version of the patch. A list of changes since
>>>> last
>>>>  >> version:
>>>>  >> * move config to contrib so that it's _not_ enabled by default
>>>> (current
>>>>  >> score is 2/1 in favor of no Vim config by default)
>>>>  >> * update Makefile.in to make .local.vimrc if developer asks for it
>>>>  >> * disable autoformatting for flex files
>>>>  >> * fix filtering of non-GNU sources (libsanitizer)
>>>>  >> * added some small fixes in cinoptions based on feedback from
>>>> community
>>>>  >>
>>>>  >> As noted by Richard, the config does not do a good job of
>>>> formatting
>>>>  >> unbound {} blocks e.g.
>>>>  >> void
>>>>  >> foo ()
>>>>  >> {
>>>>  >>    int x;
>>>>  >>      {
>>>>  >>        // I'm an example of bad bad formatting
>>>>  >>      }
>>>>  >> }
>>>>  >> but it seems to be the best we can get with Vim's cindent
>>>>  >> (and I don't think anyone seriously considers writing a custom
>>>>  >> indentexpr).
>>>>  >>
>>>>  >> Ok to commit?
>>>>  >
>>>>  > New vesion with support for another popular local .vimrc plugin.
>>>>
>>>> Hi all,
>>>>
>>>> Here is a new vesion of vimrc patch. Hope I got email settings right
>>>> this time.
>>>>
>>>> Changes since v4:
>>>> * fixed and enhanced docs
>>>> * added support for .lvimrc in Makefile
>>>> * minor fixes in cinoptions and formatoptions (reported by Segher)
>>>> * removed shiftwidth settings (as it does not really relate to code
>>>> formatting)
>
>

Comments

Jeff Law Dec. 8, 2014, 9:46 p.m. UTC | #1 
On 11/28/14 10:26, Yury Gribov wrote:
>
>
> commit 3f560e9dd16a5e914b6f2ba82edffe13dfde944c
> Author: Yury Gribov<y.gribov@samsung.com>
> Date:   Thu Oct 2 15:50:52 2014 +0400
>
>      2014-10-02  Laurynas Biveinis<laurynas.biveinis@gmail.com>
>      	    Yury Gribov<y.gribov@samsung.com>
>
>      Vim config with GNU formatting.
>
>      contrib/
>      	* vimrc: New file.
>
>      /
>      	* .gitignore: Added .local.vimrc and .lvimrc.
>      	* Makefile.tpl (vimrc, .lvimrc, .local.vimrc): New targets.
>      	* Makefile.in: Regenerate.
OK, primarily because it's an improvement and not the default :-)  Folks 
that want to use can explicitly opt-in.
Jeff
diff mbox

Patch

commit 3f560e9dd16a5e914b6f2ba82edffe13dfde944c
Author: Yury Gribov <y.gribov@samsung.com>
Date:   Thu Oct 2 15:50:52 2014 +0400

    2014-10-02  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
    	    Yury Gribov  <y.gribov@samsung.com>
    
    Vim config with GNU formatting.
    
    contrib/
    	* vimrc: New file.
    
    /
    	* .gitignore: Added .local.vimrc and .lvimrc.
    	* Makefile.tpl (vimrc, .lvimrc, .local.vimrc): New targets.
    	* Makefile.in: Regenerate.

diff --git a/.gitignore b/.gitignore
index e9b56be..ab97ac6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,9 @@  POTFILES
 TAGS
 TAGS.sub
 
+.local.vimrc
+.lvimrc
+
 .gdbinit
 .gdb_history
 
diff --git a/Makefile.in b/Makefile.in
index d6105b3..f3a34af 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2384,6 +2384,18 @@  mail-report-with-warnings.log: warning.log
 	chmod +x $@
 	echo If you really want to send e-mail, run ./$@ now
 
+# Local Vim config
+
+$(srcdir)/.local.vimrc:
+	$(LN_S) $(srcdir)/contrib/vimrc $@
+
+$(srcdir)/.lvimrc:
+	$(LN_S) $(srcdir)/contrib/vimrc $@
+
+vimrc: $(srcdir)/.local.vimrc $(srcdir)/.lvimrc
+
+.PHONY: vimrc
+
 # Installation targets.
 
 .PHONY: install uninstall
diff --git a/Makefile.tpl b/Makefile.tpl
index f7c7e38..b98930c 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -867,6 +867,18 @@  mail-report-with-warnings.log: warning.log
 	chmod +x $@
 	echo If you really want to send e-mail, run ./$@ now
 
+# Local Vim config
+
+$(srcdir)/.local.vimrc:
+	$(LN_S) $(srcdir)/contrib/vimrc $@
+
+$(srcdir)/.lvimrc:
+	$(LN_S) $(srcdir)/contrib/vimrc $@
+
+vimrc: $(srcdir)/.local.vimrc $(srcdir)/.lvimrc
+
+.PHONY: vimrc
+
 # Installation targets.
 
 .PHONY: install uninstall
diff --git a/contrib/vimrc b/contrib/vimrc
new file mode 100644
index 0000000..34e8f35
--- /dev/null
+++ b/contrib/vimrc
@@ -0,0 +1,45 @@ 
+" Code formatting settings for Vim.
+"
+" To enable this for GCC files by default, you can either source this file
+" in your .vimrc via autocmd:
+"   :au BufNewFile,BufReadPost path/to/gcc/* :so path/to/gcc/contrib/vimrc
+" or source the script manually for each newly opened file:
+"   :so contrib/vimrc
+" You could also use numerous plugins that enable local vimrc e.g.
+" mbr's localvimrc or thinca's vim-localrc (but note that the latter
+" is much less secure). To install local vimrc config, run
+"   $ make vimrc
+" from GCC build folder.
+" 
+" Copyright (C) 2014 Free Software Foundation, Inc.
+"
+" This program is free software; you can redistribute it and/or modify
+" it under the terms of the GNU General Public License as published by
+" the Free Software Foundation; either version 3 of the License, or
+" (at your option) any later version.
+"
+" This program is distributed in the hope that it will be useful,
+" but WITHOUT ANY WARRANTY; without even the implied warranty of
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+" GNU General Public License for more details.
+"
+" You should have received a copy of the GNU General Public License
+" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+function! SetStyle()
+  let l:fname = expand("%:p")
+  if stridx(l:fname, 'libsanitizer') != -1
+    return
+  endif
+  let l:ext = fnamemodify(l:fname, ":e")
+  let l:c_exts = ['c', 'h', 'cpp', 'cc', 'C', 'H', 'def', 'java']
+  if index(l:c_exts, l:ext) != -1
+    setlocal cindent
+    setlocal softtabstop=2
+    setlocal cinoptions=>4,n-2,{2,^-2,:2,=2,g0,f0,h2,p4,t0,+2,(0,u0,w1,m0
+    setlocal textwidth=80
+    setlocal formatoptions-=ro formatoptions+=cqlt
+  endif
+endfunction
+
+call SetStyle()