]> git.ipfire.org Git - thirdparty/git.git/commit - t/t4034-diff-words.sh
userdiff: add built-in pattern for CSS
authorWilliam Duclot <william.duclot@ensimag.grenoble-inp.fr>
Fri, 3 Jun 2016 12:32:26 +0000 (14:32 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Jun 2016 21:45:56 +0000 (14:45 -0700)
commit0719f3eecd1234f6331cab980088239207e93335
treebb3a1a01ac9412ef6c35bf8337b278a221e96f14
parent4b0891ffe4ec3aef081cf48c5f9a747586076f7a
userdiff: add built-in pattern for CSS

CSS is widely used, motivating it being included as a built-in pattern.

It must be noted that the word_regex for CSS (i.e. the regex defining
what is a word in the language) does not consider '.' and '#' characters
(in CSS selectors) to be part of the word. This behavior is documented
by the test t/t4018/css-rule.
The logic behind this behavior is the following: identifiers in CSS
selectors are identifiers in a HTML/XML document. Therefore, the '.'/'#'
character are not part of the identifier, but an indicator of the nature
of the identifier in HTML/XML (class or id). Diffing ".class1" and
".class2" must show that the class name is changed, but we still are
selecting a class.

Logic behind the "pattern" regex is:
    1. reject lines ending with a colon/semicolon (properties)
    2. if a line begins with a name in column 1, pick the whole line

Credits to Johannes Sixt (j6t@kdbg.org) for the pattern regex and most
of the tests.

Signed-off-by: William Duclot <william.duclot@ensimag.grenoble-inp.fr>
Signed-off-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 files changed:
Documentation/gitattributes.txt
t/t4018-diff-funcname.sh
t/t4018/css-brace-in-col-1 [new file with mode: 0644]
t/t4018/css-colon-eol [new file with mode: 0644]
t/t4018/css-colon-selector [new file with mode: 0644]
t/t4018/css-common [new file with mode: 0644]
t/t4018/css-long-selector-list [new file with mode: 0644]
t/t4018/css-prop-sans-indent [new file with mode: 0644]
t/t4018/css-short-selector-list [new file with mode: 0644]
t/t4018/css-trailing-space [new file with mode: 0644]
t/t4034-diff-words.sh
t/t4034/css/expect [new file with mode: 0644]
t/t4034/css/post [new file with mode: 0644]
t/t4034/css/pre [new file with mode: 0644]
userdiff.c