vim: src/misc1.c comparison

comparison src/misc1.c @ 2297:5ffe000a9ecf vim73

Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)

author	Bram Moolenaar <bram@vim.org>
date	Sun, 11 Jul 2010 17:23:02 +0200
parents	4dda2bd944e1
children	488be8cbe19c

comparison

equal deleted inserted replaced

-:eb7be7b075a6
+:5ffe000a9ecf
 		continue;
 	    curwin->w_cursor = cursor_save;
 	    if (cin_isterminated(line, TRUE, FALSE)
 		    || cin_isscopedecl(line)
-		    || cin_iscase(line)
+		    || cin_iscase(line, TRUE)
 		    || (cin_islabel_skip(&line) && cin_nocode(line)))
 		return TRUE;
 	    return FALSE;
 	}
 	curwin->w_cursor = cursor_save;
 /*
 * Recognize a switch label: "case .*:" or "default:".
 */
 int
-cin_iscase(s)
+cin_iscase(s, strict)
 char_u *s;
+int strict; /* Allow relaxed check of case statement for JS */
 {
 s = cin_skipcomment(s);
 if (STRNCMP(s, "case", 4) == 0 && !vim_isIDc(s[4]))
 {
 	for (s += 4; *s; ++s)
 		    ++s;
 		else
 		    return TRUE;
 	    }
 	    if (*s == '\'' && s[1] && s[2] == '\'')
-		s += 2;			/* skip over '.' */
+		s += 2;			/* skip over ':' */
 	    else if (*s == '/' && (s[1] == '*' || s[1] == '/'))
 		return FALSE;		/* stop at comment */
 	    else if (*s == '"')
-		return FALSE;		/* stop at string */
+	    {
+		/* JS etc. */
+		if (strict)
+		    return FALSE;		/* stop at string */
+		else
+		    return TRUE;
+	    }
 	}
 	return FALSE;
 }
 if (cin_isdefault(s))
 {
 	if (*l == ':')
 	{
 	    if (l[1] == ':')	    /* skip over "::" for C++ */
 		++l;
-	    else if (!cin_iscase(l + 1))
+	    else if (!cin_iscase(l + 1, FALSE))
 		break;
 	}
 	else if (*l == '\'' && l[1] && l[2] == '\'')
 	    l += 2;		    /* skip over 'x' */
 }
 cursor_save = curwin->w_cursor;
 curwin->w_cursor.lnum = lnum;
 l = ml_get_curline();
 				    /* XXX */
-if (cin_iscase(l) || cin_isscopedecl(l) || cin_islabel(ind_maxcomment))
+if (cin_iscase(l, FALSE) || cin_isscopedecl(l)
+					       || cin_islabel(ind_maxcomment))
 {
 	amount = get_indent_nolabel(lnum);
 	l = after_label(ml_get_curline());
 	if (l == NULL)		/* just in case */
 	    l = ml_get_curline();
 /*
 * 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;
 	    case ')': ind_maxparen = n; break;
 	    case '*': ind_maxcomment = n; break;
 	    case 'g': ind_scopedecl = n; break;
 	    case 'h': ind_scopedecl_code = n; break;
 	    case 'j': ind_java = n; break;
+	    case 'J': ind_js = n; break;
 	    case 'l': ind_keep_case_label = n; break;
 	    case '#': ind_hash_comment = n; break;
 	}
 	if (*options == ',')
 	    ++options;
 }
 /* remember where the cursor was when we started */
 cur_curpos = curwin->w_cursor;
+/* if we are at line 1 0 is fine, right? */
+if (cur_curpos.lnum == 1)
+	return 0;
 /* Get a copy of the current contents of the line.
 * This is required, because only the most recent line obtained with
 * ml_get is valid! */
 linecopy = vim_strsave(ml_get(cur_curpos.lnum));
 {
 	amount = 0;
 }
 /*
-* Is it a non-case label?	Then that goes at the left margin too.
+* Is it a non-case label?	Then that goes at the left margin too unless JS flag is set.
 */
-else if (cin_islabel(ind_maxcomment))	    /* XXX */
+else if (!ind_js && cin_islabel(ind_maxcomment))	    /* XXX */
 {
 	amount = 0;
 }
 /*
 	     * It could have been something like
 	     *	   case 1: if (asdf &&
 	     *			ldfd) {
 	     *		    }
 	     */
-	    if (ind_keep_case_label && cin_iscase(skipwhite(ml_get_curline())))
+	    if ((ind_keep_case_label
+			   && cin_iscase(skipwhite(ml_get_curline()), FALSE)))
 		amount = get_indent();
 	    else
 		amount = skip_label(lnum, &l, ind_maxcomment);
 	    start_brace = BRACE_AT_END;
 		}
 	    }
 	    lookfor_break = FALSE;
-	    if (cin_iscase(theline))	/* it's a switch() label */
+	    if (cin_iscase(theline, FALSE))	/* it's a switch() label */
 	    {
 		lookfor = LOOKFOR_CASE;	/* find a previous switch() label */
 		amount += ind_case;
 	    }
 	    else if (cin_isscopedecl(theline))	/* private:, ... */
 			    /* nothing found (abuse ind_maxparen as limit)
 			     * assume terminated line (i.e. a variable
 			     * initialization) */
 			    if (cont_amount > 0)
 				amount = cont_amount;
-			    else
+			    else if (!ind_js)
 				amount += ind_continuation;
 			    break;
 			}
 			l = ml_get_curline();
 		/*
 		 * If this is a switch() label, may line up relative to that.
 		 * If this is a C++ scope declaration, do the same.
 		 */
-		iscase = cin_iscase(l);
+		iscase = cin_iscase(l, FALSE);
 		if (iscase || cin_isscopedecl(l))
 		{
 		    /* we are only looking for cpp base class
 		     * declaration/initialization any longer */
 		    if (lookfor == LOOKFOR_CPP_BASECLASS)
 		}
 		/*
 		 * Ignore jump labels with nothing after them.
 		 */
-		if (cin_islabel(ind_maxcomment))
+		if (!ind_js && cin_islabel(ind_maxcomment))
 		{
 		    l = after_label(ml_get_curline());
 		    if (l == NULL || cin_nocode(l))
 			continue;
 		}
 			 *     case xx:  if ( asdf &&
 			 *			asdf)
 			 */
 			curwin->w_cursor = *trypos;
 			l = ml_get_curline();
-			if (cin_iscase(l) || cin_isscopedecl(l))
+			if (cin_iscase(l, FALSE) || cin_isscopedecl(l))
 			{
 			    ++curwin->w_cursor.lnum;
 			    curwin->w_cursor.col = 0;
 			    continue;
 			}
 		    /*
 		     * Get indent and pointer to text for current line,
 		     * ignoring any jump label.	    XXX
 		     */
-		    cur_amount = skip_label(curwin->w_cursor.lnum,
+		    if (!ind_js)
+			cur_amount = skip_label(curwin->w_cursor.lnum,
 							  &l, ind_maxcomment);
+		    else
+			cur_amount = get_indent();
 		    /*
 		     * If this is just above the line we are indenting, and it
 		     * starts with a '{', line it up with this line.
 		     *		while (not)
 		     * ->	{
 			     *	   case xx:  if ( asdf &&
 			     *			    asdf)
 			     */
 			    curwin->w_cursor = *trypos;
 			    l = ml_get_curline();
-			    if (cin_iscase(l) || cin_isscopedecl(l))
+			    if (cin_iscase(l, FALSE) || cin_isscopedecl(l))
 			    {
 				++curwin->w_cursor.lnum;
 				curwin->w_cursor.col = 0;
 				continue;
 			    }
 			 *  }
 			 *  case 2:
 			 *	stat;
 			 * }
 			 */
-			iscase = (ind_keep_case_label && cin_iscase(l));
+			iscase = (ind_keep_case_label && cin_iscase(l, FALSE));
 			/*
 			 * Get indent and pointer to text for current line,
 			 * ignoring any jump label.
 			 */

Mercurial > vim

comparison src/misc1.c @ 2297:5ffe000a9ecf vim73