vim: src/textprop.c annotate

annotate src/textprop.c @ 16714:ba592f30c082 v8.1.1359

patch 8.1.1359: text property wrong after :substitute with backslash commit https://github.com/vim/vim/commit/f3333b02f34526da46cdae608f7e2d869bb8c654 Author: Bram Moolenaar <Bram@vim.org> Date: Sun May 19 22:53:40 2019 +0200 patch 8.1.1359: text property wrong after :substitute with backslash Problem: Text property wrong after :substitute with backslash. Solution: Adjust text property columns when removing backslashes. (closes #4397)

author	Bram Moolenaar <Bram@vim.org>
date	Sun, 19 May 2019 23:00:05 +0200
parents	23af483c4ceb
children	75703a39d875

rev	line source
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	1 /* vi:set ts=8 sts=4 sw=4 noet:
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	2 *
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	3 * VIM - Vi IMproved by Bram Moolenaar
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	4 *
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	5 * Do ":help uganda" in Vim to read copying and usage conditions.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	6 * Do ":help credits" in Vim to see a list of people who contributed.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	7 * See README.txt for an overview of the Vim source code.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	8 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	9
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	10 /*
16662 1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	11 * Text properties implementation. See ":help text-properties".
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	12 *
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	13 * TODO:
15335 18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	14 * - Adjust text property column and length when text is inserted/deleted.
15367 273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	15 * -> a :substitute with a multi-line match
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	16 * -> search for changed_bytes() from misc1.c
16678 6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	17 * -> search for mark_col_adjust()
15335 18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	18 * - Perhaps we only need TP_FLAG_CONT_NEXT and can drop TP_FLAG_CONT_PREV?
15294 2d8225cc1315 patch 8.1.0655: when appending a line text property flags are not added Bram Moolenaar <Bram@vim.org> parents: 15255 diff changeset	19 * - Add an arrray for global_proptypes, to quickly lookup a prop type by ID
2d8225cc1315 patch 8.1.0655: when appending a line text property flags are not added Bram Moolenaar <Bram@vim.org> parents: 15255 diff changeset	20 * - Add an arrray for b_proptypes, to quickly lookup a prop type by ID
2d8225cc1315 patch 8.1.0655: when appending a line text property flags are not added Bram Moolenaar <Bram@vim.org> parents: 15255 diff changeset	21 * - Checking the text length to detect text properties is slow. Use a flag in
2d8225cc1315 patch 8.1.0655: when appending a line text property flags are not added Bram Moolenaar <Bram@vim.org> parents: 15255 diff changeset	22 * the index, like DB_MARKED?
15255 19e79a1ed6b6 patch 8.1.0636: line2byte() gives wrong values with text properties Bram Moolenaar <Bram@vim.org> parents: 15251 diff changeset	23 * - Also test line2byte() with many lines, so that ml_updatechunk() is taken
19e79a1ed6b6 patch 8.1.0636: line2byte() gives wrong values with text properties Bram Moolenaar <Bram@vim.org> parents: 15251 diff changeset	24 * into account.
15939 8013b532a1f7 patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	25 * - Perhaps have a window-local option to disable highlighting from text
8013b532a1f7 patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	26 * properties?
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	27 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	28
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	29 #include "vim.h"
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	30
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	31 #if defined(FEAT_TEXT_PROP) \|\| defined(PROTO)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	32
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	33 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	34 * In a hashtable item "hi_key" points to "pt_name" in a proptype_T.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	35 * This avoids adding a pointer to the hashtable item.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	36 * PT2HIKEY() converts a proptype pointer to a hashitem key pointer.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	37 * HIKEY2PT() converts a hashitem key pointer to a proptype pointer.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	38 * HI2PT() converts a hashitem pointer to a proptype pointer.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	39 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	40 #define PT2HIKEY(p) ((p)->pt_name)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	41 #define HIKEY2PT(p) ((proptype_T *)((p) - offsetof(proptype_T, pt_name)))
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	42 #define HI2PT(hi) HIKEY2PT((hi)->hi_key)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	43
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	44 // The global text property types.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	45 static hashtab_T *global_proptypes = NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	46
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	47 // The last used text property type ID.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	48 static int proptype_id = 0;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	49
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	50 static char_u e_type_not_exist[] = N_("E971: Property type %s does not exist");
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	51 static char_u e_invalid_col[] = N_("E964: Invalid column number: %ld");
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	52 static char_u e_invalid_lnum[] = N_("E966: Invalid line number: %ld");
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	53
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	54 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	55 * Find a property type by name, return the hashitem.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	56 * Returns NULL if the item can't be found.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	57 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	58 static hashitem_T *
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	59 find_prop_hi(char_u name, buf_T buf)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	60 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	61 hashtab_T *ht;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	62 hashitem_T *hi;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	63
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	64 if (*name == NUL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	65 return NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	66 if (buf == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	67 ht = global_proptypes;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	68 else
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	69 ht = buf->b_proptypes;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	70
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	71 if (ht == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	72 return NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	73 hi = hash_find(ht, name);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	74 if (HASHITEM_EMPTY(hi))
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	75 return NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	76 return hi;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	77 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	78
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	79 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	80 * Like find_prop_hi() but return the property type.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	81 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	82 static proptype_T *
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	83 find_prop(char_u name, buf_T buf)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	84 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	85 hashitem_T *hi = find_prop_hi(name, buf);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	86
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	87 if (hi == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	88 return NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	89 return HI2PT(hi);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	90 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	91
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	92 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	93 * Lookup a property type by name. First in "buf" and when not found in the
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	94 * global types.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	95 * When not found gives an error message and returns NULL.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	96 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	97 static proptype_T *
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	98 lookup_prop_type(char_u name, buf_T buf)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	99 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	100 proptype_T *type = find_prop(name, buf);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	101
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	102 if (type == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	103 type = find_prop(name, NULL);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	104 if (type == NULL)
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	105 semsg(_(e_type_not_exist), name);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	106 return type;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	107 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	108
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	109 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	110 * Get an optional "bufnr" item from the dict in "arg".
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	111 * When the argument is not used or "bufnr" is not present then "buf" is
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	112 * unchanged.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	113 * If "bufnr" is valid or not present return OK.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	114 * When "arg" is not a dict or "bufnr" is invalide return FAIL.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	115 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	116 static int
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	117 get_bufnr_from_arg(typval_T arg, buf_T *buf)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	118 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	119 dictitem_T *di;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	120
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	121 if (arg->v_type != VAR_DICT)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	122 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	123 emsg(_(e_dictreq));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	124 return FAIL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	125 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	126 if (arg->vval.v_dict == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	127 return OK; // NULL dict is like an empty dict
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	128 di = dict_find(arg->vval.v_dict, (char_u *)"bufnr", -1);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	129 if (di != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	130 {
15355 73b153ed5af8 patch 8.1.0685: get_buf_tv() is named inconsistently Bram Moolenaar <Bram@vim.org> parents: 15353 diff changeset	131 *buf = tv_get_buf(&di->di_tv, FALSE);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	132 if (*buf == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	133 return FAIL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	134 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	135 return OK;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	136 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	137
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	138 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	139 * prop_add({lnum}, {col}, {props})
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	140 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	141 void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	142 f_prop_add(typval_T argvars, typval_T rettv UNUSED)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	143 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	144 linenr_T lnum;
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	145 linenr_T start_lnum;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	146 linenr_T end_lnum;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	147 colnr_T start_col;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	148 colnr_T end_col;
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	149 dict_T *dict;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	150 char_u *type_name;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	151 proptype_T *type;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	152 buf_T *buf = curbuf;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	153 int id = 0;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	154 char_u *newtext;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	155 int proplen;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	156 size_t textlen;
15939 8013b532a1f7 patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	157 char_u *props = NULL;
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	158 char_u *newprops;
15144 7960bf50d345 patch 8.1.0582: text properties are not enabled Bram Moolenaar <Bram@vim.org> parents: 15138 diff changeset	159 textprop_T tmp_prop;
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	160 int i;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	161
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	162 start_lnum = tv_get_number(&argvars[0]);
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	163 start_col = tv_get_number(&argvars[1]);
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	164 if (start_col < 1)
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	165 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	166 semsg(_(e_invalid_col), (long)start_col);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	167 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	168 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	169 if (argvars[2].v_type != VAR_DICT)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	170 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	171 emsg(_(e_dictreq));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	172 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	173 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	174 dict = argvars[2].vval.v_dict;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	175
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	176 if (dict == NULL \|\| dict_find(dict, (char_u *)"type", -1) == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	177 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	178 emsg(_("E965: missing property type name"));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	179 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	180 }
15146 7903dce131d4 patch 8.1.0583: using illogical name for get_dict_number()/get_dict_string() Bram Moolenaar <Bram@vim.org> parents: 15144 diff changeset	181 type_name = dict_get_string(dict, (char_u *)"type", FALSE);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	182
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	183 if (dict_find(dict, (char_u *)"end_lnum", -1) != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	184 {
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	185 end_lnum = dict_get_number(dict, (char_u *)"end_lnum");
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	186 if (end_lnum < start_lnum)
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	187 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	188 semsg(_(e_invargval), "end_lnum");
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	189 return;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	190 }
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	191 }
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	192 else
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	193 end_lnum = start_lnum;
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	194
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	195 if (dict_find(dict, (char_u *)"length", -1) != NULL)
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	196 {
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	197 long length = dict_get_number(dict, (char_u *)"length");
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	198
15335 18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	199 if (length < 0 \|\| end_lnum > start_lnum)
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	200 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	201 semsg(_(e_invargval), "length");
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	202 return;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	203 }
15335 18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	204 end_col = start_col + length;
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	205 }
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	206 else if (dict_find(dict, (char_u *)"end_col", -1) != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	207 {
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	208 end_col = dict_get_number(dict, (char_u *)"end_col");
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	209 if (end_col <= 0)
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	210 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	211 semsg(_(e_invargval), "end_col");
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	212 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	213 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	214 }
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	215 else if (start_lnum == end_lnum)
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	216 end_col = start_col;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	217 else
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	218 end_col = 1;
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	219
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	220 if (dict_find(dict, (char_u *)"id", -1) != NULL)
15146 7903dce131d4 patch 8.1.0583: using illogical name for get_dict_number()/get_dict_string() Bram Moolenaar <Bram@vim.org> parents: 15144 diff changeset	221 id = dict_get_number(dict, (char_u *)"id");
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	222
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	223 if (get_bufnr_from_arg(&argvars[2], &buf) == FAIL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	224 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	225
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	226 type = lookup_prop_type(type_name, buf);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	227 if (type == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	228 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	229
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	230 if (start_lnum < 1 \|\| start_lnum > buf->b_ml.ml_line_count)
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	231 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	232 semsg(_(e_invalid_lnum), (long)start_lnum);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	233 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	234 }
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	235 if (end_lnum < start_lnum \|\| end_lnum > buf->b_ml.ml_line_count)
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	236 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	237 semsg(_(e_invalid_lnum), (long)end_lnum);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	238 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	239 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	240
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	241 for (lnum = start_lnum; lnum <= end_lnum; ++lnum)
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	242 {
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	243 colnr_T col; // start column
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	244 long length; // in bytes
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	245
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	246 // Fetch the line to get the ml_line_len field updated.
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	247 proplen = get_text_props(buf, lnum, &props, TRUE);
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	248 textlen = buf->b_ml.ml_line_len - proplen * sizeof(textprop_T);
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	249
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	250 if (lnum == start_lnum)
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	251 col = start_col;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	252 else
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	253 col = 1;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	254 if (col - 1 > (colnr_T)textlen)
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	255 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	256 semsg(_(e_invalid_col), (long)start_col);
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	257 return;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	258 }
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	259
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	260 if (lnum == end_lnum)
15335 18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	261 length = end_col - col;
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	262 else
15353 21580db06cf3 patch 8.1.0684: warnings from 64-bit compiler Bram Moolenaar <Bram@vim.org> parents: 15349 diff changeset	263 length = (int)textlen - col + 1;
15255 19e79a1ed6b6 patch 8.1.0636: line2byte() gives wrong values with text properties Bram Moolenaar <Bram@vim.org> parents: 15251 diff changeset	264 if (length > (long)textlen)
15353 21580db06cf3 patch 8.1.0684: warnings from 64-bit compiler Bram Moolenaar <Bram@vim.org> parents: 15349 diff changeset	265 length = (int)textlen; // can include the end-of-line
15335 18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	266 if (length < 0)
18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	267 length = 0; // zero-width property
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	268
15251 17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	269 // Allocate the new line with space for the new proprety.
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	270 newtext = alloc(buf->b_ml.ml_line_len + sizeof(textprop_T));
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	271 if (newtext == NULL)
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	272 return;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	273 // Copy the text, including terminating NUL.
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	274 mch_memmove(newtext, buf->b_ml.ml_line_ptr, textlen);
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	275
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	276 // Find the index where to insert the new property.
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	277 // Since the text properties are not aligned properly when stored with the
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	278 // text, we need to copy them as bytes before using it as a struct.
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	279 for (i = 0; i < proplen; ++i)
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	280 {
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	281 mch_memmove(&tmp_prop, props + i * sizeof(textprop_T),
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	282 sizeof(textprop_T));
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	283 if (tmp_prop.tp_col >= col)
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	284 break;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	285 }
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	286 newprops = newtext + textlen;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	287 if (i > 0)
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	288 mch_memmove(newprops, props, sizeof(textprop_T) * i);
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	289
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	290 tmp_prop.tp_col = col;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	291 tmp_prop.tp_len = length;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	292 tmp_prop.tp_id = id;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	293 tmp_prop.tp_type = type->pt_id;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	294 tmp_prop.tp_flags = (lnum > start_lnum ? TP_FLAG_CONT_PREV : 0)
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	295 \| (lnum < end_lnum ? TP_FLAG_CONT_NEXT : 0);
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	296 mch_memmove(newprops + i * sizeof(textprop_T), &tmp_prop,
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	297 sizeof(textprop_T));
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	298
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	299 if (i < proplen)
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	300 mch_memmove(newprops + (i + 1) * sizeof(textprop_T),
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	301 props + i * sizeof(textprop_T),
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	302 sizeof(textprop_T) * (proplen - i));
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	303
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	304 if (buf->b_ml.ml_flags & ML_LINE_DIRTY)
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	305 vim_free(buf->b_ml.ml_line_ptr);
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	306 buf->b_ml.ml_line_ptr = newtext;
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	307 buf->b_ml.ml_line_len += sizeof(textprop_T);
17525ca95e1e patch 8.1.0634: text properties cannot cross line boundaries Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	308 buf->b_ml.ml_flags \|= ML_LINE_DIRTY;
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	309 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	310
15255 19e79a1ed6b6 patch 8.1.0636: line2byte() gives wrong values with text properties Bram Moolenaar <Bram@vim.org> parents: 15251 diff changeset	311 buf->b_has_textprop = TRUE; // this is never reset
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	312 redraw_buf_later(buf, NOT_VALID);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	313 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	314
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	315 /*
15144 7960bf50d345 patch 8.1.0582: text properties are not enabled Bram Moolenaar <Bram@vim.org> parents: 15138 diff changeset	316 * Fetch the text properties for line "lnum" in buffer "buf".
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	317 * Returns the number of text properties and, when non-zero, a pointer to the
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	318 * first one in "props" (note that it is not aligned, therefore the char_u
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	319 * pointer).
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	320 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	321 int
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	322 get_text_props(buf_T buf, linenr_T lnum, char_u *props, int will_change)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	323 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	324 char_u *text;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	325 size_t textlen;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	326 size_t proplen;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	327
15255 19e79a1ed6b6 patch 8.1.0636: line2byte() gives wrong values with text properties Bram Moolenaar <Bram@vim.org> parents: 15251 diff changeset	328 // Be quick when no text property types have been defined or the buffer,
19e79a1ed6b6 patch 8.1.0636: line2byte() gives wrong values with text properties Bram Moolenaar <Bram@vim.org> parents: 15251 diff changeset	329 // unless we are adding one.
19e79a1ed6b6 patch 8.1.0636: line2byte() gives wrong values with text properties Bram Moolenaar <Bram@vim.org> parents: 15251 diff changeset	330 if (!buf->b_has_textprop && !will_change)
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	331 return 0;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	332
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	333 // Fetch the line to get the ml_line_len field updated.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	334 text = ml_get_buf(buf, lnum, will_change);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	335 textlen = STRLEN(text) + 1;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	336 proplen = buf->b_ml.ml_line_len - textlen;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	337 if (proplen % sizeof(textprop_T) != 0)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	338 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	339 iemsg(_("E967: text property info corrupted"));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	340 return 0;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	341 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	342 if (proplen > 0)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	343 *props = text + textlen;
15182 4b2de998ebd6 patch 8.1.0601: a few compiler warnings Bram Moolenaar <Bram@vim.org> parents: 15146 diff changeset	344 return (int)(proplen / sizeof(textprop_T));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	345 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	346
15367 273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	347 /*
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	348 * Set the text properties for line "lnum" to "props" with length "len".
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	349 * If "len" is zero text properties are removed, "props" is not used.
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	350 * Any existing text properties are dropped.
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	351 * Only works for the current buffer.
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	352 */
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	353 static void
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	354 set_text_props(linenr_T lnum, char_u *props, int len)
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	355 {
15390 00aa76a735e7 patch 8.1.0703: compiler warnings with 64-bit compiler Bram Moolenaar <Bram@vim.org> parents: 15373 diff changeset	356 char_u *text;
00aa76a735e7 patch 8.1.0703: compiler warnings with 64-bit compiler Bram Moolenaar <Bram@vim.org> parents: 15373 diff changeset	357 char_u *newtext;
00aa76a735e7 patch 8.1.0703: compiler warnings with 64-bit compiler Bram Moolenaar <Bram@vim.org> parents: 15373 diff changeset	358 int textlen;
15367 273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	359
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	360 text = ml_get(lnum);
15390 00aa76a735e7 patch 8.1.0703: compiler warnings with 64-bit compiler Bram Moolenaar <Bram@vim.org> parents: 15373 diff changeset	361 textlen = (int)STRLEN(text) + 1;
15367 273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	362 newtext = alloc(textlen + len);
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	363 if (newtext == NULL)
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	364 return;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	365 mch_memmove(newtext, text, textlen);
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	366 if (len > 0)
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	367 mch_memmove(newtext + textlen, props, len);
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	368 if (curbuf->b_ml.ml_flags & ML_LINE_DIRTY)
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	369 vim_free(curbuf->b_ml.ml_line_ptr);
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	370 curbuf->b_ml.ml_line_ptr = newtext;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	371 curbuf->b_ml.ml_line_len = textlen + len;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	372 curbuf->b_ml.ml_flags \|= ML_LINE_DIRTY;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	373 }
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	374
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	375 static proptype_T *
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	376 find_type_by_id(hashtab_T *ht, int id)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	377 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	378 long todo;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	379 hashitem_T *hi;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	380
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	381 if (ht == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	382 return NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	383
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	384 // TODO: Make this faster by keeping a list of types sorted on ID and use
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	385 // a binary search.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	386
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	387 todo = (long)ht->ht_used;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	388 for (hi = ht->ht_array; todo > 0; ++hi)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	389 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	390 if (!HASHITEM_EMPTY(hi))
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	391 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	392 proptype_T *prop = HI2PT(hi);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	393
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	394 if (prop->pt_id == id)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	395 return prop;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	396 --todo;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	397 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	398 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	399 return NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	400 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	401
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	402 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	403 * Find a property type by ID in "buf" or globally.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	404 * Returns NULL if not found.
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	405 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	406 proptype_T *
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	407 text_prop_type_by_id(buf_T *buf, int id)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	408 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	409 proptype_T *type;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	410
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	411 type = find_type_by_id(buf->b_proptypes, id);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	412 if (type == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	413 type = find_type_by_id(global_proptypes, id);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	414 return type;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	415 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	416
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	417 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	418 * prop_clear({lnum} [, {lnum_end} [, {bufnr}]])
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	419 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	420 void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	421 f_prop_clear(typval_T argvars, typval_T rettv UNUSED)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	422 {
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15182 diff changeset	423 linenr_T start = tv_get_number(&argvars[0]);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	424 linenr_T end = start;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	425 linenr_T lnum;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	426 buf_T *buf = curbuf;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	427
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	428 if (argvars[1].v_type != VAR_UNKNOWN)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	429 {
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15182 diff changeset	430 end = tv_get_number(&argvars[1]);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	431 if (argvars[2].v_type != VAR_UNKNOWN)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	432 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	433 if (get_bufnr_from_arg(&argvars[2], &buf) == FAIL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	434 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	435 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	436 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	437 if (start < 1 \|\| end < 1)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	438 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	439 emsg(_(e_invrange));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	440 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	441 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	442
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	443 for (lnum = start; lnum <= end; ++lnum)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	444 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	445 char_u *text;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	446 size_t len;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	447
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	448 if (lnum > buf->b_ml.ml_line_count)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	449 break;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	450 text = ml_get_buf(buf, lnum, FALSE);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	451 len = STRLEN(text) + 1;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	452 if ((size_t)buf->b_ml.ml_line_len > len)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	453 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	454 if (!(buf->b_ml.ml_flags & ML_LINE_DIRTY))
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	455 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	456 char_u *newtext = vim_strsave(text);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	457
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	458 // need to allocate the line now
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	459 if (newtext == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	460 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	461 buf->b_ml.ml_line_ptr = newtext;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	462 buf->b_ml.ml_flags \|= ML_LINE_DIRTY;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	463 }
15182 4b2de998ebd6 patch 8.1.0601: a few compiler warnings Bram Moolenaar <Bram@vim.org> parents: 15146 diff changeset	464 buf->b_ml.ml_line_len = (int)len;
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	465 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	466 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	467 redraw_buf_later(buf, NOT_VALID);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	468 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	469
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	470 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	471 * prop_list({lnum} [, {bufnr}])
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	472 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	473 void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	474 f_prop_list(typval_T argvars, typval_T rettv)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	475 {
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15182 diff changeset	476 linenr_T lnum = tv_get_number(&argvars[0]);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	477 buf_T *buf = curbuf;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	478
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	479 if (argvars[1].v_type != VAR_UNKNOWN)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	480 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	481 if (get_bufnr_from_arg(&argvars[1], &buf) == FAIL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	482 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	483 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	484 if (lnum < 1 \|\| lnum > buf->b_ml.ml_line_count)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	485 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	486 emsg(_(e_invrange));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	487 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	488 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	489
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	490 if (rettv_list_alloc(rettv) == OK)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	491 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	492 char_u *text = ml_get_buf(buf, lnum, FALSE);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	493 size_t textlen = STRLEN(text) + 1;
15182 4b2de998ebd6 patch 8.1.0601: a few compiler warnings Bram Moolenaar <Bram@vim.org> parents: 15146 diff changeset	494 int count = (int)((buf->b_ml.ml_line_len - textlen)
4b2de998ebd6 patch 8.1.0601: a few compiler warnings Bram Moolenaar <Bram@vim.org> parents: 15146 diff changeset	495 / sizeof(textprop_T));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	496 int i;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	497 textprop_T prop;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	498 proptype_T *pt;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	499
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	500 for (i = 0; i < count; ++i)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	501 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	502 dict_T *d = dict_alloc();
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	503
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	504 if (d == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	505 break;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	506 mch_memmove(&prop, text + textlen + i * sizeof(textprop_T),
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	507 sizeof(textprop_T));
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	508 dict_add_number(d, "col", prop.tp_col);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	509 dict_add_number(d, "length", prop.tp_len);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	510 dict_add_number(d, "id", prop.tp_id);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	511 dict_add_number(d, "start", !(prop.tp_flags & TP_FLAG_CONT_PREV));
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	512 dict_add_number(d, "end", !(prop.tp_flags & TP_FLAG_CONT_NEXT));
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	513 pt = text_prop_type_by_id(buf, prop.tp_type);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	514 if (pt != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	515 dict_add_string(d, "type", pt->pt_name);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	516
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	517 list_append_dict(rettv->vval.v_list, d);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	518 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	519 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	520 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	521
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	522 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	523 * prop_remove({props} [, {lnum} [, {lnum_end}]])
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	524 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	525 void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	526 f_prop_remove(typval_T argvars, typval_T rettv)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	527 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	528 linenr_T start = 1;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	529 linenr_T end = 0;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	530 linenr_T lnum;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	531 dict_T *dict;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	532 buf_T *buf = curbuf;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	533 dictitem_T *di;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	534 int do_all = FALSE;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	535 int id = -1;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	536 int type_id = -1;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	537
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	538 rettv->vval.v_number = 0;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	539 if (argvars[0].v_type != VAR_DICT \|\| argvars[0].vval.v_dict == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	540 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	541 emsg(_(e_invarg));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	542 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	543 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	544
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	545 if (argvars[1].v_type != VAR_UNKNOWN)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	546 {
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15182 diff changeset	547 start = tv_get_number(&argvars[1]);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	548 end = start;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	549 if (argvars[2].v_type != VAR_UNKNOWN)
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15182 diff changeset	550 end = tv_get_number(&argvars[2]);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	551 if (start < 1 \|\| end < 1)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	552 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	553 emsg(_(e_invrange));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	554 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	555 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	556 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	557
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	558 dict = argvars[0].vval.v_dict;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	559 di = dict_find(dict, (char_u *)"bufnr", -1);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	560 if (di != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	561 {
15355 73b153ed5af8 patch 8.1.0685: get_buf_tv() is named inconsistently Bram Moolenaar <Bram@vim.org> parents: 15353 diff changeset	562 buf = tv_get_buf(&di->di_tv, FALSE);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	563 if (buf == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	564 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	565 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	566
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	567 di = dict_find(dict, (char_u*)"all", -1);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	568 if (di != NULL)
15146 7903dce131d4 patch 8.1.0583: using illogical name for get_dict_number()/get_dict_string() Bram Moolenaar <Bram@vim.org> parents: 15144 diff changeset	569 do_all = dict_get_number(dict, (char_u *)"all");
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	570
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	571 if (dict_find(dict, (char_u *)"id", -1) != NULL)
15146 7903dce131d4 patch 8.1.0583: using illogical name for get_dict_number()/get_dict_string() Bram Moolenaar <Bram@vim.org> parents: 15144 diff changeset	572 id = dict_get_number(dict, (char_u *)"id");
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	573 if (dict_find(dict, (char_u *)"type", -1))
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	574 {
15146 7903dce131d4 patch 8.1.0583: using illogical name for get_dict_number()/get_dict_string() Bram Moolenaar <Bram@vim.org> parents: 15144 diff changeset	575 char_u name = dict_get_string(dict, (char_u )"type", FALSE);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	576 proptype_T *type = lookup_prop_type(name, buf);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	577
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	578 if (type == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	579 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	580 type_id = type->pt_id;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	581 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	582 if (id == -1 && type_id == -1)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	583 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	584 emsg(_("E968: Need at least one of 'id' or 'type'"));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	585 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	586 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	587
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	588 if (end == 0)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	589 end = buf->b_ml.ml_line_count;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	590 for (lnum = start; lnum <= end; ++lnum)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	591 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	592 char_u *text;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	593 size_t len;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	594
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	595 if (lnum > buf->b_ml.ml_line_count)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	596 break;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	597 text = ml_get_buf(buf, lnum, FALSE);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	598 len = STRLEN(text) + 1;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	599 if ((size_t)buf->b_ml.ml_line_len > len)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	600 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	601 static textprop_T textprop; // static because of alignment
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	602 unsigned idx;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	603
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	604 for (idx = 0; idx < (buf->b_ml.ml_line_len - len)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	605 / sizeof(textprop_T); ++idx)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	606 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	607 char_u *cur_prop = buf->b_ml.ml_line_ptr + len
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	608 + idx * sizeof(textprop_T);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	609 size_t taillen;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	610
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	611 mch_memmove(&textprop, cur_prop, sizeof(textprop_T));
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	612 if (textprop.tp_id == id \|\| textprop.tp_type == type_id)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	613 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	614 if (!(buf->b_ml.ml_flags & ML_LINE_DIRTY))
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	615 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	616 char_u *newptr = alloc(buf->b_ml.ml_line_len);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	617
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	618 // need to allocate the line to be able to change it
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	619 if (newptr == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	620 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	621 mch_memmove(newptr, buf->b_ml.ml_line_ptr,
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	622 buf->b_ml.ml_line_len);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	623 buf->b_ml.ml_line_ptr = newptr;
16060 176872829dc2 patch 8.1.1035: prop_remove() second argument is not optional Bram Moolenaar <Bram@vim.org> parents: 15939 diff changeset	624 buf->b_ml.ml_flags \|= ML_LINE_DIRTY;
176872829dc2 patch 8.1.1035: prop_remove() second argument is not optional Bram Moolenaar <Bram@vim.org> parents: 15939 diff changeset	625
176872829dc2 patch 8.1.1035: prop_remove() second argument is not optional Bram Moolenaar <Bram@vim.org> parents: 15939 diff changeset	626 cur_prop = buf->b_ml.ml_line_ptr + len
176872829dc2 patch 8.1.1035: prop_remove() second argument is not optional Bram Moolenaar <Bram@vim.org> parents: 15939 diff changeset	627 + idx * sizeof(textprop_T);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	628 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	629
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	630 taillen = buf->b_ml.ml_line_len - len
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	631 - (idx + 1) * sizeof(textprop_T);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	632 if (taillen > 0)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	633 mch_memmove(cur_prop, cur_prop + sizeof(textprop_T),
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	634 taillen);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	635 buf->b_ml.ml_line_len -= sizeof(textprop_T);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	636 --idx;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	637
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	638 ++rettv->vval.v_number;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	639 if (!do_all)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	640 break;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	641 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	642 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	643 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	644 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	645 redraw_buf_later(buf, NOT_VALID);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	646 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	647
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	648 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	649 * Common for f_prop_type_add() and f_prop_type_change().
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	650 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	651 void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	652 prop_type_set(typval_T *argvars, int add)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	653 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	654 char_u *name;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	655 buf_T *buf = NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	656 dict_T *dict;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	657 dictitem_T *di;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	658 proptype_T *prop;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	659
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15182 diff changeset	660 name = tv_get_string(&argvars[0]);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	661 if (*name == NUL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	662 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	663 emsg(_(e_invarg));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	664 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	665 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	666
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	667 if (get_bufnr_from_arg(&argvars[1], &buf) == FAIL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	668 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	669 dict = argvars[1].vval.v_dict;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	670
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	671 prop = find_prop(name, buf);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	672 if (add)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	673 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	674 hashtab_T **htp;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	675
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	676 if (prop != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	677 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	678 semsg(_("E969: Property type %s already defined"), name);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	679 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	680 }
15182 4b2de998ebd6 patch 8.1.0601: a few compiler warnings Bram Moolenaar <Bram@vim.org> parents: 15146 diff changeset	681 prop = (proptype_T *)alloc_clear((int)(sizeof(proptype_T) + STRLEN(name)));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	682 if (prop == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	683 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	684 STRCPY(prop->pt_name, name);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	685 prop->pt_id = ++proptype_id;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	686 htp = buf == NULL ? &global_proptypes : &buf->b_proptypes;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	687 if (*htp == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	688 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	689 htp = (hashtab_T )alloc(sizeof(hashtab_T));
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	690 if (*htp == NULL)
15144 7960bf50d345 patch 8.1.0582: text properties are not enabled Bram Moolenaar <Bram@vim.org> parents: 15138 diff changeset	691 {
7960bf50d345 patch 8.1.0582: text properties are not enabled Bram Moolenaar <Bram@vim.org> parents: 15138 diff changeset	692 vim_free(prop);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	693 return;
15144 7960bf50d345 patch 8.1.0582: text properties are not enabled Bram Moolenaar <Bram@vim.org> parents: 15138 diff changeset	694 }
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	695 hash_init(*htp);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	696 }
15144 7960bf50d345 patch 8.1.0582: text properties are not enabled Bram Moolenaar <Bram@vim.org> parents: 15138 diff changeset	697 hash_add(*htp, PT2HIKEY(prop));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	698 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	699 else
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	700 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	701 if (prop == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	702 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	703 semsg(_(e_type_not_exist), name);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	704 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	705 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	706 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	707
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	708 if (dict != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	709 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	710 di = dict_find(dict, (char_u *)"highlight", -1);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	711 if (di != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	712 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	713 char_u *highlight;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	714 int hl_id = 0;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	715
15146 7903dce131d4 patch 8.1.0583: using illogical name for get_dict_number()/get_dict_string() Bram Moolenaar <Bram@vim.org> parents: 15144 diff changeset	716 highlight = dict_get_string(dict, (char_u *)"highlight", FALSE);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	717 if (highlight != NULL && *highlight != NUL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	718 hl_id = syn_name2id(highlight);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	719 if (hl_id <= 0)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	720 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	721 semsg(_("E970: Unknown highlight group name: '%s'"),
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	722 highlight == NULL ? (char_u *)"" : highlight);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	723 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	724 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	725 prop->pt_hl_id = hl_id;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	726 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	727
16549 08557bad0b9d patch 8.1.1278: missing change for "combine" field Bram Moolenaar <Bram@vim.org> parents: 16060 diff changeset	728 di = dict_find(dict, (char_u *)"combine", -1);
08557bad0b9d patch 8.1.1278: missing change for "combine" field Bram Moolenaar <Bram@vim.org> parents: 16060 diff changeset	729 if (di != NULL)
08557bad0b9d patch 8.1.1278: missing change for "combine" field Bram Moolenaar <Bram@vim.org> parents: 16060 diff changeset	730 {
08557bad0b9d patch 8.1.1278: missing change for "combine" field Bram Moolenaar <Bram@vim.org> parents: 16060 diff changeset	731 if (tv_get_number(&di->di_tv))
08557bad0b9d patch 8.1.1278: missing change for "combine" field Bram Moolenaar <Bram@vim.org> parents: 16060 diff changeset	732 prop->pt_flags \|= PT_FLAG_COMBINE;
08557bad0b9d patch 8.1.1278: missing change for "combine" field Bram Moolenaar <Bram@vim.org> parents: 16060 diff changeset	733 else
08557bad0b9d patch 8.1.1278: missing change for "combine" field Bram Moolenaar <Bram@vim.org> parents: 16060 diff changeset	734 prop->pt_flags &= ~PT_FLAG_COMBINE;
08557bad0b9d patch 8.1.1278: missing change for "combine" field Bram Moolenaar <Bram@vim.org> parents: 16060 diff changeset	735 }
08557bad0b9d patch 8.1.1278: missing change for "combine" field Bram Moolenaar <Bram@vim.org> parents: 16060 diff changeset	736
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	737 di = dict_find(dict, (char_u *)"priority", -1);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	738 if (di != NULL)
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15182 diff changeset	739 prop->pt_priority = tv_get_number(&di->di_tv);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	740
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	741 di = dict_find(dict, (char_u *)"start_incl", -1);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	742 if (di != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	743 {
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15182 diff changeset	744 if (tv_get_number(&di->di_tv))
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	745 prop->pt_flags \|= PT_FLAG_INS_START_INCL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	746 else
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	747 prop->pt_flags &= ~PT_FLAG_INS_START_INCL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	748 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	749
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	750 di = dict_find(dict, (char_u *)"end_incl", -1);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	751 if (di != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	752 {
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15182 diff changeset	753 if (tv_get_number(&di->di_tv))
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	754 prop->pt_flags \|= PT_FLAG_INS_END_INCL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	755 else
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	756 prop->pt_flags &= ~PT_FLAG_INS_END_INCL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	757 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	758 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	759 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	760
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	761 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	762 * prop_type_add({name}, {props})
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	763 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	764 void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	765 f_prop_type_add(typval_T argvars, typval_T rettv UNUSED)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	766 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	767 prop_type_set(argvars, TRUE);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	768 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	769
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	770 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	771 * prop_type_change({name}, {props})
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	772 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	773 void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	774 f_prop_type_change(typval_T argvars, typval_T rettv UNUSED)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	775 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	776 prop_type_set(argvars, FALSE);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	777 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	778
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	779 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	780 * prop_type_delete({name} [, {bufnr}])
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	781 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	782 void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	783 f_prop_type_delete(typval_T argvars, typval_T rettv UNUSED)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	784 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	785 char_u *name;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	786 buf_T *buf = NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	787 hashitem_T *hi;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	788
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15182 diff changeset	789 name = tv_get_string(&argvars[0]);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	790 if (*name == NUL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	791 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	792 emsg(_(e_invarg));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	793 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	794 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	795
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	796 if (argvars[1].v_type != VAR_UNKNOWN)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	797 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	798 if (get_bufnr_from_arg(&argvars[1], &buf) == FAIL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	799 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	800 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	801
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	802 hi = find_prop_hi(name, buf);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	803 if (hi != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	804 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	805 hashtab_T *ht;
15144 7960bf50d345 patch 8.1.0582: text properties are not enabled Bram Moolenaar <Bram@vim.org> parents: 15138 diff changeset	806 proptype_T *prop = HI2PT(hi);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	807
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	808 if (buf == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	809 ht = global_proptypes;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	810 else
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	811 ht = buf->b_proptypes;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	812 hash_remove(ht, hi);
15144 7960bf50d345 patch 8.1.0582: text properties are not enabled Bram Moolenaar <Bram@vim.org> parents: 15138 diff changeset	813 vim_free(prop);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	814 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	815 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	816
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	817 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	818 * prop_type_get({name} [, {bufnr}])
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	819 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	820 void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	821 f_prop_type_get(typval_T argvars, typval_T rettv UNUSED)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	822 {
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15182 diff changeset	823 char_u *name = tv_get_string(&argvars[0]);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	824
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	825 if (*name == NUL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	826 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	827 emsg(_(e_invarg));
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	828 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	829 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	830 if (rettv_dict_alloc(rettv) == OK)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	831 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	832 proptype_T *prop = NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	833 buf_T *buf = NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	834
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	835 if (argvars[1].v_type != VAR_UNKNOWN)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	836 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	837 if (get_bufnr_from_arg(&argvars[1], &buf) == FAIL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	838 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	839 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	840
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	841 prop = find_prop(name, buf);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	842 if (prop != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	843 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	844 dict_T *d = rettv->vval.v_dict;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	845
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	846 if (prop->pt_hl_id > 0)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	847 dict_add_string(d, "highlight", syn_id2name(prop->pt_hl_id));
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	848 dict_add_number(d, "priority", prop->pt_priority);
16549 08557bad0b9d patch 8.1.1278: missing change for "combine" field Bram Moolenaar <Bram@vim.org> parents: 16060 diff changeset	849 dict_add_number(d, "combine",
08557bad0b9d patch 8.1.1278: missing change for "combine" field Bram Moolenaar <Bram@vim.org> parents: 16060 diff changeset	850 (prop->pt_flags & PT_FLAG_COMBINE) ? 1 : 0);
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	851 dict_add_number(d, "start_incl",
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	852 (prop->pt_flags & PT_FLAG_INS_START_INCL) ? 1 : 0);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	853 dict_add_number(d, "end_incl",
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	854 (prop->pt_flags & PT_FLAG_INS_END_INCL) ? 1 : 0);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	855 if (buf != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	856 dict_add_number(d, "bufnr", buf->b_fnum);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	857 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	858 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	859 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	860
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	861 static void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	862 list_types(hashtab_T ht, list_T l)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	863 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	864 long todo;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	865 hashitem_T *hi;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	866
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	867 todo = (long)ht->ht_used;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	868 for (hi = ht->ht_array; todo > 0; ++hi)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	869 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	870 if (!HASHITEM_EMPTY(hi))
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	871 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	872 proptype_T *prop = HI2PT(hi);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	873
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	874 list_append_string(l, prop->pt_name, -1);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	875 --todo;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	876 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	877 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	878 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	879
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	880 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	881 * prop_type_list([{bufnr}])
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	882 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	883 void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	884 f_prop_type_list(typval_T argvars, typval_T rettv UNUSED)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	885 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	886 buf_T *buf = NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	887
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	888 if (rettv_list_alloc(rettv) == OK)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	889 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	890 if (argvars[0].v_type != VAR_UNKNOWN)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	891 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	892 if (get_bufnr_from_arg(&argvars[0], &buf) == FAIL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	893 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	894 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	895 if (buf == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	896 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	897 if (global_proptypes != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	898 list_types(global_proptypes, rettv->vval.v_list);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	899 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	900 else if (buf->b_proptypes != NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	901 list_types(buf->b_proptypes, rettv->vval.v_list);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	902 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	903 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	904
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	905 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	906 * Free all property types in "ht".
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	907 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	908 static void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	909 clear_ht_prop_types(hashtab_T *ht)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	910 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	911 long todo;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	912 hashitem_T *hi;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	913
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	914 if (ht == NULL)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	915 return;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	916
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	917 todo = (long)ht->ht_used;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	918 for (hi = ht->ht_array; todo > 0; ++hi)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	919 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	920 if (!HASHITEM_EMPTY(hi))
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	921 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	922 proptype_T *prop = HI2PT(hi);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	923
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	924 vim_free(prop);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	925 --todo;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	926 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	927 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	928
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	929 hash_clear(ht);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	930 vim_free(ht);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	931 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	932
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	933 #if defined(EXITFREE) \|\| defined(PROTO)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	934 /*
15144 7960bf50d345 patch 8.1.0582: text properties are not enabled Bram Moolenaar <Bram@vim.org> parents: 15138 diff changeset	935 * Free all global property types.
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	936 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	937 void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	938 clear_global_prop_types(void)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	939 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	940 clear_ht_prop_types(global_proptypes);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	941 global_proptypes = NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	942 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	943 #endif
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	944
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	945 /*
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	946 * Free all property types for "buf".
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	947 */
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	948 void
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	949 clear_buf_prop_types(buf_T *buf)
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	950 {
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	951 clear_ht_prop_types(buf->b_proptypes);
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	952 buf->b_proptypes = NULL;
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	953 }
9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	954
15335 18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	955 /*
18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	956 * Adjust the columns of text properties in line "lnum" after position "col" to
18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	957 * shift by "bytes_added" (can be negative).
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	958 * Note that "col" is zero-based, while tp_col is one-based.
03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	959 * Only for the current buffer.
16714 ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	960 * "flags" can have:
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	961 * APC_SAVE_FOR_UNDO: Call u_savesub() before making changes to the line.
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	962 * APC_SUBSTITUTE: Text is replaced, not inserted.
16682 7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	963 * Caller is expected to check b_has_textprop and "bytes_added" being non-zero.
16698 23af483c4ceb patch 8.1.1351: text property wrong after :substitute Bram Moolenaar <Bram@vim.org> parents: 16682 diff changeset	964 * Returns TRUE when props were changed.
15335 18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	965 */
16698 23af483c4ceb patch 8.1.1351: text property wrong after :substitute Bram Moolenaar <Bram@vim.org> parents: 16682 diff changeset	966 int
15349 6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	967 adjust_prop_columns(
6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	968 linenr_T lnum,
6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	969 colnr_T col,
16698 23af483c4ceb patch 8.1.1351: text property wrong after :substitute Bram Moolenaar <Bram@vim.org> parents: 16682 diff changeset	970 int bytes_added,
16714 ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	971 int flags)
15335 18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	972 {
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	973 int proplen;
03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	974 char_u *props;
03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	975 textprop_T tmp_prop;
03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	976 proptype_T *pt;
03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	977 int dirty = FALSE;
15349 6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	978 int ri, wi;
6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	979 size_t textlen;
6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	980
6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	981 if (text_prop_frozen > 0)
16698 23af483c4ceb patch 8.1.1351: text property wrong after :substitute Bram Moolenaar <Bram@vim.org> parents: 16682 diff changeset	982 return FALSE;
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	983
03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	984 proplen = get_text_props(curbuf, lnum, &props, TRUE);
03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	985 if (proplen == 0)
16698 23af483c4ceb patch 8.1.1351: text property wrong after :substitute Bram Moolenaar <Bram@vim.org> parents: 16682 diff changeset	986 return FALSE;
15349 6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	987 textlen = curbuf->b_ml.ml_line_len - proplen * sizeof(textprop_T);
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	988
15349 6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	989 wi = 0; // write index
6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	990 for (ri = 0; ri < proplen; ++ri)
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	991 {
16714 ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	992 int start_incl;
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	993
15349 6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	994 mch_memmove(&tmp_prop, props + ri * sizeof(textprop_T),
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	995 sizeof(textprop_T));
03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	996 pt = text_prop_type_by_id(curbuf, tmp_prop.tp_type);
16714 ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	997 start_incl = (flags & APC_SUBSTITUTE) \|\|
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	998 (pt != NULL && (pt->pt_flags & PT_FLAG_INS_START_INCL));
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	999
15349 6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	1000 if (bytes_added > 0
16714 ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1001 && (tmp_prop.tp_col >= col + (start_incl ? 2 : 1)))
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1002 {
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1003 if (tmp_prop.tp_col < col + (start_incl ? 2 : 1))
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1004 {
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1005 tmp_prop.tp_len += (tmp_prop.tp_col - 1 - col) + bytes_added;
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1006 tmp_prop.tp_col = col + 1;
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1007 }
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1008 else
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1009 tmp_prop.tp_col += bytes_added;
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1010 // Save for undo if requested and not done yet.
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1011 if ((flags & APC_SAVE_FOR_UNDO) && !dirty)
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1012 u_savesub(lnum);
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1013 dirty = TRUE;
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1014 }
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1015 else if (bytes_added <= 0 && (tmp_prop.tp_col > col + 1))
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	1016 {
16682 7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1017 if (tmp_prop.tp_col + bytes_added < col + 1)
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1018 {
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1019 tmp_prop.tp_len += (tmp_prop.tp_col - 1 - col) + bytes_added;
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1020 tmp_prop.tp_col = col + 1;
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1021 }
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1022 else
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1023 tmp_prop.tp_col += bytes_added;
16698 23af483c4ceb patch 8.1.1351: text property wrong after :substitute Bram Moolenaar <Bram@vim.org> parents: 16682 diff changeset	1024 // Save for undo if requested and not done yet.
16714 ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1025 if ((flags & APC_SAVE_FOR_UNDO) && !dirty)
16698 23af483c4ceb patch 8.1.1351: text property wrong after :substitute Bram Moolenaar <Bram@vim.org> parents: 16682 diff changeset	1026 u_savesub(lnum);
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	1027 dirty = TRUE;
16682 7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1028 if (tmp_prop.tp_len <= 0)
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1029 continue; // drop this text property
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	1030 }
15349 6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	1031 else if (tmp_prop.tp_len > 0
6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	1032 && tmp_prop.tp_col + tmp_prop.tp_len > col
15373 44dd3ce11201 patch 8.1.0694: when using text props may free memory that is not allocated Bram Moolenaar <Bram@vim.org> parents: 15367 diff changeset	1033 + ((pt != NULL && (pt->pt_flags & PT_FLAG_INS_END_INCL))
15349 6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	1034 ? 0 : 1))
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	1035 {
16682 7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1036 int after = col - bytes_added
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1037 - (tmp_prop.tp_col - 1 + tmp_prop.tp_len);
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1038 if (after > 0)
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1039 tmp_prop.tp_len += bytes_added + after;
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1040 else
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16678 diff changeset	1041 tmp_prop.tp_len += bytes_added;
16698 23af483c4ceb patch 8.1.1351: text property wrong after :substitute Bram Moolenaar <Bram@vim.org> parents: 16682 diff changeset	1042 // Save for undo if requested and not done yet.
16714 ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash Bram Moolenaar <Bram@vim.org> parents: 16698 diff changeset	1043 if ((flags & APC_SAVE_FOR_UNDO) && !dirty)
16698 23af483c4ceb patch 8.1.1351: text property wrong after :substitute Bram Moolenaar <Bram@vim.org> parents: 16682 diff changeset	1044 u_savesub(lnum);
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	1045 dirty = TRUE;
15349 6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	1046 if (tmp_prop.tp_len <= 0)
6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	1047 continue; // drop this text property
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	1048 }
15349 6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	1049 mch_memmove(props + wi * sizeof(textprop_T), &tmp_prop,
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	1050 sizeof(textprop_T));
15349 6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	1051 ++wi;
6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	1052 }
6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	1053 if (dirty)
6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	1054 {
15373 44dd3ce11201 patch 8.1.0694: when using text props may free memory that is not allocated Bram Moolenaar <Bram@vim.org> parents: 15367 diff changeset	1055 colnr_T newlen = (int)textlen + wi * (colnr_T)sizeof(textprop_T);
44dd3ce11201 patch 8.1.0694: when using text props may free memory that is not allocated Bram Moolenaar <Bram@vim.org> parents: 15367 diff changeset	1056
44dd3ce11201 patch 8.1.0694: when using text props may free memory that is not allocated Bram Moolenaar <Bram@vim.org> parents: 15367 diff changeset	1057 if ((curbuf->b_ml.ml_flags & ML_LINE_DIRTY) == 0)
44dd3ce11201 patch 8.1.0694: when using text props may free memory that is not allocated Bram Moolenaar <Bram@vim.org> parents: 15367 diff changeset	1058 curbuf->b_ml.ml_line_ptr =
44dd3ce11201 patch 8.1.0694: when using text props may free memory that is not allocated Bram Moolenaar <Bram@vim.org> parents: 15367 diff changeset	1059 vim_memsave(curbuf->b_ml.ml_line_ptr, newlen);
15349 6abee072b93c patch 8.1.0682: text properties not adjusted when backspacing replaced text Bram Moolenaar <Bram@vim.org> parents: 15341 diff changeset	1060 curbuf->b_ml.ml_flags \|= ML_LINE_DIRTY;
15373 44dd3ce11201 patch 8.1.0694: when using text props may free memory that is not allocated Bram Moolenaar <Bram@vim.org> parents: 15367 diff changeset	1061 curbuf->b_ml.ml_line_len = newlen;
15341 03a7a9fdb792 patch 8.1.0678: text properties as not adjusted for inserted text Bram Moolenaar <Bram@vim.org> parents: 15335 diff changeset	1062 }
16698 23af483c4ceb patch 8.1.1351: text property wrong after :substitute Bram Moolenaar <Bram@vim.org> parents: 16682 diff changeset	1063 return dirty;
15335 18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	1064 }
18c20ceee4b5 patch 8.1.0675: text property column in screen columns is not practical Bram Moolenaar <Bram@vim.org> parents: 15294 diff changeset	1065
15367 273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1066 /*
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1067 * Adjust text properties for a line that was split in two.
16662 1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1068 * "lnum_props" is the line that has the properties from before the split.
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1069 * "lnum_top" is the top line.
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1070 * "kept" is the number of bytes kept in the first line, while
15367 273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1071 * "deleted" is the number of bytes deleted.
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1072 */
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1073 void
16662 1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1074 adjust_props_for_split(
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1075 linenr_T lnum_props,
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1076 linenr_T lnum_top,
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1077 int kept,
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1078 int deleted)
15367 273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1079 {
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1080 char_u *props;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1081 int count;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1082 garray_T prevprop;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1083 garray_T nextprop;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1084 int i;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1085 int skipped = kept + deleted;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1086
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1087 if (!curbuf->b_has_textprop)
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1088 return;
16662 1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1089
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1090 // Get the text properties from "lnum_props".
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1091 count = get_text_props(curbuf, lnum_props, &props, FALSE);
15367 273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1092 ga_init2(&prevprop, sizeof(textprop_T), 10);
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1093 ga_init2(&nextprop, sizeof(textprop_T), 10);
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1094
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1095 // Keep the relevant ones in the first line, reducing the length if needed.
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1096 // Copy the ones that include the split to the second line.
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1097 // Move the ones after the split to the second line.
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1098 for (i = 0; i < count; ++i)
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1099 {
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1100 textprop_T prop;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1101 textprop_T *p;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1102
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1103 // copy the prop to an aligned structure
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1104 mch_memmove(&prop, props + i * sizeof(textprop_T), sizeof(textprop_T));
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1105
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1106 if (prop.tp_col < kept && ga_grow(&prevprop, 1) == OK)
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1107 {
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1108 p = ((textprop_T *)prevprop.ga_data) + prevprop.ga_len;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1109 *p = prop;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1110 if (p->tp_col + p->tp_len >= kept)
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1111 p->tp_len = kept - p->tp_col;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1112 ++prevprop.ga_len;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1113 }
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1114
16670 5733d8e33bce patch 8.1.1337: get empty text prop when splitting line just after text prop Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	1115 // Only add the property to the next line if the length is bigger than
5733d8e33bce patch 8.1.1337: get empty text prop when splitting line just after text prop Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	1116 // zero.
5733d8e33bce patch 8.1.1337: get empty text prop when splitting line just after text prop Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	1117 if (prop.tp_col + prop.tp_len > skipped && ga_grow(&nextprop, 1) == OK)
15367 273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1118 {
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1119 p = ((textprop_T *)nextprop.ga_data) + nextprop.ga_len;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1120 *p = prop;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1121 if (p->tp_col > skipped)
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1122 p->tp_col -= skipped - 1;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1123 else
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1124 {
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1125 p->tp_len -= skipped - p->tp_col;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1126 p->tp_col = 1;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1127 }
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1128 ++nextprop.ga_len;
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1129 }
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1130 }
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1131
16662 1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1132 set_text_props(lnum_top, prevprop.ga_data,
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1133 prevprop.ga_len * sizeof(textprop_T));
15367 273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1134 ga_clear(&prevprop);
16662 1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1135 set_text_props(lnum_top + 1, nextprop.ga_data,
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16549 diff changeset	1136 nextprop.ga_len * sizeof(textprop_T));
15367 273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1137 ga_clear(&nextprop);
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1138 }
273649cad196 patch 8.1.0691: text properties are not adjusted for :substitute Bram Moolenaar <Bram@vim.org> parents: 15355 diff changeset	1139
16678 6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1140 /*
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1141 * Line "lnum" has been joined and will end up at column "col" in the new line.
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1142 * "removed" bytes have been removed from the start of the line, properties
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1143 * there are to be discarded.
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1144 * Move the adjusted text properties to an allocated string, store it in
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1145 * "prop_line" and adjust the columns.
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1146 */
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1147 void
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1148 adjust_props_for_join(
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1149 linenr_T lnum,
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1150 textprop_T **prop_line,
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1151 int *prop_length,
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1152 long col,
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1153 int removed)
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1154 {
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1155 int proplen;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1156 char_u *props;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1157 int ri;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1158 int wi = 0;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1159
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1160 proplen = get_text_props(curbuf, lnum, &props, FALSE);
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1161 if (proplen > 0)
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1162 {
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1163 prop_line = (textprop_T )alloc(proplen * (int)sizeof(textprop_T));
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1164 if (*prop_line != NULL)
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1165 {
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1166 for (ri = 0; ri < proplen; ++ri)
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1167 {
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1168 textprop_T cp = prop_line + wi;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1169
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1170 mch_memmove(cp, props + ri * sizeof(textprop_T),
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1171 sizeof(textprop_T));
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1172 if (cp->tp_col + cp->tp_len > removed)
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1173 {
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1174 if (cp->tp_col > removed)
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1175 cp->tp_col += col;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1176 else
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1177 {
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1178 // property was partly deleted, make it shorter
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1179 cp->tp_len -= removed - cp->tp_col;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1180 cp->tp_col = col;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1181 }
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1182 ++wi;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1183 }
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1184 }
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1185 }
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1186 *prop_length = wi;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1187 }
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1188 }
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1189
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1190 /*
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1191 * After joining lines: concatenate the text and the properties of all joined
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1192 * lines into one line and replace the line.
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1193 */
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1194 void
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1195 join_prop_lines(
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1196 linenr_T lnum,
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1197 char_u *newp,
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1198 textprop_T **prop_lines,
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1199 int *prop_lengths,
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1200 int count)
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1201 {
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1202 size_t proplen = 0;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1203 size_t oldproplen;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1204 char_u *props;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1205 int i;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1206 int len;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1207 char_u *line;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1208 size_t l;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1209
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1210 for (i = 0; i < count - 1; ++i)
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1211 proplen += prop_lengths[i];
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1212 if (proplen == 0)
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1213 {
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1214 ml_replace(lnum, newp, FALSE);
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1215 return;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1216 }
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1217
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1218 // get existing properties of the joined line
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1219 oldproplen = get_text_props(curbuf, lnum, &props, FALSE);
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1220
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1221 len = (int)STRLEN(newp) + 1;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1222 line = alloc(len + (oldproplen + proplen) * (int)sizeof(textprop_T));
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1223 if (line == NULL)
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1224 return;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1225 mch_memmove(line, newp, len);
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1226 l = oldproplen * sizeof(textprop_T);
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1227 mch_memmove(line + len, props, l);
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1228 len += l;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1229
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1230 for (i = 0; i < count - 1; ++i)
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1231 if (prop_lines[i] != NULL)
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1232 {
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1233 l = prop_lengths[i] * sizeof(textprop_T);
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1234 mch_memmove(line + len, prop_lines[i], l);
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1235 len += l;
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1236 vim_free(prop_lines[i]);
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1237 }
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1238
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1239 ml_replace_len(lnum, line, len, TRUE, FALSE);
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1240 vim_free(newp);
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1241 vim_free(prop_lines);
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1242 vim_free(prop_lengths);
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1243 }
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16676 diff changeset	1244
15138 9df130fd5e0d patch 8.1.0579: cannot attach properties to text Bram Moolenaar <Bram@vim.org> parents: diff changeset	1245 #endif // FEAT_TEXT_PROP

Mercurial > vim

annotate src/textprop.c @ 16714:ba592f30c082 v8.1.1359