A message that is not in the archive (sent off-list or not yet received): 20220301070226.2477769-1-jaydeepjd.8914
This patch removes the previously implemented regex for matching method calls and adds a new regex for specially matching floating numbers starting with a decimal point.
Added some more compound operators and their tests.
--
Thanks :-]
Jaydeep
PATCH v5 1/1 userdiff: add builtin diff driver for kotlin language.
The xfuncname pattern finds func/class declarations in diffs to display as a hunk header. The word_regex pattern finds individual tokens in Kotlin code to generate appropriate diffs.
This patch adds xfuncname regex and word_regex for Kotlin language.
--- Documentation/gitattributes.txt | 2 ++ t/t4018/kotlin-class | 5 ++++ t/t4018/kotlin-enum-class | 5 ++++ t/t4018/kotlin-fun | 5 ++++ t/t4018/kotlin-inheritace-class | 5 ++++ t/t4018/kotlin-inline-class | 5 ++++ t/t4018/kotlin-interface | 5 ++++ t/t4018/kotlin-nested-fun | 9 +++++++ t/t4018/kotlin-public-class | 5 ++++ t/t4018/kotlin-sealed-class | 5 ++++ t/t4034-diff-words.sh | 1 + t/t4034/kotlin/expect | 42 +++++++++++++++++++++++++++++++++ t/t4034/kotlin/post | 29 +++++++++++++++++++++++ t/t4034/kotlin/pre | 29 +++++++++++++++++++++++ userdiff.c | 12 ++++++++++ 15 files changed, 164 insertions(+) create mode 100644 t/t4018/kotlin-class create mode 100644 t/t4018/kotlin-enum-class create mode 100644 t/t4018/kotlin-fun create mode 100644 t/t4018/kotlin-inheritace-class create mode 100644 t/t4018/kotlin-inline-class create mode 100644 t/t4018/kotlin-interface create mode 100644 t/t4018/kotlin-nested-fun create mode 100644 t/t4018/kotlin-public-class create mode 100644 t/t4018/kotlin-sealed-class create mode 100644 t/t4034/kotlin/expect create mode 100644 t/t4034/kotlin/post create mode 100644 t/t4034/kotlin/pre
Documentation/gitattributes.txt +2 -0
@@ -829,6 +829,8 @@ patterns are available: - `java` suitable for source code in the Java language. +- `kotlin` suitable for source code in the Kotlin language. + - `markdown` suitable for Markdown documents. - `matlab` suitable for source code in the MATLAB and Octave languages.
t/t4018/kotlin-class new file +5 -0
@@ -0,0 +1,5 @@ +class RIGHT { + //comment + //comment + return ChangeMe +}
t/t4018/kotlin-enum-class new file +5 -0
@@ -0,0 +1,5 @@ +enum class RIGHT{ + // Left + // a comment + ChangeMe +}
t/t4018/kotlin-fun new file +5 -0
@@ -0,0 +1,5 @@ +fun RIGHT(){ + //a comment + //b comment + return ChangeMe() +}
t/t4018/kotlin-inheritace-class new file +5 -0
@@ -0,0 +1,5 @@ +open class RIGHT{ + // a comment + // b comment + // ChangeMe +}
t/t4018/kotlin-inline-class new file +5 -0
@@ -0,0 +1,5 @@ +value class RIGHT(Args){ + // a comment + // b comment + ChangeMe +}
t/t4018/kotlin-interface new file +5 -0
@@ -0,0 +1,5 @@ +interface RIGHT{ + //another comment + //another comment + //ChangeMe +}
t/t4018/kotlin-nested-fun new file +9 -0
@@ -0,0 +1,9 @@ +class LEFT{ + class CENTER{ + fun RIGHT( a:Int){ + //comment + //comment + ChangeMe + } + } +}
t/t4018/kotlin-public-class new file +5 -0
@@ -0,0 +1,5 @@ +public class RIGHT{ + //comment1 + //comment2 + ChangeMe +}
t/t4018/kotlin-sealed-class new file +5 -0
@@ -0,0 +1,5 @@ +sealed class RIGHT { + // a comment + // b comment + ChangeMe +}
t/t4034-diff-words.sh +1 -0
@@ -324,6 +324,7 @@ test_language_driver dts test_language_driver fortran test_language_driver html test_language_driver java +test_language_driver kotlin test_language_driver matlab test_language_driver objc test_language_driver pascal
t/t4034/kotlin/expect new file +42 -0
42 lines not on this page · raw message
t/t4034/kotlin/post new file +29 -0
@@ -0,0 +1,29 @@ +println("Hello World?") +(1) (-1e10) (0xabcdef) 'y' +[x] x->y x.y +!x x.inv() x*y x&y +x*y x/y x%y +x+y x-y +a shl b +x<y x<=y x>y x>=y +x==y x!=y x===y +x and y +x^y +x or y +x&&y x||y +x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y +a+=b c=d e<=f g>=h i/j k%l m<<n o>>p q&r s^t u|v +a<=b +a|b a&b +x,y +--a!=--b +a++!=++b +0xFF_E1_DE_5E 0b100_100 200_000 +a===b +a!=b +_33.find(arr) +X.find() +X.f+1 +X.u+2 +a..b +a?:b
t/t4034/kotlin/pre new file +29 -0
@@ -0,0 +1,29 @@ +println("Hello World!\n") +1 -1e10 0xabcdef 'x' +[a] a->b a.b +!a a.inv() a*b a&b +a*b a/b a%b +a+b a-b +a shr b +a<b a<=b a>b a>=b +a==b a!=b a===b +a and b +a^b +a or b +a&&b a||b +a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b +a=b c+=d e-=f g*=h i/=j k%=l m<<=n o>>=p q&=r s^=t u|=v +a<<=b +a||b a&&b +a,y +--a==--b +a++==++b +0xFF_EC_DE_5E 0b100_000 100_000 +a==b +a!!b +_32.find(arr) +X.fill() +X.u+1 +X.u-2 +a.b +a?.b
userdiff.c +12 -0
@@ -168,6 +168,18 @@ PATTERNS("java","|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?" "|[-+*/<>%&^|=!]=" "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"), +PATTERNS ("kotlin" , +"^[ \t]*(([a-z]+[ \t]+)*(fun|class|interface)[ \t]+.*)$" , +/* -- */ +"[a-zA-Z_][a-zA-Z0-9_]*" +/* hexadecimal and binary numbers */ +"|0[xXbB][0-9a-fA-F_]+[lLuU]*" +/* integers and floats */ +"|[0-9][.]?[0-9_]+([Ee][-+]?[0-9]+)?[fFlL]*" +/* floating point numbers beginning with decimal point */ +"|[.][0-9][0-9]*([Ee][-+]?[0-9]+)?[fFlLuU]?" +/* unary and binary operators */ +"|[-+*/<>%&^|=!]?==?|--|\\+\\+|<<?=?|>>?=?|&&|\\|[|]?|->|\\.\\*|!!|::|[?:.][.:]" ), PATTERNS("markdown", "^ {0,3}#{1,6}[ \t].*",/* -- */
Signature · 1 line
2.35.1
Please ignore this patch. I think I made some mistake when copy-pasting the In-reply-to code.
Sorry for the trouble. I have sent this same patch on the appropriate thread.
Thanks,
Jaydeep.