mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-21 20:14:44 +00:00
Merge pull request #2258 from libgit2/jk/userdiff-cc
pull userdiff pattern updates from git.git
This commit is contained in:
commit
3ed8d00cc8
@ -45,13 +45,13 @@ typedef struct {
|
|||||||
static git_diff_driver_definition builtin_defs[] = {
|
static git_diff_driver_definition builtin_defs[] = {
|
||||||
|
|
||||||
IPATTERN("ada",
|
IPATTERN("ada",
|
||||||
"!^(.*[ \t])?(is new|renames|is separate)([ \t].*)?$\n"
|
"!^(.*[ \t])?(is[ \t]+new|renames|is[ \t]+separate)([ \t].*)?$\n"
|
||||||
"!^[ \t]*with[ \t].*$\n"
|
"!^[ \t]*with[ \t].*$\n"
|
||||||
"^[ \t]*((procedure|function)[ \t]+.*)$\n"
|
"^[ \t]*((procedure|function)[ \t]+.*)$\n"
|
||||||
"^[ \t]*((package|protected|task)[ \t]+.*)$",
|
"^[ \t]*((package|protected|task)[ \t]+.*)$",
|
||||||
/* -- */
|
/* -- */
|
||||||
"[a-zA-Z][a-zA-Z0-9_]*"
|
"[a-zA-Z][a-zA-Z0-9_]*"
|
||||||
"|[0-9][-+0-9#_.eE]"
|
"|[-+]?[0-9][0-9#_.aAbBcCdDeEfF]*([eE][+-]?[0-9_]+)?"
|
||||||
"|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"),
|
"|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"),
|
||||||
|
|
||||||
IPATTERN("fortran",
|
IPATTERN("fortran",
|
||||||
@ -159,15 +159,13 @@ PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
|
|||||||
|
|
||||||
PATTERNS("cpp",
|
PATTERNS("cpp",
|
||||||
/* Jump targets or access declarations */
|
/* Jump targets or access declarations */
|
||||||
"!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:.*$\n"
|
"!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:[[:space:]]*($|/[/*])\n"
|
||||||
/* C/++ functions/methods at top level */
|
/* functions/methods, variables, and compounds at top level */
|
||||||
"^([A-Za-z_][A-Za-z_0-9]*([ \t*]+[A-Za-z_][A-Za-z_0-9]*([ \t]*::[ \t]*[^[:space:]]+)?){1,}[ \t]*\\([^;]*)$\n"
|
"^((::[[:space:]]*)?[A-Za-z_].*)$",
|
||||||
/* compound type at top level */
|
|
||||||
"^((struct|class|enum)[^;]*)$",
|
|
||||||
/* -- */
|
/* -- */
|
||||||
"[a-zA-Z_][a-zA-Z0-9_]*"
|
"[a-zA-Z_][a-zA-Z0-9_]*"
|
||||||
"|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
|
"|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lLuU]*"
|
||||||
"|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"),
|
"|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"),
|
||||||
|
|
||||||
PATTERNS("csharp",
|
PATTERNS("csharp",
|
||||||
/* Keywords */
|
/* Keywords */
|
||||||
|
Loading…
Reference in New Issue
Block a user