From 825722cea1e33dea9279c84001446e5b1f68f447 Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Thu, 13 Jun 2019 17:18:30 +0100 Subject: [PATCH 1/4] Add Groovy custom filetype --- data/filedefs/filetypes.Groovy.conf | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 data/filedefs/filetypes.Groovy.conf diff --git a/data/filedefs/filetypes.Groovy.conf b/data/filedefs/filetypes.Groovy.conf new file mode 100644 index 0000000000..d3cd68c4f3 --- /dev/null +++ b/data/filedefs/filetypes.Groovy.conf @@ -0,0 +1,33 @@ +[styling=C] + +[keywords] +# http://docs.groovy-lang.org/docs/next/html/documentation/#_keywords +primary=as assert break case catch class const continue def default do else enum extends false finally for goto if implements import in instanceof interface new null package return super switch this throw throws trait true try while +# http://groovy-lang.org/objectorientation.html#_primitive_types +secondary=boolean byte char double float int long short void +# documentation keywords for javadoc +doccomment=author deprecated exception param return see serial serialData serialField since throws todo version +typedefs= + +[lexer_properties=C] +lexer.cpp.allow.dollars=1 +lexer.cpp.triplequoted.strings=1 + +[settings] +lexer_filetype=C +tag_parser=C +extension=groovy +mime_type=text/x-groovy + +[build-menu] +#~ FT_00_LB=_Compile +#~ FT_00_CM=kotlinc "%f" +#~ FT_00_WD= + +#~ EX_00_LB=_Execute +#~ EX_00_CM=kotlin "%eKt" +#~ EX_00_WD= + +#~ EX_01_LB=Execute _Script +#~ EX_01_CM=kotlinc -script "%f" +#~ EX_01_WD= From 4c96f87c35838a437d8fd141887449cfdcc11794 Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Thu, 13 Jun 2019 17:54:10 +0100 Subject: [PATCH 2/4] Don't highlight lines with unterminated string literal; C++ tags --- data/filedefs/filetypes.Groovy.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/filedefs/filetypes.Groovy.conf b/data/filedefs/filetypes.Groovy.conf index d3cd68c4f3..9b6be5078d 100644 --- a/data/filedefs/filetypes.Groovy.conf +++ b/data/filedefs/filetypes.Groovy.conf @@ -1,4 +1,5 @@ [styling=C] +stringeol=string_1 [keywords] # http://docs.groovy-lang.org/docs/next/html/documentation/#_keywords @@ -15,7 +16,7 @@ lexer.cpp.triplequoted.strings=1 [settings] lexer_filetype=C -tag_parser=C +tag_parser=C++ extension=groovy mime_type=text/x-groovy From 06a04bf101e2c4a2e7bcb18dbab5c16f772eeeaf Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Thu, 13 Jun 2019 18:01:10 +0100 Subject: [PATCH 3/4] filetype registration --- data/Makefile.am | 1 + data/filetype_extensions.conf | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data/Makefile.am b/data/Makefile.am index 04dead33e9..f23104d751 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -37,6 +37,7 @@ filetypes = \ filedefs/filetypes.glsl \ filedefs/filetypes.go \ filedefs/filetypes.Graphviz.conf \ + filedefs/filetypes.Groovy.conf \ filedefs/filetypes.haskell \ filedefs/filetypes.haxe \ filedefs/filetypes.html \ diff --git a/data/filetype_extensions.conf b/data/filetype_extensions.conf index 4f0d309fe9..a45d3365f4 100644 --- a/data/filetype_extensions.conf +++ b/data/filetype_extensions.conf @@ -35,6 +35,7 @@ Genie=*.gs; GLSL=*.glsl;*.frag;*.vert; Go=*.go; Graphviz=*.gv;*.dot; +Groovy=*.groovy Haskell=*.hs;*.lhs;*.hs-boot;*.lhs-boot; Haxe=*.hx; HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;*.tpl; @@ -77,7 +78,7 @@ None=*; # Note: restarting is required after editing groups [Groups] -Programming=Arduino;Clojure;CUDA;Cython;Genie;Kotlin;Scala;Swift; +Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Scala;Swift; Script=Graphviz; Markup= Misc=JSON; From d31320d1225c339eda6b6105468eb56db12c2ccc Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Fri, 14 Jun 2019 10:19:37 +0100 Subject: [PATCH 4/4] Add *.gradle and build menu commands --- data/filedefs/filetypes.Groovy.conf | 16 ++++++---------- data/filetype_extensions.conf | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/data/filedefs/filetypes.Groovy.conf b/data/filedefs/filetypes.Groovy.conf index 9b6be5078d..000854080c 100644 --- a/data/filedefs/filetypes.Groovy.conf +++ b/data/filedefs/filetypes.Groovy.conf @@ -21,14 +21,10 @@ extension=groovy mime_type=text/x-groovy [build-menu] -#~ FT_00_LB=_Compile -#~ FT_00_CM=kotlinc "%f" -#~ FT_00_WD= +FT_00_LB=_Compile +FT_00_CM=groovyc "%f" +FT_00_WD= -#~ EX_00_LB=_Execute -#~ EX_00_CM=kotlin "%eKt" -#~ EX_00_WD= - -#~ EX_01_LB=Execute _Script -#~ EX_01_CM=kotlinc -script "%f" -#~ EX_01_WD= +EX_00_LB=Execute _Script +EX_00_CM=groovy "%f" +EX_00_WD= diff --git a/data/filetype_extensions.conf b/data/filetype_extensions.conf index a45d3365f4..bee6e7f8b3 100644 --- a/data/filetype_extensions.conf +++ b/data/filetype_extensions.conf @@ -35,7 +35,7 @@ Genie=*.gs; GLSL=*.glsl;*.frag;*.vert; Go=*.go; Graphviz=*.gv;*.dot; -Groovy=*.groovy +Groovy=*.groovy;*.gradle; Haskell=*.hs;*.lhs;*.hs-boot;*.lhs-boot; Haxe=*.hx; HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;*.tpl;