Commits November 2024

commits@lists.geany.org

1 participants
67 discussions

[geany/geany] 4ad908: Add SystemVerilog filetype
by Javier Mora 20 Nov '24

20 Nov '24

Branch: refs/heads/master Author: Javier Mora <cousteaulecommandant(a)gmail.com> Committer: Javier Mora <cousteaulecommandant(a)gmail.com> Date: Mon, 18 Nov 2024 23:33:09 UTC Commit: 4ad90857cf94f8f0628f0eaeb440c06d070231db https://github.com/geany/geany/commit/4ad90857cf94f8f0628f0eaeb440c06d07023… Log Message: ----------- Add SystemVerilog filetype Add SystemVerilog filetype and syntax highlighting: - Create SystemVerilog filedefs file, including all the standard keywords from SystemVerilog-2017 (IEEE Std 1800-2017). - Set it to use the existing Verilog lexer and ctags parser (which already supported both Verilog and SystemVerilog). - Create an initial draft for a ctags mapping for SystemVerilog. The ctags parser is currently underutilized, since classes and other SystemVerilog constructs are tagged but not shown in the Symbols panel. These will be added in a future commit. Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.SystemVerilog.conf data/filetype_extensions.conf src/tagmanager/tm_parser.c src/tagmanager/tm_parser.h src/tagmanager/tm_parsers.h Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -77,6 +77,7 @@ filetypes_dist = \ filedefs/filetypes.smalltalk \ filedefs/filetypes.sql \ filedefs/filetypes.Swift.conf \ + filedefs/filetypes.SystemVerilog.conf \ filedefs/filetypes.TypeScript.conf \ filedefs/filetypes.tcl \ filedefs/filetypes.txt2tags \ Modified: data/filedefs/filetypes.SystemVerilog.conf 45 lines changed, 45 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,45 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling=Verilog] + +[keywords] +# all items must be in one line +word=accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind bins binsof bit break buf bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin function generate genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import incdir include initial inout input inside instance int integer interconnect interface intersect join join_any join_none large let liblist library local localparam logic longint macromodule matches medium modport module nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 null or output package packed parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor +word2=$finish $exit $stop $realtime $time $stime $printtimescale $timeformat $bitstoreal $bitstoshortreal $itor $signed $cast $realtobits $shortrealtobits $rtoi $unsigned $bits $typename $isunbounded $unpacked_dimensions $left $low $increment $dimensions $right $high $size $clog2 $ln $log10 $exp $sqrt $pow $floor $ceil $sin $cos $tan $asin $acos $atan $atan2 $hypot $sinh $cosh $tanh $asinh $acosh $atanh $countbits $onehot $isunknown $countones $onehot0 $fatal $warning $error $info $fatal $warning $error $info $asserton $assertkill $assertpasson $assertfailon $assertnonvacuouson $assertoff $assertcontrol $assertpassoff $assertfailoff $assertvacuousoff $sampled $fell $changed $past_gclk $fell_gclk $changed_gclk $rising_gclk $steady_gclk $rose $stable $past $rose_gclk $stable_gclk $future_gclk $falling_gclk $changing_gclk $coverage_control $coverage_get $coverage_save $set_coverage_db_name $coverage_get_max $coverage_merge $get_coverage $load_coverage_db $random $dist_erla ng $dist_normal $dist_t $dist_chi_square $dist_exponential $dist_poisson $dist_uniform $q_initialize $q_remove $q_exam $q_add $q_full $async$and$array $async$nand$array $async$or$array $async$nor$array $sync$and$array $sync$nand$array $sync$or$array $sync$nor$array $async$and$plane $async$nand$plane $async$or$plane $async$nor$plane $sync$and$plane $sync$nand$plane $sync$or$plane $sync$nor$plane $system +word3= +docComment= + +[settings] +lexer_filetype=Verilog +tag_parser=SystemVerilog + +# default extension used when saving files +extension=sv + +# MIME type +mime_type=text/x-systemverilog + +# these characters define word boundaries when making selections and searching +# using word matching options +#wordchars=_$abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d +# #command_example(); +# setting to false would generate this +# # command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: data/filetype_extensions.conf 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -76,11 +76,12 @@ Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.mksh;*.zsh;* Smalltalk=*.st; SQL=*.sql; Swift=*.swift; +SystemVerilog=*.sv;*.svh; Tcl=*.tcl;*.tk;*.wish;*.exp; Txt2tags=*.t2t; TypeScript=*.ts;*.cts;*.mts;*.tsx; Vala=*.vala;*.vapi; -Verilog=*.v; +Verilog=*.v;*.vh; VHDL=*.vhd;*.vhdl; XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;*.xhtml;*.xul;*.dtd;*.xtpl;*.mml;*.mathml; YAML=*.yaml;*.yml; @@ -90,7 +91,7 @@ None=*; # Note: restarting is required after editing groups [Groups] -Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Scala;Swift; +Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Scala;Swift;SystemVerilog; Script=Dockerfile;Graphviz;TypeScript;Meson; Markup= Misc=JSON; Modified: src/tagmanager/tm_parser.c 43 lines changed, 43 insertions(+), 0 deletions(-) =================================================================== @@ -788,6 +788,47 @@ static TMParserMapGroup group_VERILOG[] = { {N_("Variables"), TM_ICON_VAR, tm_tag_variable_t}, }; +static TMParserMapEntry map_SYSVERILOG[] = { + // Verilog and SystemVerilog + {'c', tm_tag_variable_t}, // constant + {'d', tm_tag_variable_t}, // define + {'e', tm_tag_typedef_t}, // event + {'f', tm_tag_function_t}, // function + {'m', tm_tag_class_t}, // module + {'n', tm_tag_variable_t}, // net + {'p', tm_tag_variable_t}, // port + {'r', tm_tag_variable_t}, // register + {'t', tm_tag_function_t}, // task + {'b', tm_tag_undef_t}, // block + {'i', tm_tag_undef_t}, // instance + // SystemVerilog only (currently unused) + {'A', tm_tag_undef_t}, // assert + {'C', tm_tag_undef_t}, // class + {'V', tm_tag_undef_t}, // covergroup + {'E', tm_tag_undef_t}, // enum + {'I', tm_tag_undef_t}, // interface + {'M', tm_tag_undef_t}, // modport + {'K', tm_tag_undef_t}, // package + {'P', tm_tag_undef_t}, // program + {'Q', tm_tag_undef_t}, // prototype + {'R', tm_tag_undef_t}, // property + {'S', tm_tag_undef_t}, // struct + {'T', tm_tag_undef_t}, // typedef + {'H', tm_tag_undef_t}, // checker + {'L', tm_tag_undef_t}, // clocking + {'q', tm_tag_undef_t}, // sequence + {'w', tm_tag_undef_t}, // member + {'l', tm_tag_undef_t}, // ifclass + {'O', tm_tag_undef_t}, // constraint + {'N', tm_tag_undef_t}, // nettype +}; +static TMParserMapGroup group_SYSVERILOG[] = { + {N_("Events"), TM_ICON_MACRO, tm_tag_typedef_t}, + {N_("Modules"), TM_ICON_CLASS, tm_tag_class_t}, + {N_("Functions / Tasks"), TM_ICON_METHOD, tm_tag_function_t}, + {N_("Variables"), TM_ICON_VAR, tm_tag_variable_t}, +}; + static TMParserMapEntry map_R[] = { {'f', tm_tag_function_t}, // function {'l', tm_tag_other_t}, // library @@ -1280,6 +1321,7 @@ static TMParserMap parser_map[] = { MAP_ENTRY(LDSCRIPT), MAP_ENTRY(FORTH), MAP_ENTRY(MESON), + MAP_ENTRY(SYSVERILOG), }; /* make sure the parser map is consistent and complete */ G_STATIC_ASSERT(G_N_ELEMENTS(parser_map) == TM_PARSER_COUNT); @@ -1811,6 +1853,7 @@ gboolean tm_parser_has_full_scope(TMParserType lang) case TM_PARSER_VALA: case TM_PARSER_VHDL: case TM_PARSER_VERILOG: + case TM_PARSER_SYSVERILOG: case TM_PARSER_ZEPHIR: case TM_PARSER_AUTOIT: return TRUE; Modified: src/tagmanager/tm_parser.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -144,6 +144,7 @@ enum TM_PARSER_LDSCRIPT, TM_PARSER_FORTH, TM_PARSER_MESON, + TM_PARSER_SYSVERILOG, TM_PARSER_COUNT }; Modified: src/tagmanager/tm_parsers.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -78,6 +78,7 @@ OcamlParser, \ LdScriptParser, \ ForthParser, \ - MesonParser + MesonParser, \ + SystemVerilogParser #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 66710b: tagmanager: Unify Verilog and SystemVerilog tags
by Javier Mora 20 Nov '24

20 Nov '24

1 0

[geany/geany] f998f7: Merge pull request #4039 from cousteaulecommandant/sv
by Jiří Techet 20 Nov '24

20 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Wed, 20 Nov 2024 13:45:41 UTC Commit: f998f789fa0424fc928ba86a5be7b7ab69a1ef9c https://github.com/geany/geany/commit/f998f789fa0424fc928ba86a5be7b7ab69a1e… Log Message: ----------- Merge pull request #4039 from cousteaulecommandant/sv Add support for SystemVerilog Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.SystemVerilog.conf data/filetype_extensions.conf src/tagmanager/tm_parser.c src/tagmanager/tm_parser.h src/tagmanager/tm_parsers.h tests/ctags/Makefile.am tests/ctags/bug1111214-j-chan.v.tags tests/ctags/bug1111214.v.tags tests/ctags/bug1743330.v.tags tests/ctags/bug2747828.v.tags tests/ctags/bug960316.v.tags tests/ctags/bug961001.v.tags tests/ctags/oop.sv tests/ctags/oop.sv.tags tests/ctags/state_machine.v.tags tests/ctags/sysverilog.sv tests/ctags/sysverilog.sv.tags tests/ctags/traffic_signal.v.tags tests/meson.build Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -77,6 +77,7 @@ filetypes_dist = \ filedefs/filetypes.smalltalk \ filedefs/filetypes.sql \ filedefs/filetypes.Swift.conf \ + filedefs/filetypes.SystemVerilog.conf \ filedefs/filetypes.TypeScript.conf \ filedefs/filetypes.tcl \ filedefs/filetypes.txt2tags \ Modified: data/filedefs/filetypes.SystemVerilog.conf 45 lines changed, 45 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,45 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling=Verilog] + +[keywords] +# all items must be in one line +word=accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind bins binsof break buf bufif0 bufif1 case casex casez cell checker class clocking cmos config const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup endinterface endmodule endpackage endprimitive endprogram endproperty endsequence endspecify endtable endtask enum eventually expect export extends extern final first_match for force foreach forever fork forkjoin function generate global if iff ifnone ignore_bins illegal_bins implements implies import incdir include initial inside instance interface intersect join join_any join_none let liblist library local macromodule matches modport module nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 null or package packed pmos posedge primitive prio rity program property protected pulldown pullup pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime s_until s_until_with sequence showcancelled soft solve specify static strong struct super sync_accept_on sync_reject_on table tagged task this throughout timeprecision timeunit tran tranif0 tranif1 typedef union unique unique0 until until_with untyped use virtual wait wait_order weak while wildcard with within xnor xor +word2=$acos $acosh $asin $asinh $assertcontrol $assertfailoff $assertfailon $assertkill $assertnonvacuouson $assertoff $asserton $assertpassoff $assertpasson $assertvacuousoff $async$and$array $async$and$plane $async$nand$array $async$nand$plane $async$nor$array $async$nor$plane $async$or$array $async$or$plane $atan $atan2 $atanh $bits $bitstoreal $bitstoshortreal $cast $ceil $changed $changed_gclk $changing_gclk $clog2 $cos $cosh $countbits $countones $coverage_control $coverage_get $coverage_get_max $coverage_merge $coverage_save $dimensions $display $displayb $displayh $displayo $dist_chi_square $dist_erlang $dist_exponential $dist_normal $dist_poisson $dist_t $dist_uniform $dumpall $dumpfile $dumpflush $dumplimit $dumpoff $dumpon $dumpports $dumpportsall $dumpportsflush $dumpportslimit $dumpportsoff $dumpportson $dumpvars $error $exit $exp $falling_gclk $fatal $fclose $fdisplay $fdisplayb $fdisplayh $fdisplayo $fell $fell_gclk $feof $ferror $fflush $fgetc $fgets $finish $floor $ fmonitor $fmonitorb $fmonitorh $fmonitoro $fopen $fread $fscanf $fseek $fstrobe $fstrobeb $fstrobeh $fstrobeo $ftell $future_gclk $fwrite $fwriteb $fwriteh $fwriteo $get_coverage $high $hypot $increment $info $isunbounded $isunknown $itor $left $ln $load_coverage_db $log10 $low $monitor $monitorb $monitorh $monitoro $monitoroff $monitoron $onehot $onehot0 $past $past_gclk $pow $printtimescale $q_add $q_exam $q_full $q_initialize $q_remove $random $readmemb $readmemh $realtime $realtobits $rewind $right $rising_gclk $rose $rose_gclk $rtoi $sampled $set_coverage_db_name $sformat $sformatf $shortrealtobits $signed $sin $sinh $size $sqrt $sscanf $stable $stable_gclk $steady_gclk $stime $stop $strobe $strobeb $strobeh $strobeo $swrite $swriteb $swriteh $swriteo $sync$and$array $sync$and$plane $sync$nand$array $sync$nand$plane $sync$nor$array $sync$nor$plane $sync$or$array $sync$or$plane $system $tan $tanh $test$plusargs $time $timeformat $typename $ungetc $unpacked_dimensions $unsigned $ value$plusargs $warning $write $writeb $writeh $writememb $writememh $writeo +word3=bit byte chandle event genvar highz0 highz1 inout input int integer interconnect large localparam logic longint medium output parameter pull0 pull1 real realtime ref reg scalared shortint shortreal signed small specparam string strong0 strong1 supply0 supply1 time tri tri0 tri1 triand trior trireg type unsigned uwire var vectored void wand weak0 weak1 wire wor +docComment= + +[settings] +lexer_filetype=Verilog +tag_parser=SystemVerilog + +# default extension used when saving files +extension=sv + +# MIME type +mime_type=text/x-systemverilog + +# these characters define word boundaries when making selections and searching +# using word matching options +#wordchars=_$abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d +# #command_example(); +# setting to false would generate this +# # command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: data/filetype_extensions.conf 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -76,11 +76,12 @@ Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.mksh;*.zsh;* Smalltalk=*.st; SQL=*.sql; Swift=*.swift; +SystemVerilog=*.sv;*.svh; Tcl=*.tcl;*.tk;*.wish;*.exp; Txt2tags=*.t2t; TypeScript=*.ts;*.cts;*.mts;*.tsx; Vala=*.vala;*.vapi; -Verilog=*.v; +Verilog=*.v;*.vh; VHDL=*.vhd;*.vhdl; XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;*.xhtml;*.xul;*.dtd;*.xtpl;*.mml;*.mathml; YAML=*.yaml;*.yml; @@ -90,7 +91,7 @@ None=*; # Note: restarting is required after editing groups [Groups] -Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Scala;Swift; +Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Scala;Swift;SystemVerilog; Script=Dockerfile;Graphviz;TypeScript;Meson; Markup= Misc=JSON; Modified: src/tagmanager/tm_parser.c 69 lines changed, 55 insertions(+), 14 deletions(-) =================================================================== @@ -768,26 +768,65 @@ static TMParserMapEntry map_ABC[] = { }; #define group_ABC group_REST +#define COMMON_VERILOG \ + {'c', tm_tag_field_t}, /* constant */ \ + {'d', tm_tag_macro_t}, /* define */ \ + {'e', tm_tag_variable_t}, /* event */ \ + {'f', tm_tag_function_t}, /* function */ \ + {'m', tm_tag_prototype_t}, /* module */ \ + {'n', tm_tag_variable_t}, /* net */ \ + {'p', tm_tag_externvar_t}, /* port */ \ + {'r', tm_tag_variable_t}, /* register */ \ + {'t', tm_tag_function_t}, /* task */ \ + {'b', tm_tag_namespace_t}, /* block */ \ + {'i', tm_tag_enumerator_t}, /* instance */ + static TMParserMapEntry map_VERILOG[] = { - {'c', tm_tag_variable_t}, // constant - {'d', tm_tag_variable_t}, // define - {'e', tm_tag_typedef_t}, // event - {'f', tm_tag_function_t}, // function - {'m', tm_tag_class_t}, // module - {'n', tm_tag_variable_t}, // net - {'p', tm_tag_variable_t}, // port - {'r', tm_tag_variable_t}, // register - {'t', tm_tag_function_t}, // task - {'b', tm_tag_undef_t}, // block - {'i', tm_tag_undef_t}, // instance + COMMON_VERILOG }; static TMParserMapGroup group_VERILOG[] = { - {N_("Events"), TM_ICON_MACRO, tm_tag_typedef_t}, - {N_("Modules"), TM_ICON_CLASS, tm_tag_class_t}, + /* Verilog and SystemVerilog */ + {N_("Modules"), TM_ICON_CLASS, tm_tag_prototype_t}, + {N_("Instances"), TM_ICON_OTHER, tm_tag_enumerator_t}, + {N_("Blocks"), TM_ICON_NAMESPACE, tm_tag_namespace_t}, {N_("Functions / Tasks"), TM_ICON_METHOD, tm_tag_function_t}, - {N_("Variables"), TM_ICON_VAR, tm_tag_variable_t}, + {N_("Macros"), TM_ICON_MACRO, tm_tag_macro_t}, + {N_("Parameters / Constants"), TM_ICON_MACRO, tm_tag_field_t}, + {N_("Ports"), TM_ICON_MEMBER, tm_tag_externvar_t}, + {N_("Signals"), TM_ICON_VAR, tm_tag_variable_t}, + /* SystemVerilog only */ + {N_("Classes"), TM_ICON_STRUCT, tm_tag_class_t}, + {N_("Interfaces"), TM_ICON_STRUCT, tm_tag_interface_t | tm_tag_union_t}, + {N_("Package"), TM_ICON_NAMESPACE, tm_tag_package_t}, + {N_("Members"), TM_ICON_MEMBER, tm_tag_member_t}, + {N_("Structs"), TM_ICON_STRUCT, tm_tag_struct_t}, + {N_("Typedefs / Enums"), TM_ICON_STRUCT, tm_tag_typedef_t | tm_tag_enum_t}, }; +static TMParserMapEntry map_SYSVERILOG[] = { + COMMON_VERILOG + {'A', tm_tag_undef_t}, // assert + {'C', tm_tag_class_t}, // class + {'V', tm_tag_undef_t}, // covergroup + {'E', tm_tag_enum_t}, // enum + {'I', tm_tag_interface_t}, // interface + {'M', tm_tag_union_t}, // modport + {'K', tm_tag_package_t}, // package + {'P', tm_tag_prototype_t}, // program + {'Q', tm_tag_function_t}, // prototype + {'R', tm_tag_undef_t}, // property + {'S', tm_tag_struct_t}, // struct + {'T', tm_tag_typedef_t}, // typedef + {'H', tm_tag_undef_t}, // checker + {'L', tm_tag_undef_t}, // clocking + {'q', tm_tag_undef_t}, // sequence + {'w', tm_tag_member_t}, // member + {'l', tm_tag_class_t}, // ifclass + {'O', tm_tag_undef_t}, // constraint + {'N', tm_tag_typedef_t}, // nettype +}; +#define group_SYSVERILOG group_VERILOG + static TMParserMapEntry map_R[] = { {'f', tm_tag_function_t}, // function {'l', tm_tag_other_t}, // library @@ -1280,6 +1319,7 @@ static TMParserMap parser_map[] = { MAP_ENTRY(LDSCRIPT), MAP_ENTRY(FORTH), MAP_ENTRY(MESON), + MAP_ENTRY(SYSVERILOG), }; /* make sure the parser map is consistent and complete */ G_STATIC_ASSERT(G_N_ELEMENTS(parser_map) == TM_PARSER_COUNT); @@ -1811,6 +1851,7 @@ gboolean tm_parser_has_full_scope(TMParserType lang) case TM_PARSER_VALA: case TM_PARSER_VHDL: case TM_PARSER_VERILOG: + case TM_PARSER_SYSVERILOG: case TM_PARSER_ZEPHIR: case TM_PARSER_AUTOIT: return TRUE; Modified: src/tagmanager/tm_parser.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -144,6 +144,7 @@ enum TM_PARSER_LDSCRIPT, TM_PARSER_FORTH, TM_PARSER_MESON, + TM_PARSER_SYSVERILOG, TM_PARSER_COUNT }; Modified: src/tagmanager/tm_parsers.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -78,6 +78,7 @@ OcamlParser, \ LdScriptParser, \ ForthParser, \ - MesonParser + MesonParser, \ + SystemVerilogParser #endif Modified: tests/ctags/Makefile.am 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -263,6 +263,7 @@ test_sources = \ objectivec_interface.mm \ objectivec_property.mm \ objectivec_protocol.mm \ + oop.sv \ Package.pm \ php5_5_class_kw.php \ parenthesis-rvalue.js \ @@ -341,6 +342,7 @@ test_sources = \ strings.php \ strings.rb \ structure.f \ + sysverilog.sv \ tabindent.py \ test.erl \ test.go \ Modified: tests/ctags/bug1111214-j-chan.v.tags 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -1,6 +1,6 @@ -insig�16384�top�0 -variable: top :: insig -outsig�16384�top�0 -variable: top :: outsig -top�1�0 -class: top +insig�32768�top�0 +externvar: top :: insig +outsig�32768�top�0 +externvar: top :: outsig +top�1024�0 +prototype: top Modified: tests/ctags/bug1111214.v.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -wahoo�1�0 -class: wahoo +wahoo�1024�0 +prototype: wahoo Modified: tests/ctags/bug1743330.v.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -dummy�1�0 -class: dummy +dummy�1024�0 +prototype: dummy Modified: tests/ctags/bug2747828.v.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -ramaddr_0�16384�0 -variable: ramaddr_0 +ramaddr_0�8�0 +field: ramaddr_0 Modified: tests/ctags/bug960316.v.tags 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -1,11 +1,11 @@ -fail_define_2�16384�0 -variable: fail_define_2 +fail_define_2�65536�0 +macro: fail_define_2 fail_func_2�16�0 function: fail_func_2 fail_task_2�16�0 function: fail_task_2 -pass_define_1�16384�0 -variable: pass_define_1 +pass_define_1�65536�0 +macro: pass_define_1 pass_func_1�16�0 function: pass_func_1 pass_task_1�16�0 Modified: tests/ctags/bug961001.v.tags 32 lines changed, 16 insertions(+), 16 deletions(-) =================================================================== @@ -1,16 +1,16 @@ -GUESTA�16384�0 -variable: GUESTA -GUESTB�16384�0 -variable: GUESTB -GUESTC�16384�0 -variable: GUESTC -GUESTD�16384�0 -variable: GUESTD -HOSTA�16384�0 -variable: HOSTA -HOSTB�16384�0 -variable: HOSTB -HOSTC�16384�0 -variable: HOSTC -HOSTD�16384�0 -variable: HOSTD +GUESTA�65536�0 +macro: GUESTA +GUESTB�65536�0 +macro: GUESTB +GUESTC�65536�0 +macro: GUESTC +GUESTD�65536�0 +macro: GUESTD +HOSTA�65536�0 +macro: HOSTA +HOSTB�65536�0 +macro: HOSTB +HOSTC�65536�0 +macro: HOSTC +HOSTD�65536�0 +macro: HOSTD Modified: tests/ctags/oop.sv 145 lines changed, 145 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,145 @@ +/* Tests the following SystemVerilog ctags: + * - [x] constant + * - [x] define + * - [ ] event + * - [x] function + * - [ ] module + * - [ ] net + * - [ ] port + * - [x] register + * - [x] task + * - [ ] block + * - [ ] instance + * - [x] class + * - [x] enum + * - [x] interface + * - [x] modport + * - [x] package + * - [ ] program + * - [x] prototype + * - [x] struct + * - [x] typedef + * - [z] member + * - [x] ifclass + * - [x] nettype + */ + +package oop; + +`define MACRO 1234 // NB: Shouldn't the ctag for this be outside of the package? (ctags bug?) + +/* Constants */ + +const int ANSWER_TO_LIFE = 42; +localparam real APPROX_PI = 3.14; + +/* Methods */ + +task display_int(int x); + $display("%0d", x); +endtask + +function automatic resolve_nettype(real driver[]); + resolve_nettype = 0.0; + foreach (driver[i]) + resolve_nettype += driver[i]; +endfunction + +/* Typedefs */ + +nettype real net_t with resolve_nettype; + +typedef struct packed { + logic [7:0] data; + logic parity; +} struct_t; + +typedef union packed { + logic [7:0] data; + logic [3:0] control; +} union_t; + +typedef enum { + red, + yellow, + green +} enum_t; + +/* Classes */ + +interface class ifclass #( + type T = logic +); + pure virtual function T get_value(); + pure virtual function void set_value(T x); +endclass : ifclass + +class a_class implements ifclass #(int); + + int value; + + virtual function int get_value(); + get_value = value; + endfunction + + virtual function void put_value(int x); + value = x; + endfunction + + task print_value(); + $display("value = %0d", value); + endtask + + function value_plus(int x); + value_plus = value + x; + endfunction + +endclass : a_class + +class other_class; + + struct packed { + byte s_a, s_b, s_c; + string s_str; + } s_member; + + union packed { + byte u_a; + int u_b; + } u_member; + + enum { ready, steady, go } e_member; + + struct_t st_member; + union_t ut_member; + enum_t et_member; + +endclass : other_class + +/*virtual*/ class vclass; // NB: ctags bug!! Declaring class as virtual inhibits detection of next element. + pure virtual function void do_something(); +endclass : vclass + +/* Interface (not related to "interface class") */ + +interface spi; + + logic sclk; + logic cs_n; + logic mosi; + logic miso; + + modport master (output sclk, cs_n, mosi, input miso); + modport slave (input sclk, cs_n, mosi, output miso); + + task enable_cs(); + cs_n <= 1'b0; + endtask + + task disable_cs(); + cs_n <= 1'b1; + endtask + +endinterface : spi + +endpackage : oop Modified: tests/ctags/oop.sv.tags 118 lines changed, 118 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,118 @@ +ANSWER_TO_LIFE�16384�oop�0 +variable: oop :: ANSWER_TO_LIFE +APPROX_PI�8�oop�0 +field: oop :: APPROX_PI +MACRO�65536�oop�0 +macro: oop :: MACRO +T�8�oop.ifclass�0 +field: oop.ifclass :: T +a_class�1�oop�0 +class: oop :: a_class +control�64�oop.union_t�0 +member: oop.union_t :: control +cs_n�16384�oop.spi�0 +variable: oop.spi :: cs_n +data�64�oop.struct_t�0 +member: oop.struct_t :: data +data�64�oop.union_t�0 +member: oop.union_t :: data +disable_cs�16�oop.spi�0 +function: oop.spi :: disable_cs +display_int�16�oop�0 +function: oop :: display_int +do_something�16�oop.vclass�0 +function: oop.vclass :: do_something +driver�32768�oop.resolve_nettype�0 +externvar: oop.resolve_nettype :: driver +e_member�2�oop.other_class�0 +enum: oop.other_class :: e_member +enable_cs�16�oop.spi�0 +function: oop.spi :: enable_cs +enum_t�4096�oop�0 +typedef: oop :: enum_t +et_member�16384�oop.other_class�0 +variable: oop.other_class :: et_member +get_value�16�oop.a_class�0 +function: oop.a_class :: get_value +get_value�16�oop.ifclass�0 +function: oop.ifclass :: get_value +go�8�oop.other_class.e_member�0 +field: oop.other_class.e_member :: go +green�8�oop.enum_t�0 +field: oop.enum_t :: green +ifclass�1�oop�0 +class: oop :: ifclass +master�8192�oop.spi�0 +union: oop.spi :: master +miso�16384�oop.spi�0 +variable: oop.spi :: miso +mosi�16384�oop.spi�0 +variable: oop.spi :: mosi +net_t�4096�oop�0 +typedef: oop :: net_t +oop�512�0 +package: oop +other_class�1�oop�0 +class: oop :: other_class +parity�64�oop.struct_t�0 +member: oop.struct_t :: parity +print_value�16�oop.a_class�0 +function: oop.a_class :: print_value +put_value�16�oop.a_class�0 +function: oop.a_class :: put_value +ready�8�oop.other_class.e_member�0 +field: oop.other_class.e_member :: ready +red�8�oop.enum_t�0 +field: oop.enum_t :: red +resolve_nettype�16�oop�0 +function: oop :: resolve_nettype +s_a�64�oop.other_class.s_member�0 +member: oop.other_class.s_member :: s_a +s_b�64�oop.other_class.s_member�0 +member: oop.other_class.s_member :: s_b +s_c�64�oop.other_class.s_member�0 +member: oop.other_class.s_member :: s_c +s_member�2048�oop.other_class�0 +struct: oop.other_class :: s_member +s_str�64�oop.other_class.s_member�0 +member: oop.other_class.s_member :: s_str +sclk�16384�oop.spi�0 +variable: oop.spi :: sclk +set_value�16�oop.ifclass�0 +function: oop.ifclass :: set_value +slave�8192�oop.spi�0 +union: oop.spi :: slave +spi�32�oop�0 +interface: oop :: spi +st_member�16384�oop.other_class�0 +variable: oop.other_class :: st_member +steady�8�oop.other_class.e_member�0 +field: oop.other_class.e_member :: steady +struct_t�4096�oop�0 +typedef: oop :: struct_t +u_a�64�oop.other_class.u_member�0 +member: oop.other_class.u_member :: u_a +u_b�64�oop.other_class.u_member�0 +member: oop.other_class.u_member :: u_b +u_member�2048�oop.other_class�0 +struct: oop.other_class :: u_member +union_t�4096�oop�0 +typedef: oop :: union_t +ut_member�16384�oop.other_class�0 +variable: oop.other_class :: ut_member +value�16384�oop.a_class�0 +variable: oop.a_class :: value +value_plus�16�oop.a_class�0 +function: oop.a_class :: value_plus +vclass�1�oop�0 +class: oop :: vclass +x�32768�oop.a_class.put_value�0 +externvar: oop.a_class.put_value :: x +x�32768�oop.a_class.value_plus�0 +externvar: oop.a_class.value_plus :: x +x�32768�oop.display_int�0 +externvar: oop.display_int :: x +x�32768�oop.ifclass.set_value�0 +externvar: oop.ifclass.set_value :: x +yellow�8�oop.enum_t�0 +field: oop.enum_t :: yellow Modified: tests/ctags/state_machine.v.tags 16 lines changed, 8 insertions(+), 8 deletions(-) =================================================================== @@ -1,11 +1,11 @@ -S0�16384�0 -variable: S0 -S1�16384�0 -variable: S1 -S2�16384�0 -variable: S2 -S3�16384�0 -variable: S3 +S0�8�0 +field: S0 +S1�8�0 +field: S1 +S2�8�0 +field: S2 +S3�8�0 +field: S3 next_state�16384�0 variable: next_state state�16384�0 Modified: tests/ctags/sysverilog.sv 192 lines changed, 192 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,192 @@ +/* Tests the following SystemVerilog ctags: + * - [x] constant + * - [x] define + * - [x] event + * - [x] function + * - [x] module + * - [x] net + * - [x] port + * - [x] register + * - [x] task + * - [x] block + * - [x] instance + * - [ ] class + * - [ ] enum + * - [ ] interface + * - [ ] modport + * - [ ] package + * - [x] program + * - [ ] prototype + * - [ ] struct + * - [ ] typedef + * - [ ] member + * - [ ] ifclass + * - [ ] nettype + */ + +`timescale 1ns/1ps +`default_nettype none + +`define DEFAULT_WIDTH 32 +`define BITS_TO_BYTES(x) ((x)/8) + +module a_module #( + parameter WIDTH = `DEFAULT_WIDTH, + localparam BYTES = `BITS_TO_BYTES(WIDTH) +) ( + input clk, reset, + input logic [WIDTH-1:0] data_in, + input logic valid, + input wire [BYTES-1:0] byte_en, + output wire [WIDTH-1:0] data_out +); + + wire be_filtered [BYTES-1:0]; + + genvar i; + generate + for (i = 0; i < BYTES; i++) begin : be_filtered_gen + logic x; + and and_gate ( // NB: this SHOULD be detected as an instance (ctags bug?) + x, + byte_en[i], + valid + ); + assign be_filtered[i] = x; + end + endgenerate + + wire [BYTES-1:0][7:0] data_in_bytes; + reg [BYTES-1:0][7:0] data_out_bytes; + + assign data_in_bytes = data_in; + assign data_out = data_out_bytes; + + always @(posedge clk, posedge reset) begin : main_block + if (reset) + data_out_bytes <= '0; + else begin + int i; + for (i = 0; i < BYTES; i++) + if (be_filtered[i]) + data_out_bytes[i] <= data_in_bytes[i]; + end + end + +endmodule : a_module + +program generate_signals #( + parameter NUM_UUT = 4, + parameter UUT_WIDTH = 64, + localparam UUT_BYTES = `BITS_TO_BYTES(UUT_WIDTH) +) ( + input logic clk, reset, + output logic [UUT_WIDTH-1:0] data_in, + output logic valid_uut [NUM_UUT-1:0], + output logic [UUT_BYTES-1:0] byte_en, + output event finished // NB: counts as "port", not "event" +); + + task write_byte( + byte byte_data, + int byte_index, + int uut_index + ); + begin + logic [UUT_BYTES-1:0][7:0] data_in_bytes; + data_in_bytes = '0; + data_in_bytes[byte_index] = byte_data; + data_in = data_in_bytes; + byte_en = UUT_BYTES'(1) << byte_index; + + valid_uut[uut_index] <= 1'b1; + @(posedge clk); + valid_uut[uut_index] <= 1'b0; + end + endtask + + initial begin + @(negedge reset); + @(posedge clk); + + write_byte(8'h12, 3, 0); + write_byte(8'h34, 2, 0); + write_byte(8'h56, 1, 0); + write_byte(8'h78, 0, 0); + + @(posedge clk); + + -> finished; + end + +endprogram : generate_signals + +module testbench; + + localparam NUM_UUT = 4; + localparam UUT_WIDTH = 64; + localparam UUT_BYTES = `BITS_TO_BYTES(UUT_WIDTH); + + logic clk = 1'b0, reset = 1'b0; + logic [UUT_WIDTH-1:0] data_in; + logic valid_uut [NUM_UUT-1:0]; + logic [UUT_BYTES-1:0] byte_en; + + generate + for (genvar j = 0; j < NUM_UUT; j++) begin : uut_gen + logic [UUT_WIDTH-1:0] data_out; + a_module #( // NB: this SHOULDN'T be detected as a module declaration (ctags bug) + .WIDTH (UUT_WIDTH) + ) uut ( // but this should be detected as an instance (ctags works) + .valid (valid_uut[j]), + .* + ); + end + endgenerate + + event trigger_success, trigger_failure, finished; + + function logic compare( + logic [UUT_BYTES-1:0][7:0] A, B, + logic [UUT_BYTES-1:0] mask + ); + begin + int i; + for (i = 0; i < UUT_BYTES; i++) + if (mask[i] && (A[i] != B[i])) begin + return 1'b0; + end + compare = 1'b1; // same as return 1'b1 + end + endfunction + + always begin : clk_gen + clk = ~clk; + #0.5; + end + + initial begin : reset_gen + reset = 1'b1; + #3.5; + reset = 1'b0; + end + + generate_signals #( + .NUM_UUT (NUM_UUT), + .UUT_WIDTH (UUT_WIDTH) + ) gen_signals ( + .* + ); + + initial begin + @finished; + + if (compare(uut_gen[0].data_out, 64'h 00000000_12_34_56_78, 8'b 0000_1111)) + $display("Comparison succeeded."); + else + $display("Comparison failed!"); + + $finish; + end + +endmodule : testbench Modified: tests/ctags/sysverilog.sv.tags 118 lines changed, 118 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,118 @@ +A�32768�testbench.compare�0 +externvar: testbench.compare :: A +B�32768�testbench.compare�0 +externvar: testbench.compare :: B +BITS_TO_BYTES�65536�0 +macro: BITS_TO_BYTES +BYTES�8�a_module�0 +field: a_module :: BYTES +DEFAULT_WIDTH�65536�0 +macro: DEFAULT_WIDTH +NUM_UUT�8�generate_signals�0 +field: generate_signals :: NUM_UUT +NUM_UUT�8�testbench�0 +field: testbench :: NUM_UUT +UUT_BYTES�8�generate_signals�0 +field: generate_signals :: UUT_BYTES +UUT_BYTES�8�testbench�0 +field: testbench :: UUT_BYTES +UUT_WIDTH�8�generate_signals�0 +field: generate_signals :: UUT_WIDTH +UUT_WIDTH�8�testbench�0 +field: testbench :: UUT_WIDTH +WIDTH�8�a_module�0 +field: a_module :: WIDTH +a_module�1024�0 +prototype: a_module +a_module�1024�testbench.uut_gen�0 +prototype: testbench.uut_gen :: a_module +be_filtered�16384�a_module�0 +variable: a_module :: be_filtered +be_filtered_gen�256�a_module�0 +namespace: a_module :: be_filtered_gen +byte_data�32768�generate_signals.write_byte�0 +externvar: generate_signals.write_byte :: byte_data +byte_en�16384�testbench�0 +variable: testbench :: byte_en +byte_en�32768�a_module�0 +externvar: a_module :: byte_en +byte_en�32768�generate_signals�0 +externvar: generate_signals :: byte_en +byte_index�32768�generate_signals.write_byte�0 +externvar: generate_signals.write_byte :: byte_index +clk�16384�testbench�0 +variable: testbench :: clk +clk�32768�a_module�0 +externvar: a_module :: clk +clk�32768�generate_signals�0 +externvar: generate_signals :: clk +clk_gen�256�testbench�0 +namespace: testbench :: clk_gen +compare�16�testbench�0 +function: testbench :: compare +data_in�16384�testbench�0 +variable: testbench :: data_in +data_in�32768�a_module�0 +externvar: a_module :: data_in +data_in�32768�generate_signals�0 +externvar: generate_signals :: data_in +data_in_bytes�16384�a_module�0 +variable: a_module :: data_in_bytes +data_in_bytes�16384�generate_signals.write_byte�0 +variable: generate_signals.write_byte :: data_in_bytes +data_out�16384�testbench.uut_gen�0 +variable: testbench.uut_gen :: data_out +data_out�32768�a_module�0 +externvar: a_module :: data_out +data_out_bytes�16384�a_module�0 +variable: a_module :: data_out_bytes +finished�16384�testbench�0 +variable: testbench :: finished +finished�32768�generate_signals�0 +externvar: generate_signals :: finished +gen_signals�4�testbench�0�generate_signals +enumerator: generate_signals testbench :: gen_signals +generate_signals�1024�0 +prototype: generate_signals +generate_signals�1024�testbench�0 +prototype: testbench :: generate_signals +i�16384�a_module�0 +variable: a_module :: i +i�16384�a_module.main_block�0 +variable: a_module.main_block :: i +i�16384�testbench.compare�0 +variable: testbench.compare :: i +main_block�256�a_module�0 +namespace: a_module :: main_block +mask�32768�testbench.compare�0 +externvar: testbench.compare :: mask +reset�16384�testbench�0 +variable: testbench :: reset +reset�32768�a_module�0 +externvar: a_module :: reset +reset�32768�generate_signals�0 +externvar: generate_signals :: reset +reset_gen�256�testbench�0 +namespace: testbench :: reset_gen +testbench�1024�0 +prototype: testbench +trigger_failure�16384�testbench�0 +variable: testbench :: trigger_failure +trigger_success�16384�testbench�0 +variable: testbench :: trigger_success +uut�4�testbench.uut_gen�0�a_module +enumerator: a_module testbench.uut_gen :: uut +uut_gen�256�testbench�0 +namespace: testbench :: uut_gen +uut_index�32768�generate_signals.write_byte�0 +externvar: generate_signals.write_byte :: uut_index +valid�32768�a_module�0 +externvar: a_module :: valid +valid_uut�16384�testbench�0 +variable: testbench :: valid_uut +valid_uut�32768�generate_signals�0 +externvar: generate_signals :: valid_uut +write_byte�16�generate_signals�0 +function: generate_signals :: write_byte +x�16384�a_module.be_filtered_gen�0 +variable: a_module.be_filtered_gen :: x Modified: tests/ctags/traffic_signal.v.tags 40 lines changed, 24 insertions(+), 16 deletions(-) =================================================================== @@ -1,26 +1,34 @@ +Init�256�traffic�0 +namespace: traffic :: Init amber�16384�traffic�0 variable: traffic :: amber -amber_tics�16384�traffic�0 -variable: traffic :: amber_tics +amber_tics�8�traffic�0 +field: traffic :: amber_tics clock�16384�traffic�0 variable: traffic :: clock -color�16384�traffic.light�0 -variable: traffic.light :: color +clock_wave�256�traffic�0 +namespace: traffic :: clock_wave +color�32768�traffic.light�0 +externvar: traffic.light :: color green�16384�traffic�0 variable: traffic :: green -green_tics�16384�traffic�0 -variable: traffic :: green_tics +green_tics�8�traffic�0 +field: traffic :: green_tics light�16�traffic�0 function: traffic :: light -off�16384�traffic�0 -variable: traffic :: off -on�16384�traffic�0 -variable: traffic :: on +main_process�256�traffic�0 +namespace: traffic :: main_process +off�8�traffic�0 +field: traffic :: off +on�8�traffic�0 +field: traffic :: on red�16384�traffic�0 variable: traffic :: red -red_tics�16384�traffic�0 -variable: traffic :: red_tics -tics�16384�traffic.light�0 -variable: traffic.light :: tics -traffic�1�0 -class: traffic +red_tics�8�traffic�0 +field: traffic :: red_tics +stop_at�256�traffic�0 +namespace: traffic :: stop_at +tics�32768�traffic.light�0 +externvar: traffic.light :: tics +traffic�1024�0 +prototype: traffic Modified: tests/meson.build 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -260,6 +260,7 @@ ctags_tests = [ 'ctags/objectivec_interface.mm.tags', 'ctags/objectivec_property.mm.tags', 'ctags/objectivec_protocol.mm.tags', + 'ctags/oop.sv.tags', 'ctags/Package.pm.tags', 'ctags/php5_5_class_kw.php.tags', 'ctags/parenthesis-rvalue.js.tags', @@ -338,6 +339,7 @@ ctags_tests = [ 'ctags/strings.php.tags', 'ctags/strings.rb.tags', 'ctags/structure.f.tags', + 'ctags/sysverilog.sv.tags', 'ctags/tabindent.py.tags', 'ctags/test.erl.tags', 'ctags/test.go.tags', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] 8d9ef1: Merge pull request #76 from slowpeek/master
by Colomban Wendling 10 Nov '24

10 Nov '24

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 10 Nov 2024 21:23:02 UTC Commit: 8d9ef110b3fc3bcc141ce31ddd27e74afff532be https://github.com/geany/geany-themes/commit/8d9ef110b3fc3bcc141ce31ddd27e7… Log Message: ----------- Merge pull request #76 from slowpeek/master Remove executable bit from grey8.conf Modified Paths: -------------- colorschemes/grey8.conf Modified: colorschemes/grey8.conf 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c04399: Merge pull request #3973 from techee/dart
by Jiří Techet 10 Nov '24

10 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sun, 10 Nov 2024 16:40:18 UTC Commit: c043996a9a3dc1b0aa36571cd5f5d61fd8d2eb59 https://github.com/geany/geany/commit/c043996a9a3dc1b0aa36571cd5f5d61fd8d2e… Log Message: ----------- Merge pull request #3973 from techee/dart Add Dart support Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.dart data/filetype_extensions.conf meson.build scintilla/Makefile.am scintilla/lexilla/lexers/LexDart.cxx scintilla/lexilla/src/Lexilla.cxx scintilla/scintilla_changes.patch src/editor.c src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -28,6 +28,7 @@ filetypes_dist = \ filedefs/filetypes.CUDA.conf \ filedefs/filetypes.Cython.conf \ filedefs/filetypes.d \ + filedefs/filetypes.dart \ filedefs/filetypes.diff \ filedefs/filetypes.docbook \ filedefs/filetypes.Dockerfile.conf \ Modified: data/filedefs/filetypes.dart 93 lines changed, 93 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,93 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# Edit these in the colorscheme .conf file instead + +default=default +commentline=comment_line +commentlinedoc=comment_doc +commentblock=comment +commentblockdoc=comment_doc +stringsq=string_1 +stringdq=string_1 +triplestringsq=string_1 +triplestringdq=string_1 +rawstringsq=string_1 +rawstringdq=string_1 +triplerawstringsq=string_1 +triplerawstringdq=string_1 +escapechar=string_2 +identifier=default +identifierstring=string_2 +operator=operator +operatorstring=string_2 +symbolidentifier=preprocessor +symboloperator=preprocessor +number=number_1 +key=other +metadata=decorator +kwprimary=keyword_1 +kwsecondary=keyword_1 +kwtertiary=keyword_2 +kwtype=class + +[keywords] +# all items must be in one line +primary=abstract as assert async await base break case catch class const continue covariant default deferred do else enum export extends extension external factory false final finally for get hide if implements import in interface is late library mixin native new null of on operator part required rethrow return sealed set show static super switch sync this throw true try type typedef var when while with yield +secondary=Function Never bool double dynamic int num void +tertiary=BigInt Comparable Comparator Completer DateTime Deprecated Directory DoubleLinkedQueue Duration Enum Error Exception Expando File FileLock FileMode FileStat FileSystemEntity FileSystemEvent Future FutureOr HashMap HashSet IOException Invocation Iterable IterableBase IterableMixin Iterator LinkedHashMap LinkedHashSet LinkedList LinkedListEntry List ListBase ListMixin ListQueue Map MapBase MapEntry MapMixin MapView Match Null OSError Object Pattern Platform Point Process Queue Random RawSocket RawSocketEvent Record Rectangle RegExp RegExpMatch RuneIterator Runes ServerSocket Set SetBase SetMixin Sink Socket SocketException SplayTreeMap SplayTreeSet StackTrace Stopwatch Stream String StringBuffer StringSink Symbol SystemHash Timer Type Uri UriData WeakReference + +[lexer_properties] + +[settings] +tag_parser=Java + +# default extension used when saving files +extension=dart + +# MIME type +mime_type=text/x-dart + +# these characters define word boundaries when making selections and searching +# using word matching options +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comment char, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d +# #command_example(); +# setting to false would generate this +# # command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[indentation] +#width=2 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=0 + +[build-menu] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +FT_00_LB=_Compile +FT_00_CM=dart compile exe "%f" +FT_00_WD= +FT_01_LB=_Analyze +FT_01_CM=dart analyze "%f" +FT_01_WD= +FT_02_LB=_Test +FT_02_CM=dart test "%f" +FT_02_WD= +EX_00_LB=Dart _Run +EX_00_CM=dart run "%f" +EX_00_WD=%p +EX_01_LB=Flutter R_un +EX_01_CM=flutter run "%f" +EX_01_WD=%p Modified: data/filetype_extensions.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -26,6 +26,7 @@ Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop;*.properties; CSS=*.css; Cython=*.pyx;*.pxd;*.pxi; D=*.d;*.di; +Dart=*.dart; Diff=*.diff;*.patch;*.rej; Docbook=*.docbook; Dockerfile=Dockerfile;dockerfile;*.dockerfile;*.Dockerfile;Dockerfile.*; Modified: meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -258,6 +258,7 @@ lexilla = static_library('lexilla', 'scintilla/lexilla/lexers/LexCPP.cxx', 'scintilla/lexilla/lexers/LexCSS.cxx', 'scintilla/lexilla/lexers/LexD.cxx', + 'scintilla/lexilla/lexers/LexDart.cxx', 'scintilla/lexilla/lexers/LexDiff.cxx', 'scintilla/lexilla/lexers/LexErlang.cxx', 'scintilla/lexilla/lexers/LexForth.cxx', Modified: scintilla/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -28,6 +28,7 @@ lexilla/lexers/LexCaml.cxx \ lexilla/lexers/LexCmake.cxx \ lexilla/lexers/LexCoffeeScript.cxx \ lexilla/lexers/LexD.cxx \ +lexilla/lexers/LexDart.cxx \ lexilla/lexers/LexDiff.cxx \ lexilla/lexers/LexErlang.cxx \ lexilla/lexers/LexForth.cxx \ Modified: scintilla/lexilla/lexers/LexDart.cxx 702 lines changed, 702 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,702 @@ +// Scintilla source code edit control +/** @file LexDart.cxx + ** Lexer for Dart. + **/ +// Based on Zufu Liu's Notepad4 Dart lexer +// Modified for Scintilla by Jiri Techet, 2024 +// The License.txt file describes the conditions under which this software may be distributed. + +#include <cassert> +#include <cstring> + +#include <string> +#include <string_view> +#include <vector> +#include <map> +#include <algorithm> + +#include "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "WordList.h" +#include "LexAccessor.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "CharacterSet.h" +#include "LexerModule.h" +#include "OptionSet.h" +#include "DefaultLexer.h" + +using namespace Scintilla; +using namespace Lexilla; + +namespace { +// Use an unnamed namespace to protect the functions and classes from name conflicts + +constexpr bool IsEOLChar(int ch) noexcept { + return ch == '\r' || ch == '\n'; +} + +constexpr bool IsAGraphic(int ch) noexcept { + // excludes C0 control characters and whitespace + return ch > 32 && ch < 127; +} + +constexpr bool IsIdentifierChar(int ch) noexcept { + return IsAlphaNumeric(ch) || ch == '_'; +} + +constexpr bool IsIdentifierStart(int ch) noexcept { + return IsUpperOrLowerCase(ch) || ch == '_'; +} + +constexpr bool IsNumberContinue(int chPrev, int ch, int chNext) noexcept { + return ((ch == '+' || ch == '-') && (chPrev == 'e' || chPrev == 'E')) + || (ch == '.' && chNext != '.'); +} + +constexpr bool IsNumberStart(int ch, int chNext) noexcept { + return IsADigit(ch) || (ch == '.' && IsADigit(chNext)); +} + +constexpr bool IsDecimalNumber(int chPrev, int ch, int chNext) noexcept { + return IsIdentifierChar(ch) || IsNumberContinue(chPrev, ch, chNext); +} + +struct EscapeSequence { + int outerState = SCE_DART_DEFAULT; + int digitsLeft = 0; + bool brace = false; + + // highlight any character as escape sequence. + bool resetEscapeState(int state, int chNext) noexcept { + if (IsEOLChar(chNext)) { + return false; + } + outerState = state; + brace = false; + digitsLeft = (chNext == 'x')? 3 : ((chNext == 'u') ? 5 : 1); + return true; + } + bool atEscapeEnd(int ch) noexcept { + --digitsLeft; + return digitsLeft <= 0 || !IsAHeXDigit(ch); + } +}; + +constexpr bool IsDartIdentifierStart(int ch) noexcept { + return IsIdentifierStart(ch) || ch == '$'; +} + +constexpr bool IsDartIdentifierChar(int ch) noexcept { + return IsIdentifierChar(ch) || ch == '$'; +} + +constexpr bool IsDefinableOperator(int ch) noexcept { + // https://github.com/dart-lang/sdk/blob/main/sdk/lib/core/symbol.dart + return AnyOf(ch, '+', '-', '*', '/', '%', '~', '&', '|', + '^', '<', '>', '=', '[', ']'); +} + +constexpr bool IsSpaceEquiv(int state) noexcept { + return state == SCE_DART_DEFAULT || + state == SCE_DART_COMMENTLINE || + state == SCE_DART_COMMENTLINEDOC || + state == SCE_DART_COMMENTBLOCK || + state == SCE_DART_COMMENTBLOCKDOC; +} + +constexpr bool IsTripleString(int state) noexcept { + return state == SCE_DART_TRIPLE_STRING_SQ || + state == SCE_DART_TRIPLE_STRING_DQ || + state == SCE_DART_TRIPLE_RAWSTRING_SQ || + state == SCE_DART_TRIPLE_RAWSTRING_DQ; +} + +constexpr bool IsDoubleQuoted(int state) noexcept { + return state == SCE_DART_STRING_DQ || + state == SCE_DART_RAWSTRING_DQ || + state == SCE_DART_TRIPLE_STRING_DQ || + state == SCE_DART_TRIPLE_RAWSTRING_DQ; +} + +constexpr bool IsRaw(int state) noexcept { + return state == SCE_DART_RAWSTRING_SQ || + state == SCE_DART_RAWSTRING_DQ || + state == SCE_DART_TRIPLE_RAWSTRING_SQ || + state == SCE_DART_TRIPLE_RAWSTRING_DQ; +} + +constexpr int GetStringQuote(int state) noexcept { + return IsDoubleQuoted(state) ? '\"' : '\''; +} + +enum { + DartLineStateMaskLineComment = 1, // line comment + DartLineStateMaskImport = (1 << 1), // import + DartLineStateMaskInterpolation = (1 << 2), // string interpolation +}; + +// string interpolating state +struct InterpolatingState { + int state; + int braceCount; +}; + +struct FoldLineState { + int lineComment; + int packageImport; + constexpr explicit FoldLineState(int lineState) noexcept: + lineComment(lineState & DartLineStateMaskLineComment), + packageImport((lineState >> 1) & 1) { + } +}; + +// Options used for LexerDart +struct OptionsDart { + bool fold = false; +}; + +const char * const dartWordListDesc[] = { + "Primary keywords", + "Secondary keywords", + "Tertiary keywords", + "Global type definitions", + nullptr +}; + +struct OptionSetDart : public OptionSet<OptionsDart> { + OptionSetDart() { + DefineProperty("fold", &OptionsDart::fold); + + DefineWordListSets(dartWordListDesc); + } +}; + + +LexicalClass lexicalClasses[] = { + // Lexer DART SCLEX_DART SCE_DART_: + 0, "SCE_DART_DEFAULT", "default", "White space", + 1, "SCE_DART_COMMENTLINE", "comment line", "Comment: //", + 2, "SCE_DART_COMMENTLINEDOC", "comment line documentation", "Comment: ///", + 3, "SCE_DART_COMMENTBLOCK", "comment", "Comment: /* */", + 4, "SCE_DART_COMMENTBLOCKDOC", "comment documentation", "Comment: /** */", + 5, "SCE_DART_STRING_SQ", "literal string", "Single quoted string", + 6, "SCE_DART_STRING_DQ", "literal string", "Double quoted string", + 7, "SCE_DART_TRIPLE_STRING_SQ", "literal string multiline", "Single quoted multiline string", + 8, "SCE_DART_TRIPLE_STRING_DQ", "literal string multiline", "Double quoted multiline string", + 9, "SCE_DART_RAWSTRING_SQ", "literal string raw", "Single quoted raw string", + 10, "SCE_DART_RAWSTRING_DQ", "literal string raw", "Double quoted raw string", + 11, "SCE_DART_TRIPLE_RAWSTRING_SQ", "literal string multiline raw", "Single quoted multiline raw string", + 12, "SCE_DART_TRIPLE_RAWSTRING_DQ", "literal string multiline raw", "Double quoted multiline raw string", + 13, "SCE_DART_ESCAPECHAR", "literal string escapesequence", "Escape sequence", + 14, "SCE_DART_IDENTIFIER", "identifier", "Identifier", + 15, "SCE_DART_IDENTIFIER_STRING", "identifier interpolated", "Identifier following $ inside strings", + 16, "SCE_DART_OPERATOR", "operator", "Operator", + 17, "SCE_DART_OPERATOR_STRING", "operator interpolated", "Braces following $ inside string", + 18, "SCE_DART_SYMBOL_IDENTIFIER", "identifier symbol", "Symbol name introduced by #", + 19, "SCE_DART_SYMBOL_OPERATOR", "operator symbol", "Operator introduced by #", + 20, "SCE_DART_NUMBER", "literal numeric", "Number", + 21, "SCE_DART_KEY", "key", "Keys preceding ':' and named parameters", + 22, "SCE_DART_METADATA", "preprocessor", "Metadata introduced by @", + 23, "SCE_DART_KW_PRIMARY", "keyword", "Primary keywords", + 24, "SCE_DART_KW_SECONDARY", "identifier", "Secondary keywords", + 25, "SCE_DART_KW_TERTIARY", "identifier", "Tertiary keywords", + 26, "SCE_DART_KW_TYPE", "identifier", "Global types", +}; + +class LexerDart : public DefaultLexer { + WordList keywordsPrimary; + WordList keywordsSecondary; + WordList keywordsTertiary; + WordList keywordsTypes; + OptionsDart options; + OptionSetDart osDart; +public: + LexerDart(const char *languageName_, int language_) : + DefaultLexer(languageName_, language_, lexicalClasses, std::size(lexicalClasses)) { + } + // Deleted so LexerDart objects can not be copied. + LexerDart(const LexerDart &) = delete; + LexerDart(LexerDart &&) = delete; + void operator=(const LexerDart &) = delete; + void operator=(LexerDart &&) = delete; + ~LexerDart() override = default; + + void SCI_METHOD Release() override { + delete this; + } + int SCI_METHOD Version() const override { + return lvRelease5; + } + const char *SCI_METHOD PropertyNames() override { + return osDart.PropertyNames(); + } + int SCI_METHOD PropertyType(const char *name) override { + return osDart.PropertyType(name); + } + const char *SCI_METHOD DescribeProperty(const char *name) override { + return osDart.DescribeProperty(name); + } + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override; + const char *SCI_METHOD PropertyGet(const char *key) override { + return osDart.PropertyGet(key); + } + const char *SCI_METHOD DescribeWordListSets() override { + return osDart.DescribeWordListSets(); + } + Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override; + + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override; + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override; + + void *SCI_METHOD PrivateCall(int, void *) override { + return nullptr; + } + + void BacktrackToStart(const LexAccessor &styler, int stateMask, Sci_PositionU &startPos, Sci_Position &lengthDoc, int &initStyle); + Sci_PositionU LookbackNonWhite(LexAccessor &styler, Sci_PositionU startPos, int &chPrevNonWhite, int &stylePrevNonWhite); + + static ILexer5 *LexerFactoryDart() { + return new LexerDart("dart", SCLEX_DART); + } +}; + +Sci_Position SCI_METHOD LexerDart::PropertySet(const char *key, const char *val) { + if (osDart.PropertySet(&options, key, val)) { + return 0; + } + return -1; +} + +Sci_Position SCI_METHOD LexerDart::WordListSet(int n, const char *wl) { + WordList *wordListN = nullptr; + switch (n) { + case 0: + wordListN = &keywordsPrimary; + break; + case 1: + wordListN = &keywordsSecondary; + break; + case 2: + wordListN = &keywordsTertiary; + break; + case 3: + wordListN = &keywordsTypes; + break; + default: + break; + } + Sci_Position firstModification = -1; + if (wordListN && wordListN->Set(wl)) { + firstModification = 0; + } + return firstModification; +} + +void LexerDart::BacktrackToStart(const LexAccessor &styler, int stateMask, Sci_PositionU &startPos, Sci_Position &lengthDoc, int &initStyle) { + const Sci_Position currentLine = styler.GetLine(startPos); + if (currentLine != 0) { + Sci_Position line = currentLine - 1; + int lineState = styler.GetLineState(line); + while ((lineState & stateMask) != 0 && line != 0) { + --line; + lineState = styler.GetLineState(line); + } + if ((lineState & stateMask) == 0) { + ++line; + } + if (line != currentLine) { + const Sci_PositionU endPos = startPos + lengthDoc; + startPos = (line == 0) ? 0 : styler.LineStart(line); + lengthDoc = endPos - startPos; + initStyle = (startPos == 0) ? 0 : styler.StyleAt(startPos - 1); + } + } +} + +Sci_PositionU LexerDart::LookbackNonWhite(LexAccessor &styler, Sci_PositionU startPos, int &chPrevNonWhite, int &stylePrevNonWhite) { + do { + --startPos; + const unsigned style = styler.StyleAt(startPos); + if (!IsSpaceEquiv(style)) { + stylePrevNonWhite = style; + chPrevNonWhite = static_cast<unsigned char>(styler[startPos]); + break; + } + } while (startPos != 0); + return startPos; +} + +void LexerDart::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) { + Accessor styler(pAccess, nullptr); + + int lineStateLineType = 0; + int commentLevel = 0; // nested block comment level + + std::vector<InterpolatingState> interpolatingStack; + + int visibleChars = 0; + int chBefore = 0; + int chPrevNonWhite = 0; + EscapeSequence escSeq; + + if (startPos != 0) { + // backtrack to the line where interpolation starts + BacktrackToStart(styler, DartLineStateMaskInterpolation, startPos, lengthDoc, initStyle); + } + + StyleContext sc(startPos, lengthDoc, initStyle, styler); + if (sc.currentLine > 0) { + const int lineState = styler.GetLineState(sc.currentLine - 1); + commentLevel = lineState >> 4; + } + if (startPos == 0) { + if (sc.Match('#', '!')) { + // Shell Shebang at beginning of file + sc.SetState(SCE_DART_COMMENTLINE); + sc.Forward(); + lineStateLineType = DartLineStateMaskLineComment; + } + } else if (IsSpaceEquiv(initStyle)) { + LookbackNonWhite(styler, startPos, chPrevNonWhite, initStyle); + chBefore = chPrevNonWhite; + } + + while (sc.More()) { + switch (sc.state) { + case SCE_DART_OPERATOR: + case SCE_DART_OPERATOR_STRING: + sc.SetState(SCE_DART_DEFAULT); + break; + + case SCE_DART_NUMBER: + if (!IsDecimalNumber(sc.chPrev, sc.ch, sc.chNext)) { + sc.SetState(SCE_DART_DEFAULT); + } + break; + + case SCE_DART_IDENTIFIER: + case SCE_DART_IDENTIFIER_STRING: + case SCE_DART_METADATA: + case SCE_DART_SYMBOL_IDENTIFIER: + if (!IsDartIdentifierChar(sc.ch) || (sc.ch == '$' && sc.state == SCE_DART_IDENTIFIER_STRING)) { + if (sc.state == SCE_DART_METADATA || sc.state == SCE_DART_SYMBOL_IDENTIFIER) { + if (sc.ch == '.') { + const int state = sc.state; + sc.SetState(SCE_DART_OPERATOR); + sc.ForwardSetState(state); + continue; + } + } else { + char s[64]; + sc.GetCurrent(s, sizeof(s)); + const int state = sc.state; + if (state == SCE_DART_IDENTIFIER_STRING) { + sc.SetState(escSeq.outerState); + continue; + } else if (keywordsPrimary.InList(s)) { + sc.ChangeState(SCE_DART_KW_PRIMARY); + if (strcmp(s, "import") == 0 || strcmp(s, "part") == 0) { + if (visibleChars == sc.LengthCurrent()) { + lineStateLineType = DartLineStateMaskImport; + } + } + } else if (keywordsSecondary.InList(s)) { + sc.ChangeState(SCE_DART_KW_SECONDARY); + } else if (keywordsTertiary.InList(s)) { + sc.ChangeState(SCE_DART_KW_TERTIARY); + } else if (keywordsTypes.InList(s)) { + sc.ChangeState(SCE_DART_KW_TYPE); + } else if (state == SCE_DART_IDENTIFIER && sc.ch == ':') { + if (chBefore == ',' || chBefore == '{' || chBefore == '(') { + sc.ChangeState(SCE_DART_KEY); // map key or named parameter + } + } + } + + sc.SetState(SCE_DART_DEFAULT); + } + break; + + case SCE_DART_SYMBOL_OPERATOR: + if (!IsDefinableOperator(sc.ch)) { + sc.SetState(SCE_DART_DEFAULT); + } + break; + + case SCE_DART_COMMENTLINE: + case SCE_DART_COMMENTLINEDOC: + if (sc.atLineStart) { + sc.SetState(SCE_DART_DEFAULT); + } + break; + + case SCE_DART_COMMENTBLOCK: + case SCE_DART_COMMENTBLOCKDOC: + if (sc.Match('*', '/')) { + sc.Forward(); + --commentLevel; + if (commentLevel == 0) { + sc.ForwardSetState(SCE_DART_DEFAULT); + } + } else if (sc.Match('/', '*')) { + sc.Forward(); + ++commentLevel; + } + break; + + case SCE_DART_STRING_SQ: + case SCE_DART_STRING_DQ: + case SCE_DART_TRIPLE_STRING_SQ: + case SCE_DART_TRIPLE_STRING_DQ: + case SCE_DART_RAWSTRING_SQ: + case SCE_DART_RAWSTRING_DQ: + case SCE_DART_TRIPLE_RAWSTRING_SQ: + case SCE_DART_TRIPLE_RAWSTRING_DQ: + if (sc.atLineStart && !IsTripleString(sc.state)) { + sc.SetState(SCE_DART_DEFAULT); + } else if (sc.ch == '\\' && !IsRaw(sc.state)) { + if (escSeq.resetEscapeState(sc.state, sc.chNext)) { + sc.SetState(SCE_DART_ESCAPECHAR); + sc.Forward(); + if (sc.Match('u', '{')) { + escSeq.brace = true; + escSeq.digitsLeft = 7; // Unicode code point + sc.Forward(); + } + } + } else if (sc.ch == '$' && !IsRaw(sc.state)) { + escSeq.outerState = sc.state; + sc.SetState(SCE_DART_OPERATOR_STRING); + sc.Forward(); + if (sc.ch == '{') { + interpolatingStack.push_back({escSeq.outerState, 1}); + } else if (sc.ch != '$' && IsDartIdentifierStart(sc.ch)) { + sc.SetState(SCE_DART_IDENTIFIER_STRING); + } else { // error + sc.SetState(escSeq.outerState); + continue; + } + } else if (sc.ch == GetStringQuote(sc.state) && + (!IsTripleString(sc.state) || (sc.Match(IsDoubleQuoted(sc.state) ? R"(""")" : R"(''')")))) { + if (IsTripleString(sc.state)) { + sc.Forward(2); + } + sc.Forward(); + sc.SetState(SCE_DART_DEFAULT); + } + break; + + case SCE_DART_ESCAPECHAR: + if (escSeq.atEscapeEnd(sc.ch)) { + if (escSeq.brace && sc.ch == '}') { + sc.Forward(); + } + sc.SetState(escSeq.outerState); + continue; + } + break; + } + + if (sc.state == SCE_DART_DEFAULT) { + if (sc.ch == '/' && (sc.chNext == '/' || sc.chNext == '*')) { + const int chNext = sc.chNext; + sc.SetState((chNext == '/') ? SCE_DART_COMMENTLINE : SCE_DART_COMMENTBLOCK); + sc.Forward(2); + if (sc.ch == chNext && sc.chNext != chNext) { + if (sc.state == SCE_DART_COMMENTLINE) { + sc.ChangeState(SCE_DART_COMMENTLINEDOC); + } else { + sc.ChangeState(SCE_DART_COMMENTBLOCKDOC); + } + } + if (chNext == '/') { + if (visibleChars == 0) { + lineStateLineType = DartLineStateMaskLineComment; + } + } else { + commentLevel = 1; + } + continue; + } + if (sc.ch == 'r' && (sc.chNext == '\'' || sc.chNext == '"')) { + sc.SetState((sc.chNext == '\'') ? SCE_DART_RAWSTRING_SQ : SCE_DART_RAWSTRING_DQ); + sc.Forward(2); + if (sc.chPrev == '\'' && sc.Match('\'', '\'')) { + sc.ChangeState(SCE_DART_TRIPLE_RAWSTRING_SQ); + sc.Forward(2); + } else if (sc.chPrev == '"' && sc.Match('"', '"')) { + sc.ChangeState(SCE_DART_TRIPLE_RAWSTRING_DQ); + sc.Forward(2); + } + continue; + } + if (sc.ch == '"') { + if (sc.Match(R"(""")")) { + sc.SetState(SCE_DART_TRIPLE_STRING_DQ); + sc.Forward(2); + } else { + chBefore = chPrevNonWhite; + sc.SetState(SCE_DART_STRING_DQ); + } + } else if (sc.ch == '\'') { + if (sc.Match(R"(''')")) { + sc.SetState(SCE_DART_TRIPLE_STRING_SQ); + sc.Forward(2); + } else { + chBefore = chPrevNonWhite; + sc.SetState(SCE_DART_STRING_SQ); + } + } else if (IsNumberStart(sc.ch, sc.chNext)) { + sc.SetState(SCE_DART_NUMBER); + } else if ((sc.ch == '@' || sc.ch == '#') && IsDartIdentifierStart(sc.chNext)) { + sc.SetState((sc.ch == '@') ? SCE_DART_METADATA : SCE_DART_SYMBOL_IDENTIFIER); + } else if (IsDartIdentifierStart(sc.ch)) { + chBefore = chPrevNonWhite; + sc.SetState(SCE_DART_IDENTIFIER); + } else if (sc.ch == '#' && IsDefinableOperator(sc.chNext)) { + sc.SetState(SCE_DART_SYMBOL_OPERATOR); + } else if (IsAGraphic(sc.ch)) { + sc.SetState(SCE_DART_OPERATOR); + if (!interpolatingStack.empty() && AnyOf(sc.ch, '{', '}')) { + InterpolatingState &current = interpolatingStack.back(); + if (sc.ch == '{') { + current.braceCount += 1; + } else { + current.braceCount -= 1; + if (current.braceCount == 0) { + sc.ChangeState(SCE_DART_OPERATOR_STRING); + sc.ForwardSetState(current.state); + interpolatingStack.pop_back(); + continue; + } + } + } + } + } + + if (!isspacechar(sc.ch)) { + visibleChars++; + if (!IsSpaceEquiv(sc.state)) { + chPrevNonWhite = sc.ch; + } + } + if (sc.atLineEnd) { + int lineState = (commentLevel << 4) | lineStateLineType; + if (!interpolatingStack.empty()) { + lineState |= DartLineStateMaskInterpolation; + } + styler.SetLineState(sc.currentLine, lineState); + lineStateLineType = 0; + visibleChars = 0; + } + sc.Forward(); + } + + sc.Complete(); +} + +void LexerDart::Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) { + if (!options.fold) + return; + + Accessor styler(pAccess, nullptr); + const Sci_PositionU endPos = startPos + lengthDoc; + Sci_Position lineCurrent = styler.GetLine(startPos); + while (lineCurrent > 0) { + lineCurrent--; + startPos = styler.LineStart(lineCurrent); + initStyle = (startPos > 0) ? styler.StyleIndexAt(startPos) : 0; + if (initStyle != SCE_DART_COMMENTBLOCKDOC && initStyle != SCE_DART_COMMENTBLOCK && + initStyle != SCE_DART_TRIPLE_RAWSTRING_SQ && initStyle != SCE_DART_TRIPLE_RAWSTRING_DQ && + initStyle != SCE_DART_TRIPLE_STRING_SQ && initStyle != SCE_DART_TRIPLE_STRING_DQ) + break; + } + FoldLineState foldPrev(0); + int levelCurrent = SC_FOLDLEVELBASE; + if (lineCurrent > 0) { + levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16; + foldPrev = FoldLineState(styler.GetLineState(lineCurrent - 1)); + } + + int levelNext = levelCurrent; + FoldLineState foldCurrent(styler.GetLineState(lineCurrent)); + Sci_PositionU lineStartNext = styler.LineStart(lineCurrent + 1); + lineStartNext = std::min(lineStartNext, endPos); + + char chNext = styler[startPos]; + int styleNext = styler.StyleIndexAt(startPos); + int style = initStyle; + + while (startPos < endPos) { + const char ch = chNext; + const int stylePrev = style; + style = styleNext; + chNext = styler[++startPos]; + styleNext = styler.StyleIndexAt(startPos); + + switch (style) { + case SCE_DART_COMMENTBLOCKDOC: + case SCE_DART_COMMENTBLOCK: { + const int level = (ch == '/' && chNext == '*') ? 1 : ((ch == '*' && chNext == '/') ? -1 : 0); + if (level != 0) { + levelNext += level; + startPos++; + chNext = styler[startPos]; + styleNext = styler.StyleIndexAt(startPos); + } + } break; + + case SCE_DART_TRIPLE_RAWSTRING_SQ: + case SCE_DART_TRIPLE_RAWSTRING_DQ: + case SCE_DART_TRIPLE_STRING_SQ: + case SCE_DART_TRIPLE_STRING_DQ: + if (style != stylePrev && !AnyOf(stylePrev, SCE_DART_ESCAPECHAR, SCE_DART_OPERATOR_STRING, SCE_DART_IDENTIFIER_STRING)) { + levelNext++; + } + if (style != styleNext && !AnyOf(styleNext, SCE_DART_ESCAPECHAR, SCE_DART_OPERATOR_STRING, SCE_DART_IDENTIFIER_STRING)) { + levelNext--; + } + break; + + case SCE_DART_OPERATOR: + case SCE_DART_OPERATOR_STRING: + if (ch == '{' || ch == '[' || ch == '(') { + levelNext++; + } else if (ch == '}' || ch == ']' || ch == ')') { + levelNext--; + } + break; + } + + if (startPos == lineStartNext) { + const FoldLineState foldNext(styler.GetLineState(lineCurrent + 1)); + levelNext = std::max(levelNext, SC_FOLDLEVELBASE); + if (foldCurrent.lineComment) { + levelNext += foldNext.lineComment - foldPrev.lineComment; + } else if (foldCurrent.packageImport) { + levelNext += foldNext.packageImport - foldPrev.packageImport; + } + + const int levelUse = levelCurrent; + int lev = levelUse | (levelNext << 16); + if (levelUse < levelNext) { + lev |= SC_FOLDLEVELHEADERFLAG; + } + styler.SetLevel(lineCurrent, lev); + + lineCurrent++; + lineStartNext = styler.LineStart(lineCurrent + 1); + lineStartNext = std::min(lineStartNext, endPos); + levelCurrent = levelNext; + foldPrev = foldCurrent; + foldCurrent = foldNext; + } + } +} + +} // unnamed namespace end + +extern const LexerModule lmDart(SCLEX_DART, LexerDart::LexerFactoryDart, "dart", dartWordListDesc); Modified: scintilla/lexilla/src/Lexilla.cxx 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -59,6 +59,7 @@ extern LexerModule lmCPPNoCase; extern LexerModule lmCsound; extern LexerModule lmCss; extern LexerModule lmD; +extern LexerModule lmDart; extern LexerModule lmDataflex; extern LexerModule lmDiff; extern LexerModule lmDMAP; @@ -186,6 +187,7 @@ static void AddGeanyLexers() &lmCPP, &lmCss, &lmD, + &lmDart, &lmDiff, &lmErlang, &lmF77, @@ -273,6 +275,7 @@ void AddEachLexer() { &lmCsound, &lmCss, &lmD, + &lmDart, &lmDataflex, &lmDiff, &lmDMAP, Modified: scintilla/scintilla_changes.patch 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -62,7 +62,7 @@ diff --git scintilla/lexilla/src/Lexilla.cxx scintilla/lexilla/src/Lexilla.cxx index cd4b23617..af4a73db4 100644 --- scintilla/lexilla/src/Lexilla.cxx +++ scintilla/lexilla/src/Lexilla.cxx -@@ -167,8 +167,73 @@ +@@ -167,8 +167,74 @@ CatalogueModules catalogueLexilla; @@ -84,6 +84,7 @@ index cd4b23617..af4a73db4 100644 + &lmCPP, + &lmCss, + &lmD, ++ &lmDart, + &lmDiff, + &lmErlang, + &lmF77, Modified: src/editor.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1321,6 +1321,7 @@ static gboolean lexer_has_braces(ScintillaObject *sci) case SCLEX_CIL: case SCLEX_CPP: case SCLEX_D: + case SCLEX_DART: case SCLEX_HTML: /* for PHP & JS */ case SCLEX_PHPSCRIPT: case SCLEX_PASCAL: /* for multiline comments? */ @@ -5148,6 +5149,7 @@ void editor_set_indentation_guides(GeanyEditor *editor) case SCLEX_OCTAVE: case SCLEX_RUST: case SCLEX_ZIG: + case SCLEX_DART: mode = SC_IV_LOOKBOTH; break; Modified: src/filetypes.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -194,6 +194,7 @@ static void init_builtin_filetypes(void) FT_INIT( PROLOG, NONE, "Prolog", NULL, SOURCE_FILE, COMPILED ); FT_INIT( NIM, NONE, "Nim", NULL, SOURCE_FILE, COMPILED ); FT_INIT( ZIG, NONE, "Zig", NULL, SOURCE_FILE, COMPILED ); + FT_INIT( DART, NONE, "Dart", NULL, SOURCE_FILE, COMPILED ); } @@ -626,7 +627,8 @@ static GeanyFiletype *find_shebang(const gchar *utf8_filename, const gchar *line { "dmd", GEANY_FILETYPES_D }, { "wish", GEANY_FILETYPES_TCL }, { "node", GEANY_FILETYPES_JS }, - { "rust", GEANY_FILETYPES_RUST } + { "rust", GEANY_FILETYPES_RUST }, + { "dart", GEANY_FILETYPES_DART } }; gchar *tmp = g_path_get_basename(line + 2); gchar *basename_interpreter = tmp; Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -114,6 +114,7 @@ typedef enum GEANY_FILETYPES_PROLOG, GEANY_FILETYPES_NIM, GEANY_FILETYPES_ZIG, + GEANY_FILETYPES_DART, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 18 lines changed, 18 insertions(+), 0 deletions(-) =================================================================== @@ -1014,6 +1014,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(CONF); init_styleset_case(CSS); init_styleset_case(D); + init_styleset_case(DART); init_styleset_case(DIFF); init_styleset_case(LISP); init_styleset_case(ERLANG); @@ -1111,6 +1112,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(CONF); styleset_case(CSS); styleset_case(D); + styleset_case(DART); styleset_case(DIFF); styleset_case(LISP); styleset_case(ERLANG); @@ -1693,6 +1695,16 @@ gboolean highlighting_is_string_style(gint lexer, gint style) style == SCE_ZIG_MULTISTRING || style == SCE_ZIG_CHARACTER || style == SCE_ZIG_ESCAPECHAR); + + case SCLEX_DART: + return (style == SCE_DART_STRING_SQ || + style == SCE_DART_STRING_DQ || + style == SCE_DART_TRIPLE_STRING_SQ || + style == SCE_DART_TRIPLE_STRING_DQ || + style == SCE_DART_RAWSTRING_SQ || + style == SCE_DART_RAWSTRING_DQ || + style == SCE_DART_TRIPLE_RAWSTRING_SQ || + style == SCE_DART_TRIPLE_RAWSTRING_DQ); } return FALSE; } @@ -1950,6 +1962,12 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) return (style == SCE_ZIG_COMMENTLINE || style == SCE_ZIG_COMMENTLINEDOC || style == SCE_ZIG_COMMENTLINETOP); + + case SCLEX_DART: + return (style == SCE_DART_COMMENTLINE || + style == SCE_DART_COMMENTLINEDOC || + style == SCE_DART_COMMENTBLOCK || + style == SCE_DART_COMMENTBLOCKDOC); } return FALSE; } Modified: src/highlightingmappings.h 42 lines changed, 42 insertions(+), 0 deletions(-) =================================================================== @@ -538,6 +538,48 @@ static const HLKeyword highlighting_keywords_D[] = #define highlighting_properties_D EMPTY_PROPERTIES +/* DART */ +#define highlighting_lexer_DART SCLEX_DART +static const HLStyle highlighting_styles_DART[] = +{ + { SCE_DART_DEFAULT, "default", FALSE }, + { SCE_DART_COMMENTLINE, "commentline", FALSE }, + { SCE_DART_COMMENTLINEDOC, "commentlinedoc", FALSE }, + { SCE_DART_COMMENTBLOCK, "commentblock", FALSE }, + { SCE_DART_COMMENTBLOCKDOC, "commentblockdoc", FALSE }, + { SCE_DART_STRING_SQ, "stringsq", FALSE }, + { SCE_DART_STRING_DQ, "stringdq", FALSE }, + { SCE_DART_TRIPLE_STRING_SQ, "triplestringsq", FALSE }, + { SCE_DART_TRIPLE_STRING_DQ, "triplestringdq", FALSE }, + { SCE_DART_RAWSTRING_SQ, "rawstringsq", FALSE }, + { SCE_DART_RAWSTRING_DQ, "rawstringdq", FALSE }, + { SCE_DART_TRIPLE_RAWSTRING_SQ, "triplerawstringsq", FALSE }, + { SCE_DART_TRIPLE_RAWSTRING_DQ, "triplerawstringdq", FALSE }, + { SCE_DART_ESCAPECHAR, "escapechar", FALSE }, + { SCE_DART_IDENTIFIER, "identifier", FALSE }, + { SCE_DART_IDENTIFIER_STRING, "identifierstring", FALSE }, + { SCE_DART_OPERATOR, "operator", FALSE }, + { SCE_DART_OPERATOR_STRING, "operatorstring", FALSE }, + { SCE_DART_SYMBOL_IDENTIFIER, "symbolidentifier", FALSE }, + { SCE_DART_SYMBOL_OPERATOR, "symboloperator", FALSE }, + { SCE_DART_NUMBER, "number", FALSE }, + { SCE_DART_KEY, "key", FALSE }, + { SCE_DART_METADATA, "metadata", FALSE }, + { SCE_DART_KW_PRIMARY, "kwprimary", FALSE }, + { SCE_DART_KW_SECONDARY, "kwsecondary", FALSE }, + { SCE_DART_KW_TERTIARY, "kwtertiary", FALSE }, + { SCE_DART_KW_TYPE, "kwtype", FALSE }, +}; +static const HLKeyword highlighting_keywords_DART[] = +{ + { 0, "primary", FALSE }, + { 1, "secondary", FALSE }, + { 2, "tertiary", FALSE }, + { 3, "types", FALSE }, +}; +#define highlighting_properties_DART EMPTY_PROPERTIES + + /* Diff */ #define highlighting_lexer_DIFF SCLEX_DIFF static const HLStyle highlighting_styles_DIFF[] = -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] a6c7ae: Remove executable bit from grey8.conf
by slowpeek 09 Nov '24

09 Nov '24

Branch: refs/heads/master Author: slowpeek <slowpeek(a)users.noreply.github.com> Committer: slowpeek <slowpeek(a)users.noreply.github.com> Date: Sat, 09 Nov 2024 22:00:28 UTC Commit: a6c7aef6ad5308f04464f037efaf90da405c7b07 https://github.com/geany/geany-themes/commit/a6c7aef6ad5308f04464f037efaf90… Log Message: ----------- Remove executable bit from grey8.conf Modified Paths: -------------- colorschemes/grey8.conf Modified: colorschemes/grey8.conf 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c8586c: Add Dart support
by Jiří Techet 09 Nov '24

09 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 09 Nov 2024 17:39:20 UTC Commit: c8586cb7893982a7ff4b10d39a18128063ada030 https://github.com/geany/geany/commit/c8586cb7893982a7ff4b10d39a18128063ada… Log Message: ----------- Add Dart support This PR adds support for the Dart language: 1. It uses the Dart lexer which has been recently merged to lexilla 2. The keywords are based on Notepad4 keywords 3. Build menu settings is based on https://github.com/geany/geany/issues/371 Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.dart data/filetype_extensions.conf meson.build scintilla/Makefile.am scintilla/lexilla/lexers/LexDart.cxx scintilla/lexilla/src/Lexilla.cxx scintilla/scintilla_changes.patch src/editor.c src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -28,6 +28,7 @@ filetypes_dist = \ filedefs/filetypes.CUDA.conf \ filedefs/filetypes.Cython.conf \ filedefs/filetypes.d \ + filedefs/filetypes.dart \ filedefs/filetypes.diff \ filedefs/filetypes.docbook \ filedefs/filetypes.Dockerfile.conf \ Modified: data/filedefs/filetypes.dart 93 lines changed, 93 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,93 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# Edit these in the colorscheme .conf file instead + +default=default +commentline=comment_line +commentlinedoc=comment_doc +commentblock=comment +commentblockdoc=comment_doc +stringsq=string_1 +stringdq=string_1 +triplestringsq=string_1 +triplestringdq=string_1 +rawstringsq=string_1 +rawstringdq=string_1 +triplerawstringsq=string_1 +triplerawstringdq=string_1 +escapechar=string_2 +identifier=default +identifierstring=string_2 +operator=operator +operatorstring=string_2 +symbolidentifier=preprocessor +symboloperator=preprocessor +number=number_1 +key=other +metadata=decorator +kwprimary=keyword_1 +kwsecondary=keyword_1 +kwtertiary=keyword_2 +kwtype=class + +[keywords] +# all items must be in one line +primary=abstract as assert async await base break case catch class const continue covariant default deferred do else enum export extends extension external factory false final finally for get hide if implements import in interface is late library mixin native new null of on operator part required rethrow return sealed set show static super switch sync this throw true try type typedef var when while with yield +secondary=Function Never bool double dynamic int num void +tertiary=BigInt Comparable Comparator Completer DateTime Deprecated Directory DoubleLinkedQueue Duration Enum Error Exception Expando File FileLock FileMode FileStat FileSystemEntity FileSystemEvent Future FutureOr HashMap HashSet IOException Invocation Iterable IterableBase IterableMixin Iterator LinkedHashMap LinkedHashSet LinkedList LinkedListEntry List ListBase ListMixin ListQueue Map MapBase MapEntry MapMixin MapView Match Null OSError Object Pattern Platform Point Process Queue Random RawSocket RawSocketEvent Record Rectangle RegExp RegExpMatch RuneIterator Runes ServerSocket Set SetBase SetMixin Sink Socket SocketException SplayTreeMap SplayTreeSet StackTrace Stopwatch Stream String StringBuffer StringSink Symbol SystemHash Timer Type Uri UriData WeakReference + +[lexer_properties] + +[settings] +tag_parser=Java + +# default extension used when saving files +extension=dart + +# MIME type +mime_type=text/x-dart + +# these characters define word boundaries when making selections and searching +# using word matching options +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comment char, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d +# #command_example(); +# setting to false would generate this +# # command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[indentation] +#width=2 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=0 + +[build-menu] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +FT_00_LB=_Compile +FT_00_CM=dart compile exe "%f" +FT_00_WD= +FT_01_LB=_Analyze +FT_01_CM=dart analyze "%f" +FT_01_WD= +FT_02_LB=_Test +FT_02_CM=dart test "%f" +FT_02_WD= +EX_00_LB=Dart _Run +EX_00_CM=dart run "%f" +EX_00_WD=%p +EX_01_LB=Flutter R_un +EX_01_CM=flutter run "%f" +EX_01_WD=%p Modified: data/filetype_extensions.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -26,6 +26,7 @@ Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop;*.properties; CSS=*.css; Cython=*.pyx;*.pxd;*.pxi; D=*.d;*.di; +Dart=*.dart; Diff=*.diff;*.patch;*.rej; Docbook=*.docbook; Dockerfile=Dockerfile;dockerfile;*.dockerfile;*.Dockerfile;Dockerfile.*; Modified: meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -258,6 +258,7 @@ lexilla = static_library('lexilla', 'scintilla/lexilla/lexers/LexCPP.cxx', 'scintilla/lexilla/lexers/LexCSS.cxx', 'scintilla/lexilla/lexers/LexD.cxx', + 'scintilla/lexilla/lexers/LexDart.cxx', 'scintilla/lexilla/lexers/LexDiff.cxx', 'scintilla/lexilla/lexers/LexErlang.cxx', 'scintilla/lexilla/lexers/LexForth.cxx', Modified: scintilla/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -28,6 +28,7 @@ lexilla/lexers/LexCaml.cxx \ lexilla/lexers/LexCmake.cxx \ lexilla/lexers/LexCoffeeScript.cxx \ lexilla/lexers/LexD.cxx \ +lexilla/lexers/LexDart.cxx \ lexilla/lexers/LexDiff.cxx \ lexilla/lexers/LexErlang.cxx \ lexilla/lexers/LexForth.cxx \ Modified: scintilla/lexilla/lexers/LexDart.cxx 702 lines changed, 702 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,702 @@ +// Scintilla source code edit control +/** @file LexDart.cxx + ** Lexer for Dart. + **/ +// Based on Zufu Liu's Notepad4 Dart lexer +// Modified for Scintilla by Jiri Techet, 2024 +// The License.txt file describes the conditions under which this software may be distributed. + +#include <cassert> +#include <cstring> + +#include <string> +#include <string_view> +#include <vector> +#include <map> +#include <algorithm> + +#include "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "WordList.h" +#include "LexAccessor.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "CharacterSet.h" +#include "LexerModule.h" +#include "OptionSet.h" +#include "DefaultLexer.h" + +using namespace Scintilla; +using namespace Lexilla; + +namespace { +// Use an unnamed namespace to protect the functions and classes from name conflicts + +constexpr bool IsEOLChar(int ch) noexcept { + return ch == '\r' || ch == '\n'; +} + +constexpr bool IsAGraphic(int ch) noexcept { + // excludes C0 control characters and whitespace + return ch > 32 && ch < 127; +} + +constexpr bool IsIdentifierChar(int ch) noexcept { + return IsAlphaNumeric(ch) || ch == '_'; +} + +constexpr bool IsIdentifierStart(int ch) noexcept { + return IsUpperOrLowerCase(ch) || ch == '_'; +} + +constexpr bool IsNumberContinue(int chPrev, int ch, int chNext) noexcept { + return ((ch == '+' || ch == '-') && (chPrev == 'e' || chPrev == 'E')) + || (ch == '.' && chNext != '.'); +} + +constexpr bool IsNumberStart(int ch, int chNext) noexcept { + return IsADigit(ch) || (ch == '.' && IsADigit(chNext)); +} + +constexpr bool IsDecimalNumber(int chPrev, int ch, int chNext) noexcept { + return IsIdentifierChar(ch) || IsNumberContinue(chPrev, ch, chNext); +} + +struct EscapeSequence { + int outerState = SCE_DART_DEFAULT; + int digitsLeft = 0; + bool brace = false; + + // highlight any character as escape sequence. + bool resetEscapeState(int state, int chNext) noexcept { + if (IsEOLChar(chNext)) { + return false; + } + outerState = state; + brace = false; + digitsLeft = (chNext == 'x')? 3 : ((chNext == 'u') ? 5 : 1); + return true; + } + bool atEscapeEnd(int ch) noexcept { + --digitsLeft; + return digitsLeft <= 0 || !IsAHeXDigit(ch); + } +}; + +constexpr bool IsDartIdentifierStart(int ch) noexcept { + return IsIdentifierStart(ch) || ch == '$'; +} + +constexpr bool IsDartIdentifierChar(int ch) noexcept { + return IsIdentifierChar(ch) || ch == '$'; +} + +constexpr bool IsDefinableOperator(int ch) noexcept { + // https://github.com/dart-lang/sdk/blob/main/sdk/lib/core/symbol.dart + return AnyOf(ch, '+', '-', '*', '/', '%', '~', '&', '|', + '^', '<', '>', '=', '[', ']'); +} + +constexpr bool IsSpaceEquiv(int state) noexcept { + return state == SCE_DART_DEFAULT || + state == SCE_DART_COMMENTLINE || + state == SCE_DART_COMMENTLINEDOC || + state == SCE_DART_COMMENTBLOCK || + state == SCE_DART_COMMENTBLOCKDOC; +} + +constexpr bool IsTripleString(int state) noexcept { + return state == SCE_DART_TRIPLE_STRING_SQ || + state == SCE_DART_TRIPLE_STRING_DQ || + state == SCE_DART_TRIPLE_RAWSTRING_SQ || + state == SCE_DART_TRIPLE_RAWSTRING_DQ; +} + +constexpr bool IsDoubleQuoted(int state) noexcept { + return state == SCE_DART_STRING_DQ || + state == SCE_DART_RAWSTRING_DQ || + state == SCE_DART_TRIPLE_STRING_DQ || + state == SCE_DART_TRIPLE_RAWSTRING_DQ; +} + +constexpr bool IsRaw(int state) noexcept { + return state == SCE_DART_RAWSTRING_SQ || + state == SCE_DART_RAWSTRING_DQ || + state == SCE_DART_TRIPLE_RAWSTRING_SQ || + state == SCE_DART_TRIPLE_RAWSTRING_DQ; +} + +constexpr int GetStringQuote(int state) noexcept { + return IsDoubleQuoted(state) ? '\"' : '\''; +} + +enum { + DartLineStateMaskLineComment = 1, // line comment + DartLineStateMaskImport = (1 << 1), // import + DartLineStateMaskInterpolation = (1 << 2), // string interpolation +}; + +// string interpolating state +struct InterpolatingState { + int state; + int braceCount; +}; + +struct FoldLineState { + int lineComment; + int packageImport; + constexpr explicit FoldLineState(int lineState) noexcept: + lineComment(lineState & DartLineStateMaskLineComment), + packageImport((lineState >> 1) & 1) { + } +}; + +// Options used for LexerDart +struct OptionsDart { + bool fold = false; +}; + +const char * const dartWordListDesc[] = { + "Primary keywords", + "Secondary keywords", + "Tertiary keywords", + "Global type definitions", + nullptr +}; + +struct OptionSetDart : public OptionSet<OptionsDart> { + OptionSetDart() { + DefineProperty("fold", &OptionsDart::fold); + + DefineWordListSets(dartWordListDesc); + } +}; + + +LexicalClass lexicalClasses[] = { + // Lexer DART SCLEX_DART SCE_DART_: + 0, "SCE_DART_DEFAULT", "default", "White space", + 1, "SCE_DART_COMMENTLINE", "comment line", "Comment: //", + 2, "SCE_DART_COMMENTLINEDOC", "comment line documentation", "Comment: ///", + 3, "SCE_DART_COMMENTBLOCK", "comment", "Comment: /* */", + 4, "SCE_DART_COMMENTBLOCKDOC", "comment documentation", "Comment: /** */", + 5, "SCE_DART_STRING_SQ", "literal string", "Single quoted string", + 6, "SCE_DART_STRING_DQ", "literal string", "Double quoted string", + 7, "SCE_DART_TRIPLE_STRING_SQ", "literal string multiline", "Single quoted multiline string", + 8, "SCE_DART_TRIPLE_STRING_DQ", "literal string multiline", "Double quoted multiline string", + 9, "SCE_DART_RAWSTRING_SQ", "literal string raw", "Single quoted raw string", + 10, "SCE_DART_RAWSTRING_DQ", "literal string raw", "Double quoted raw string", + 11, "SCE_DART_TRIPLE_RAWSTRING_SQ", "literal string multiline raw", "Single quoted multiline raw string", + 12, "SCE_DART_TRIPLE_RAWSTRING_DQ", "literal string multiline raw", "Double quoted multiline raw string", + 13, "SCE_DART_ESCAPECHAR", "literal string escapesequence", "Escape sequence", + 14, "SCE_DART_IDENTIFIER", "identifier", "Identifier", + 15, "SCE_DART_IDENTIFIER_STRING", "identifier interpolated", "Identifier following $ inside strings", + 16, "SCE_DART_OPERATOR", "operator", "Operator", + 17, "SCE_DART_OPERATOR_STRING", "operator interpolated", "Braces following $ inside string", + 18, "SCE_DART_SYMBOL_IDENTIFIER", "identifier symbol", "Symbol name introduced by #", + 19, "SCE_DART_SYMBOL_OPERATOR", "operator symbol", "Operator introduced by #", + 20, "SCE_DART_NUMBER", "literal numeric", "Number", + 21, "SCE_DART_KEY", "key", "Keys preceding ':' and named parameters", + 22, "SCE_DART_METADATA", "preprocessor", "Metadata introduced by @", + 23, "SCE_DART_KW_PRIMARY", "keyword", "Primary keywords", + 24, "SCE_DART_KW_SECONDARY", "identifier", "Secondary keywords", + 25, "SCE_DART_KW_TERTIARY", "identifier", "Tertiary keywords", + 26, "SCE_DART_KW_TYPE", "identifier", "Global types", +}; + +class LexerDart : public DefaultLexer { + WordList keywordsPrimary; + WordList keywordsSecondary; + WordList keywordsTertiary; + WordList keywordsTypes; + OptionsDart options; + OptionSetDart osDart; +public: + LexerDart(const char *languageName_, int language_) : + DefaultLexer(languageName_, language_, lexicalClasses, std::size(lexicalClasses)) { + } + // Deleted so LexerDart objects can not be copied. + LexerDart(const LexerDart &) = delete; + LexerDart(LexerDart &&) = delete; + void operator=(const LexerDart &) = delete; + void operator=(LexerDart &&) = delete; + ~LexerDart() override = default; + + void SCI_METHOD Release() override { + delete this; + } + int SCI_METHOD Version() const override { + return lvRelease5; + } + const char *SCI_METHOD PropertyNames() override { + return osDart.PropertyNames(); + } + int SCI_METHOD PropertyType(const char *name) override { + return osDart.PropertyType(name); + } + const char *SCI_METHOD DescribeProperty(const char *name) override { + return osDart.DescribeProperty(name); + } + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override; + const char *SCI_METHOD PropertyGet(const char *key) override { + return osDart.PropertyGet(key); + } + const char *SCI_METHOD DescribeWordListSets() override { + return osDart.DescribeWordListSets(); + } + Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override; + + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override; + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override; + + void *SCI_METHOD PrivateCall(int, void *) override { + return nullptr; + } + + void BacktrackToStart(const LexAccessor &styler, int stateMask, Sci_PositionU &startPos, Sci_Position &lengthDoc, int &initStyle); + Sci_PositionU LookbackNonWhite(LexAccessor &styler, Sci_PositionU startPos, int &chPrevNonWhite, int &stylePrevNonWhite); + + static ILexer5 *LexerFactoryDart() { + return new LexerDart("dart", SCLEX_DART); + } +}; + +Sci_Position SCI_METHOD LexerDart::PropertySet(const char *key, const char *val) { + if (osDart.PropertySet(&options, key, val)) { + return 0; + } + return -1; +} + +Sci_Position SCI_METHOD LexerDart::WordListSet(int n, const char *wl) { + WordList *wordListN = nullptr; + switch (n) { + case 0: + wordListN = &keywordsPrimary; + break; + case 1: + wordListN = &keywordsSecondary; + break; + case 2: + wordListN = &keywordsTertiary; + break; + case 3: + wordListN = &keywordsTypes; + break; + default: + break; + } + Sci_Position firstModification = -1; + if (wordListN && wordListN->Set(wl)) { + firstModification = 0; + } + return firstModification; +} + +void LexerDart::BacktrackToStart(const LexAccessor &styler, int stateMask, Sci_PositionU &startPos, Sci_Position &lengthDoc, int &initStyle) { + const Sci_Position currentLine = styler.GetLine(startPos); + if (currentLine != 0) { + Sci_Position line = currentLine - 1; + int lineState = styler.GetLineState(line); + while ((lineState & stateMask) != 0 && line != 0) { + --line; + lineState = styler.GetLineState(line); + } + if ((lineState & stateMask) == 0) { + ++line; + } + if (line != currentLine) { + const Sci_PositionU endPos = startPos + lengthDoc; + startPos = (line == 0) ? 0 : styler.LineStart(line); + lengthDoc = endPos - startPos; + initStyle = (startPos == 0) ? 0 : styler.StyleAt(startPos - 1); + } + } +} + +Sci_PositionU LexerDart::LookbackNonWhite(LexAccessor &styler, Sci_PositionU startPos, int &chPrevNonWhite, int &stylePrevNonWhite) { + do { + --startPos; + const unsigned style = styler.StyleAt(startPos); + if (!IsSpaceEquiv(style)) { + stylePrevNonWhite = style; + chPrevNonWhite = static_cast<unsigned char>(styler[startPos]); + break; + } + } while (startPos != 0); + return startPos; +} + +void LexerDart::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) { + Accessor styler(pAccess, nullptr); + + int lineStateLineType = 0; + int commentLevel = 0; // nested block comment level + + std::vector<InterpolatingState> interpolatingStack; + + int visibleChars = 0; + int chBefore = 0; + int chPrevNonWhite = 0; + EscapeSequence escSeq; + + if (startPos != 0) { + // backtrack to the line where interpolation starts + BacktrackToStart(styler, DartLineStateMaskInterpolation, startPos, lengthDoc, initStyle); + } + + StyleContext sc(startPos, lengthDoc, initStyle, styler); + if (sc.currentLine > 0) { + const int lineState = styler.GetLineState(sc.currentLine - 1); + commentLevel = lineState >> 4; + } + if (startPos == 0) { + if (sc.Match('#', '!')) { + // Shell Shebang at beginning of file + sc.SetState(SCE_DART_COMMENTLINE); + sc.Forward(); + lineStateLineType = DartLineStateMaskLineComment; + } + } else if (IsSpaceEquiv(initStyle)) { + LookbackNonWhite(styler, startPos, chPrevNonWhite, initStyle); + chBefore = chPrevNonWhite; + } + + while (sc.More()) { + switch (sc.state) { + case SCE_DART_OPERATOR: + case SCE_DART_OPERATOR_STRING: + sc.SetState(SCE_DART_DEFAULT); + break; + + case SCE_DART_NUMBER: + if (!IsDecimalNumber(sc.chPrev, sc.ch, sc.chNext)) { + sc.SetState(SCE_DART_DEFAULT); + } + break; + + case SCE_DART_IDENTIFIER: + case SCE_DART_IDENTIFIER_STRING: + case SCE_DART_METADATA: + case SCE_DART_SYMBOL_IDENTIFIER: + if (!IsDartIdentifierChar(sc.ch) || (sc.ch == '$' && sc.state == SCE_DART_IDENTIFIER_STRING)) { + if (sc.state == SCE_DART_METADATA || sc.state == SCE_DART_SYMBOL_IDENTIFIER) { + if (sc.ch == '.') { + const int state = sc.state; + sc.SetState(SCE_DART_OPERATOR); + sc.ForwardSetState(state); + continue; + } + } else { + char s[64]; + sc.GetCurrent(s, sizeof(s)); + const int state = sc.state; + if (state == SCE_DART_IDENTIFIER_STRING) { + sc.SetState(escSeq.outerState); + continue; + } else if (keywordsPrimary.InList(s)) { + sc.ChangeState(SCE_DART_KW_PRIMARY); + if (strcmp(s, "import") == 0 || strcmp(s, "part") == 0) { + if (visibleChars == sc.LengthCurrent()) { + lineStateLineType = DartLineStateMaskImport; + } + } + } else if (keywordsSecondary.InList(s)) { + sc.ChangeState(SCE_DART_KW_SECONDARY); + } else if (keywordsTertiary.InList(s)) { + sc.ChangeState(SCE_DART_KW_TERTIARY); + } else if (keywordsTypes.InList(s)) { + sc.ChangeState(SCE_DART_KW_TYPE); + } else if (state == SCE_DART_IDENTIFIER && sc.ch == ':') { + if (chBefore == ',' || chBefore == '{' || chBefore == '(') { + sc.ChangeState(SCE_DART_KEY); // map key or named parameter + } + } + } + + sc.SetState(SCE_DART_DEFAULT); + } + break; + + case SCE_DART_SYMBOL_OPERATOR: + if (!IsDefinableOperator(sc.ch)) { + sc.SetState(SCE_DART_DEFAULT); + } + break; + + case SCE_DART_COMMENTLINE: + case SCE_DART_COMMENTLINEDOC: + if (sc.atLineStart) { + sc.SetState(SCE_DART_DEFAULT); + } + break; + + case SCE_DART_COMMENTBLOCK: + case SCE_DART_COMMENTBLOCKDOC: + if (sc.Match('*', '/')) { + sc.Forward(); + --commentLevel; + if (commentLevel == 0) { + sc.ForwardSetState(SCE_DART_DEFAULT); + } + } else if (sc.Match('/', '*')) { + sc.Forward(); + ++commentLevel; + } + break; + + case SCE_DART_STRING_SQ: + case SCE_DART_STRING_DQ: + case SCE_DART_TRIPLE_STRING_SQ: + case SCE_DART_TRIPLE_STRING_DQ: + case SCE_DART_RAWSTRING_SQ: + case SCE_DART_RAWSTRING_DQ: + case SCE_DART_TRIPLE_RAWSTRING_SQ: + case SCE_DART_TRIPLE_RAWSTRING_DQ: + if (sc.atLineStart && !IsTripleString(sc.state)) { + sc.SetState(SCE_DART_DEFAULT); + } else if (sc.ch == '\\' && !IsRaw(sc.state)) { + if (escSeq.resetEscapeState(sc.state, sc.chNext)) { + sc.SetState(SCE_DART_ESCAPECHAR); + sc.Forward(); + if (sc.Match('u', '{')) { + escSeq.brace = true; + escSeq.digitsLeft = 7; // Unicode code point + sc.Forward(); + } + } + } else if (sc.ch == '$' && !IsRaw(sc.state)) { + escSeq.outerState = sc.state; + sc.SetState(SCE_DART_OPERATOR_STRING); + sc.Forward(); + if (sc.ch == '{') { + interpolatingStack.push_back({escSeq.outerState, 1}); + } else if (sc.ch != '$' && IsDartIdentifierStart(sc.ch)) { + sc.SetState(SCE_DART_IDENTIFIER_STRING); + } else { // error + sc.SetState(escSeq.outerState); + continue; + } + } else if (sc.ch == GetStringQuote(sc.state) && + (!IsTripleString(sc.state) || (sc.Match(IsDoubleQuoted(sc.state) ? R"(""")" : R"(''')")))) { + if (IsTripleString(sc.state)) { + sc.Forward(2); + } + sc.Forward(); + sc.SetState(SCE_DART_DEFAULT); + } + break; + + case SCE_DART_ESCAPECHAR: + if (escSeq.atEscapeEnd(sc.ch)) { + if (escSeq.brace && sc.ch == '}') { + sc.Forward(); + } + sc.SetState(escSeq.outerState); + continue; + } + break; + } + + if (sc.state == SCE_DART_DEFAULT) { + if (sc.ch == '/' && (sc.chNext == '/' || sc.chNext == '*')) { + const int chNext = sc.chNext; + sc.SetState((chNext == '/') ? SCE_DART_COMMENTLINE : SCE_DART_COMMENTBLOCK); + sc.Forward(2); + if (sc.ch == chNext && sc.chNext != chNext) { + if (sc.state == SCE_DART_COMMENTLINE) { + sc.ChangeState(SCE_DART_COMMENTLINEDOC); + } else { + sc.ChangeState(SCE_DART_COMMENTBLOCKDOC); + } + } + if (chNext == '/') { + if (visibleChars == 0) { + lineStateLineType = DartLineStateMaskLineComment; + } + } else { + commentLevel = 1; + } + continue; + } + if (sc.ch == 'r' && (sc.chNext == '\'' || sc.chNext == '"')) { + sc.SetState((sc.chNext == '\'') ? SCE_DART_RAWSTRING_SQ : SCE_DART_RAWSTRING_DQ); + sc.Forward(2); + if (sc.chPrev == '\'' && sc.Match('\'', '\'')) { + sc.ChangeState(SCE_DART_TRIPLE_RAWSTRING_SQ); + sc.Forward(2); + } else if (sc.chPrev == '"' && sc.Match('"', '"')) { + sc.ChangeState(SCE_DART_TRIPLE_RAWSTRING_DQ); + sc.Forward(2); + } + continue; + } + if (sc.ch == '"') { + if (sc.Match(R"(""")")) { + sc.SetState(SCE_DART_TRIPLE_STRING_DQ); + sc.Forward(2); + } else { + chBefore = chPrevNonWhite; + sc.SetState(SCE_DART_STRING_DQ); + } + } else if (sc.ch == '\'') { + if (sc.Match(R"(''')")) { + sc.SetState(SCE_DART_TRIPLE_STRING_SQ); + sc.Forward(2); + } else { + chBefore = chPrevNonWhite; + sc.SetState(SCE_DART_STRING_SQ); + } + } else if (IsNumberStart(sc.ch, sc.chNext)) { + sc.SetState(SCE_DART_NUMBER); + } else if ((sc.ch == '@' || sc.ch == '#') && IsDartIdentifierStart(sc.chNext)) { + sc.SetState((sc.ch == '@') ? SCE_DART_METADATA : SCE_DART_SYMBOL_IDENTIFIER); + } else if (IsDartIdentifierStart(sc.ch)) { + chBefore = chPrevNonWhite; + sc.SetState(SCE_DART_IDENTIFIER); + } else if (sc.ch == '#' && IsDefinableOperator(sc.chNext)) { + sc.SetState(SCE_DART_SYMBOL_OPERATOR); + } else if (IsAGraphic(sc.ch)) { + sc.SetState(SCE_DART_OPERATOR); + if (!interpolatingStack.empty() && AnyOf(sc.ch, '{', '}')) { + InterpolatingState &current = interpolatingStack.back(); + if (sc.ch == '{') { + current.braceCount += 1; + } else { + current.braceCount -= 1; + if (current.braceCount == 0) { + sc.ChangeState(SCE_DART_OPERATOR_STRING); + sc.ForwardSetState(current.state); + interpolatingStack.pop_back(); + continue; + } + } + } + } + } + + if (!isspacechar(sc.ch)) { + visibleChars++; + if (!IsSpaceEquiv(sc.state)) { + chPrevNonWhite = sc.ch; + } + } + if (sc.atLineEnd) { + int lineState = (commentLevel << 4) | lineStateLineType; + if (!interpolatingStack.empty()) { + lineState |= DartLineStateMaskInterpolation; + } + styler.SetLineState(sc.currentLine, lineState); + lineStateLineType = 0; + visibleChars = 0; + } + sc.Forward(); + } + + sc.Complete(); +} + +void LexerDart::Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) { + if (!options.fold) + return; + + Accessor styler(pAccess, nullptr); + const Sci_PositionU endPos = startPos + lengthDoc; + Sci_Position lineCurrent = styler.GetLine(startPos); + while (lineCurrent > 0) { + lineCurrent--; + startPos = styler.LineStart(lineCurrent); + initStyle = (startPos > 0) ? styler.StyleIndexAt(startPos) : 0; + if (initStyle != SCE_DART_COMMENTBLOCKDOC && initStyle != SCE_DART_COMMENTBLOCK && + initStyle != SCE_DART_TRIPLE_RAWSTRING_SQ && initStyle != SCE_DART_TRIPLE_RAWSTRING_DQ && + initStyle != SCE_DART_TRIPLE_STRING_SQ && initStyle != SCE_DART_TRIPLE_STRING_DQ) + break; + } + FoldLineState foldPrev(0); + int levelCurrent = SC_FOLDLEVELBASE; + if (lineCurrent > 0) { + levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16; + foldPrev = FoldLineState(styler.GetLineState(lineCurrent - 1)); + } + + int levelNext = levelCurrent; + FoldLineState foldCurrent(styler.GetLineState(lineCurrent)); + Sci_PositionU lineStartNext = styler.LineStart(lineCurrent + 1); + lineStartNext = std::min(lineStartNext, endPos); + + char chNext = styler[startPos]; + int styleNext = styler.StyleIndexAt(startPos); + int style = initStyle; + + while (startPos < endPos) { + const char ch = chNext; + const int stylePrev = style; + style = styleNext; + chNext = styler[++startPos]; + styleNext = styler.StyleIndexAt(startPos); + + switch (style) { + case SCE_DART_COMMENTBLOCKDOC: + case SCE_DART_COMMENTBLOCK: { + const int level = (ch == '/' && chNext == '*') ? 1 : ((ch == '*' && chNext == '/') ? -1 : 0); + if (level != 0) { + levelNext += level; + startPos++; + chNext = styler[startPos]; + styleNext = styler.StyleIndexAt(startPos); + } + } break; + + case SCE_DART_TRIPLE_RAWSTRING_SQ: + case SCE_DART_TRIPLE_RAWSTRING_DQ: + case SCE_DART_TRIPLE_STRING_SQ: + case SCE_DART_TRIPLE_STRING_DQ: + if (style != stylePrev && !AnyOf(stylePrev, SCE_DART_ESCAPECHAR, SCE_DART_OPERATOR_STRING, SCE_DART_IDENTIFIER_STRING)) { + levelNext++; + } + if (style != styleNext && !AnyOf(styleNext, SCE_DART_ESCAPECHAR, SCE_DART_OPERATOR_STRING, SCE_DART_IDENTIFIER_STRING)) { + levelNext--; + } + break; + + case SCE_DART_OPERATOR: + case SCE_DART_OPERATOR_STRING: + if (ch == '{' || ch == '[' || ch == '(') { + levelNext++; + } else if (ch == '}' || ch == ']' || ch == ')') { + levelNext--; + } + break; + } + + if (startPos == lineStartNext) { + const FoldLineState foldNext(styler.GetLineState(lineCurrent + 1)); + levelNext = std::max(levelNext, SC_FOLDLEVELBASE); + if (foldCurrent.lineComment) { + levelNext += foldNext.lineComment - foldPrev.lineComment; + } else if (foldCurrent.packageImport) { + levelNext += foldNext.packageImport - foldPrev.packageImport; + } + + const int levelUse = levelCurrent; + int lev = levelUse | (levelNext << 16); + if (levelUse < levelNext) { + lev |= SC_FOLDLEVELHEADERFLAG; + } + styler.SetLevel(lineCurrent, lev); + + lineCurrent++; + lineStartNext = styler.LineStart(lineCurrent + 1); + lineStartNext = std::min(lineStartNext, endPos); + levelCurrent = levelNext; + foldPrev = foldCurrent; + foldCurrent = foldNext; + } + } +} + +} // unnamed namespace end + +extern const LexerModule lmDart(SCLEX_DART, LexerDart::LexerFactoryDart, "dart", dartWordListDesc); Modified: scintilla/lexilla/src/Lexilla.cxx 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -59,6 +59,7 @@ extern LexerModule lmCPPNoCase; extern LexerModule lmCsound; extern LexerModule lmCss; extern LexerModule lmD; +extern LexerModule lmDart; extern LexerModule lmDataflex; extern LexerModule lmDiff; extern LexerModule lmDMAP; @@ -186,6 +187,7 @@ static void AddGeanyLexers() &lmCPP, &lmCss, &lmD, + &lmDart, &lmDiff, &lmErlang, &lmF77, @@ -273,6 +275,7 @@ void AddEachLexer() { &lmCsound, &lmCss, &lmD, + &lmDart, &lmDataflex, &lmDiff, &lmDMAP, Modified: scintilla/scintilla_changes.patch 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -62,7 +62,7 @@ diff --git scintilla/lexilla/src/Lexilla.cxx scintilla/lexilla/src/Lexilla.cxx index cd4b23617..af4a73db4 100644 --- scintilla/lexilla/src/Lexilla.cxx +++ scintilla/lexilla/src/Lexilla.cxx -@@ -167,8 +167,73 @@ +@@ -167,8 +167,74 @@ CatalogueModules catalogueLexilla; @@ -84,6 +84,7 @@ index cd4b23617..af4a73db4 100644 + &lmCPP, + &lmCss, + &lmD, ++ &lmDart, + &lmDiff, + &lmErlang, + &lmF77, Modified: src/editor.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1321,6 +1321,7 @@ static gboolean lexer_has_braces(ScintillaObject *sci) case SCLEX_CIL: case SCLEX_CPP: case SCLEX_D: + case SCLEX_DART: case SCLEX_HTML: /* for PHP & JS */ case SCLEX_PHPSCRIPT: case SCLEX_PASCAL: /* for multiline comments? */ @@ -5148,6 +5149,7 @@ void editor_set_indentation_guides(GeanyEditor *editor) case SCLEX_OCTAVE: case SCLEX_RUST: case SCLEX_ZIG: + case SCLEX_DART: mode = SC_IV_LOOKBOTH; break; Modified: src/filetypes.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -194,6 +194,7 @@ static void init_builtin_filetypes(void) FT_INIT( PROLOG, NONE, "Prolog", NULL, SOURCE_FILE, COMPILED ); FT_INIT( NIM, NONE, "Nim", NULL, SOURCE_FILE, COMPILED ); FT_INIT( ZIG, NONE, "Zig", NULL, SOURCE_FILE, COMPILED ); + FT_INIT( DART, NONE, "Dart", NULL, SOURCE_FILE, COMPILED ); } @@ -626,7 +627,8 @@ static GeanyFiletype *find_shebang(const gchar *utf8_filename, const gchar *line { "dmd", GEANY_FILETYPES_D }, { "wish", GEANY_FILETYPES_TCL }, { "node", GEANY_FILETYPES_JS }, - { "rust", GEANY_FILETYPES_RUST } + { "rust", GEANY_FILETYPES_RUST }, + { "dart", GEANY_FILETYPES_DART } }; gchar *tmp = g_path_get_basename(line + 2); gchar *basename_interpreter = tmp; Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -114,6 +114,7 @@ typedef enum GEANY_FILETYPES_PROLOG, GEANY_FILETYPES_NIM, GEANY_FILETYPES_ZIG, + GEANY_FILETYPES_DART, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 18 lines changed, 18 insertions(+), 0 deletions(-) =================================================================== @@ -1014,6 +1014,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(CONF); init_styleset_case(CSS); init_styleset_case(D); + init_styleset_case(DART); init_styleset_case(DIFF); init_styleset_case(LISP); init_styleset_case(ERLANG); @@ -1111,6 +1112,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(CONF); styleset_case(CSS); styleset_case(D); + styleset_case(DART); styleset_case(DIFF); styleset_case(LISP); styleset_case(ERLANG); @@ -1693,6 +1695,16 @@ gboolean highlighting_is_string_style(gint lexer, gint style) style == SCE_ZIG_MULTISTRING || style == SCE_ZIG_CHARACTER || style == SCE_ZIG_ESCAPECHAR); + + case SCLEX_DART: + return (style == SCE_DART_STRING_SQ || + style == SCE_DART_STRING_DQ || + style == SCE_DART_TRIPLE_STRING_SQ || + style == SCE_DART_TRIPLE_STRING_DQ || + style == SCE_DART_RAWSTRING_SQ || + style == SCE_DART_RAWSTRING_DQ || + style == SCE_DART_TRIPLE_RAWSTRING_SQ || + style == SCE_DART_TRIPLE_RAWSTRING_DQ); } return FALSE; } @@ -1950,6 +1962,12 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) return (style == SCE_ZIG_COMMENTLINE || style == SCE_ZIG_COMMENTLINEDOC || style == SCE_ZIG_COMMENTLINETOP); + + case SCLEX_DART: + return (style == SCE_DART_COMMENTLINE || + style == SCE_DART_COMMENTLINEDOC || + style == SCE_DART_COMMENTBLOCK || + style == SCE_DART_COMMENTBLOCKDOC); } return FALSE; } Modified: src/highlightingmappings.h 42 lines changed, 42 insertions(+), 0 deletions(-) =================================================================== @@ -538,6 +538,48 @@ static const HLKeyword highlighting_keywords_D[] = #define highlighting_properties_D EMPTY_PROPERTIES +/* DART */ +#define highlighting_lexer_DART SCLEX_DART +static const HLStyle highlighting_styles_DART[] = +{ + { SCE_DART_DEFAULT, "default", FALSE }, + { SCE_DART_COMMENTLINE, "commentline", FALSE }, + { SCE_DART_COMMENTLINEDOC, "commentlinedoc", FALSE }, + { SCE_DART_COMMENTBLOCK, "commentblock", FALSE }, + { SCE_DART_COMMENTBLOCKDOC, "commentblockdoc", FALSE }, + { SCE_DART_STRING_SQ, "stringsq", FALSE }, + { SCE_DART_STRING_DQ, "stringdq", FALSE }, + { SCE_DART_TRIPLE_STRING_SQ, "triplestringsq", FALSE }, + { SCE_DART_TRIPLE_STRING_DQ, "triplestringdq", FALSE }, + { SCE_DART_RAWSTRING_SQ, "rawstringsq", FALSE }, + { SCE_DART_RAWSTRING_DQ, "rawstringdq", FALSE }, + { SCE_DART_TRIPLE_RAWSTRING_SQ, "triplerawstringsq", FALSE }, + { SCE_DART_TRIPLE_RAWSTRING_DQ, "triplerawstringdq", FALSE }, + { SCE_DART_ESCAPECHAR, "escapechar", FALSE }, + { SCE_DART_IDENTIFIER, "identifier", FALSE }, + { SCE_DART_IDENTIFIER_STRING, "identifierstring", FALSE }, + { SCE_DART_OPERATOR, "operator", FALSE }, + { SCE_DART_OPERATOR_STRING, "operatorstring", FALSE }, + { SCE_DART_SYMBOL_IDENTIFIER, "symbolidentifier", FALSE }, + { SCE_DART_SYMBOL_OPERATOR, "symboloperator", FALSE }, + { SCE_DART_NUMBER, "number", FALSE }, + { SCE_DART_KEY, "key", FALSE }, + { SCE_DART_METADATA, "metadata", FALSE }, + { SCE_DART_KW_PRIMARY, "kwprimary", FALSE }, + { SCE_DART_KW_SECONDARY, "kwsecondary", FALSE }, + { SCE_DART_KW_TERTIARY, "kwtertiary", FALSE }, + { SCE_DART_KW_TYPE, "kwtype", FALSE }, +}; +static const HLKeyword highlighting_keywords_DART[] = +{ + { 0, "primary", FALSE }, + { 1, "secondary", FALSE }, + { 2, "tertiary", FALSE }, + { 3, "types", FALSE }, +}; +#define highlighting_properties_DART EMPTY_PROPERTIES + + /* Diff */ #define highlighting_lexer_DIFF SCLEX_DIFF static const HLStyle highlighting_styles_DIFF[] = -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6dc240: Add support for .tsx and .jsx file extensions to filetype_extensions.conf
by ajpf44 09 Nov '24

09 Nov '24

Branch: refs/heads/master Author: ajpf44 <ajpf44(a)gmail.com> Committer: ajpf44 <ajpf44(a)gmail.com> Date: Thu, 06 Jun 2024 12:24:55 UTC Commit: 6dc240625f4ace92bd18edf67d8961e77efb3ed6 https://github.com/geany/geany/commit/6dc240625f4ace92bd18edf67d8961e77efb3… Log Message: ----------- Add support for .tsx and .jsx file extensions to filetype_extensions.conf Modified Paths: -------------- data/filetype_extensions.conf Modified: data/filetype_extensions.conf 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -43,7 +43,7 @@ Haskell=*.hs;*.lhs;*.hs-boot;*.lhs-boot; Haxe=*.hx; HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;*.tpl; Java=*.java;*.jsp; -Javascript=*.js;*.cjs;*.mjs; +Javascript=*.js;*.cjs;*.mjs;*.jsx; JSON=*.json; Julia=*.jl; Kotlin=*.kt;*.kts; @@ -75,7 +75,7 @@ SQL=*.sql; Swift=*.swift; Tcl=*.tcl;*.tk;*.wish;*.exp; Txt2tags=*.t2t; -TypeScript=*.ts;*.cts;*.mts; +TypeScript=*.ts;*.cts;*.mts;*.tsx; Vala=*.vala;*.vapi; Verilog=*.v; VHDL=*.vhd;*.vhdl; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] bf35b7: Merge pull request #3892 from ajpf44/add-filetype-support
by Jiří Techet 09 Nov '24

09 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sat, 09 Nov 2024 16:08:04 UTC Commit: bf35b7b778d085b81df11c8b2e71ded47c6a8379 https://github.com/geany/geany/commit/bf35b7b778d085b81df11c8b2e71ded47c6a8… Log Message: ----------- Merge pull request #3892 from ajpf44/add-filetype-support Add support for .tsx and .jsx file extensions to Modified Paths: -------------- data/filetype_extensions.conf Modified: data/filetype_extensions.conf 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -44,7 +44,7 @@ Haskell=*.hs;*.lhs;*.hs-boot;*.lhs-boot; Haxe=*.hx; HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;*.tpl; Java=*.java;*.jsp; -Javascript=*.js;*.cjs;*.mjs; +Javascript=*.js;*.cjs;*.mjs;*.jsx; JSON=*.json; Julia=*.jl; Kotlin=*.kt;*.kts; @@ -77,7 +77,7 @@ SQL=*.sql; Swift=*.swift; Tcl=*.tcl;*.tk;*.wish;*.exp; Txt2tags=*.t2t; -TypeScript=*.ts;*.cts;*.mts; +TypeScript=*.ts;*.cts;*.mts;*.tsx; Vala=*.vala;*.vapi; Verilog=*.v; VHDL=*.vhd;*.vhdl; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 38dd80: Add a simple Geany portable variant to the FAQ (#52)
by Enrico Tröger 09 Nov '24

09 Nov '24

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 09 Nov 2024 09:06:28 UTC Commit: 38dd8042030a7837e41d03d4f23b50c923dff31a https://github.com/geany/www.geany.org/commit/38dd8042030a7837e41d03d4f23b5… Log Message: ----------- Add a simple Geany portable variant to the FAQ (#52) Co-authored-by: Colomban Wendling <lists.ban(a)herbesfolles.org> Modified Paths: -------------- page_content/documentation/faq.md static_docs/templates/pages/i18n.html Modified: page_content/documentation/faq.md 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -201,6 +201,29 @@ indent settings - i.e. you might want one document indented with tabs whilst another is open with spaces indentation. See the [manual][8] for details. +## How to install a portable version of Geany on Windows (e.g. for USB drives)? + +You can use the official installer to install Geany and copy its files to a portable device: + +- install Geany from the official installer to any path on a local disk +- copy the whole directory to the portable device +- then uninstall Geany from your local system +- create a new file in the installation directory and name it `GeanyPortable.bat` (or any other name you like) +- copy the following contents into the file: + ``` + @ECHO OFF + + SET XDG_CONFIG_HOME=./config + REM Optionally set the language you prefer, a list of available translations can be found on https://www.geany.org/contribute/translation/statistics/ + SET LANG=en + + start /b bin\geany.exe --config=./config/geany + ``` +- if you want to change the GTK theme for another look and feel, see [How to change the GTK theme?][12] below and use the directory `config` for creating the `gtk-3.0` and `themes` directories +- to install Geany-Plugins proceed like above with the Geany-Plugins installer + +There is also a third party package for a portable Geany version, see [Geany Portable for Windows (portableapps.com)][13]. Please keep in mind this package is not maintained by the Geany team and it is each user's own decision of its trustworthiness. + ## How to change the GTK theme? The GTK theme defines the look and feel of Geany. @@ -265,3 +288,5 @@ If that doesn't answer your question, the quickest and best way is to ask on the [9]: /support/mailing-lists/ [10]: https://plugins.geany.org/geanylua/geanylua-index.html [11]: https://plugins.geany.org/geanypy.html +[12]: #how-to-change-the-gtk-theme +[13]: /download/third-party/#geany-portable-for-windows-portableappscom Modified: static_docs/templates/pages/i18n.html 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -24,7 +24,7 @@ <h2>Geany translation statistics</h2> <tbody> {% for language_data in i18n_statistics.catalog_statistics|dictsort:"language_name" %} <tr> - <td class="col-md-4"><a href="{{ static_docs_geany_destination_url }}/{{ language_data.filename }}">{{ language_data.language_name }}</a> ({{ language_data.last_translator }})</td> + <td class="col-md-4"><a href="{{ static_docs_geany_destination_url }}/{{ language_data.filename }}">{{ language_data.language_name }}</a> [{{ language_data.language_code }}] ({{ language_data.last_translator }})</td> <td class="col-md-1">{{ language_data.statistics.translated }} ({{ language_data.statistics.percentage_translated|floatformat:1 }} %)</td> <td class="col-md-1">{{ language_data.statistics.fuzzy }} ({{ language_data.statistics.percentage_fuzzy|floatformat:1 }} %)</td> <td class="col-md-1">{{ language_data.statistics.untranslated }} ({{ language_data.statistics.percentage_untranslated|floatformat:1 }} %)</td> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2024