diff options
| author |  Sohom Datta <sohom.datta@learner.manipal.edu> | 2020-10-08 08:36:04 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-08 10:21:11 -0700 |
| commit | ff01513f45a74d08fdd43f72461800a915e15c90 (patch) | |
| tree | 517c82e99ceb83f6ae5ce007e65a13a8093247fb | |
| parent | Git 2.29-rc0 (diff) | |
| download | tgif-ff01513f45a74d08fdd43f72461800a915e15c90.tar.xz | |
userdiff: expand detected chunk headers for css
The regex used for the CSS builtin diff driver in git is only
able to show chunk headers for lines that start with a number,
a letter or an underscore.
However, the regex fails to detect classes (starts with a .), ids
(starts with a #), :root and attribute-value based selectors (for
example [class*="col-"]), as well as @based block-level statements
like @page,@keyframes and @media since all of them, start with a
special character.
Allow the selectors and block level statements to begin with these
special characters.
Signed-off-by: Sohom Datta <sohom.datta@learner.manipal.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/t4018/css-attribute-value-selector | 4 | ||||
| -rw-r--r-- | t/t4018/css-block-level-@-statements | 10 | ||||
| -rw-r--r-- | t/t4018/css-class-selector | 4 | ||||
| -rw-r--r-- | t/t4018/css-id-selector | 4 | ||||
| -rw-r--r-- | t/t4018/css-root-selector | 4 | ||||
| -rw-r--r-- | userdiff.c | 2 |
6 files changed, 27 insertions, 1 deletions
diff --git a/t/t4018/css-attribute-value-selector b/t/t4018/css-attribute-value-selector new file mode 100644 index 0000000000..918256b20c --- /dev/null +++ b/t/t4018/css-attribute-value-selector @@ -0,0 +1,4 @@ +[class*="RIGHT"] { + background : #000; + border : 10px ChangeMe #C6C6C6; +} diff --git a/t/t4018/css-block-level-@-statements b/t/t4018/css-block-level-@-statements new file mode 100644 index 0000000000..d6755f2f3d --- /dev/null +++ b/t/t4018/css-block-level-@-statements @@ -0,0 +1,10 @@ +@keyframes RIGHT { + from { + background : #000; + border : 10px ChangeMe #C6C6C6; + } + to { + background : #fff; + border : 10px solid #C6C6C6; + } +} diff --git a/t/t4018/css-class-selector b/t/t4018/css-class-selector new file mode 100644 index 0000000000..f790a0062f --- /dev/null +++ b/t/t4018/css-class-selector @@ -0,0 +1,4 @@ +.RIGHT { + background : #000; + border : 10px ChangeMe #C6C6C6; +} diff --git a/t/t4018/css-id-selector b/t/t4018/css-id-selector new file mode 100644 index 0000000000..17c5111052 --- /dev/null +++ b/t/t4018/css-id-selector @@ -0,0 +1,4 @@ +#RIGHT { + background : #000; + border : 10px ChangeMe #C6C6C6; +} diff --git a/t/t4018/css-root-selector b/t/t4018/css-root-selector new file mode 100644 index 0000000000..22b958e369 --- /dev/null +++ b/t/t4018/css-root-selector @@ -0,0 +1,4 @@ +:RIGHT { + background : #000; + border : 10px ChangeMe #C6C6C6; +} diff --git a/userdiff.c b/userdiff.c index fde02f225b..f6a4b0fb2e 100644 --- a/userdiff.c +++ b/userdiff.c @@ -200,7 +200,7 @@ PATTERNS("csharp", "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), IPATTERN("css", "![:;][[:space:]]*$\n" - "^[_a-z0-9].*$", + "^[:[@.#]?[_a-z0-9].*$", /* -- */ /* * This regex comes from W3C CSS specs. Should theoretically also |