To: vim_dev@googlegroups.com

Subject: Patch 7.4.069

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.4.069

Problem:    Cannot right shift lines starting with #.

Solution:   Allow the right shift when 'cino' contains #N with N > 0.

            (Christian Brabandt)

            Refactor parsing 'cino', store the values in the buffer.

Files:      runtime/doc/indent.txt, src/buffer.c, src/edit.c, src/eval.c,

            src/ex_getln.c, src/fold.c, src/misc1.c, src/ops.c,

            src/proto/misc1.pro, src/proto/option.pro, src/structs.h,

            src/option.c

*** ../vim-7.4.068/runtime/doc/indent.txt	2013-08-10 13:24:56.000000000 +0200

--- runtime/doc/indent.txt	2013-11-05 07:10:56.000000000 +0100

***************

*** 545,554 ****

  	      (default 70 lines).

  								*cino-#*

! 	#N    When N is non-zero recognize shell/Perl comments, starting with

! 	      '#'.  Default N is zero: don't recognize '#' comments.  Note

! 	      that lines starting with # will still be seen as preprocessor

! 	      lines.

  The defaults, spelled out in full, are:

--- 545,556 ----

  	      (default 70 lines).

  								*cino-#*

! 	#N    When N is non-zero recognize shell/Perl comments starting with

! 	      '#', do not recognize preprocessor lines; allow right-shifting

! 	      lines that start with "#".

! 	      When N is zero (default): don't recognize '#' comments, do

! 	      recognize preprocessor lines; right-shifting lines that start

! 	      with "#" does not work.

  The defaults, spelled out in full, are:

***************

*** 556,562 ****

  			c3,C0,/0,(2s,us,U0,w0,W0,k0,m0,j0,J0,)20,*70,#0

  Vim puts a line in column 1 if:

! - It starts with '#' (preprocessor directives), if 'cinkeys' contains '#'.

  - It starts with a label (a keyword followed by ':', other than "case" and

    "default") and 'cinoptions' does not contain an 'L' entry with a positive

    value.

--- 558,564 ----

  			c3,C0,/0,(2s,us,U0,w0,W0,k0,m0,j0,J0,)20,*70,#0

  Vim puts a line in column 1 if:

! - It starts with '#' (preprocessor directives), if 'cinkeys' contains '#0'.

  - It starts with a label (a keyword followed by ':', other than "case" and

    "default") and 'cinoptions' does not contain an 'L' entry with a positive

    value.

***************

*** 581,588 ****

  Clojure indentation differs somewhat from traditional Lisps, due in part to

  the use of square and curly brackets, and otherwise by community convention.

! These conventions are not always universally followed, so the Clojure indent

! script offers a few configurable options, listed below.

  If the current vim does not include searchpairpos(), the indent script falls

  back to normal 'lisp' indenting, and the following options are ignored.

--- 583,590 ----

  Clojure indentation differs somewhat from traditional Lisps, due in part to

  the use of square and curly brackets, and otherwise by community convention.

! These conventions are not universally followed, so the Clojure indent script

! offers a few configurable options, listed below.

  If the current vim does not include searchpairpos(), the indent script falls

  back to normal 'lisp' indenting, and the following options are ignored.

*** ../vim-7.4.068/src/buffer.c	2013-11-02 04:39:34.000000000 +0100

--- src/buffer.c	2013-11-05 06:18:54.000000000 +0100

***************

*** 211,217 ****

--- 211,220 ----

      /* if first time loading this buffer, init b_chartab[] */

      if (curbuf->b_flags & BF_NEVERLOADED)

+     {

  	(void)buf_init_chartab(curbuf, FALSE);

+ 	parse_cino(curbuf);

+     }

      /*

       * Set/reset the Changed flag first, autocmds may change the buffer.

*** ../vim-7.4.068/src/edit.c	2013-11-04 04:20:28.000000000 +0100

--- src/edit.c	2013-11-05 06:12:45.000000000 +0100

***************

*** 8958,8964 ****

  	    *inserted_space_p = FALSE;

  	    if (p_sta && in_indent)

! 		ts = (int)get_sw_value();

  	    else

  		ts = (int)get_sts_value();

  	    /* Compute the virtual column where we want to be.  Since

--- 8958,8964 ----

  	    *inserted_space_p = FALSE;

  	    if (p_sta && in_indent)

! 		ts = (int)get_sw_value(curbuf);

  	    else

  		ts = (int)get_sts_value();

  	    /* Compute the virtual column where we want to be.  Since

***************

*** 9647,9653 ****

       * When nothing special, insert TAB like a normal character

       */

      if (!curbuf->b_p_et

! 	    && !(p_sta && ind && curbuf->b_p_ts != get_sw_value())

  	    && get_sts_value() == 0)

  	return TRUE;

--- 9647,9653 ----

       * When nothing special, insert TAB like a normal character

       */

      if (!curbuf->b_p_et

! 	    && !(p_sta && ind && curbuf->b_p_ts != get_sw_value(curbuf))

  	    && get_sts_value() == 0)

  	return TRUE;

***************

*** 9663,9669 ****

      AppendToRedobuff((char_u *)"\t");

      if (p_sta && ind)		/* insert tab in indent, use 'shiftwidth' */

! 	temp = (int)get_sw_value();

      else if (curbuf->b_p_sts != 0) /* use 'softtabstop' when set */

  	temp = (int)get_sts_value();

      else			/* otherwise use 'tabstop' */

--- 9663,9669 ----

      AppendToRedobuff((char_u *)"\t");

      if (p_sta && ind)		/* insert tab in indent, use 'shiftwidth' */

! 	temp = (int)get_sw_value(curbuf);

      else if (curbuf->b_p_sts != 0) /* use 'softtabstop' when set */

  	temp = (int)get_sts_value();

      else			/* otherwise use 'tabstop' */

*** ../vim-7.4.068/src/eval.c	2013-11-02 23:29:17.000000000 +0100

--- src/eval.c	2013-11-05 06:12:49.000000000 +0100

***************

*** 16934,16940 ****

      typval_T	*argvars UNUSED;

      typval_T	*rettv;

  {

!     rettv->vval.v_number = get_sw_value();

  }

  /*

--- 16934,16940 ----

      typval_T	*argvars UNUSED;

      typval_T	*rettv;

  {

!     rettv->vval.v_number = get_sw_value(curbuf);

  }

  /*

*** ../vim-7.4.068/src/ex_getln.c	2013-07-05 19:44:21.000000000 +0200

--- src/ex_getln.c	2013-11-05 06:12:57.000000000 +0100

***************

*** 2280,2286 ****

  	    if (c1 == Ctrl_T)

  	    {

! 		long        sw = get_sw_value();

  		p = (char_u *)line_ga.ga_data;

  		p[line_ga.ga_len] = NUL;

--- 2280,2286 ----

  	    if (c1 == Ctrl_T)

  	    {

! 		long        sw = get_sw_value(curbuf);

  		p = (char_u *)line_ga.ga_data;

  		p[line_ga.ga_len] = NUL;

***************

*** 2337,2343 ****

  		    p[line_ga.ga_len] = NUL;

  		    indent = get_indent_str(p, 8);

  		    --indent;

! 		    indent -= indent % get_sw_value();

  		}

  		while (get_indent_str(p, 8) > indent)

  		{

--- 2337,2343 ----

  		    p[line_ga.ga_len] = NUL;

  		    indent = get_indent_str(p, 8);

  		    --indent;

! 		    indent -= indent % get_sw_value(curbuf);

  		}

  		while (get_indent_str(p, 8) > indent)

  		{

***************

*** 4178,4184 ****

  /*

   * Prepare a string for expansion.

   * When expanding file names: The string will be used with expand_wildcards().

!  * Copy the file name into allocated memory and add a '*' at the end.

   * When expanding other names: The string will be used with regcomp().  Copy

   * the name into allocated memory and prepend "^".

   */

--- 4178,4184 ----

  /*

   * Prepare a string for expansion.

   * When expanding file names: The string will be used with expand_wildcards().

!  * Copy "fname[len]" into allocated memory and add a '*' at the end.

   * When expanding other names: The string will be used with regcomp().  Copy

   * the name into allocated memory and prepend "^".

   */

*** ../vim-7.4.068/src/fold.c	2013-06-15 16:57:24.000000000 +0200

--- src/fold.c	2013-11-05 06:13:03.000000000 +0100

***************

*** 3052,3058 ****

  	    flp->lvl = -1;

      }

      else

! 	flp->lvl = get_indent_buf(buf, lnum) / get_sw_value();

      if (flp->lvl > flp->wp->w_p_fdn)

      {

  	flp->lvl = flp->wp->w_p_fdn;

--- 3052,3058 ----

  	    flp->lvl = -1;

      }

      else

! 	flp->lvl = get_indent_buf(buf, lnum) / get_sw_value(curbuf);

      if (flp->lvl > flp->wp->w_p_fdn)

      {

  	flp->lvl = flp->wp->w_p_fdn;

*** ../vim-7.4.068/src/misc1.c	2013-11-04 02:53:46.000000000 +0100

--- src/misc1.c	2013-11-05 06:45:15.000000000 +0100

***************

*** 1405,1411 ****

  #ifdef FEAT_SMARTINDENT

  	if (did_si)

  	{

! 	    int        sw = (int)get_sw_value();

  	    if (p_sr)

  		newindent -= newindent % sw;

--- 1405,1411 ----

  #ifdef FEAT_SMARTINDENT

  	if (did_si)

  	{

! 	    int        sw = (int)get_sw_value(curbuf);

  	    if (p_sr)

  		newindent -= newindent % sw;

***************

*** 5342,5349 ****

  static int	find_match __ARGS((int lookfor, linenr_T ourscope, int ind_maxparen, int ind_maxcomment));

  static int	cin_is_cpp_namespace __ARGS((char_u *));

- static int	ind_hash_comment = 0;   /* # starts a comment */

- 

  /*

   * Skip over white space and C comments within the line.

   * Also skip over Perl/shell comments if desired.

--- 5342,5347 ----

***************

*** 5360,5366 ****

  	/* Perl/shell # comment comment continues until eol.  Require a space

  	 * before # to avoid recognizing $#array. */

! 	if (ind_hash_comment != 0 && s != prev_s && *s == '#')

  	{

  	    s += STRLEN(s);

  	    break;

--- 5358,5364 ----

  	/* Perl/shell # comment comment continues until eol.  Require a space

  	 * before # to avoid recognizing $#array. */

! 	if (curbuf->b_ind_hash_comment != 0 && s != prev_s && *s == '#')

  	{

  	    s += STRLEN(s);

  	    break;

***************

*** 6639,6839 ****

      return retval;

  }

!     int

! get_c_indent()

  {

!     int sw = (int)get_sw_value();

      /*

!      * spaces from a block's opening brace the prevailing indent for that

!      * block should be

       */

!     int ind_level = sw;

!     /*

!      * spaces from the edge of the line an open brace that's at the end of a

!      * line is imagined to be.

!      */

!     int ind_open_imag = 0;

!     /*

!      * spaces from the prevailing indent for a line that is not preceded by

!      * an opening brace.

!      */

!     int ind_no_brace = 0;

! 

!     /*

!      * column where the first { of a function should be located }

!      */

!     int ind_first_open = 0;

!     /*

!      * spaces from the prevailing indent a leftmost open brace should be

!      * located

!      */

!     int ind_open_extra = 0;

!     /*

!      * spaces from the matching open brace (real location for one at the left

       * edge; imaginary location from one that ends a line) the matching close

!      * brace should be located

!      */

!     int ind_close_extra = 0;

!     /*

!      * spaces from the edge of the line an open brace sitting in the leftmost

!      * column is imagined to be

!      */

!     int ind_open_left_imag = 0;

!     /*

!      * Spaces jump labels should be shifted to the left if N is non-negative,

!      * otherwise the jump label will be put to column 1.

!      */

!     int ind_jump_label = -1;

!     /*

!      * spaces from the switch() indent a "case xx" label should be located

!      */

!     int ind_case = sw;

!     /*

!      * spaces from the "case xx:" code after a switch() should be located

!      */

!     int ind_case_code = sw;

!     /*

!      * lineup break at end of case in switch() with case label

!      */

!     int ind_case_break = 0;

!     /*

!      * spaces from the class declaration indent a scope declaration label

!      * should be located

!      */

!     int ind_scopedecl = sw;

!     /*

!      * spaces from the scope declaration label code should be located

!      */

!     int ind_scopedecl_code = sw;

!     /*

!      * amount K&R-style parameters should be indented

!      */

!     int ind_param = sw;

!     /*

!      * amount a function type spec should be indented

!      */

!     int ind_func_type = sw;

!     /*

!      * amount a cpp base class declaration or constructor initialization

!      * should be indented

!      */

!     int ind_cpp_baseclass = sw;

!     /*

!      * additional spaces beyond the prevailing indent a continuation line

!      * should be located

!      */

!     int ind_continuation = sw;

!     /*

!      * spaces from the indent of the line with an unclosed parentheses

!      */

!     int ind_unclosed = sw * 2;

!     /*

!      * spaces from the indent of the line with an unclosed parentheses, which

!      * itself is also unclosed

!      */

!     int ind_unclosed2 = sw;

!     /*

!      * suppress ignoring spaces from the indent of a line starting with an

!      * unclosed parentheses.

!      */

!     int ind_unclosed_noignore = 0;

!     /*

!      * If the opening paren is the last nonwhite character on the line, and

!      * ind_unclosed_wrapped is nonzero, use this indent relative to the outer

!      * context (for very long lines).

!      */

!     int ind_unclosed_wrapped = 0;

!     /*

!      * suppress ignoring white space when lining up with the character after

!      * an unclosed parentheses.

!      */

!     int ind_unclosed_whiteok = 0;

!     /*

!      * indent a closing parentheses under the line start of the matching

!      * opening parentheses.

!      */

!     int ind_matching_paren = 0;

!     /*

!      * indent a closing parentheses under the previous line.

!      */

!     int ind_paren_prev = 0;

!     /*

!      * Extra indent for comments.

!      */

!     int ind_comment = 0;

!     /*

!      * spaces from the comment opener when there is nothing after it.

!      */

!     int ind_in_comment = 3;

!     /*

!      * boolean: if non-zero, use ind_in_comment even if there is something

!      * after the comment opener.

!      */

!     int ind_in_comment2 = 0;

!     /*

!      * max lines to search for an open paren

!      */

!     int ind_maxparen = 20;

!     /*

!      * max lines to search for an open comment

!      */

!     int ind_maxcomment = 70;

!     /*

!      * handle braces for java code

!      */

!     int	ind_java = 0;

!     /*

!      * not to confuse JS object properties with labels

!      */

!     int ind_js = 0;

!     /*

!      * handle blocked cases correctly

!      */

!     int ind_keep_case_label = 0;

!     /*

!      * handle C++ namespace

!      */

!     int ind_cpp_namespace = 0;

!     /*

!      * handle continuation lines containing conditions of if(), for() and

!      * while()

!      */

!     int ind_if_for_while = 0;

      pos_T	cur_curpos;

      int		amount;

      int		scope_amount;

--- 6637,6865 ----

      return retval;

  }

! /*

!  * Parse 'cinoptions' and set the values in "curbuf".

!  * Must be called when 'cinoptions', 'shiftwidth' and/or 'tabstop' changes.

!  */

!     void

! parse_cino(buf)

!     buf_T	*buf;

  {

!     char_u	*p;

!     char_u	*l;

!     char_u	*digits;

!     int		n;

!     int		divider;

!     int		fraction = 0;

!     int		sw = (int)get_sw_value(buf);

      /*

!      * Set the default values.

       */

+     /* Spaces from a block's opening brace the prevailing indent for that

+      * block should be. */

+     buf->b_ind_level = sw;

!     /* Spaces from the edge of the line an open brace that's at the end of a

!      * line is imagined to be. */

!     buf->b_ind_open_imag = 0;

!     /* Spaces from the prevailing indent for a line that is not preceded by

!      * an opening brace. */

!     buf->b_ind_no_brace = 0;

!     /* Column where the first { of a function should be located }. */

!     buf->b_ind_first_open = 0;

!     /* Spaces from the prevailing indent a leftmost open brace should be

!      * located. */

!     buf->b_ind_open_extra = 0;

!     /* Spaces from the matching open brace (real location for one at the left

       * edge; imaginary location from one that ends a line) the matching close

!      * brace should be located. */

!     buf->b_ind_close_extra = 0;

!     /* Spaces from the edge of the line an open brace sitting in the leftmost

!      * column is imagined to be. */

!     buf->b_ind_open_left_imag = 0;

!     /* Spaces jump labels should be shifted to the left if N is non-negative,

!      * otherwise the jump label will be put to column 1. */

!     buf->b_ind_jump_label = -1;

!     /* Spaces from the switch() indent a "case xx" label should be located. */

!     buf->b_ind_case = sw;

!     /* Spaces from the "case xx:" code after a switch() should be located. */

!     buf->b_ind_case_code = sw;

!     /* Lineup break at end of case in switch() with case label. */

!     buf->b_ind_case_break = 0;

!     /* Spaces from the class declaration indent a scope declaration label

!      * should be located. */

!     buf->b_ind_scopedecl = sw;

!     /* Spaces from the scope declaration label code should be located. */

!     buf->b_ind_scopedecl_code = sw;

!     /* Amount K&R-style parameters should be indented. */

!     buf->b_ind_param = sw;

!     /* Amount a function type spec should be indented. */

!     buf->b_ind_func_type = sw;

!     /* Amount a cpp base class declaration or constructor initialization

!      * should be indented. */

!     buf->b_ind_cpp_baseclass = sw;

!     /* additional spaces beyond the prevailing indent a continuation line

!      * should be located. */

!     buf->b_ind_continuation = sw;

!     /* Spaces from the indent of the line with an unclosed parentheses. */

!     buf->b_ind_unclosed = sw * 2;

!     /* Spaces from the indent of the line with an unclosed parentheses, which

!      * itself is also unclosed. */

!     buf->b_ind_unclosed2 = sw;

!     /* Suppress ignoring spaces from the indent of a line starting with an

!      * unclosed parentheses. */

!     buf->b_ind_unclosed_noignore = 0;

!     /* If the opening paren is the last nonwhite character on the line, and

!      * b_ind_unclosed_wrapped is nonzero, use this indent relative to the outer

!      * context (for very long lines). */

!     buf->b_ind_unclosed_wrapped = 0;

!     /* Suppress ignoring white space when lining up with the character after

!      * an unclosed parentheses. */

!     buf->b_ind_unclosed_whiteok = 0;

!     /* Indent a closing parentheses under the line start of the matching

!      * opening parentheses. */

!     buf->b_ind_matching_paren = 0;

!     /* Indent a closing parentheses under the previous line. */

!     buf->b_ind_paren_prev = 0;

!     /* Extra indent for comments. */

!     buf->b_ind_comment = 0;

!     /* Spaces from the comment opener when there is nothing after it. */

!     buf->b_ind_in_comment = 3;

!     /* Boolean: if non-zero, use b_ind_in_comment even if there is something

!      * after the comment opener. */

!     buf->b_ind_in_comment2 = 0;

!     /* Max lines to search for an open paren. */

!     buf->b_ind_maxparen = 20;

!     /* Max lines to search for an open comment. */

!     buf->b_ind_maxcomment = 70;

!     /* Handle braces for java code. */

!     buf->b_ind_java = 0;

!     /* Not to confuse JS object properties with labels. */

!     buf->b_ind_js = 0;

!     /* Handle blocked cases correctly. */

!     buf->b_ind_keep_case_label = 0;

!     /* Handle C++ namespace. */

!     buf->b_ind_cpp_namespace = 0;

!     /* Handle continuation lines containing conditions of if(), for() and

!      * while(). */

!     buf->b_ind_if_for_while = 0;

! 

!     for (p = buf->b_p_cino; *p; )

!     {

! 	l = p++;

! 	if (*p == '-')

! 	    ++p;

! 	digits = p;	    /* remember where the digits start */

! 	n = getdigits(&p);

! 	divider = 0;

! 	if (*p == '.')	    /* ".5s" means a fraction */

! 	{

! 	    fraction = atol((char *)++p);

! 	    while (VIM_ISDIGIT(*p))

! 	    {

! 		++p;

! 		if (divider)

! 		    divider *= 10;

! 		else

! 		    divider = 10;

! 	    }

! 	}

! 	if (*p == 's')	    /* "2s" means two times 'shiftwidth' */

! 	{

! 	    if (p == digits)

! 		n = sw;	/* just "s" is one 'shiftwidth' */

! 	    else

! 	    {

! 		n *= sw;

! 		if (divider)

! 		    n += (sw * fraction + divider / 2) / divider;

! 	    }

! 	    ++p;

! 	}

! 	if (l[1] == '-')

! 	    n = -n;

+ 	/* When adding an entry here, also update the default 'cinoptions' in

+ 	 * doc/indent.txt, and add explanation for it! */

+ 	switch (*l)

+ 	{

+ 	    case '>': buf->b_ind_level = n; break;

+ 	    case 'e': buf->b_ind_open_imag = n; break;

+ 	    case 'n': buf->b_ind_no_brace = n; break;

+ 	    case 'f': buf->b_ind_first_open = n; break;

+ 	    case '{': buf->b_ind_open_extra = n; break;

+ 	    case '}': buf->b_ind_close_extra = n; break;

+ 	    case '^': buf->b_ind_open_left_imag = n; break;

+ 	    case 'L': buf->b_ind_jump_label = n; break;

+ 	    case ':': buf->b_ind_case = n; break;

+ 	    case '=': buf->b_ind_case_code = n; break;

+ 	    case 'b': buf->b_ind_case_break = n; break;

+ 	    case 'p': buf->b_ind_param = n; break;

+ 	    case 't': buf->b_ind_func_type = n; break;

+ 	    case '/': buf->b_ind_comment = n; break;

+ 	    case 'c': buf->b_ind_in_comment = n; break;

+ 	    case 'C': buf->b_ind_in_comment2 = n; break;

+ 	    case 'i': buf->b_ind_cpp_baseclass = n; break;

+ 	    case '+': buf->b_ind_continuation = n; break;

+ 	    case '(': buf->b_ind_unclosed = n; break;

+ 	    case 'u': buf->b_ind_unclosed2 = n; break;

+ 	    case 'U': buf->b_ind_unclosed_noignore = n; break;

+ 	    case 'W': buf->b_ind_unclosed_wrapped = n; break;

+ 	    case 'w': buf->b_ind_unclosed_whiteok = n; break;

+ 	    case 'm': buf->b_ind_matching_paren = n; break;

+ 	    case 'M': buf->b_ind_paren_prev = n; break;

+ 	    case ')': buf->b_ind_maxparen = n; break;

+ 	    case '*': buf->b_ind_maxcomment = n; break;

+ 	    case 'g': buf->b_ind_scopedecl = n; break;

+ 	    case 'h': buf->b_ind_scopedecl_code = n; break;

+ 	    case 'j': buf->b_ind_java = n; break;

+ 	    case 'J': buf->b_ind_js = n; break;

+ 	    case 'l': buf->b_ind_keep_case_label = n; break;

+ 	    case '#': buf->b_ind_hash_comment = n; break;

+ 	    case 'N': buf->b_ind_cpp_namespace = n; break;

+ 	    case 'k': buf->b_ind_if_for_while = n; break;

+ 	}

+ 	if (*p == ',')

+ 	    ++p;

+     }

+ }

+ 

+     int

+ get_c_indent()

+ {