mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-17 07:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Add unittest spec for option.c (#5289)

Browse Source 
Move typedef expand_T to types.h for tests
Fix lint error for old style comments

Describe 'check_ff_value' valid values as an initial test.

Fix 'get_sts_value' comment inaccuracy and add unit test for it
This commit is contained in:
Kalle Ranki
2016-09-04 10:54:41 +03:00
committed by Justin M. Keyes
parent 9bba8ba372
commit e75e9c10dc
4 changed files with 79 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/nvim/ex_cmds_defs.h
View File

@@ -126,39 +126,36 @@ struct exarg {
struct condstack *cstack; ///< condition stack for ":if" etc.
};
#define FORCE_BIN 1 /* ":edit ++bin file" */
#define FORCE_NOBIN 2 /* ":edit ++nobin file" */
#define FORCE_BIN 1 // ":edit ++bin file"
#define FORCE_NOBIN 2 // ":edit ++nobin file"
/* Values for "flags" */
#define EXFLAG_LIST 0x01 /* 'l': list */
#define EXFLAG_NR 0x02 /* '#': number */
#define EXFLAG_PRINT 0x04 /* 'p': print */
// Values for "flags"
#define EXFLAG_LIST 0x01 // 'l': list
#define EXFLAG_NR 0x02 // '#': number
#define EXFLAG_PRINT 0x04 // 'p': print
/*
* used for completion on the command line
*/
typedef struct expand {
int xp_context; /* type of expansion */
char_u *xp_pattern; /* start of item to expand */
int xp_pattern_len; /* bytes in xp_pattern before cursor */
char_u *xp_arg; /* completion function */
int xp_scriptID; /* SID for completion function */
int xp_backslash; /* one of the XP_BS_ values */
// used for completion on the command line
struct expand {
int xp_context; // type of expansion
char_u *xp_pattern; // start of item to expand
int xp_pattern_len; // bytes in xp_pattern before cursor
char_u *xp_arg; // completion function
int xp_scriptID; // SID for completion function
int xp_backslash; // one of the XP_BS_ values
#ifndef BACKSLASH_IN_FILENAME
int xp_shell; /* TRUE for a shell command, more
characters need to be escaped */
int xp_shell; // TRUE for a shell command, more
// characters need to be escaped
#endif
int xp_numfiles; /* number of files found by
file name completion */
char_u **xp_files; /* list of files */
char_u *xp_line; /* text being completed */
int xp_col; /* cursor position in line */
} expand_T;
int xp_numfiles; // number of files found by file name completion
char_u **xp_files; // list of files
char_u *xp_line; // text being completed
int xp_col; // cursor position in line
};
/* values for xp_backslash */
#define XP_BS_NONE 0 /* nothing special for backslashes */
#define XP_BS_ONE 1 /* uses one backslash before a space */
#define XP_BS_THREE 2 /* uses three backslashes before a space */
// values for xp_backslash
#define XP_BS_NONE 0 // nothing special for backslashes
#define XP_BS_ONE 1 // uses one backslash before a space
#define XP_BS_THREE 2 // uses three backslashes before a space
/// Command modifiers ":vertical", ":browse", ":confirm", ":hide", etc. set a
/// flag. This needs to be saved for recursive commands, put them in a

6
src/nvim/option.c
View File

@@ -6585,10 +6585,8 @@ int get_sw_value(buf_T *buf)
return (int)result;
}
/*
* Return the effective softtabstop value for the current buffer, using the
* 'tabstop' value when 'softtabstop' is negative.
*/
// Return the effective softtabstop value for the current buffer,
// using the effective shiftwidth value when 'softtabstop' is negative.
int get_sts_value(void)
{
long result = curbuf->b_p_sts < 0 ? get_sw_value(curbuf) : curbuf->b_p_sts;

1
src/nvim/types.h
View File

@@ -13,4 +13,5 @@ typedef unsigned char char_u;
// Can hold one decoded UTF-8 character.
typedef uint32_t u8char_T;
typedef struct expand expand_T;
#endif // NVIM_TYPES_H