Commits June 2022

commits@lists.geany.org

1 participants
14 discussions

[geany/geany] aba66f: Update unit tests to use the pretty-printed format
by Jiří Techet 15 Jun '22

15 Jun '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 12 Jun 2022 22:31:22 UTC Commit: aba66f07cca62b28d33534ec88c686b600fe2533 https://github.com/geany/geany/commit/aba66f07cca62b28d33534ec88c686b600fe2… Log Message: ----------- Update unit tests to use the pretty-printed format Modified Paths: -------------- tests/ctags/1795612.js.tags tests/ctags/1850914.js.tags tests/ctags/1878155.js.tags tests/ctags/1880687.js.tags tests/ctags/2023624.js.tags tests/ctags/3184782.sql.tags tests/ctags/3470609.js.tags tests/ctags/3526726.tex.tags tests/ctags/68hc11.asm.tags tests/ctags/Package.pm.tags tests/ctags/actionscript/as-first-token.as.tags tests/ctags/actionscript/classes.as.tags tests/ctags/actionscript/const.as.tags tests/ctags/actionscript/const2.as.tags tests/ctags/actionscript/method-attributes.as.tags tests/ctags/actionscript/packages.as.tags tests/ctags/actionscript/sampler.as.tags tests/ctags/ada-adb.adb.tags tests/ctags/ada-ads.ads.tags tests/ctags/ada-expression-function-generic.adb.tags tests/ctags/ada-expression-function.adb.tags tests/ctags/ada-overriding.ads.tags tests/ctags/ada-package-generic.ads.tags tests/ctags/ada-task.adb.tags tests/ctags/angle_bracket.cpp.tags tests/ctags/anonymous_functions.php.tags tests/ctags/array-spec.f90.tags tests/ctags/array_ref_and_out.cs.tags tests/ctags/array_spec.f90.tags tests/ctags/arraylist.js.tags tests/ctags/attributes.cs.tags tests/ctags/auto.f.tags tests/ctags/backslashes.c.tags tests/ctags/bit_field.c.tags tests/ctags/block.f90.tags tests/ctags/bracematch.js.tags tests/ctags/bug1020715.c.tags tests/ctags/bug1020715.cpp.tags tests/ctags/bug1086609.c.tags tests/ctags/bug1093123.cpp.tags tests/ctags/bug1111214-j-chan.v.tags tests/ctags/bug1111214.v.tags tests/ctags/bug1201689.c.tags tests/ctags/bug1447756.java.tags tests/ctags/bug1458930.c.tags tests/ctags/bug1466117.c.tags tests/ctags/bug1491666.c.tags tests/ctags/bug1515910.cs.tags tests/ctags/bug1548443.cpp.tags tests/ctags/bug1563476.cpp.tags tests/ctags/bug1570779.sql.tags tests/ctags/bug1575055.cpp.tags tests/ctags/bug1585745.cpp.tags tests/ctags/bug1611054.cs.tags tests/ctags/bug1691412.java.tags tests/ctags/bug1742588.rb.tags tests/ctags/bug1743330.v.tags tests/ctags/bug1764143.h.tags tests/ctags/bug1764148.py.tags tests/ctags/bug1770479.cpp.tags tests/ctags/bug1773926.cpp.tags tests/ctags/bug1777344.java.tags tests/ctags/bug1799340.cpp.tags tests/ctags/bug1799343-1.cpp.tags tests/ctags/bug1799343-2.cpp.tags tests/ctags/bug1800065.cs.tags tests/ctags/bug1809024.py.tags tests/ctags/bug1830343.cs.tags tests/ctags/bug1830344.cs.tags tests/ctags/bug1856363.py.tags tests/ctags/bug1906062.py.tags tests/ctags/bug1907083.cpp.tags tests/ctags/bug1924919.cpp.tags tests/ctags/bug1938565.sql.tags tests/ctags/bug1944150.sql.tags tests/ctags/bug1950327.js.tags tests/ctags/bug1988026.py.tags tests/ctags/bug1988027.py.tags tests/ctags/bug1988130.py.tags tests/ctags/bug2049723.java.tags tests/ctags/bug2075402.py.tags tests/ctags/bug2117073.java.tags tests/ctags/bug2374109.vhd.tags tests/ctags/bug2411878.cs.tags tests/ctags/bug2747828.v.tags tests/ctags/bug2777310.js.tags tests/ctags/bug2781264.rb.tags tests/ctags/bug2886870.tex.tags tests/ctags/bug2888482.js.tags tests/ctags/bug3036476.js.tags tests/ctags/bug3168705.py.tags tests/ctags/bug3571233.js.tags tests/ctags/bug507864.c.tags tests/ctags/bug538629.asm.tags tests/ctags/bug556645.c.tags tests/ctags/bug556646.c.tags tests/ctags/bug565813.f90.tags tests/ctags/bug612019.pas.tags tests/ctags/bug612621.pl.tags tests/ctags/bug620288.f.tags tests/ctags/bug639639.h.tags tests/ctags/bug639644.hpp.tags tests/ctags/bug665086.cpp.tags tests/ctags/bug670433.f90.tags tests/ctags/bug699171.py.tags tests/ctags/bug722501.sql.tags tests/ctags/bug726712.f90.tags tests/ctags/bug726875.f90.tags tests/ctags/bug734933.f90.tags tests/ctags/bug762027.v.tags tests/ctags/bug814263.java.tags tests/ctags/bug823000.sql.tags tests/ctags/bug842077.pl.tags tests/ctags/bug849591.cpp.tags tests/ctags/bug852368.cpp.tags tests/ctags/bug858165.f90.tags tests/ctags/bug872494.cpp.tags tests/ctags/bug877956.f90.tags tests/ctags/bug960316.v.tags tests/ctags/bug961001.v.tags tests/ctags/byte.f.tags tests/ctags/c-digraphs.c.tags tests/ctags/c-trigraphs.c.tags tests/ctags/case_sensitivity.php.tags tests/ctags/char-selector.f90.tags tests/ctags/classes.php.tags tests/ctags/cobol/helloworld.cbl.tags tests/ctags/cobol/helloworld2.cbl.tags tests/ctags/cobol/levels.cbl.tags tests/ctags/cobol/quoted-program-id.cbl.tags tests/ctags/cobol/simple.cbl.tags tests/ctags/common.f.tags tests/ctags/complex-return.js.tags tests/ctags/continuation.f90.tags tests/ctags/continuation.mak.tags tests/ctags/countall.sql.tags tests/ctags/cpp_destructor.cpp.tags tests/ctags/css-at-rules.css.tags tests/ctags/css-at-supports.css.tags tests/ctags/css-attribute-selectors.css.tags tests/ctags/css-comma-no-space.css.tags tests/ctags/css-namespace-selectors.css.tags tests/ctags/css-pseudo-classes.css.tags tests/ctags/css-simple.css.tags tests/ctags/css-singlequote-in-comment-issue2.css.tags tests/ctags/css-tag-types.css.tags tests/ctags/css-trivial.css.tags tests/ctags/cxx11-final.cpp.tags tests/ctags/cxx11-noexcept.cpp.tags tests/ctags/cxx11-override.cpp.tags tests/ctags/cxx11-raw-strings.cpp.tags tests/ctags/cxx11enum.cpp.tags tests/ctags/cxx14-combined.cpp.tags tests/ctags/cython_sample.pyx.tags tests/ctags/cython_sample2.pyx.tags tests/ctags/db-trig.sql.tags tests/ctags/debian_432872.f90.tags tests/ctags/directives.c.tags tests/ctags/dopbl2.f.tags tests/ctags/dotted-names.json.tags tests/ctags/enum.c.tags tests/ctags/enum.f90.tags tests/ctags/enum.java.tags tests/ctags/enumerators.f90.tags tests/ctags/events.cs.tags tests/ctags/extern_variable.h.tags tests/ctags/forall_module.f90.tags tests/ctags/format.pl.tags tests/ctags/fortran_associate.f90.tags tests/ctags/fortran_line_continuation.f90.tags tests/ctags/func_typedef.h.tags tests/ctags/gdscript-inner-class.gd.tags tests/ctags/gdscript-modifiers.gd.tags tests/ctags/gdscript-no-implicit-class.gd.tags tests/ctags/geany.nsi.tags tests/ctags/general.cs.tags tests/ctags/hex2dec.sql.tags tests/ctags/implied_program.f.tags tests/ctags/indexer.cs.tags tests/ctags/infinite_loop.java.tags tests/ctags/ingres_procedures.sql.tags tests/ctags/initialization.f90.tags tests/ctags/interface_indexers.cs.tags tests/ctags/interface_properties.cs.tags tests/ctags/interfaces.f90.tags tests/ctags/internal.cs.tags tests/ctags/intro.tex.tags tests/ctags/intro_orig.tex.tags tests/ctags/invalid_name.f90.tags tests/ctags/java_enum.java.tags tests/ctags/js-broken-strings.js.tags tests/ctags/js-class-related-unterminated.js.tags tests/ctags/js-const.js.tags tests/ctags/js-implicit-semicolons.js.tags tests/ctags/js-let.js.tags tests/ctags/js-scope.js.tags tests/ctags/js-signature.js.tags tests/ctags/js-string-continuation.js.tags tests/ctags/js-sub-block-scope.js.tags tests/ctags/js-unknown-construct-nesting.js.tags tests/ctags/jsFunc_tutorial.js.tags tests/ctags/julia-corner_cases.jl.tags tests/ctags/keyword_abstract.cs.tags tests/ctags/keyword_catch_try.cs.tags tests/ctags/keyword_class.cs.tags tests/ctags/keyword_const.cs.tags tests/ctags/keyword_delegate.cs.tags tests/ctags/keyword_enum.cs.tags tests/ctags/keyword_event.cs.tags tests/ctags/keyword_explicit.cs.tags tests/ctags/keyword_extern.cs.tags tests/ctags/keyword_implicit.cs.tags tests/ctags/keyword_interface.cs.tags tests/ctags/keyword_names.f90.tags tests/ctags/keyword_namespace.cs.tags tests/ctags/keyword_out.cs.tags tests/ctags/keyword_override.cs.tags tests/ctags/keyword_params.cs.tags tests/ctags/keyword_private.cs.tags tests/ctags/keyword_protected.cs.tags tests/ctags/keyword_public.cs.tags tests/ctags/keyword_sealed.cs.tags tests/ctags/keyword_static.cs.tags tests/ctags/keyword_struct.cs.tags tests/ctags/keyword_virtual.cs.tags tests/ctags/keyword_volatile.cs.tags tests/ctags/labels.sql.tags tests/ctags/lanus.for.tags tests/ctags/line_directives.c.tags tests/ctags/local.c.tags tests/ctags/macros.c.tags tests/ctags/make-comment-in-rule.mak.tags tests/ctags/make-gnumake-pattern-rules.mak.tags tests/ctags/make-multi-target.mak.tags tests/ctags/make-parentheses.mak.tags tests/ctags/make-target-with-parentheses.mak.tags tests/ctags/make-variable-on-cmdline.mak.tags tests/ctags/masm.asm.tags tests/ctags/matlab_backtracking.m.tags tests/ctags/matlab_test.m.tags tests/ctags/maze.erl.tags tests/ctags/members.f90.tags tests/ctags/misc_types.f.tags tests/ctags/misc_types.f90.tags tests/ctags/mode.php.tags tests/ctags/moniker.x68.asm.tags tests/ctags/namelist.f.tags tests/ctags/namespace.cpp.tags tests/ctags/namespaces.php.tags tests/ctags/namespaces2.php.tags tests/ctags/no_terminator.js.tags tests/ctags/non-ascii-ident1.php.tags tests/ctags/numlib.f90.tags tests/ctags/objectivec_implementation.mm.tags tests/ctags/objectivec_interface.mm.tags tests/ctags/objectivec_property.mm.tags tests/ctags/objectivec_protocol.mm.tags tests/ctags/parenthesis-rvalue.js.tags tests/ctags/php5_5_class_kw.php.tags tests/ctags/preprocessor.f90.tags tests/ctags/procedure_pointer_module.f90.tags tests/ctags/process_order.c.tags tests/ctags/procpoint.f90.tags tests/ctags/property.cs.tags tests/ctags/prototype.h.tags tests/ctags/pure_elem.f95.tags tests/ctags/py-skipped-string.py.tags tests/ctags/py_constructor_arglist.py.tags tests/ctags/python-anonymous-nestlevel_ctags-bug-356.py.tags tests/ctags/python-comments.py.tags tests/ctags/qualified_types.f90.tags tests/ctags/random.sql.tags tests/ctags/readlob.sql.tags tests/ctags/readlong.sql.tags tests/ctags/recursive.f95.tags tests/ctags/refcurs.sql.tags tests/ctags/regexp.js.tags tests/ctags/return-hint.zep.tags tests/ctags/return-types.go.tags tests/ctags/ruby-block-call.rb.tags tests/ctags/ruby-class-method-in-lt-lt-self.rb.tags tests/ctags/ruby-doc.rb.tags tests/ctags/ruby-namespaced-class.rb.tags tests/ctags/ruby-scope-after-anonymous-class.rb.tags tests/ctags/ruby-sf-bug-364.rb.tags tests/ctags/rules.t2t.tags tests/ctags/sample.t2t.tags tests/ctags/secondary_fcn_name.js.tags tests/ctags/semicolon.f90.tags tests/ctags/shebang.js.tags tests/ctags/signature.cpp.tags tests/ctags/simple.abc.tags tests/ctags/simple.asciidoc.tags tests/ctags/simple.bas.tags tests/ctags/simple.clj.tags tests/ctags/simple.conf.tags tests/ctags/simple.d.tags tests/ctags/simple.diff.tags tests/ctags/simple.docbook.tags tests/ctags/simple.hs.tags Modified: tests/ctags/1795612.js.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager RPC�1�Test�0 +class: Test :: RPC asyncMethod�128�( uri, method, params, callback)�Test.RPC�0 +method: Test.RPC :: asyncMethod( uri, method, params, callback) asyncRequest�128�( uri, data, callback)�Test.RPC�0 +method: Test.RPC :: asyncRequest( uri, data, callback) request_id�64�Test.RPC�0 +member: Test.RPC :: request_id Modified: tests/ctags/1850914.js.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager objLiteralMethod�128�()�objectLiteral�0 +method: objectLiteral :: objLiteralMethod() objLiteralProperty�64�objectLiteral�0 +member: objectLiteral :: objLiteralProperty objectLiteral�1�0 +class: objectLiteral Modified: tests/ctags/1878155.js.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager RE�1�0 +class: RE bar�64�RE�0 +member: RE :: bar foo�16384�0 +variable: foo my_function�16�()�0 +function: my_function() Modified: tests/ctags/1880687.js.tags 42 lines changed, 41 insertions(+), 1 deletions(-) =================================================================== @@ -1,42 +1,82 @@ -# format=tagmanager MyClass�1�0 +class: MyClass MyClass_sub1�128�(x)�MyClass�0 +method: MyClass :: MyClass_sub1(x) MyClass_sub2�128�(x)�MyClass�0 +method: MyClass :: MyClass_sub2(x) a�16�(flag)�0 +function: a(flag) aa�16�()�0 +function: aa() aa_sub1�16�()�aa�0 +function: aa :: aa_sub1() aa_sub2�16�()�aa�0 +function: aa :: aa_sub2() b�16�()�0 +function: b() baz�16�()�f�0 +function: f :: baz() c�16�(flag)�0 +function: c(flag) d�16�()�0 +function: d() e�16�(flag)�0 +function: e(flag) f�16�()�0 +function: f() g�16�(flag)�0 +function: g(flag) h�16�()�0 +function: h() i�16�(flag)�0 +function: i(flag) j�16�()�0 +function: j() k�16�(flag)�0 +function: k(flag) l�16�()�0 +function: l() m�16�(flag)�0 +function: m(flag) n�16�()�0 +function: n() o�16�()�0 +function: o() p�16�()�0 +function: p() q�16�()�0 +function: q() r�16�(flag)�0 +function: r(flag) s�16�()�0 +function: s() t�16�(flag)�0 +function: t(flag) u�16�(flag)�0 +function: u(flag) v�16�(flag)�0 +function: v(flag) w�16�()�0 +function: w() w_sub1�16�(x)�w�0 +function: w :: w_sub1(x) w_sub2�16�()�w�0 +function: w :: w_sub2() x�16�()�0 +function: x() x_sub1�16�()�x�0 +function: x :: x_sub1() x_sub2�16�()�x�0 +function: x :: x_sub2() y�16�()�0 +function: y() y_sub1�16�()�y�0 +function: y :: y_sub1() y_sub2�16�()�y�0 +function: y :: y_sub2() z�16�()�0 +function: z() z_sub1�16�()�z�0 +function: z :: z_sub1() z_sub2�16�()�z�0 +function: z :: z_sub2() Modified: tests/ctags/2023624.js.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager f1�16�()�0 +function: f1() f2�16�()�0 +function: f2() Modified: tests/ctags/3184782.sql.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager do_this_stuff�256�p_test�0 +namespace: p_test :: do_this_stuff myfn1�256�p_test�0 +namespace: p_test :: myfn1 myfn2�256�p_test�0 +namespace: p_test :: myfn2 p_test�512�0 +package: p_test process_this�256�p_test�0 +namespace: p_test :: process_this Modified: tests/ctags/3470609.js.tags 13 lines changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -1,13 +1,24 @@ -# format=tagmanager array�64�root�0 +member: root :: array decimal�64�root�0 +member: root :: decimal f�16�()�0 +function: f() id�64�root�0 +member: root :: id method�128�()�root�0 +method: root :: method() neg�64�root�0 +member: root :: neg parentheses�64�root�0 +member: root :: parentheses root�1�0 +class: root string�64�root�0 +member: root :: string subFunction�128�()�root.subObject�0 +method: root.subObject :: subFunction() subObject�1�root�0 +class: root :: subObject subProperty�64�root.subObject�0 +member: root.subObject :: subProperty Modified: tests/ctags/3526726.tex.tags 149 lines changed, 148 insertions(+), 1 deletions(-) =================================================================== @@ -1,149 +1,296 @@ -# format=tagmanager A Rule with PCRE causes a failure to load snort.conf. Why?�65536�Problems�0 +macro: Problems :: A Rule with PCRE causes a failure to load snort.conf. Why? After I add new rules or comment out rules how do I make Snort reload?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: After I add new rules or comment out rules how do I make Snort reload? Are rule keywords ORed or ANDed together?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Are rule keywords ORed or ANDed together? Are there other output systems for Snort besides ``Barnyard''?\label{spoolers}�65536�Getting Fancy�0 +macro: Getting Fancy :: Are there other output systems for Snort besides ``Barnyard''?\label{spoolers} BASE appears to be broken in Lynx�65536�Problems�0 +macro: Problems :: BASE appears to be broken in Lynx Background�64�0 +member: Background Can Snort be evaded by the use of polymorphic mutators on shellcode?�65536�Background�0 +macro: Background :: Can Snort be evaded by the use of polymorphic mutators on shellcode? Can Snort trigger a rule by MAC addresses?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Can Snort trigger a rule by MAC addresses? Can priorities be assigned to alerts using BASE?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Can priorities be assigned to alerts using BASE? Configuring Snort�64�0 +member: Configuring Snort Development�64�0 +member: Development Does Snort handle IP defragmentation?�65536�Background�0 +macro: Background :: Does Snort handle IP defragmentation? Does Snort log the full packets when it generates alerts?�65536�Background�0 +macro: Background :: Does Snort log the full packets when it generates alerts? Does Snort perform TCP stream reassembly?�65536�Background�0 +macro: Background :: Does Snort perform TCP stream reassembly? Does Snort perform stateful protocol analysis?�65536�Background�0 +macro: Background :: Does Snort perform stateful protocol analysis? Does snort see packets filtered by IPTables/IPChains/IPF/PF?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Does snort see packets filtered by IPTables/IPChains/IPF/PF? Errors loading rules files�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Errors loading rules files Getting Fancy�64�0 +member: Getting Fancy Getting Started�64�0 +member: Getting Started How can I deactivate a rule?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How can I deactivate a rule? How can I define an address to be anything except some hosts?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How can I define an address to be anything except some hosts? How can I examine logged packets in more detail?�65536�Getting Fancy�0 +macro: Getting Fancy :: How can I examine logged packets in more detail? How can I protect web servers running on ports other than 80?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How can I protect web servers running on ports other than 80? How can I run Snort on multiple interfaces simultaneously?�65536�Configuring Snort�0 +macro: Configuring Snort :: How can I run Snort on multiple interfaces simultaneously? How can I specify a list of ports in a rule?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How can I specify a list of ports in a rule? How can I test Snort without having an Ethernet card or a connection to other computers?�65536�Getting Fancy�0 +macro: Getting Fancy :: How can I test Snort without having an Ethernet card or a connection to other computers? How can I use Snort to log HTTP URLs or SMTP traffic?�65536�Getting Fancy�0 +macro: Getting Fancy :: How can I use Snort to log HTTP URLs or SMTP traffic? How do I build this BASE thing?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I build this BASE thing? How do I configure stream4?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I configure stream4? How do I get Snort and ACID working?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I get Snort and ACID working? How do I get Snort to e-mail me alerts?�65536�Getting Fancy�0 +macro: Getting Fancy :: How do I get Snort to e-mail me alerts? How do I get Snort to log the packet payload as well as the header?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I get Snort to log the packet payload as well as the header? How do I ignore traffic coming from a particular host or hosts?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I ignore traffic coming from a particular host or hosts? How do I log a specific type of traffic and send alerts to syslog?�65536�Getting Fancy�0 +macro: Getting Fancy :: How do I log a specific type of traffic and send alerts to syslog? How do I log to multiple databases or output plugins?�65536�Getting Fancy�0 +macro: Getting Fancy :: How do I log to multiple databases or output plugins? How do I process those Snort logs into reports?�65536�Getting Fancy�0 +macro: Getting Fancy :: How do I process those Snort logs into reports? How do I run Snort?�65536�Getting Started�0 +macro: Getting Started :: How do I run Snort? How do I set EXTERNAL\_NET?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I set EXTERNAL\_NET? How do I setup a receive-only ethernet cable?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I setup a receive-only ethernet cable? How do I setup snort on a `stealth' interface?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I setup snort on a `stealth' interface? How do I test Snort alerts and logging?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How do I test Snort alerts and logging? How do I turn off ``spp:possible EVASIVE RST detection'' alerts?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How do I turn off ``spp:possible EVASIVE RST detection'' alerts? How do I understand this traffic and do IDS alert analysis?�65536�Getting Fancy�0 +macro: Getting Fancy :: How do I understand this traffic and do IDS alert analysis? How do I use a remote syslog machine?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I use a remote syslog machine? How do you get Snort to ignore some traffic?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do you get Snort to ignore some traffic? How do you pronounce the names of some of these guys who work on Snort?�65536�Background�0 +macro: Background :: How do you pronounce the names of some of these guys who work on Snort? How do you put Snort in debug mode?�65536�Development�0 +macro: Development :: How do you put Snort in debug mode? How does rule ordering work?�65536�Configuring Snort�0 +macro: Configuring Snort :: How does rule ordering work? How long can address lists, variables, or rules be?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How long can address lists, variables, or rules be? How to start Snort as a win32 service?�65536�Getting Fancy�0 +macro: Getting Fancy :: How to start Snort as a win32 service? I am getting `snort [pid] uses obsolete (PF\_INET, SOCK\_PACKET)' warnings. What's wrong?�65536�Problems�0 +macro: Problems :: I am getting `snort [pid] uses obsolete (PF\_INET, SOCK\_PACKET)' warnings. What's wrong? I am getting too many ``IIS Unicode attack detected'' and/or ``CGI Null Byte attack detected'' false positives. How can I turn this detection off?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: I am getting too many ``IIS Unicode attack detected'' and/or ``CGI Null Byte attack detected'' false positives. How can I turn this detection off? I am still getting bombarded with spp\_portscan messages even though the IP that I am getting the portscan from is in my \$DNS\_SERVERs var�65536�Problems�0 +macro: Problems :: I am still getting bombarded with spp\_portscan messages even though the IP that I am getting the portscan from is in my \$DNS\_SERVERs var I am using Snort on Windows and receive an ``OpenPcap() error upon startup: ERROR: OpenPcap() device open: Error opening adapter'' message. What's wrong?�65536�Problems�0 +macro: Problems :: I am using Snort on Windows and receive an ``OpenPcap() error upon startup: ERROR: OpenPcap() device open: Error opening adapter'' message. What's wrong? I have one network card and two aliases, how can I force Snort to ``listen'' on both addresses?�65536�Configuring Snort�0 +macro: Configuring Snort :: I have one network card and two aliases, how can I force Snort to ``listen'' on both addresses? I hear people talking about ``Barnyard''. What's that?\label{barnyard}�65536�Getting Fancy�0 +macro: Getting Fancy :: I hear people talking about ``Barnyard''. What's that?\label{barnyard} I just downloaded a new ruleset and now Snort fails, complaining about the rules.�65536�Problems�0 +macro: Problems :: I just downloaded a new ruleset and now Snort fails, complaining about the rules. I think I found a bug in Snort. Now what?�65536�Problems�0 +macro: Problems :: I think I found a bug in Snort. Now what? I try to start Snort and it gives an error like ``ERROR: Unable to open rules file: /root/.snortrc or /root//root/.snortrc.'' What can I do to fix this?�65536�Problems�0 +macro: Problems :: I try to start Snort and it gives an error like ``ERROR: Unable to open rules file: /root/.snortrc or /root//root/.snortrc.'' What can I do to fix this? I want to build a Snort box. Will this $<$Insert list of hardware$>$ handle $<$this much$>$ traffic?�65536�Getting Started�0 +macro: Getting Started :: I want to build a Snort box. Will this $<$Insert list of hardware$>$ handle $<$this much$>$ traffic? I'm getting large amounts of $<$some alerts type$>$. What should I do? Where can I go to find out more about it?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: I'm getting large amounts of $<$some alerts type$>$. What should I do? Where can I go to find out more about it? I'm getting lots of *ICMP Ping Speedera*, is this bad?�65536�Problems�0 +macro: Problems :: I'm getting lots of *ICMP Ping Speedera*, is this bad? I'm not seeing any interfaces listed under Win32.�65536�Problems�0 +macro: Problems :: I'm not seeing any interfaces listed under Win32. I'm on a switched network, can I still use Snort?�65536�Background�0 +macro: Background :: I'm on a switched network, can I still use Snort? I've got RedHat and ....�65536�Getting Started�0 +macro: Getting Started :: I've got RedHat and .... IDSCenter�2048�0 +struct: IDSCenter Is Fyodor Yarochkin the same Fyodor who wrote nmap?�65536�Background�0 +macro: Background :: Is Fyodor Yarochkin the same Fyodor who wrote nmap? Is Snort vulnerable to IDS noise generators like ``Stick'' and ``Snot''?�65536�Background�0 +macro: Background :: Is Snort vulnerable to IDS noise generators like ``Stick'' and ``Snot''? Is it possible to have Snort call an external program when an alert is raised?�65536�Getting Fancy�0 +macro: Getting Fancy :: Is it possible to have Snort call an external program when an alert is raised? Is it possible with snort to add a ipfilter/ipfw rule to a firewall?�65536�Getting Fancy�0 +macro: Getting Fancy :: Is it possible with snort to add a ipfilter/ipfw rule to a firewall? Is there a private SID number range so my rules don't conflict?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Is there a private SID number range so my rules don't conflict? It's not working on Win32, how can I tell if my problem is Snort or WinPcap?�65536�Problems�0 +macro: Problems :: It's not working on Win32, how can I tell if my problem is Snort or WinPcap? Libpcap complains about permissions problems, what's going on?�65536�Getting Started�0 +macro: Getting Started :: Libpcap complains about permissions problems, what's going on? Miscellaneous�64�0 +member: Miscellaneous My /var/log/snort directory gets very large...�65536�Problems�0 +macro: Problems :: My /var/log/snort directory gets very large... My BASE db connection times-out when performing long operations (e.g. deleting a large number of alerts).�65536�Problems�0 +macro: Problems :: My BASE db connection times-out when performing long operations (e.g. deleting a large number of alerts). My IP address is assigned dynamically to my interface, can I use Snort with it?�65536�Configuring Snort�0 +macro: Configuring Snort :: My IP address is assigned dynamically to my interface, can I use Snort with it? My network spans multiple subnets. How do I define HOME\_NET?�65536�Configuring Snort�0 +macro: Configuring Snort :: My network spans multiple subnets. How do I define HOME\_NET? My snort crashes, how do I restart it?�65536�Problems�0 +macro: Problems :: My snort crashes, how do I restart it? On HPUX I get device lan0 open: recv\_ack: promisc\_phys: Invalid argument�65536�Problems�0 +macro: Problems :: On HPUX I get device lan0 open: recv\_ack: promisc\_phys: Invalid argument Portscans are not being logged to my database�65536�Problems�0 +macro: Problems :: Portscans are not being logged to my database Problems�64�0 +member: Problems Rules and Alerts�64�0 +member: Rules and Alerts SMB alerts aren't working, what's wrong?�65536�Problems�0 +macro: Problems :: SMB alerts aren't working, what's wrong? Snort complains about the ``react'' keyword...�65536�Getting Fancy�0 +macro: Getting Fancy :: Snort complains about the ``react'' keyword... Snort fails to respond to a kill signal on Linux. Why?�65536�Problems�0 +macro: Problems :: Snort fails to respond to a kill signal on Linux. Why? Snort is behind a firewall (ipf/pf/ipchains/ipfilter) and awfully quiet...�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Snort is behind a firewall (ipf/pf/ipchains/ipfilter) and awfully quiet... Snort is dying with a `can not create file' error and I have plenty of diskspace. What's wrong?�65536�Problems�0 +macro: Problems :: Snort is dying with a `can not create file' error and I have plenty of diskspace. What's wrong? Snort is not logging to my database�65536�Problems�0 +macro: Problems :: Snort is not logging to my database Snort is not logging to syslog�65536�Problems�0 +macro: Problems :: Snort is not logging to syslog Snort says BACKDOOR SIGNATURE... does my machine have a Trojan?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Snort says BACKDOOR SIGNATURE... does my machine have a Trojan? Snort says ``Garbage Packet with Null Pointer discarded!'' Huh?�65536�Problems�0 +macro: Problems :: Snort says ``Garbage Packet with Null Pointer discarded!'' Huh? Snort says ``Ran Out Of Space.'' Huh?�65536�Problems�0 +macro: Problems :: Snort says ``Ran Out Of Space.'' Huh? Snort says ``Rule IP addr (``1.1.1.1'') didn't x-late, WTF?''�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Snort says ``Rule IP addr (``1.1.1.1'') didn't x-late, WTF?'' Trying to install snort it says: ``bad interpreter: No such file or directory''�65536�Problems�0 +macro: Problems :: Trying to install snort it says: ``bad interpreter: No such file or directory'' What about `SMB Name Wildcard' alerts?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What about `SMB Name Wildcard' alerts? What about ``CGI Null Byte attacks?''�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What about ``CGI Null Byte attacks?'' What about all these false alarms?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What about all these false alarms? What are CIDR netmasks?�65536�Getting Started�0 +macro: Getting Started :: What are CIDR netmasks? What are HOME\_NET and EXTERNAL\_NET?�65536�Configuring Snort�0 +macro: Configuring Snort :: What are HOME\_NET and EXTERNAL\_NET? What are all these ICMP files in subdirectories under /var/log/snort?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What are all these ICMP files in subdirectories under /var/log/snort? What are all these ``ICMP destination unreachable'' alerts?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What are all these ``ICMP destination unreachable'' alerts? What are some resources that I can use to understand more about source addresses logged and where they are coming from?�65536�Getting Fancy�0 +macro: Getting Fancy :: What are some resources that I can use to understand more about source addresses logged and where they are coming from? What are these IDS codes in the alert names?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What are these IDS codes in the alert names? What do the numbers (ie: [116:56:1]) in front of a Snort alert mean?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What do the numbers (ie: [116:56:1]) in front of a Snort alert mean? What is the best way to use Snort to block attack traffic?�65536�Getting Fancy�0 +macro: Getting Fancy :: What is the best way to use Snort to block attack traffic? What is the difference between ``Alerting'' and ``Logging''?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What is the difference between ``Alerting'' and ``Logging''? What is the use of the ``-r'' switch to read tcpdump files?�65536�Getting Started�0 +macro: Getting Started :: What is the use of the ``-r'' switch to read tcpdump files? What the heck is a SYNFIN scan?�65536�Configuring Snort�0 +macro: Configuring Snort :: What the heck is a SYNFIN scan? What the heck is a SYNFIN scan?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What the heck is a SYNFIN scan? What the heck is a ``Stealth scan''?�65536�Configuring Snort�0 +macro: Configuring Snort :: What the heck is a ``Stealth scan''? What version of Winpcap do I need?\label{winpcap}�65536�Getting Started�0 +macro: Getting Started :: What version of Winpcap do I need?\label{winpcap} What's this about a Snort drinking game?�65536�Miscellaneous�0 +macro: Miscellaneous :: What's this about a Snort drinking game? Where are my log files located? What are they named?�65536�Getting Started�0 +macro: Getting Started :: Where are my log files located? What are they named? Where can I get more reading and courses about IDS?\label{courses}�65536�Background�0 +macro: Background :: Where can I get more reading and courses about IDS?\label{courses} Where do I find binary packages for BlueHat BSD-Linux-RT?�65536�Getting Started�0 +macro: Getting Started :: Where do I find binary packages for BlueHat BSD-Linux-RT? Where do I get more help on Snort?�65536�Background�0 +macro: Background :: Where do I get more help on Snort? Where do I get the latest version of Winpcap?�65536�Getting Started�0 +macro: Getting Started :: Where do I get the latest version of Winpcap? Where do I get the latest version of libpcap?�65536�Getting Started�0 +macro: Getting Started :: Where do I get the latest version of libpcap? Where do the distance and within keywords work from to modify content searches in rules?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Where do the distance and within keywords work from to modify content searches in rules? Where does one obtain new/modifed rules? How do you merge them in?�65536�Configuring Snort�0 +macro: Configuring Snort :: Where does one obtain new/modifed rules? How do you merge them in? Where's a good place to physically put a Snort sensor?�65536�Getting Started�0 +macro: Getting Started :: Where's a good place to physically put a Snort sensor? Which takes precedence, commandline or rule file ?�65536�Configuring Snort�0 +macro: Configuring Snort :: Which takes precedence, commandline or rule file ? Why am I seeing so many ``SMTP RCPT TO overflow'' alerts ?�65536�Problems�0 +macro: Problems :: Why am I seeing so many ``SMTP RCPT TO overflow'' alerts ? Why are my unified alert times off by +/- N hours?�65536�Problems�0 +macro: Problems :: Why are my unified alert times off by +/- N hours? Why are there no subdirectories under /var/log/snort for IP addresses?�65536�Configuring Snort�0 +macro: Configuring Snort :: Why are there no subdirectories under /var/log/snort for IP addresses? Why can't snort see one of the 10Mbps or 100Mbps traffic on my autoswitch hub?�65536�Problems�0 +macro: Problems :: Why can't snort see one of the 10Mbps or 100Mbps traffic on my autoswitch hub? Why do certain alerts seem to have `unknown' IPs in BASE?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Why do certain alerts seem to have `unknown' IPs in BASE? Why do many Snort rules have the flags P (TCP PuSH) and A (TCP ACK) set?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Why do many Snort rules have the flags P (TCP PuSH) and A (TCP ACK) set? Why does Snort complain about /var/log/snort?�65536�Getting Started�0 +macro: Getting Started :: Why does Snort complain about /var/log/snort? Why does building Snort complain about missing references?�65536�Getting Started�0 +macro: Getting Started :: Why does building Snort complain about missing references? Why does building snort fail with errors about yylex and lex\_init?�65536�Getting Started�0 +macro: Getting Started :: Why does building snort fail with errors about yylex and lex\_init? Why does chrooted Snort die when I send it a SIGHUP? \label{chroot}�65536�Problems�0 +macro: Problems :: Why does chrooted Snort die when I send it a SIGHUP? \label{chroot} Why does snort report ``Packet loss statistics are unavailable under Linux?''�65536�Problems�0 +macro: Problems :: Why does snort report ``Packet loss statistics are unavailable under Linux?'' Why does the `error deleting alert' message occur when attempting to delete an alert with BASE?�65536�Problems�0 +macro: Problems :: Why does the `error deleting alert' message occur when attempting to delete an alert with BASE? Why does the portscan plugin log ``stealth'' packets even though the host is in the portscan-ignorehosts list?�65536�Configuring Snort�0 +macro: Configuring Snort :: Why does the portscan plugin log ``stealth'' packets even though the host is in the portscan-ignorehosts list? Why does the program generate alerts on packets that have pass rules?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Why does the program generate alerts on packets that have pass rules? \myquote�16�0 +function: \myquote \myref�16�0 +function: \myref center�1�0 +class: center document�1�0 +class: document enumerate�1�0 +class: enumerate itemize�1�0 +class: itemize latexonly�1�0 +class: latexonly stealth�2048�0 +struct: stealth stream4�2048�0 +struct: stream4 tabular�1�0 +class: tabular verbatim�1�0 +class: verbatim Modified: tests/ctags/68hc11.asm.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager COLD�256�0 +namespace: COLD INTERRUPTS�256�0 +namespace: INTERRUPTS PORTD�65536�0 +macro: PORTD PROMPT�256�0 +namespace: PROMPT SP�65536�0 +macro: SP TRAPP�256�0 +namespace: TRAPP sym1�65536�0 +macro: sym1 sym2�65536�0 +macro: sym2 sym3�256�0 +namespace: sym3 sym4�256�0 +namespace: sym4 Modified: tests/ctags/Package.pm.tags 13 lines changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -1,13 +1,24 @@ -# format=tagmanager CONST�2�0 +enum: CONST END�65536�0 +macro: END END2�65536�0 +macro: END2 Test�512�0 +package: Test Test::One�512�0 +package: Test::One Test::One::Two�512�0 +package: Test::One::Two dude�16�0 +function: dude init�16�0 +function: init quo�16�0 +function: quo quo�1024�0 +prototype: quo xtz�1024�0 +prototype: xtz xuz�1024�0 +prototype: xuz Modified: tests/ctags/actionscript/as-first-token.as.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager f1�16�0 +function: f1 Modified: tests/ctags/actionscript/classes.as.tags 13 lines changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -1,13 +1,24 @@ -# format=tagmanager C1�1�0 +class: C1 C2�1�0 +class: C2 C3�1�0 +class: C3 C4�1�0 +class: C4 C5�1�0 +class: C5 C6�1�0 +class: C6 C7�1�0 +class: C7 I1�32�0 +interface: I1 I2�32�0 +interface: I2 I3�32�0 +interface: I3 I4�32�0 +interface: I4 m1�128�C1�0 +method: C1 :: m1 Modified: tests/ctags/actionscript/const.as.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager AlarmClock�1�0 +class: AlarmClock MODE_AUDIO�65536�AlarmClock�0 +macro: AlarmClock :: MODE_AUDIO MODE_BOTH�65536�AlarmClock�0 +macro: AlarmClock :: MODE_BOTH MODE_VISUAL�65536�AlarmClock�0 +macro: AlarmClock :: MODE_VISUAL mode�16384�AlarmClock�0 +variable: AlarmClock :: mode Modified: tests/ctags/actionscript/const2.as.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager MIN_AGE�65536�0 +macro: MIN_AGE product_array�65536�0 +macro: product_array Modified: tests/ctags/actionscript/method-attributes.as.tags 10 lines changed, 9 insertions(+), 1 deletions(-) =================================================================== @@ -1,10 +1,18 @@ -# format=tagmanager C�1�0 +class: C f1�128�C�0 +method: C :: f1 f2�128�C�0 +method: C :: f2 f3�128�C�0 +method: C :: f3 f4�128�C�0 +method: C :: f4 f5�128�C�0 +method: C :: f5 f6�128�C�0 +method: C :: f6 f7�128�C�0 +method: C :: f7 f8�128�C�0 +method: C :: f8 Modified: tests/ctags/actionscript/packages.as.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager C1�1�P3�0 +class: P3 :: C1 P1�512�0 +package: P1 P2�512�0 +package: P2 P3�512�0 +package: P3 f1�16�P2�0 +function: P2 :: f1 qualified.test.pkg�512�0 +package: qualified.test.pkg Modified: tests/ctags/actionscript/sampler.as.tags 16 lines changed, 15 insertions(+), 1 deletions(-) =================================================================== @@ -1,16 +1,30 @@ -# format=tagmanager assert�128�sampleTypes�0 +method: sampleTypes :: assert b�16384�sampleTypes�0 +variable: sampleTypes :: b cpuSamples�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: cpuSamples delSamples�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: delSamples dos�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: dos flash.display.Sprite�32768�0 +externvar: flash.display.Sprite flash.sampler.*�32768�0 +externvar: flash.sampler.* flash.system.*�32768�0 +externvar: flash.system.* flash.utils.*�32768�0 +externvar: flash.utils.* ids�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: ids lastTime�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: lastTime newSamples�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: newSamples nos�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: nos sampleTypes�1�0 +class: sampleTypes sampleTypes�128�sampleTypes�0 +method: sampleTypes :: sampleTypes Modified: tests/ctags/ada-adb.adb.tags 20 lines changed, 19 insertions(+), 1 deletions(-) =================================================================== @@ -1,20 +1,38 @@ -# format=tagmanager Altivec�16�0 +function: Altivec Days�4096�Greet�0 +typedef: Greet :: Days Friday�4�Days�0 +enumerator: Days :: Friday Greet�16�0 +function: Greet M�16384�Greet�0 +variable: Greet :: M Monday�4�Days�0 +enumerator: Days :: Monday S�16384�Greet�0 +variable: Greet :: S Saturday�4�Days�0 +enumerator: Days :: Saturday Sunday�4�Days�0 +enumerator: Days :: Sunday Thursday�4�Days�0 +enumerator: Days :: Thursday Tuesday�4�Days�0 +enumerator: Days :: Tuesday Vector_A�65536�Altivec�0 +macro: Altivec :: Vector_A Vector_B�65536�Altivec�0 +macro: Altivec :: Vector_B Vector_C�16384�Altivec�0 +variable: Altivec :: Vector_C View_A�65536�Altivec�0 +macro: Altivec :: View_A View_B�65536�Altivec�0 +macro: Altivec :: View_B View_C�16384�Altivec�0 +variable: Altivec :: View_C Wednesday�4�Days�0 +enumerator: Days :: Wednesday Weekend_Days�4096�Greet�0 +typedef: Greet :: Weekend_Days Modified: tests/ctags/ada-ads.ads.tags 17 lines changed, 16 insertions(+), 1 deletions(-) =================================================================== @@ -1,17 +1,32 @@ -# format=tagmanager Adjust�1024�GenStack�0 +prototype: GenStack :: Adjust Data�64�Node�0 +member: Node :: Data Data_Ptr�4096�GenStack�0 +typedef: GenStack :: Data_Ptr Empty�1024�GenStack�0 +prototype: GenStack :: Empty Finalize�1024�GenStack�0 +prototype: GenStack :: Finalize GenStack�512�0 +package: GenStack Head�64�Stack�0 +member: Stack :: Head Initialize�1024�GenStack�0 +prototype: GenStack :: Initialize Next�64�Node�0 +member: Node :: Next Node�4096�GenStack�0 +typedef: GenStack :: Node Node_Ptr�4096�GenStack�0 +typedef: GenStack :: Node_Ptr Pop�1024�GenStack�0 +prototype: GenStack :: Pop Push�1024�GenStack�0 +prototype: GenStack :: Push Stack�4096�GenStack�0 +typedef: GenStack :: Stack StackData�4096�GenStack�0 +typedef: GenStack :: StackData Top�1024�GenStack�0 +prototype: GenStack :: Top Modified: tests/ctags/ada-expression-function-generic.adb.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager Digit_To_Character�16�Generic_Integer_Images�0 +function: Generic_Integer_Images :: Digit_To_Character Digit_To_Character�1024�Generic_Integer_Images�0 +prototype: Generic_Integer_Images :: Digit_To_Character Generic_Integer_Images�512�My_Package�0 +package: My_Package :: Generic_Integer_Images My_Package�16�0 +function: My_Package Signed_Address�4096�My_Package�0 +typedef: My_Package :: Signed_Address Modified: tests/ctags/ada-expression-function.adb.tags 10 lines changed, 9 insertions(+), 1 deletions(-) =================================================================== @@ -1,10 +1,18 @@ -# format=tagmanager Another_Boolean_As_String�16�Tagged_Procedure�0 +function: Tagged_Procedure :: Another_Boolean_As_String Boolean_As_String�16�Tagged_Procedure�0 +function: Tagged_Procedure :: Boolean_As_String My_Type�16384�Test�0 +variable: Test :: My_Type Not_Tagged_Procedure�16�Test�0 +function: Test :: Not_Tagged_Procedure Tagged_Procedure�16�Test�0 +function: Test :: Tagged_Procedure Test�16�0 +function: Test Yet_Boolean_As_String�16�Tagged_Procedure�0 +function: Tagged_Procedure :: Yet_Boolean_As_String p0�16�Tagged_Procedure�0 +function: Tagged_Procedure :: p0 p1�16�Tagged_Procedure�0 +function: Tagged_Procedure :: p1 Modified: tests/ctags/ada-overriding.ads.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager Input�512�0 +package: Input Inutile�1024�Input�0 +prototype: Input :: Inutile Tasche_T�1024�Input�0 +prototype: Input :: Tasche_T Modified: tests/ctags/ada-package-generic.ads.tags 10 lines changed, 9 insertions(+), 1 deletions(-) =================================================================== @@ -1,10 +1,18 @@ -# format=tagmanager Blue�4�Primary_Color�0 +enumerator: Primary_Color :: Blue Conversions�512�My_Package�0 +package: My_Package :: Conversions From_Big_Real�1024�Conversions�0 +prototype: Conversions :: From_Big_Real Green�4�Primary_Color�0 +enumerator: Primary_Color :: Green Missing_Tag�4096�My_Package�0 +typedef: My_Package :: Missing_Tag My_Package�512�0 +package: My_Package Num�64�Missing_Tag�0 +member: Missing_Tag :: Num Primary_Color�4096�My_Package�0 +typedef: My_Package :: Primary_Color Red�4�Primary_Color�0 +enumerator: Primary_Color :: Red Modified: tests/ctags/ada-task.adb.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager Show_Simple_Tasks�16�0 +function: Show_Simple_Tasks T�128�Show_Simple_Tasks�0 +method: Show_Simple_Tasks :: T T�1024�Show_Simple_Tasks�0 +prototype: Show_Simple_Tasks :: T T2�128�Show_Simple_Tasks�0 +method: Show_Simple_Tasks :: T2 T2�1024�Show_Simple_Tasks�0 +prototype: Show_Simple_Tasks :: T2 Modified: tests/ctags/angle_bracket.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager bar�16�(int value)�0�void +function: void bar(int value) bar2�16�(void)�0 +function: bar2(void) foo�16�(int nelem)�0�void +function: void foo(int nelem) Modified: tests/ctags/anonymous_functions.php.tags 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1,9 +1,16 @@ -# format=tagmanager _g�16384�0 +variable: _g a�16�()�0 +function: a() b�16�($x, $y)�0 +function: b($x, $y) c�16�()�0 +function: c() d�16�()�0 +function: d() e�16�()�0 +function: e() f�16�()�0 +function: f() f_sub�16�()�f�0 +function: f :: f_sub() Modified: tests/ctags/array-spec.f90.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager df_mb_data�64�df_type�0 +member: df_type :: df_mb_data df_mb_time�64�df_type�0 +member: df_type :: df_mb_time df_type�1�inm_df�0 +class: inm_df :: df_type df_wb_data�64�df_type�0 +member: df_type :: df_wb_data df_wb_time�64�df_type�0 +member: df_type :: df_wb_time inm_df�256�0 +namespace: inm_df Modified: tests/ctags/array_ref_and_out.cs.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager FillArray�128�(out int[] myArray)�TestOut�0�public void +method: public void TestOut :: FillArray(out int[] myArray) Main�128�()�TestOut�0�public void +method: public void TestOut :: Main() MyMethod�128�(out int[] arr)�0�public void +method: public void MyMethod(out int[] arr) MyMethod�128�(ref int[] arr)�0�public void +method: public void MyMethod(ref int[] arr) TestOut�1�0 +class: TestOut Modified: tests/ctags/array_spec.f90.tags 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1,9 +1,16 @@ -# format=tagmanager Global_Variables�256�0 +namespace: Global_Variables H�16384�Global_Variables�0 +variable: Global_Variables :: H H0�16384�Global_Variables�0 +variable: Global_Variables :: H0 H1�16384�Global_Variables�0 +variable: Global_Variables :: H1 H2�16384�Global_Variables�0 +variable: Global_Variables :: H2 H3�16384�Global_Variables�0 +variable: Global_Variables :: H3 H4�16384�Global_Variables�0 +variable: Global_Variables :: H4 H5�16384�Global_Variables�0 +variable: Global_Variables :: H5 Modified: tests/ctags/arraylist.js.tags 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1,9 +1,16 @@ -# format=tagmanager a�16384�0 +variable: a b�16384�0 +variable: b bar�64�class.test1�0 +member: class.test1 :: bar c�16384�0 +variable: c class�1�()�0 +class: class() foo�64�class.test1�0 +member: class.test1 :: foo test1�1�class�0 +class: class :: test1 test3�128�()�class�0 +method: class :: test3() Modified: tests/ctags/attributes.cs.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager Author�1�0 +class: Author Author�128�(string name)�Author�0 +method: Author :: Author(string name) MyDllimportClass�1�0 +class: MyDllimportClass TraceMethod�128�()�0�[][][][]void +method: [][][][]void TraceMethod() name�8�Author�0 +field: Author :: name version�8�Author�0�double +field: double Author :: version Modified: tests/ctags/auto.f.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager AUTO_TEST�2048�0 +struct: AUTO_TEST D�16384�AUTO_TEST�0 +variable: AUTO_TEST :: D P�16384�AUTO_TEST�0 +variable: AUTO_TEST :: P Q�16384�AUTO_TEST�0 +variable: AUTO_TEST :: Q Modified: tests/ctags/backslashes.c.tags 12 lines changed, 11 insertions(+), 1 deletions(-) =================================================================== @@ -1,12 +1,22 @@ -# format=tagmanager MACRO1�65536�0 +macro: MACRO1 MACRO2�131072�(x)�0 +macro_arg: MACRO2(x) MACRO3�131072�(y)�0 +macro_arg: MACRO3(y) T�4096�0�int +typedef: int T func1�1024�(int var1,int var2,...)�0�int +prototype: int func1(int var1,int var2,...) func2�1024�(int var1,int var2,...)�0�int +prototype: int func2(int var1,int var2,...) func3�1024�(T var1,T var2,...)�0�int +prototype: int func3(T var1,T var2,...) func4�1024�(T var1,T var2,...)�0�int +prototype: int func4(T var1,T var2,...) func5�1024�(int var1,int var2,...)�0�int +prototype: int func5(int var1,int var2,...) func6�1024�(void)�0�int +prototype: int func6(void) func7�1024�(int a)�0�int +prototype: int func7(int a) Modified: tests/ctags/bit_field.c.tags 24 lines changed, 23 insertions(+), 1 deletions(-) =================================================================== @@ -1,24 +1,46 @@ -# format=tagmanager a�64�bit_fields�0�unsigned int:1 +member: unsigned int:1 bit_fields :: a anon_struct_1�2048�1 +struct: anon_struct_1 flags: 1 b�64�bit_fields�0�unsigned int:1 +member: unsigned int:1 bit_fields :: b bad2�64�bitfield_flags�0�BYTE:1 +member: BYTE:1 bitfield_flags :: bad2 bit_fields�2048�0 +struct: bit_fields bitfield_flags�2048�0 +struct: bitfield_flags c�64�bit_fields�0�unsigned int:2 +member: unsigned int:2 bit_fields :: c exp�64�anon_struct_1�0�unsigned +member: unsigned anon_struct_1 :: exp frac0�64�anon_struct_1�0�unsigned +member: unsigned anon_struct_1 :: frac0 frac1�64�anon_struct_1�0�unsigned +member: unsigned anon_struct_1 :: frac1 group�64�bitfield_flags�0�BYTE:1 +member: BYTE:1 bitfield_flags :: group lower�64�shortname_info�0�unsigned char:1 +member: unsigned char:1 shortname_info :: lower mystruct�2048�0 +struct: mystruct personal�64�bitfield_flags�0�BYTE:1 +member: BYTE:1 bitfield_flags :: personal private�64�mystruct�0�BYTE +member: BYTE mystruct :: private public�64�bitfield_flags�0�BYTE:1 +member: BYTE:1 bitfield_flags :: public public�64�mystruct�0�BYTE +member: BYTE mystruct :: public shortname_info�2048�0 +struct: shortname_info sign�64�anon_struct_1�0�unsigned:1 +member: unsigned:1 anon_struct_1 :: sign that�64�mystruct�0�BYTE +member: BYTE mystruct :: that this�64�mystruct�0�BYTE +member: BYTE mystruct :: this upper�64�shortname_info�0�unsigned char:1 +member: unsigned char:1 shortname_info :: upper valid�64�shortname_info�0�unsigned char:1 +member: unsigned char:1 shortname_info :: valid Modified: tests/ctags/block.f90.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager Blocks�256�0 +namespace: Blocks Main�2048�0 +struct: Main MyFunc�16�Blocks�0 +function: Blocks :: MyFunc i�16384�Blocks�0 +variable: Blocks :: i moreint�16384�Main�0 +variable: Main :: moreint otherint�16384�Main�0 +variable: Main :: otherint Modified: tests/ctags/bracematch.js.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager Container�16�()�0 +function: Container() MyClass�1�0 +class: MyClass insert�128�(element, insertions)�MyClass�0 +method: MyClass :: insert(element, insertions) wrap�128�(element, wrapper, attributes)�MyClass�0 +method: MyClass :: wrap(element, wrapper, attributes) x�16�()�Container�0 +function: Container :: x() y�16�()�Container�0 +function: Container :: y() Modified: tests/ctags/bug1020715.c.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager f�16�()�0�void +function: void f() Modified: tests/ctags/bug1020715.cpp.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager f�16�()�0�void +function: void f() Modified: tests/ctags/bug1086609.c.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager func2�16�(int a)�0�int +function: int func2(int a) Modified: tests/ctags/bug1093123.cpp.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager main�16�()�0�int +function: int main() Modified: tests/ctags/bug1111214-j-chan.v.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager insig�16384�top�0 +variable: top :: insig outsig�16384�top�0 +variable: top :: outsig top�1�0 +class: top Modified: tests/ctags/bug1111214.v.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager wahoo�1�0 +class: wahoo Modified: tests/ctags/bug1201689.c.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager test�16�(a,...)�0 +function: test(a,...) Modified: tests/ctags/bug1447756.java.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager Foo�32�0 +interface: Foo bar�128�()�Foo�0�public T +method: public T Foo :: bar() Modified: tests/ctags/bug1458930.c.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager x�1024�()�0�char +prototype: char x() y�1024�()�0�wchar_t +prototype: wchar_t y() Modified: tests/ctags/bug1466117.c.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager a�64�mystruct�0�int +member: int mystruct :: a b�64�mystruct�0�int +member: int mystruct :: b mystruct�2048�0 +struct: mystruct Modified: tests/ctags/bug1491666.c.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager main�16�(void)�0�void +function: void main(void) my_struct�2048�0 +struct: my_struct x�64�my_struct�0�int +member: int my_struct :: x y�64�my_struct�0�float +member: float my_struct :: y Modified: tests/ctags/bug1515910.cs.tags 10 lines changed, 9 insertions(+), 1 deletions(-) =================================================================== @@ -1,10 +1,18 @@ -# format=tagmanager C�1�0 +class: C Enum1�2�0 +enum: Enum1 MyGenericClass1�1�0 +class: MyGenericClass1 Value1�4�Enum1�0 +enumerator: Enum1 :: Value1 Values�4�Enum1�0 +enumerator: Enum1 :: Values int1�8�C�0�int +field: int C :: int1 str1�8�C�0 +field: C :: str1 str2�8�C�0 +field: C :: str2 str3�8�C�0 +field: C :: str3 Modified: tests/ctags/bug1548443.cpp.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager TestStruct�2048�0 +struct: TestStruct TestUnion�8192�0 +union: TestUnion _number�64�TestStruct�0�int +member: int TestStruct :: _number _number�64�TestUnion�0�int +member: int TestUnion :: _number Modified: tests/ctags/bug1563476.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager IntroduceBitDef�2048�0 +struct: IntroduceBitDef f�16�()�IntroduceBitDef�0�int +function: int IntroduceBitDef :: f() g�16�()�0�int +function: int g() Modified: tests/ctags/bug1570779.sql.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager address�8�employees�0 +field: employees :: address employees�1�0 +class: employees id�8�employees�0 +field: employees :: id name�8�employees�0 +field: employees :: name Modified: tests/ctags/bug1575055.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager MyClass�1�TheNamespace�0 +class: TheNamespace :: MyClass TheNamespace�256�0 +namespace: TheNamespace variable�16384�TheNamespace�0�int +variable: int TheNamespace :: variable Modified: tests/ctags/bug1585745.cpp.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager Class5�1�0 +class: Class5 ~Class1�16�()�Class1�0 +function: Class1 :: ~Class1() ~Class2�16�()�Class2�0 +function: Class2 :: ~Class2() ~Class3�16�()�Class3�0 +function: Class3 :: ~Class3() ~Class4�16�()�Class4�0 +function: Class4 :: ~Class4() ~Class5�16�()�Class5�0 +function: Class5 :: ~Class5() Modified: tests/ctags/bug1611054.cs.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager C�1�0 +class: C a�128�()�C�0�public String +method: public String C :: a() b�128�()�C�0�public void +method: public void C :: b() Modified: tests/ctags/bug1691412.java.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager C�1�0 +class: C newInstance�128�()�C�0�@NonNull @CheckReturnValue public DefaultCipherDialog +method: @NonNull @CheckReturnValue public DefaultCipherDialog C :: newInstance() toString�128�()�C�0�@Override public String +method: @Override public String C :: toString() Modified: tests/ctags/bug1742588.rb.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager A�1�0 +class: A a�128�()�A�0 +method: A :: a() b�128�()�A�0 +method: A :: b() Modified: tests/ctags/bug1743330.v.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager dummy�1�0 +class: dummy Modified: tests/ctags/bug1764143.h.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager arch_reset�16�(char mode)�0�void +function: void arch_reset(char mode) omap1_arch_reset�16�(char mode)�0�void +function: void omap1_arch_reset(char mode) Modified: tests/ctags/bug1764148.py.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager PyFunc�16�(msg)�0 +function: PyFunc(msg) Modified: tests/ctags/bug1770479.cpp.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager foo�16�(int i)�0�int +function: int foo(int i) main�16�(int argc,char ** argv)�0�int +function: int main(int argc,char ** argv) Modified: tests/ctags/bug1773926.cpp.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager ERROR_HAPPENED�65536�0 +macro: ERROR_HAPPENED NEXT_DEFINE�65536�0 +macro: NEXT_DEFINE OK�65536�0 +macro: OK main�16�(int argc,char * argv[])�0�int +function: int main(int argc,char * argv[]) Modified: tests/ctags/bug1777344.java.tags 10 lines changed, 9 insertions(+), 1 deletions(-) =================================================================== @@ -1,10 +1,18 @@ -# format=tagmanager V�128�()�bug1777344�0� +method: bug1777344 :: V() b�8�bug1777344�0�boolean +field: boolean bug1777344 :: b bug1777344�1�0 +class: bug1777344 c�8�bug1777344�0�boolean +field: boolean bug1777344 :: c d�8�bug1777344�0�boolean +field: boolean bug1777344 :: d e�8�bug1777344�0�boolean +field: boolean bug1777344 :: e map1�8�bug1777344�0�HashMap +field: HashMap bug1777344 :: map1 map2�8�bug1777344�0�HashMap +field: HashMap bug1777344 :: map2 map3�8�bug1777344�0�HashMap +field: HashMap bug1777344 :: map3 Modified: tests/ctags/bug1799340.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager f1�16�()�0�std::string & +function: std::string & f1() f2�16�()�0�const std::string & +function: const std::string & f2() f3�16�()�0�std::string const & +function: std::string const & f3() Modified: tests/ctags/bug1799343-1.cpp.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager C�2048�0 +struct: C D�16�()�D�0 +function: D :: D() D�2048�0 +struct: D main�16�(void)�0�int +function: int main(void) x�64�C�0�int +member: int C :: x ~D�16�()�D�0 +function: D :: ~D() Modified: tests/ctags/bug1799343-2.cpp.tags 15 lines changed, 14 insertions(+), 1 deletions(-) =================================================================== @@ -1,15 +1,28 @@ -# format=tagmanager A�256�0 +namespace: A B�256�0 +namespace: B C�256�A�0 +namespace: A :: C P�1�0 +class: P P�1�A�0 +class: A :: P Q�1�A�0 +class: A :: Q R�1�A::C�0 +class: A::C :: R S�1�B�0 +class: B :: S f�16�(int v)�A::C::R�0�int +function: int A::C::R :: f(int v) t�64�B::S�0�int +member: int B::S :: t x�64�A::P�0�int +member: int A::P :: x x�64�P�0�int +member: int P :: x y�64�A::Q�0�int +member: int A::Q :: y z�64�A::C::R�0�int +member: int A::C::R :: z Modified: tests/ctags/bug1800065.cs.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager C�1�0 +class: C title�8�C�0 +field: C :: title window�8�C�0�Gtk +field: Gtk C :: window Modified: tests/ctags/bug1809024.py.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager detach�16�(self)�0 +function: detach(self) Modified: tests/ctags/bug1830343.cs.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager ForEachTest�1�0 +class: ForEachTest Main�128�(string[] args)�ForEachTest�0�void +method: void ForEachTest :: Main(string[] args) Modified: tests/ctags/bug1830344.cs.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager C�1�0 +class: C m�128�()�C�0�public void +method: public void C :: m() Modified: tests/ctags/bug1856363.py.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager main�16�()�0 +function: main() Modified: tests/ctags/bug1906062.py.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager dummy�1�0 +class: dummy include_file�16384�0 +variable: include_file Modified: tests/ctags/bug1907083.cpp.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager m1�16�()�C�0�C::T * +function: C::T * C :: m1() m2�16�()�C�0�C::T * const +function: C::T * const C :: m2() m3�16�()�C�0�C::T const * +function: C::T const * C :: m3() m4�16�()�C�0�C::T const * const +function: C::T const * const C :: m4() Modified: tests/ctags/bug1924919.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager MajorVersion�16384�mud�0�std::string +variable: std::string mud :: MajorVersion MinorVersion�16384�mud�0�std::string +variable: std::string mud :: MinorVersion mud�256�0 +namespace: mud Modified: tests/ctags/bug1938565.sql.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager demo_pkg�512�0 +package: demo_pkg func1�16�demo_pkg�0 +function: demo_pkg :: func1 func1_proto�1024�demo_pkg�0 +prototype: demo_pkg :: func1_proto func2�16�demo_pkg�0 +function: demo_pkg :: func2 func2_proto�1024�demo_pkg�0 +prototype: demo_pkg :: func2_proto Modified: tests/ctags/bug1944150.sql.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager tr_d_cash_trade_comment�65536�cash_trade_comment�0 +macro: cash_trade_comment :: tr_d_cash_trade_comment Modified: tests/ctags/bug1950327.js.tags 14 lines changed, 13 insertions(+), 1 deletions(-) =================================================================== @@ -1,14 +1,26 @@ -# format=tagmanager *�64�container.dirtyTab�0 +member: container.dirtyTab :: * Different�1�0 +class: Different TabChrome�1�0 +class: TabChrome createTabTile�128�(browser)�Different�0 +method: Different :: createTabTile(browser) createTabTile�128�(browser)�TabChrome�0 +method: TabChrome :: createTabTile(browser) destroyTabTile�128�(tile)�Different�0 +method: Different :: destroyTabTile(tile) destroyTabTile�128�(tile)�TabChrome�0 +method: TabChrome :: destroyTabTile(tile) dirtyTab�1�container�0 +class: container :: dirtyTab init�128�()�Different�0 +method: Different :: init() init�128�()�TabChrome�0 +method: TabChrome :: init() snapshot�64�container.dirtyTab�0 +member: container.dirtyTab :: snapshot title�64�container.dirtyTab�0 +member: container.dirtyTab :: title url�64�container.dirtyTab�0 +member: container.dirtyTab :: url Modified: tests/ctags/bug1988026.py.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager im_a_function�16�()�0 +function: im_a_function() main�128�()�testClass�0 +method: testClass :: main() my_var�16384�testClass�0 +variable: testClass :: my_var testClass�1�0 +class: testClass Modified: tests/ctags/bug1988027.py.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager dummy�1�0 +class: dummy Modified: tests/ctags/bug1988130.py.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager main�16�()�0 +function: main() testFunc�16�()�0 +function: testFunc() Modified: tests/ctags/bug2049723.java.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager bug2049723�1�0 +class: bug2049723 m1�128�(String arg)�bug2049723�0�public void +method: public void bug2049723 :: m1(String arg) m2�128�(@Nonnull String arg)�bug2049723�0�public void +method: public void bug2049723 :: m2(@Nonnull String arg) Modified: tests/ctags/bug2075402.py.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager x�16384�0 +variable: x y�16384�0 +variable: y Modified: tests/ctags/bug2117073.java.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager AAssignmentExp�1�0 +class: AAssignmentExp AAssignmentExp�128�(@SuppressWarnings() TAssign _token_, @SuppressWarnings() PLvalue _lvalue_, @SuppressWarnings() PExp _exp_)�AAssignmentExp�0 +method: AAssignmentExp :: AAssignmentExp(@SuppressWarnings() TAssign _token_, @SuppressWarnings() PLvalue _lvalue_, @SuppressWarnings() PExp _exp_) removeChild�128�(@SuppressWarnings() Node child)�AAssignmentExp�0�@Override void +method: @Override void AAssignmentExp :: removeChild(@SuppressWarnings() Node child) Modified: tests/ctags/bug2374109.vhd.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager Pow2�16�0 +function: Pow2 Result�16384�Pow2�0 +variable: Pow2 :: Result Modified: tests/ctags/bug2411878.cs.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager C�1�0 +class: C m_name�8�C�0�System +field: System C :: m_name Modified: tests/ctags/bug2747828.v.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager ramaddr_0�16384�0 +variable: ramaddr_0 Modified: tests/ctags/bug2777310.js.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager a�16384�0 +variable: a b�16384�0 +variable: b x�16384�0 +variable: x y�16384�0 +variable: y z�16384�0 +variable: z Modified: tests/ctags/bug2781264.rb.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager Foo�1�0 +class: Foo bar�128�()�Foo�0 +method: Foo :: bar() foo�128�()�Foo�0 +method: Foo :: foo() Modified: tests/ctags/bug2886870.tex.tags 40 lines changed, 39 insertions(+), 1 deletions(-) =================================================================== @@ -1,40 +1,78 @@ -# format=tagmanager Common Greek letters�65536�Special Symbols�0 +macro: Special Symbols :: Common Greek letters Equations�64�0 +member: Equations Figures�64�0 +member: Figures Introduction�64�0 +member: Introduction Lists�64�0 +member: Lists Literal text�64�0 +member: Literal text Special Symbols�64�0 +member: Special Symbols Special symbols�65536�Special Symbols�0 +macro: Special Symbols :: Special symbols Tables�64�0 +member: Tables Test for ctags�16384�Special Symbols""Common Greek letters�0 +variable: Special Symbols""Common Greek letters :: Test for ctags \color{red}Use of Color�64�0 +member: \color{red}Use of Color \label{morefig}Subfigures�64�0 +member: \label{morefig}Subfigures \lb�16�0 +function: \lb \rb�16�0 +function: \rb \rv�16�0 +function: \rv align�1�0 +class: align cases�1�0 +class: cases center�1�0 +class: center comment�1�0 +class: comment document�1�0 +class: document enumerate�1�0 +class: enumerate eq:fine�2048�0 +struct: eq:fine eq:ising�2048�0 +struct: eq:ising eq:mdiv�2048�0 +struct: eq:mdiv equation�1�0 +class: equation fig:lj�2048�0 +struct: fig:lj fig:qm/complexfunctions�2048�0 +struct: fig:qm/complexfunctions fig:typical�2048�0 +struct: fig:typical figure�1�0 +class: figure itemize�1�0 +class: itemize latex�8�0 +field: latex pmatrix�1�0 +class: pmatrix subequations�1�0 +class: subequations tab:5/tc�2048�0 +struct: tab:5/tc table�1�0 +class: table tabular�1�0 +class: tabular thebibliography�1�0 +class: thebibliography verbatim�1�0 +class: verbatim website�8�0 +field: website Modified: tests/ctags/bug2888482.js.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager onsubmit�16�()�editFormEl�0 +function: editFormEl :: onsubmit() scrollEditBox�16�()�0 +function: scrollEditBox() Modified: tests/ctags/bug3036476.js.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager container�16384�0 +variable: container method1�16�()�container.object�0 +function: container.object :: method1() method2�16�()�container.object�0 +function: container.object :: method2() object�16�()�container�0 +function: container :: object() Modified: tests/ctags/bug3168705.py.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager A�1�0 +class: A func1�128�()�A�0 +method: A :: func1() func2�128�()�A�0 +method: A :: func2() Modified: tests/ctags/bug3571233.js.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager MyClass�1�0 +class: MyClass MyClass�16�()�0 +function: MyClass() function1�16�()�0 +function: function1() function2�16�()�0 +function: function2() method2�128�()�MyClass�0 +method: MyClass :: method2() nestedFunction1�16�()�MyClass.method2�0 +function: MyClass.method2 :: nestedFunction1() nestedFunction2�16�()�MyClass.method2�0 +function: MyClass.method2 :: nestedFunction2() nestedFunction3�16�()�function1�0 +function: function1 :: nestedFunction3() nestedFunction4�16�()�function2�0 +function: function2 :: nestedFunction4() nestedFunction5�16�()�function2�0 +function: function2 :: nestedFunction5() Modified: tests/ctags/bug507864.c.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager func1�16�(ENTSEQNO (seq))�0�FUNCSTS +function: FUNCSTS func1(ENTSEQNO (seq)) func2�16�(MEMTXT (form_msg),MEMTXT (text),MEMTXT (mail))�0�FUNCSTS +function: FUNCSTS func2(MEMTXT (form_msg),MEMTXT (text),MEMTXT (mail)) Modified: tests/ctags/bug538629.asm.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager MYMACRO�65536�0 +macro: MYMACRO Modified: tests/ctags/bug556645.c.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager A1�131072�(_type,_length)�0 +macro_arg: A1(_type,_length) Qtype�4096�0 +typedef: Qtype Modified: tests/ctags/bug556646.c.tags 21 lines changed, 20 insertions(+), 1 deletions(-) =================================================================== @@ -1,21 +1,40 @@ -# format=tagmanager A�4�task_indx_type�0 +enumerator: task_indx_type :: A INDX_C1�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_C1 INDX_C2�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_C2 INDX_IM1�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_IM1 INDX_IM2�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_IM2 INDX_L�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_L INDX_L2�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_L2 INDX_M�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_M INDX_NIL�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_NIL INDX_P�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_P INDX_R�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_R INDX_R2�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_R2 INDX_S�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_S INDX_S1�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_S1 INDX_S2�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_S2 INDX_S3�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_S3 INDX_S4�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_S4 INDX_T�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_T INDX_T2�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_T2 task_indx_type�2�0 +enum: task_indx_type Modified: tests/ctags/bug565813.f90.tags 8 lines changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -1,8 +1,14 @@ -# format=tagmanager N�16384�ctags_bug�0 +variable: ctags_bug :: N bar�64�foo_t�0 +member: foo_t :: bar ctags_bug�256�0 +namespace: ctags_bug foo_getbar�16�ctags_bug�0 +function: ctags_bug :: foo_getbar foo_set_bar�128�(f, b)�ctags_bug�0 +method: ctags_bug :: foo_set_bar(f, b) foo_setbar�128�(f, b)�ctags_bug�0 +method: ctags_bug :: foo_setbar(f, b) foo_t�1�ctags_bug�0 +class: ctags_bug :: foo_t Modified: tests/ctags/bug612019.pas.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager Test1�16�()�0 +function: Test1() Test2�16�()�0 +function: Test2() Test3�16�()�0 +function: Test3() Modified: tests/ctags/bug612621.pl.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager bar�16�0 +function: bar foo�16�0 +function: foo Modified: tests/ctags/bug620288.f.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager bar�16�0 +function: bar foo�16�0 +function: foo Modified: tests/ctags/bug639639.h.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager Namespace1�256�0 +namespace: Namespace1 anon2�4�anon_enum_1�0 +enumerator: anon_enum_1 :: anon2 anon_enum_1�2�1 +enum: anon_enum_1 flags: 1 function2�1024�(char * str)�Namespace1�0�int +prototype: int Namespace1 :: function2(char * str) Modified: tests/ctags/bug639644.hpp.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager anon_namespace_1�256�1 +namespace: anon_namespace_1 flags: 1 foo�16384�anon_namespace_1�0�int +variable: int anon_namespace_1 :: foo Modified: tests/ctags/bug665086.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager C12�1�N1::N2�0 +class: N1::N2 :: C12 N1�256�0 +namespace: N1 N2�256�N1�0 +namespace: N1 :: N2 Modified: tests/ctags/bug670433.f90.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager bar�128�(n)�foobar�0 +method: foobar :: bar(n) f�16�foo�0 +function: foo :: f foo�16�foobar�0 +function: foobar :: foo foobar�256�0 +namespace: foobar Modified: tests/ctags/bug699171.py.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager HEADER_TEMPLATE�16384�0 +variable: HEADER_TEMPLATE Quit�16�(msg, exitcode=0)�0 +function: Quit(msg, exitcode=0) Modified: tests/ctags/bug722501.sql.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager foo�256�0 +namespace: foo Modified: tests/ctags/bug726712.f90.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager sub1�128�(a)�0 +method: sub1(a) sub2�128�(a)�0 +method: sub2(a) tagstest_ctrl�128�()�0 +method: tagstest_ctrl() Modified: tests/ctags/bug726875.f90.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager coma�65536�0 +macro: coma comb�65536�0 +macro: comb comc�65536�0 +macro: comc Modified: tests/ctags/bug734933.f90.tags 17 lines changed, 16 insertions(+), 1 deletions(-) =================================================================== @@ -1,17 +1,32 @@ -# format=tagmanager ADD_COMPONENTS�128�MDCOMPONENTS�0 +method: MDCOMPONENTS :: ADD_COMPONENTS COMP�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: COMP COMPONENT�1�MDCOMPONENTS�0 +class: MDCOMPONENTS :: COMPONENT COMPONENTS�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: COMPONENTS COMPONENTS_TMP�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: COMPONENTS_TMP COMPONENT_POINTER�1�MDCOMPONENTS�0 +class: MDCOMPONENTS :: COMPONENT_POINTER COMP_TMP�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: COMP_TMP LIM_COMPONENTS�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: LIM_COMPONENTS MDCOMPONENTS�256�0 +namespace: MDCOMPONENTS MEMDEALLOC�32�MDCOMPONENTS�0 +interface: MDCOMPONENTS :: MEMDEALLOC NAME�64�COMPONENT�0 +member: COMPONENT :: NAME NCOMP�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: NCOMP NUM_COMPONENTS�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: NUM_COMPONENTS NUM_PART�64�COMPONENT�0 +member: COMPONENT :: NUM_PART P�64�COMPONENT_POINTER�0 +member: COMPONENT_POINTER :: P PART_LIST�64�COMPONENT�0 +member: COMPONENT :: PART_LIST Modified: tests/ctags/bug762027.v.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager N_83�16384�0 +variable: N_83 N_84�16384�0 +variable: N_84 Modified: tests/ctags/bug814263.java.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager bug814263�1�0 +class: bug814263 map1�8�bug814263�0�java +field: java bug814263 :: map1 map2�8�bug814263�0�Map +field: Map bug814263 :: map2 Modified: tests/ctags/bug823000.sql.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager TEST�512�0 +package: TEST TestFunc1�256�TEST�0 +namespace: TEST :: TestFunc1 TestFunc2�256�TEST�0 +namespace: TEST :: TestFunc2 Modified: tests/ctags/bug842077.pl.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager test�16�0 +function: test Modified: tests/ctags/bug849591.cpp.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager Foo�16�()�MainClass�0�void +function: void MainClass :: Foo() Modified: tests/ctags/bug852368.cpp.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager foo�1024�(std::vector<float> &)�0�void +prototype: void foo(std::vector<float> &) Modified: tests/ctags/bug858165.f90.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager a�16384�test�0 +variable: test :: a b�16384�test�0 +variable: test :: b c�16384�test�0 +variable: test :: c d�16384�test�0 +variable: test :: d test�2048�0 +struct: test Modified: tests/ctags/bug872494.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager FooClass2�1�0 +class: FooClass2 TemplClass�1�0 +class: TemplClass i�64�TemplClass�0�int +member: int TemplClass :: i Modified: tests/ctags/bug877956.f90.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager c2�16384�test�0 +variable: test :: c2 cm1�16384�test�0 +variable: test :: cm1 test�2048�0 +struct: test Modified: tests/ctags/bug960316.v.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager fail_define_2�16384�0 +variable: 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_func_1�16�0 +function: pass_func_1 pass_task_1�16�0 +function: pass_task_1 Modified: tests/ctags/bug961001.v.tags 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1,9 +1,16 @@ -# format=tagmanager 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 Modified: tests/ctags/byte.f.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager A�16384�byte_test�0 +variable: byte_test :: A A1�16384�byte_test�0 +variable: byte_test :: A1 A2�16384�byte_test�0 +variable: byte_test :: A2 B�16384�byte_test�0 +variable: byte_test :: B B1�16384�byte_test�0 +variable: byte_test :: B1 B2�16384�byte_test�0 +variable: byte_test :: B2 C�16384�byte_test�0 +variable: byte_test :: C C1�16384�byte_test�0 +variable: byte_test :: C1 C2�16384�byte_test�0 +variable: byte_test :: C2 byte_test�2048�0 +struct: byte_test Modified: tests/ctags/c-digraphs.c.tags 12 lines changed, 11 insertions(+), 1 deletions(-) =================================================================== @@ -1,12 +1,22 @@ -# format=tagmanager A�65536�0 +macro: A B�65536�0 +macro: B M3_INIT�131072�(a,b,c)�0 +macro_arg: M3_INIT(a,b,c) STRINGIFY�131072�(x)�0 +macro_arg: STRINGIFY(x) STRINGIFY_INTERN�131072�(x)�0 +macro_arg: STRINGIFY_INTERN(x) buf�64�str�0�char * +member: char * str :: buf len�64�str�0�unsigned int +member: unsigned int str :: len main�16�(void)�0�int +function: int main(void) matrix3�4096�0�int[3] +typedef: int[3] matrix3 size�64�str�0�unsigned int +member: unsigned int str :: size str�2048�0 +struct: str Modified: tests/ctags/c-trigraphs.c.tags 15 lines changed, 14 insertions(+), 1 deletions(-) =================================================================== @@ -1,15 +1,28 @@ -# format=tagmanager A�65536�0 +macro: A B�65536�0 +macro: B D�65536�0 +macro: D E�65536�0 +macro: E F�65536�0 +macro: F M3_INIT�131072�(a,b,c)�0 +macro_arg: M3_INIT(a,b,c) STRINGIFY�131072�(x)�0 +macro_arg: STRINGIFY(x) STRINGIFY_INTERN�131072�(x)�0 +macro_arg: STRINGIFY_INTERN(x) buf�64�str�0�char * +member: char * str :: buf len�64�str�0�unsigned int +member: unsigned int str :: len main�16�(void)�0�int +function: int main(void) matrix3�4096�0�int[3] +typedef: int[3] matrix3 size�64�str�0�unsigned int +member: unsigned int str :: size str�2048�0 +struct: str Modified: tests/ctags/case_sensitivity.php.tags 17 lines changed, 16 insertions(+), 1 deletions(-) =================================================================== @@ -1,17 +1,32 @@ -# format=tagmanager A�1�0 +class: A B�1�0 +class: B C�1�0 +class: C D�1�0 +class: D a�16�()�0 +function: a() b�16�()�0 +function: b() c�16�()�0 +function: c() d�16�()�0 +function: d() iA�32�0 +interface: iA iB�32�0 +interface: iB iC�32�0 +interface: iC iD�32�0 +interface: iD tA�2048�0 +struct: tA tB�2048�0 +struct: tB tC�2048�0 +struct: tC tD�2048�0 +struct: tD Modified: tests/ctags/char-selector.f90.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager MXDDI�16384�OUT_RD5�0 +variable: OUT_RD5 :: MXDDI OUT_RD5�256�0 +namespace: OUT_RD5 fpshape�16384�OUT_RD5�0 +variable: OUT_RD5 :: fpshape fpshape2�16384�OUT_RD5�0 +variable: OUT_RD5 :: fpshape2 last�16384�OUT_RD5�0 +variable: OUT_RD5 :: last list�16384�OUT_RD5�0 +variable: OUT_RD5 :: list nout�16384�OUT_RD5�0 +variable: OUT_RD5 :: nout temp�16384�OUT_RD5�0 +variable: OUT_RD5 :: temp titles�16384�OUT_RD5�0 +variable: OUT_RD5 :: titles units�16384�OUT_RD5�0 +variable: OUT_RD5 :: units Modified: tests/ctags/classes.php.tags 8 lines changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -1,8 +1,14 @@ -# format=tagmanager Bar�1�0 +class: Bar Foo�1�0 +class: Foo __construct�16�()�Bar�0 +function: Bar :: __construct() __construct�16�($a, $b)�Foo�0 +function: Foo :: __construct($a, $b) method1�16�()�Bar�0 +function: Bar :: method1() method1�16�($arg)�Foo�0 +function: Foo :: method1($arg) method2�16�()�Foo�0 +function: Foo :: method2() Modified: tests/ctags/cobol/helloworld.cbl.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager 00-MAIN�65536�0 +macro: 00-MAIN CONFIGURATION�256�0 +namespace: CONFIGURATION DATA�32�0 +interface: DATA ENVIRONMENT�32�0 +interface: ENVIRONMENT HELLO�1�0 +class: HELLO IDENTIFICATION�32�0 +interface: IDENTIFICATION OBJECT-COMPUTER�65536�0 +macro: OBJECT-COMPUTER PROCEDURE�32�0 +interface: PROCEDURE SOURCE-COMPUTER�65536�0 +macro: SOURCE-COMPUTER SPECIAL-NAMES�65536�0 +macro: SPECIAL-NAMES Modified: tests/ctags/cobol/helloworld2.cbl.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager 00-MAIN�65536�0 +macro: 00-MAIN CONFIGURATION�256�0 +namespace: CONFIGURATION DATA�32�0 +interface: DATA ENVIRONMENT�32�0 +interface: ENVIRONMENT HELLO WORLD�1�0 +class: HELLO WORLD IDENTIFICATION�32�0 +interface: IDENTIFICATION OBJECT-COMPUTER�65536�0 +macro: OBJECT-COMPUTER PROCEDURE�32�0 +interface: PROCEDURE SOURCE-COMPUTER�65536�0 +macro: SOURCE-COMPUTER SPECIAL-NAMES�65536�0 +macro: SPECIAL-NAMES Modified: tests/ctags/cobol/levels.cbl.tags 22 lines changed, 21 insertions(+), 1 deletions(-) =================================================================== @@ -1,22 +1,42 @@ -# format=tagmanager DATA�32�0 +interface: DATA EVEN�16384�RECORD1.ITEM2�0 +variable: RECORD1.ITEM2 :: EVEN G1�2048�REC2�0 +struct: REC2 :: G1 IDENTIFICATION�32�0 +interface: IDENTIFICATION ITEM1�16384�REC2.G1�0 +variable: REC2.G1 :: ITEM1 ITEM1�16384�RECORD1�0 +variable: RECORD1 :: ITEM1 ITEM2�16384�REC2.G1�0 +variable: REC2.G1 :: ITEM2 ITEM2�16384�RECORD1�0 +variable: RECORD1 :: ITEM2 ITEM3�16384�RECORD1�0 +variable: RECORD1 :: ITEM3 MAIN-PROCEDURE�65536�0 +macro: MAIN-PROCEDURE ODD�16384�RECORD1.ITEM2�0 +variable: RECORD1.ITEM2 :: ODD OTHERNAME1�16384�REC2�0 +variable: REC2 :: OTHERNAME1 OTHERNAME2�16384�REC2�0 +variable: REC2 :: OTHERNAME2 PROCEDURE�32�0 +interface: PROCEDURE RDITEM4�16384�RECORD1�0 +variable: RECORD1 :: RDITEM4 RDITEM5�16384�RECORD1�0 +variable: RECORD1 :: RDITEM5 REC2�2048�0 +struct: REC2 RECORD1�2048�0 +struct: RECORD1 STDLN1�16384�0 +variable: STDLN1 Test-Items�1�0 +class: Test-Items WORKING-STORAGE�256�0 +namespace: WORKING-STORAGE Modified: tests/ctags/cobol/quoted-program-id.cbl.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager IDENTIFICATION�32�0 +interface: IDENTIFICATION MAIN�65536�0 +macro: MAIN PROCEDURE�32�0 +interface: PROCEDURE Test program name�1�0 +class: Test program name Modified: tests/ctags/cobol/simple.cbl.tags 22 lines changed, 21 insertions(+), 1 deletions(-) =================================================================== @@ -1,22 +1,42 @@ -# format=tagmanager AUTHOR�65536�0 +macro: AUTHOR Begin�65536�0 +macro: Begin DATA�32�0 +interface: DATA DW-DAYS-IN-MONTH�16384�Group-Name.Data-Item1.DW-DAYS-IN-MONTHS�0 +variable: Group-Name.Data-Item1.DW-DAYS-IN-MONTHS :: DW-DAYS-IN-MONTH DW-DAYS-IN-MONTHS�16384�Group-Name.Data-Item1�0 +variable: Group-Name.Data-Item1 :: DW-DAYS-IN-MONTHS Data-Item1�16384�Group-Name�0 +variable: Group-Name :: Data-Item1 ENVIRONMENT�32�0 +interface: ENVIRONMENT FILE�256�0 +namespace: FILE FILE-CONTROL�65536�0 +macro: FILE-CONTROL File-Data-Item�16384�File-Group-Name�0 +variable: File-Group-Name :: File-Data-Item File-Group-Name�2048�0 +struct: File-Group-Name File-Name�16�0 +function: File-Name Group-Name�2048�0 +struct: Group-Name IDENTIFICATION�32�0 +interface: IDENTIFICATION INPUT-OUPUT�256�0 +namespace: INPUT-OUPUT PROCEDURE�32�0 +interface: PROCEDURE Program-Name�1�0 +class: Program-Name SH-WORK-MMDDYYYY�16384�Group-Name.Data-Item1�0 +variable: Group-Name.Data-Item1 :: SH-WORK-MMDDYYYY SH-WORK-MMDDYYYY-2�16384�Group-Name.Data-Item1�0 +variable: Group-Name.Data-Item1 :: SH-WORK-MMDDYYYY-2 Subprogram-Name�65536�0 +macro: Subprogram-Name WORKING-STORAGE�256�0 +namespace: WORKING-STORAGE Modified: tests/ctags/common.f.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager common1�65536�main�0 +macro: main :: common1 common2�65536�main�0 +macro: main :: common2 common3�65536�main�0 +macro: main :: common3 main�2048�0 +struct: main Modified: tests/ctags/complex-return.js.tags 20 lines changed, 19 insertions(+), 1 deletions(-) =================================================================== @@ -1,20 +1,38 @@ -# format=tagmanager anon_function_1�16�()�class2.c2m1�1 +function: class2.c2m1 :: anon_function_1() flags: 1 anon_function_2�16�(n)�class3.c3m1�1 +function: class3.c3m1 :: anon_function_2(n) flags: 1 c2m1�128�()�class2�0 +method: class2 :: c2m1() c2m2�128�(f)�class2�0 +method: class2 :: c2m2(f) c2m3�128�(f)�class2�0 +method: class2 :: c2m3(f) c3m1�128�()�class3�0 +method: class3 :: c3m1() c3m2�128�()�class3�0 +method: class3 :: c3m2() class1�1�()�0 +class: class1() class2�1�()�0 +class: class2() class3�1�()�0 +class: class3() class4�1�()�0 +class: class4() func1�16�()�0 +function: func1() func2�16�()�0 +function: func2() method1�128�()�class1�0 +method: class1 :: method1() method1�128�()�class4�0 +method: class4 :: method1() method2�128�()�class1�0 +method: class1 :: method2() method2�128�()�class4�0 +method: class4 :: method2() method3�128�()�class1�0 +method: class1 :: method3() method4�128�()�class1�0 +method: class1 :: method4() Modified: tests/ctags/continuation.f90.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager para_a�16384�test�0 +variable: test :: para_a para_b�16384�test�0 +variable: test :: para_b para_c�16384�test�0 +variable: test :: para_c test�256�0 +namespace: test Modified: tests/ctags/continuation.mak.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager A�65536�0 +macro: A B�65536�0 +macro: B Modified: tests/ctags/countall.sql.tags 8 lines changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -1,8 +1,14 @@ -# format=tagmanager row_count�16384�0 +variable: row_count stat�16384�0 +variable: stat t_c1_tname�16384�0 +variable: t_c1_tname t_cid�16384�0 +variable: t_cid t_command�16384�0 +variable: t_command t_limit�16384�0 +variable: t_limit t_total_records�16384�0 +variable: t_total_records Modified: tests/ctags/cpp_destructor.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager ~A�16�()�A�0 +function: A :: ~A() ~B�16�()�B�0 +function: B :: ~B() ~C�16�()�C�0 +function: C :: ~C() Modified: tests/ctags/css-at-rules.css.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager body�2048�0 +struct: body html�2048�0 +struct: html Modified: tests/ctags/css-at-supports.css.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager html�2048�0 +struct: html Modified: tests/ctags/css-attribute-selectors.css.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager a[href^="http://"]�2048�0 +struct: a[href^="http://"] a[href^="https://"]�2048�0 +struct: a[href^="https://"] a[lang~=en]�2048�0 +struct: a[lang~=en] body�2048�0 +struct: body p�2048�0 +struct: p Modified: tests/ctags/css-comma-no-space.css.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager input�2048�0 +struct: input textarea�2048�0 +struct: textarea Modified: tests/ctags/css-namespace-selectors.css.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager *|div�2048�0 +struct: *|div svg|a�2048�0 +struct: svg|a |a�2048�0 +struct: |a Modified: tests/ctags/css-pseudo-classes.css.tags 12 lines changed, 11 insertions(+), 1 deletions(-) =================================================================== @@ -1,12 +1,22 @@ -# format=tagmanager a:lang(en):after�2048�0 +struct: a:lang(en):after body :not(span)�2048�0 +struct: body :not(span) span:not(:first-child)�2048�0 +struct: span:not(:first-child) span:nth-child(-n+3)�2048�0 +struct: span:nth-child(-n+3) span:nth-child(0n+1)�2048�0 +struct: span:nth-child(0n+1) span:nth-child(1)�2048�0 +struct: span:nth-child(1) tr:nth-child(10n+0)�2048�0 +struct: tr:nth-child(10n+0) tr:nth-child(2n)�2048�0 +struct: tr:nth-child(2n) tr:nth-child(2n+1)�2048�0 +struct: tr:nth-child(2n+1) tr:nth-child(even)�2048�0 +struct: tr:nth-child(even) tr:nth-child(odd)�2048�0 +struct: tr:nth-child(odd) Modified: tests/ctags/css-simple.css.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager #footer�16384�0 +variable: #footer *�2048�0 +struct: * .foo a�2048�0 +struct: .foo a .foo b�2048�0 +struct: .foo b .header�1�0 +class: .header .red�1�0 +class: .red div.magic�1�0 +class: div.magic html�2048�0 +struct: html ul > li > a�2048�0 +struct: ul > li > a ul li�2048�0 +struct: ul li Modified: tests/ctags/css-singlequote-in-comment-issue2.css.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager a�2048�0 +struct: a b�2048�0 +struct: b Modified: tests/ctags/css-tag-types.css.tags 37 lines changed, 36 insertions(+), 1 deletions(-) =================================================================== @@ -1,37 +1,72 @@ -# format=tagmanager #a #foo�16384�0 +variable: #a #foo #a #foo #bar�16384�0 +variable: #a #foo #bar #a #foo .bar�1�0 +class: #a #foo .bar #a #foo bar�2048�0 +struct: #a #foo bar #a .foo�1�0 +class: #a .foo #a .foo #bar�16384�0 +variable: #a .foo #bar #a .foo .bar�1�0 +class: #a .foo .bar #a .foo bar�2048�0 +struct: #a .foo bar #a foo�2048�0 +struct: #a foo #a foo #bar�16384�0 +variable: #a foo #bar #a foo .bar�1�0 +class: #a foo .bar #a foo bar�2048�0 +struct: #a foo bar .a #foo�16384�0 +variable: .a #foo .a #foo #bar�16384�0 +variable: .a #foo #bar .a #foo .bar�1�0 +class: .a #foo .bar .a #foo bar�2048�0 +struct: .a #foo bar .a .foo�1�0 +class: .a .foo .a .foo #bar�16384�0 +variable: .a .foo #bar .a .foo .bar�1�0 +class: .a .foo .bar .a .foo bar�2048�0 +struct: .a .foo bar .a foo�2048�0 +struct: .a foo .a foo #bar�16384�0 +variable: .a foo #bar .a foo .bar�1�0 +class: .a foo .bar .a foo bar�2048�0 +struct: .a foo bar a #foo�16384�0 +variable: a #foo a #foo #bar�16384�0 +variable: a #foo #bar a #foo .bar�1�0 +class: a #foo .bar a #foo bar�2048�0 +struct: a #foo bar a .foo�1�0 +class: a .foo a .foo #bar�16384�0 +variable: a .foo #bar a .foo .bar�1�0 +class: a .foo .bar a .foo bar�2048�0 +struct: a .foo bar a foo�2048�0 +struct: a foo a foo #bar�16384�0 +variable: a foo #bar a foo .bar�1�0 +class: a foo .bar a foo bar�2048�0 +struct: a foo bar Modified: tests/ctags/css-trivial.css.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager a�2048�0 +struct: a html�2048�0 +struct: html input�2048�0 +struct: input p�2048�0 +struct: p textarea�2048�0 +struct: textarea Modified: tests/ctags/cxx11-final.cpp.tags 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1,9 +1,16 @@ -# format=tagmanager Base�1�0 +class: Base Derived�1�0 +class: Derived final�16�()�Derived�0�void +function: void Derived :: final() final�1024�()�Derived�0�void +prototype: void Derived :: final() foo�16�()�Base�0�void +function: void Base :: foo() foo�16�()�Derived�0�void +function: void Derived :: foo() foo�1024�()�Base�0�void +prototype: void Base :: foo() foo�1024�()�Derived�0�void +prototype: void Derived :: foo() Modified: tests/ctags/cxx11-noexcept.cpp.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager Base�1�0 +class: Base bar�1024�() const�Base�0�void +prototype: void Base :: bar() const baz�16�()�Base�0�int +function: int Base :: baz() foo�1024�()�Base�0�void +prototype: void Base :: foo() Modified: tests/ctags/cxx11-override.cpp.tags 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1,9 +1,16 @@ -# format=tagmanager Base�1�0 +class: Base Derived�1�0 +class: Derived foo�16�()�Base�0�void +function: void Base :: foo() foo�16�()�Derived�0�void +function: void Derived :: foo() foo�1024�()�Base�0�void +prototype: void Base :: foo() foo�1024�()�Derived�0�void +prototype: void Derived :: foo() override�16�()�Derived�0�void +function: void Derived :: override() override�1024�()�Derived�0�void +prototype: void Derived :: override() Modified: tests/ctags/cxx11-raw-strings.cpp.tags 23 lines changed, 22 insertions(+), 1 deletions(-) =================================================================== @@ -1,23 +1,44 @@ -# format=tagmanager FOUR�65536�0 +macro: FOUR memb1�64�typ1�0�int +member: int typ1 :: memb1 memb2�64�typ2�0�int +member: int typ2 :: memb2 memb3�64�typ3�0�int +member: int typ3 :: memb3 memb4�64�typ4�0�int +member: int typ4 :: memb4 memb5�64�typ5�0�int +member: int typ5 :: memb5 memb6�64�typ6�0�int +member: int typ6 :: memb6 memb7�64�typ7�0�int +member: int typ7 :: memb7 str1�16384�0�const char * +variable: const char * str1 str2�16384�0�const char * +variable: const char * str2 str3�16384�0�const char * +variable: const char * str3 str4�16384�0�const char * +variable: const char * str4 str5�16384�0�const char * +variable: const char * str5 str6�16384�0�const char * +variable: const char * str6 str7�16384�0�const char * +variable: const char * str7 typ1�2048�0 +struct: typ1 typ2�2048�0 +struct: typ2 typ3�2048�0 +struct: typ3 typ4�2048�0 +struct: typ4 typ5�2048�0 +struct: typ5 typ6�2048�0 +struct: typ6 typ7�2048�0 +struct: typ7 Modified: tests/ctags/cxx11enum.cpp.tags 19 lines changed, 18 insertions(+), 1 deletions(-) =================================================================== @@ -1,19 +1,36 @@ -# format=tagmanager A�2�0�int +enum: int A A_a�4�A�0 +enumerator: A :: A_a A_b�4�A�0 +enumerator: A :: A_b A_c�4�A�0 +enumerator: A :: A_c B�2�0�long +enum: long B B_a�4�B�0 +enumerator: B :: B_a B_b�4�B�0 +enumerator: B :: B_b B_c�4�B�0 +enumerator: B :: B_c C�2�0�unsigned int +enum: unsigned int C C_a�4�C�0 +enumerator: C :: C_a C_b�4�C@@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 475334: Add script for pretty-printing geany tags files
by Jiří Techet 15 Jun '22

15 Jun '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 12 Jun 2022 22:31:16 UTC Commit: 4753344ce886d74878c0eede924527615b22874b https://github.com/geany/geany/commit/4753344ce886d74878c0eede924527615b228… Log Message: ----------- Add script for pretty-printing geany tags files This script reads Geany binary tags files from stdin and writes to stdout a file where each of the tags is followed by a line where the tag is printed in the following human-readable form: tag_type: return_value scope :: tag_name(arglist) additional_stuff Especially the tag_type is currently hard to understand when looking at unit tests and easy to miss if there's a problem. Modified Paths: -------------- Makefile.am scripts/print-tags.py Modified: Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,7 @@ EXTRA_DIST = \ autogen.sh \ scripts/gen-api-gtkdoc.py \ scripts/gen-signallist.sh \ + scripts/print-tags.py \ geany.desktop.in \ geany.pc.in \ ChangeLog.pre-1-22 \ Modified: scripts/print-tags.py 115 lines changed, 115 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,115 @@ +#!/usr/bin/env python3 + +import sys + +# see tm_source_file.c +TA_NAME, TA_LINE, TA_LOCAL, TA_POS, TA_TYPE, TA_ARGLIST, TA_SCOPE, \ + TA_VARTYPE, TA_INHERITS, TA_TIME, TA_ACCESS, TA_IMPL, TA_LANG, \ + TA_INACTIVE, TA_FLAGS = range(200, 215) + +# see TMTagType in tm_parser.h +types = [ + "undef", "class", "enum", "enumerator", "field", "function", + "interface", "member", "method", "namespace", "package", + "prototype", "struct", "typedef", "union", "variable", "externvar", + "macro", "macro_arg", "file", "other", + "UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN", +] + +type_dct = {0: types[0]} +for i in range(len(types) - 1): + type_dct[1 << i] = types[i + 1] + + +def decode_kind(kind, value): + val = '' + if kind == TA_NAME: + val = value.decode('utf-8') + elif kind == TA_LINE: + val = int(value) + elif kind == TA_LOCAL: + val = int(value) + elif kind == TA_TYPE: + val = type_dct[int(value)] + elif kind == TA_ARGLIST: + val = value.decode('utf-8') + elif kind == TA_SCOPE: + val = value.decode('utf-8') + elif kind == TA_FLAGS: + val = int(value) + elif kind == TA_VARTYPE: + val = value.decode('utf-8') + elif kind == TA_INHERITS: + val = value.decode('utf-8') + elif kind == TA_TIME: + pass; + elif kind == TA_LANG: + pass; + elif kind == TA_INACTIVE: + pass; + elif kind == TA_ACCESS: + val = value.decode('utf-8') + elif kind == TA_IMPL: + val = value.decode('utf-8') + return val + + +def print_tag(tag): + res = '{:<12}'.format(tag[TA_TYPE] + ': ') + if TA_VARTYPE in tag: + res += tag[TA_VARTYPE] + ' ' + if TA_SCOPE in tag: + res += tag[TA_SCOPE] + ' :: ' + res += tag[TA_NAME] + if TA_ARGLIST in tag: + res += tag[TA_ARGLIST] + if TA_INHERITS in tag: + res += ' extends ' + tag[TA_INHERITS] + if TA_FLAGS in tag and tag[TA_FLAGS] > 0: + res += ' flags: ' + str(tag[TA_FLAGS]) + # stdout.buffer (stdin.buffer) needed to write (read) binary data, see: + # https://docs.python.org/3/library/sys.html?highlight=stdout#sys.stdout + sys.stdout.buffer.write(res.encode('utf-8')) + sys.stdout.buffer.write(b'\n') + + +def get_next_part(inp, pos, first): + part = b'' + c = inp[pos] + if first: + kind = TA_NAME + else: + kind = c + pos += 1 + c = inp[pos] + while c < TA_NAME and c != ord('\n'): + part += bytes([c]) + pos += 1 + c = inp[pos] + return part, kind, pos + + +inp = sys.stdin.buffer.read() + +tag = {} +pos = 0 +line_start_pos = 0 +line_start = True +first_line = True +while pos < len(inp): + part, kind, pos = get_next_part(inp, pos, line_start) + value = decode_kind(kind, part) + tag[kind] = value + line_start = False + if inp[pos] == ord('\n'): + if first_line: + pass # first line contains '# format=tagmanager' we want to skip + else: + sys.stdout.buffer.write(inp[line_start_pos:pos]) + sys.stdout.buffer.write(b'\n') + print_tag(tag) + first_line = False + tag = {} + pos += 1 + line_start_pos = pos + line_start = True -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ad304c: Use the formatting script when running unit tests
by Jiří Techet 15 Jun '22

15 Jun '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 12 Jun 2022 22:31:22 UTC Commit: ad304cf79afbf4dd8080417abbdd27e904b521a9 https://github.com/geany/geany/commit/ad304cf79afbf4dd8080417abbdd27e904b52… Log Message: ----------- Use the formatting script when running unit tests Modified Paths: -------------- tests/ctags/runner.sh Modified: tests/ctags/runner.sh 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -4,6 +4,7 @@ set -u GEANY="$1" +PRINTER="${top_srcdir:-../..}"/scripts/print-tags.py TMPDIR=$(mktemp -d) || exit 99 CONFDIR="$TMPDIR/config/" @@ -32,6 +33,8 @@ fi shift tagfile="$TMPDIR/test.${source##*.}.tags" +outfile="$TMPDIR/test.${source##*.}.out" "$GEANY" -c "$CONFDIR" -P -g "$tagfile" "$source" "$@" || exit 1 -diff -u "$result" "$tagfile" || exit 2 +cat "$tagfile" | "$PRINTER" > "$outfile" || exit 3 +diff -u "$result" "$outfile" || exit 2 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fef873: Merge pull request #3051 from techee/display_tags
by Enrico Tröger 15 Jun '22

15 Jun '22

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Wed, 15 Jun 2022 17:33:59 UTC Commit: fef873d485040bd3a679439802e5067ad9447d87 https://github.com/geany/geany/commit/fef873d485040bd3a679439802e5067ad9447… Log Message: ----------- Merge pull request #3051 from techee/display_tags Add human-readable representation of tags to unit test results Modified Paths: -------------- Makefile.am scripts/print-tags.py tests/ctags/1795612.js.tags tests/ctags/1850914.js.tags tests/ctags/1878155.js.tags tests/ctags/1880687.js.tags tests/ctags/2023624.js.tags tests/ctags/3184782.sql.tags tests/ctags/3470609.js.tags tests/ctags/3526726.tex.tags tests/ctags/68hc11.asm.tags tests/ctags/Package.pm.tags tests/ctags/actionscript/as-first-token.as.tags tests/ctags/actionscript/classes.as.tags tests/ctags/actionscript/const.as.tags tests/ctags/actionscript/const2.as.tags tests/ctags/actionscript/method-attributes.as.tags tests/ctags/actionscript/packages.as.tags tests/ctags/actionscript/sampler.as.tags tests/ctags/ada-adb.adb.tags tests/ctags/ada-ads.ads.tags tests/ctags/ada-expression-function-generic.adb.tags tests/ctags/ada-expression-function.adb.tags tests/ctags/ada-overriding.ads.tags tests/ctags/ada-package-generic.ads.tags tests/ctags/ada-task.adb.tags tests/ctags/angle_bracket.cpp.tags tests/ctags/anonymous_functions.php.tags tests/ctags/array-spec.f90.tags tests/ctags/array_ref_and_out.cs.tags tests/ctags/array_spec.f90.tags tests/ctags/arraylist.js.tags tests/ctags/attributes.cs.tags tests/ctags/auto.f.tags tests/ctags/backslashes.c.tags tests/ctags/bit_field.c.tags tests/ctags/block.f90.tags tests/ctags/bracematch.js.tags tests/ctags/bug1020715.c.tags tests/ctags/bug1020715.cpp.tags tests/ctags/bug1086609.c.tags tests/ctags/bug1093123.cpp.tags tests/ctags/bug1111214-j-chan.v.tags tests/ctags/bug1111214.v.tags tests/ctags/bug1201689.c.tags tests/ctags/bug1447756.java.tags tests/ctags/bug1458930.c.tags tests/ctags/bug1466117.c.tags tests/ctags/bug1491666.c.tags tests/ctags/bug1515910.cs.tags tests/ctags/bug1548443.cpp.tags tests/ctags/bug1563476.cpp.tags tests/ctags/bug1570779.sql.tags tests/ctags/bug1575055.cpp.tags tests/ctags/bug1585745.cpp.tags tests/ctags/bug1611054.cs.tags tests/ctags/bug1691412.java.tags tests/ctags/bug1742588.rb.tags tests/ctags/bug1743330.v.tags tests/ctags/bug1764143.h.tags tests/ctags/bug1764148.py.tags tests/ctags/bug1770479.cpp.tags tests/ctags/bug1773926.cpp.tags tests/ctags/bug1777344.java.tags tests/ctags/bug1799340.cpp.tags tests/ctags/bug1799343-1.cpp.tags tests/ctags/bug1799343-2.cpp.tags tests/ctags/bug1800065.cs.tags tests/ctags/bug1809024.py.tags tests/ctags/bug1830343.cs.tags tests/ctags/bug1830344.cs.tags tests/ctags/bug1856363.py.tags tests/ctags/bug1906062.py.tags tests/ctags/bug1907083.cpp.tags tests/ctags/bug1924919.cpp.tags tests/ctags/bug1938565.sql.tags tests/ctags/bug1944150.sql.tags tests/ctags/bug1950327.js.tags tests/ctags/bug1988026.py.tags tests/ctags/bug1988027.py.tags tests/ctags/bug1988130.py.tags tests/ctags/bug2049723.java.tags tests/ctags/bug2075402.py.tags tests/ctags/bug2117073.java.tags tests/ctags/bug2374109.vhd.tags tests/ctags/bug2411878.cs.tags tests/ctags/bug2747828.v.tags tests/ctags/bug2777310.js.tags tests/ctags/bug2781264.rb.tags tests/ctags/bug2886870.tex.tags tests/ctags/bug2888482.js.tags tests/ctags/bug3036476.js.tags tests/ctags/bug3168705.py.tags tests/ctags/bug3571233.js.tags tests/ctags/bug507864.c.tags tests/ctags/bug538629.asm.tags tests/ctags/bug556645.c.tags tests/ctags/bug556646.c.tags tests/ctags/bug565813.f90.tags tests/ctags/bug612019.pas.tags tests/ctags/bug612621.pl.tags tests/ctags/bug620288.f.tags tests/ctags/bug639639.h.tags tests/ctags/bug639644.hpp.tags tests/ctags/bug665086.cpp.tags tests/ctags/bug670433.f90.tags tests/ctags/bug699171.py.tags tests/ctags/bug722501.sql.tags tests/ctags/bug726712.f90.tags tests/ctags/bug726875.f90.tags tests/ctags/bug734933.f90.tags tests/ctags/bug762027.v.tags tests/ctags/bug814263.java.tags tests/ctags/bug823000.sql.tags tests/ctags/bug842077.pl.tags tests/ctags/bug849591.cpp.tags tests/ctags/bug852368.cpp.tags tests/ctags/bug858165.f90.tags tests/ctags/bug872494.cpp.tags tests/ctags/bug877956.f90.tags tests/ctags/bug960316.v.tags tests/ctags/bug961001.v.tags tests/ctags/byte.f.tags tests/ctags/c-digraphs.c.tags tests/ctags/c-trigraphs.c.tags tests/ctags/case_sensitivity.php.tags tests/ctags/char-selector.f90.tags tests/ctags/classes.php.tags tests/ctags/cobol/helloworld.cbl.tags tests/ctags/cobol/helloworld2.cbl.tags tests/ctags/cobol/levels.cbl.tags tests/ctags/cobol/quoted-program-id.cbl.tags tests/ctags/cobol/simple.cbl.tags tests/ctags/common.f.tags tests/ctags/complex-return.js.tags tests/ctags/continuation.f90.tags tests/ctags/continuation.mak.tags tests/ctags/countall.sql.tags tests/ctags/cpp_destructor.cpp.tags tests/ctags/css-at-rules.css.tags tests/ctags/css-at-supports.css.tags tests/ctags/css-attribute-selectors.css.tags tests/ctags/css-comma-no-space.css.tags tests/ctags/css-namespace-selectors.css.tags tests/ctags/css-pseudo-classes.css.tags tests/ctags/css-simple.css.tags tests/ctags/css-singlequote-in-comment-issue2.css.tags tests/ctags/css-tag-types.css.tags tests/ctags/css-trivial.css.tags tests/ctags/cxx11-final.cpp.tags tests/ctags/cxx11-noexcept.cpp.tags tests/ctags/cxx11-override.cpp.tags tests/ctags/cxx11-raw-strings.cpp.tags tests/ctags/cxx11enum.cpp.tags tests/ctags/cxx14-combined.cpp.tags tests/ctags/cython_sample.pyx.tags tests/ctags/cython_sample2.pyx.tags tests/ctags/db-trig.sql.tags tests/ctags/debian_432872.f90.tags tests/ctags/directives.c.tags tests/ctags/dopbl2.f.tags tests/ctags/dotted-names.json.tags tests/ctags/enum.c.tags tests/ctags/enum.f90.tags tests/ctags/enum.java.tags tests/ctags/enumerators.f90.tags tests/ctags/events.cs.tags tests/ctags/extern_variable.h.tags tests/ctags/forall_module.f90.tags tests/ctags/format.pl.tags tests/ctags/fortran_associate.f90.tags tests/ctags/fortran_line_continuation.f90.tags tests/ctags/func_typedef.h.tags tests/ctags/gdscript-inner-class.gd.tags tests/ctags/gdscript-modifiers.gd.tags tests/ctags/gdscript-no-implicit-class.gd.tags tests/ctags/geany.nsi.tags tests/ctags/general.cs.tags tests/ctags/hex2dec.sql.tags tests/ctags/implied_program.f.tags tests/ctags/indexer.cs.tags tests/ctags/infinite_loop.java.tags tests/ctags/ingres_procedures.sql.tags tests/ctags/initialization.f90.tags tests/ctags/interface_indexers.cs.tags tests/ctags/interface_properties.cs.tags tests/ctags/interfaces.f90.tags tests/ctags/internal.cs.tags tests/ctags/intro.tex.tags tests/ctags/intro_orig.tex.tags tests/ctags/invalid_name.f90.tags tests/ctags/java_enum.java.tags tests/ctags/js-broken-strings.js.tags tests/ctags/js-class-related-unterminated.js.tags tests/ctags/js-const.js.tags tests/ctags/js-implicit-semicolons.js.tags tests/ctags/js-let.js.tags tests/ctags/js-scope.js.tags tests/ctags/js-signature.js.tags tests/ctags/js-string-continuation.js.tags tests/ctags/js-sub-block-scope.js.tags tests/ctags/js-unknown-construct-nesting.js.tags tests/ctags/jsFunc_tutorial.js.tags tests/ctags/julia-corner_cases.jl.tags tests/ctags/keyword_abstract.cs.tags tests/ctags/keyword_catch_try.cs.tags tests/ctags/keyword_class.cs.tags tests/ctags/keyword_const.cs.tags tests/ctags/keyword_delegate.cs.tags tests/ctags/keyword_enum.cs.tags tests/ctags/keyword_event.cs.tags tests/ctags/keyword_explicit.cs.tags tests/ctags/keyword_extern.cs.tags tests/ctags/keyword_implicit.cs.tags tests/ctags/keyword_interface.cs.tags tests/ctags/keyword_names.f90.tags tests/ctags/keyword_namespace.cs.tags tests/ctags/keyword_out.cs.tags tests/ctags/keyword_override.cs.tags tests/ctags/keyword_params.cs.tags tests/ctags/keyword_private.cs.tags tests/ctags/keyword_protected.cs.tags tests/ctags/keyword_public.cs.tags tests/ctags/keyword_sealed.cs.tags tests/ctags/keyword_static.cs.tags tests/ctags/keyword_struct.cs.tags tests/ctags/keyword_virtual.cs.tags tests/ctags/keyword_volatile.cs.tags tests/ctags/labels.sql.tags tests/ctags/lanus.for.tags tests/ctags/line_directives.c.tags tests/ctags/local.c.tags tests/ctags/macros.c.tags tests/ctags/make-comment-in-rule.mak.tags tests/ctags/make-gnumake-pattern-rules.mak.tags tests/ctags/make-multi-target.mak.tags tests/ctags/make-parentheses.mak.tags tests/ctags/make-target-with-parentheses.mak.tags tests/ctags/make-variable-on-cmdline.mak.tags tests/ctags/masm.asm.tags tests/ctags/matlab_backtracking.m.tags tests/ctags/matlab_test.m.tags tests/ctags/maze.erl.tags tests/ctags/members.f90.tags tests/ctags/misc_types.f.tags tests/ctags/misc_types.f90.tags tests/ctags/mode.php.tags tests/ctags/moniker.x68.asm.tags tests/ctags/namelist.f.tags tests/ctags/namespace.cpp.tags tests/ctags/namespaces.php.tags tests/ctags/namespaces2.php.tags tests/ctags/no_terminator.js.tags tests/ctags/non-ascii-ident1.php.tags tests/ctags/numlib.f90.tags tests/ctags/objectivec_implementation.mm.tags tests/ctags/objectivec_interface.mm.tags tests/ctags/objectivec_property.mm.tags tests/ctags/objectivec_protocol.mm.tags tests/ctags/parenthesis-rvalue.js.tags tests/ctags/php5_5_class_kw.php.tags tests/ctags/preprocessor.f90.tags tests/ctags/procedure_pointer_module.f90.tags tests/ctags/process_order.c.tags tests/ctags/procpoint.f90.tags tests/ctags/property.cs.tags tests/ctags/prototype.h.tags tests/ctags/pure_elem.f95.tags tests/ctags/py-skipped-string.py.tags tests/ctags/py_constructor_arglist.py.tags tests/ctags/python-anonymous-nestlevel_ctags-bug-356.py.tags tests/ctags/python-comments.py.tags tests/ctags/qualified_types.f90.tags tests/ctags/random.sql.tags tests/ctags/readlob.sql.tags tests/ctags/readlong.sql.tags tests/ctags/recursive.f95.tags tests/ctags/refcurs.sql.tags tests/ctags/regexp.js.tags tests/ctags/return-hint.zep.tags tests/ctags/return-types.go.tags tests/ctags/ruby-block-call.rb.tags tests/ctags/ruby-class-method-in-lt-lt-self.rb.tags tests/ctags/ruby-doc.rb.tags tests/ctags/ruby-namespaced-class.rb.tags tests/ctags/ruby-scope-after-anonymous-class.rb.tags tests/ctags/ruby-sf-bug-364.rb.tags tests/ctags/rules.t2t.tags tests/ctags/runner.sh tests/ctags/sample.t2t.tags tests/ctags/secondary_fcn_name.js.tags tests/ctags/semicolon.f90.tags tests/ctags/shebang.js.tags tests/ctags/signature.cpp.tags tests/ctags/simple.abc.tags tests/ctags/simple.asciidoc.tags tests/ctags/simple.bas.tags tests/ctags/simple.clj.tags tests/ctags/simple.conf.tags tests/ctags/simple.d.tags Modified: Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,7 @@ EXTRA_DIST = \ autogen.sh \ scripts/gen-api-gtkdoc.py \ scripts/gen-signallist.sh \ + scripts/print-tags.py \ geany.desktop.in \ geany.pc.in \ ChangeLog.pre-1-22 \ Modified: scripts/print-tags.py 115 lines changed, 115 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,115 @@ +#!/usr/bin/env python3 + +import sys + +# see tm_source_file.c +TA_NAME, TA_LINE, TA_LOCAL, TA_POS, TA_TYPE, TA_ARGLIST, TA_SCOPE, \ + TA_VARTYPE, TA_INHERITS, TA_TIME, TA_ACCESS, TA_IMPL, TA_LANG, \ + TA_INACTIVE, TA_FLAGS = range(200, 215) + +# see TMTagType in tm_parser.h +types = [ + "undef", "class", "enum", "enumerator", "field", "function", + "interface", "member", "method", "namespace", "package", + "prototype", "struct", "typedef", "union", "variable", "externvar", + "macro", "macro_arg", "file", "other", + "UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN", +] + +type_dct = {0: types[0]} +for i in range(len(types) - 1): + type_dct[1 << i] = types[i + 1] + + +def decode_kind(kind, value): + val = '' + if kind == TA_NAME: + val = value.decode('utf-8') + elif kind == TA_LINE: + val = int(value) + elif kind == TA_LOCAL: + val = int(value) + elif kind == TA_TYPE: + val = type_dct[int(value)] + elif kind == TA_ARGLIST: + val = value.decode('utf-8') + elif kind == TA_SCOPE: + val = value.decode('utf-8') + elif kind == TA_FLAGS: + val = int(value) + elif kind == TA_VARTYPE: + val = value.decode('utf-8') + elif kind == TA_INHERITS: + val = value.decode('utf-8') + elif kind == TA_TIME: + pass; + elif kind == TA_LANG: + pass; + elif kind == TA_INACTIVE: + pass; + elif kind == TA_ACCESS: + val = value.decode('utf-8') + elif kind == TA_IMPL: + val = value.decode('utf-8') + return val + + +def print_tag(tag): + res = '{:<12}'.format(tag[TA_TYPE] + ': ') + if TA_VARTYPE in tag: + res += tag[TA_VARTYPE] + ' ' + if TA_SCOPE in tag: + res += tag[TA_SCOPE] + ' :: ' + res += tag[TA_NAME] + if TA_ARGLIST in tag: + res += tag[TA_ARGLIST] + if TA_INHERITS in tag: + res += ' extends ' + tag[TA_INHERITS] + if TA_FLAGS in tag and tag[TA_FLAGS] > 0: + res += ' flags: ' + str(tag[TA_FLAGS]) + # stdout.buffer (stdin.buffer) needed to write (read) binary data, see: + # https://docs.python.org/3/library/sys.html?highlight=stdout#sys.stdout + sys.stdout.buffer.write(res.encode('utf-8')) + sys.stdout.buffer.write(b'\n') + + +def get_next_part(inp, pos, first): + part = b'' + c = inp[pos] + if first: + kind = TA_NAME + else: + kind = c + pos += 1 + c = inp[pos] + while c < TA_NAME and c != ord('\n'): + part += bytes([c]) + pos += 1 + c = inp[pos] + return part, kind, pos + + +inp = sys.stdin.buffer.read() + +tag = {} +pos = 0 +line_start_pos = 0 +line_start = True +first_line = True +while pos < len(inp): + part, kind, pos = get_next_part(inp, pos, line_start) + value = decode_kind(kind, part) + tag[kind] = value + line_start = False + if inp[pos] == ord('\n'): + if first_line: + pass # first line contains '# format=tagmanager' we want to skip + else: + sys.stdout.buffer.write(inp[line_start_pos:pos]) + sys.stdout.buffer.write(b'\n') + print_tag(tag) + first_line = False + tag = {} + pos += 1 + line_start_pos = pos + line_start = True Modified: tests/ctags/1795612.js.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager RPC�1�Test�0 +class: Test :: RPC asyncMethod�128�( uri, method, params, callback)�Test.RPC�0 +method: Test.RPC :: asyncMethod( uri, method, params, callback) asyncRequest�128�( uri, data, callback)�Test.RPC�0 +method: Test.RPC :: asyncRequest( uri, data, callback) request_id�64�Test.RPC�0 +member: Test.RPC :: request_id Modified: tests/ctags/1850914.js.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager objLiteralMethod�128�()�objectLiteral�0 +method: objectLiteral :: objLiteralMethod() objLiteralProperty�64�objectLiteral�0 +member: objectLiteral :: objLiteralProperty objectLiteral�1�0 +class: objectLiteral Modified: tests/ctags/1878155.js.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager RE�1�0 +class: RE bar�64�RE�0 +member: RE :: bar foo�16384�0 +variable: foo my_function�16�()�0 +function: my_function() Modified: tests/ctags/1880687.js.tags 42 lines changed, 41 insertions(+), 1 deletions(-) =================================================================== @@ -1,42 +1,82 @@ -# format=tagmanager MyClass�1�0 +class: MyClass MyClass_sub1�128�(x)�MyClass�0 +method: MyClass :: MyClass_sub1(x) MyClass_sub2�128�(x)�MyClass�0 +method: MyClass :: MyClass_sub2(x) a�16�(flag)�0 +function: a(flag) aa�16�()�0 +function: aa() aa_sub1�16�()�aa�0 +function: aa :: aa_sub1() aa_sub2�16�()�aa�0 +function: aa :: aa_sub2() b�16�()�0 +function: b() baz�16�()�f�0 +function: f :: baz() c�16�(flag)�0 +function: c(flag) d�16�()�0 +function: d() e�16�(flag)�0 +function: e(flag) f�16�()�0 +function: f() g�16�(flag)�0 +function: g(flag) h�16�()�0 +function: h() i�16�(flag)�0 +function: i(flag) j�16�()�0 +function: j() k�16�(flag)�0 +function: k(flag) l�16�()�0 +function: l() m�16�(flag)�0 +function: m(flag) n�16�()�0 +function: n() o�16�()�0 +function: o() p�16�()�0 +function: p() q�16�()�0 +function: q() r�16�(flag)�0 +function: r(flag) s�16�()�0 +function: s() t�16�(flag)�0 +function: t(flag) u�16�(flag)�0 +function: u(flag) v�16�(flag)�0 +function: v(flag) w�16�()�0 +function: w() w_sub1�16�(x)�w�0 +function: w :: w_sub1(x) w_sub2�16�()�w�0 +function: w :: w_sub2() x�16�()�0 +function: x() x_sub1�16�()�x�0 +function: x :: x_sub1() x_sub2�16�()�x�0 +function: x :: x_sub2() y�16�()�0 +function: y() y_sub1�16�()�y�0 +function: y :: y_sub1() y_sub2�16�()�y�0 +function: y :: y_sub2() z�16�()�0 +function: z() z_sub1�16�()�z�0 +function: z :: z_sub1() z_sub2�16�()�z�0 +function: z :: z_sub2() Modified: tests/ctags/2023624.js.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager f1�16�()�0 +function: f1() f2�16�()�0 +function: f2() Modified: tests/ctags/3184782.sql.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager do_this_stuff�256�p_test�0 +namespace: p_test :: do_this_stuff myfn1�256�p_test�0 +namespace: p_test :: myfn1 myfn2�256�p_test�0 +namespace: p_test :: myfn2 p_test�512�0 +package: p_test process_this�256�p_test�0 +namespace: p_test :: process_this Modified: tests/ctags/3470609.js.tags 13 lines changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -1,13 +1,24 @@ -# format=tagmanager array�64�root�0 +member: root :: array decimal�64�root�0 +member: root :: decimal f�16�()�0 +function: f() id�64�root�0 +member: root :: id method�128�()�root�0 +method: root :: method() neg�64�root�0 +member: root :: neg parentheses�64�root�0 +member: root :: parentheses root�1�0 +class: root string�64�root�0 +member: root :: string subFunction�128�()�root.subObject�0 +method: root.subObject :: subFunction() subObject�1�root�0 +class: root :: subObject subProperty�64�root.subObject�0 +member: root.subObject :: subProperty Modified: tests/ctags/3526726.tex.tags 149 lines changed, 148 insertions(+), 1 deletions(-) =================================================================== @@ -1,149 +1,296 @@ -# format=tagmanager A Rule with PCRE causes a failure to load snort.conf. Why?�65536�Problems�0 +macro: Problems :: A Rule with PCRE causes a failure to load snort.conf. Why? After I add new rules or comment out rules how do I make Snort reload?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: After I add new rules or comment out rules how do I make Snort reload? Are rule keywords ORed or ANDed together?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Are rule keywords ORed or ANDed together? Are there other output systems for Snort besides ``Barnyard''?\label{spoolers}�65536�Getting Fancy�0 +macro: Getting Fancy :: Are there other output systems for Snort besides ``Barnyard''?\label{spoolers} BASE appears to be broken in Lynx�65536�Problems�0 +macro: Problems :: BASE appears to be broken in Lynx Background�64�0 +member: Background Can Snort be evaded by the use of polymorphic mutators on shellcode?�65536�Background�0 +macro: Background :: Can Snort be evaded by the use of polymorphic mutators on shellcode? Can Snort trigger a rule by MAC addresses?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Can Snort trigger a rule by MAC addresses? Can priorities be assigned to alerts using BASE?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Can priorities be assigned to alerts using BASE? Configuring Snort�64�0 +member: Configuring Snort Development�64�0 +member: Development Does Snort handle IP defragmentation?�65536�Background�0 +macro: Background :: Does Snort handle IP defragmentation? Does Snort log the full packets when it generates alerts?�65536�Background�0 +macro: Background :: Does Snort log the full packets when it generates alerts? Does Snort perform TCP stream reassembly?�65536�Background�0 +macro: Background :: Does Snort perform TCP stream reassembly? Does Snort perform stateful protocol analysis?�65536�Background�0 +macro: Background :: Does Snort perform stateful protocol analysis? Does snort see packets filtered by IPTables/IPChains/IPF/PF?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Does snort see packets filtered by IPTables/IPChains/IPF/PF? Errors loading rules files�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Errors loading rules files Getting Fancy�64�0 +member: Getting Fancy Getting Started�64�0 +member: Getting Started How can I deactivate a rule?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How can I deactivate a rule? How can I define an address to be anything except some hosts?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How can I define an address to be anything except some hosts? How can I examine logged packets in more detail?�65536�Getting Fancy�0 +macro: Getting Fancy :: How can I examine logged packets in more detail? How can I protect web servers running on ports other than 80?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How can I protect web servers running on ports other than 80? How can I run Snort on multiple interfaces simultaneously?�65536�Configuring Snort�0 +macro: Configuring Snort :: How can I run Snort on multiple interfaces simultaneously? How can I specify a list of ports in a rule?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How can I specify a list of ports in a rule? How can I test Snort without having an Ethernet card or a connection to other computers?�65536�Getting Fancy�0 +macro: Getting Fancy :: How can I test Snort without having an Ethernet card or a connection to other computers? How can I use Snort to log HTTP URLs or SMTP traffic?�65536�Getting Fancy�0 +macro: Getting Fancy :: How can I use Snort to log HTTP URLs or SMTP traffic? How do I build this BASE thing?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I build this BASE thing? How do I configure stream4?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I configure stream4? How do I get Snort and ACID working?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I get Snort and ACID working? How do I get Snort to e-mail me alerts?�65536�Getting Fancy�0 +macro: Getting Fancy :: How do I get Snort to e-mail me alerts? How do I get Snort to log the packet payload as well as the header?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I get Snort to log the packet payload as well as the header? How do I ignore traffic coming from a particular host or hosts?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I ignore traffic coming from a particular host or hosts? How do I log a specific type of traffic and send alerts to syslog?�65536�Getting Fancy�0 +macro: Getting Fancy :: How do I log a specific type of traffic and send alerts to syslog? How do I log to multiple databases or output plugins?�65536�Getting Fancy�0 +macro: Getting Fancy :: How do I log to multiple databases or output plugins? How do I process those Snort logs into reports?�65536�Getting Fancy�0 +macro: Getting Fancy :: How do I process those Snort logs into reports? How do I run Snort?�65536�Getting Started�0 +macro: Getting Started :: How do I run Snort? How do I set EXTERNAL\_NET?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I set EXTERNAL\_NET? How do I setup a receive-only ethernet cable?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I setup a receive-only ethernet cable? How do I setup snort on a `stealth' interface?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I setup snort on a `stealth' interface? How do I test Snort alerts and logging?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How do I test Snort alerts and logging? How do I turn off ``spp:possible EVASIVE RST detection'' alerts?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How do I turn off ``spp:possible EVASIVE RST detection'' alerts? How do I understand this traffic and do IDS alert analysis?�65536�Getting Fancy�0 +macro: Getting Fancy :: How do I understand this traffic and do IDS alert analysis? How do I use a remote syslog machine?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do I use a remote syslog machine? How do you get Snort to ignore some traffic?�65536�Configuring Snort�0 +macro: Configuring Snort :: How do you get Snort to ignore some traffic? How do you pronounce the names of some of these guys who work on Snort?�65536�Background�0 +macro: Background :: How do you pronounce the names of some of these guys who work on Snort? How do you put Snort in debug mode?�65536�Development�0 +macro: Development :: How do you put Snort in debug mode? How does rule ordering work?�65536�Configuring Snort�0 +macro: Configuring Snort :: How does rule ordering work? How long can address lists, variables, or rules be?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: How long can address lists, variables, or rules be? How to start Snort as a win32 service?�65536�Getting Fancy�0 +macro: Getting Fancy :: How to start Snort as a win32 service? I am getting `snort [pid] uses obsolete (PF\_INET, SOCK\_PACKET)' warnings. What's wrong?�65536�Problems�0 +macro: Problems :: I am getting `snort [pid] uses obsolete (PF\_INET, SOCK\_PACKET)' warnings. What's wrong? I am getting too many ``IIS Unicode attack detected'' and/or ``CGI Null Byte attack detected'' false positives. How can I turn this detection off?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: I am getting too many ``IIS Unicode attack detected'' and/or ``CGI Null Byte attack detected'' false positives. How can I turn this detection off? I am still getting bombarded with spp\_portscan messages even though the IP that I am getting the portscan from is in my \$DNS\_SERVERs var�65536�Problems�0 +macro: Problems :: I am still getting bombarded with spp\_portscan messages even though the IP that I am getting the portscan from is in my \$DNS\_SERVERs var I am using Snort on Windows and receive an ``OpenPcap() error upon startup: ERROR: OpenPcap() device open: Error opening adapter'' message. What's wrong?�65536�Problems�0 +macro: Problems :: I am using Snort on Windows and receive an ``OpenPcap() error upon startup: ERROR: OpenPcap() device open: Error opening adapter'' message. What's wrong? I have one network card and two aliases, how can I force Snort to ``listen'' on both addresses?�65536�Configuring Snort�0 +macro: Configuring Snort :: I have one network card and two aliases, how can I force Snort to ``listen'' on both addresses? I hear people talking about ``Barnyard''. What's that?\label{barnyard}�65536�Getting Fancy�0 +macro: Getting Fancy :: I hear people talking about ``Barnyard''. What's that?\label{barnyard} I just downloaded a new ruleset and now Snort fails, complaining about the rules.�65536�Problems�0 +macro: Problems :: I just downloaded a new ruleset and now Snort fails, complaining about the rules. I think I found a bug in Snort. Now what?�65536�Problems�0 +macro: Problems :: I think I found a bug in Snort. Now what? I try to start Snort and it gives an error like ``ERROR: Unable to open rules file: /root/.snortrc or /root//root/.snortrc.'' What can I do to fix this?�65536�Problems�0 +macro: Problems :: I try to start Snort and it gives an error like ``ERROR: Unable to open rules file: /root/.snortrc or /root//root/.snortrc.'' What can I do to fix this? I want to build a Snort box. Will this $<$Insert list of hardware$>$ handle $<$this much$>$ traffic?�65536�Getting Started�0 +macro: Getting Started :: I want to build a Snort box. Will this $<$Insert list of hardware$>$ handle $<$this much$>$ traffic? I'm getting large amounts of $<$some alerts type$>$. What should I do? Where can I go to find out more about it?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: I'm getting large amounts of $<$some alerts type$>$. What should I do? Where can I go to find out more about it? I'm getting lots of *ICMP Ping Speedera*, is this bad?�65536�Problems�0 +macro: Problems :: I'm getting lots of *ICMP Ping Speedera*, is this bad? I'm not seeing any interfaces listed under Win32.�65536�Problems�0 +macro: Problems :: I'm not seeing any interfaces listed under Win32. I'm on a switched network, can I still use Snort?�65536�Background�0 +macro: Background :: I'm on a switched network, can I still use Snort? I've got RedHat and ....�65536�Getting Started�0 +macro: Getting Started :: I've got RedHat and .... IDSCenter�2048�0 +struct: IDSCenter Is Fyodor Yarochkin the same Fyodor who wrote nmap?�65536�Background�0 +macro: Background :: Is Fyodor Yarochkin the same Fyodor who wrote nmap? Is Snort vulnerable to IDS noise generators like ``Stick'' and ``Snot''?�65536�Background�0 +macro: Background :: Is Snort vulnerable to IDS noise generators like ``Stick'' and ``Snot''? Is it possible to have Snort call an external program when an alert is raised?�65536�Getting Fancy�0 +macro: Getting Fancy :: Is it possible to have Snort call an external program when an alert is raised? Is it possible with snort to add a ipfilter/ipfw rule to a firewall?�65536�Getting Fancy�0 +macro: Getting Fancy :: Is it possible with snort to add a ipfilter/ipfw rule to a firewall? Is there a private SID number range so my rules don't conflict?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Is there a private SID number range so my rules don't conflict? It's not working on Win32, how can I tell if my problem is Snort or WinPcap?�65536�Problems�0 +macro: Problems :: It's not working on Win32, how can I tell if my problem is Snort or WinPcap? Libpcap complains about permissions problems, what's going on?�65536�Getting Started�0 +macro: Getting Started :: Libpcap complains about permissions problems, what's going on? Miscellaneous�64�0 +member: Miscellaneous My /var/log/snort directory gets very large...�65536�Problems�0 +macro: Problems :: My /var/log/snort directory gets very large... My BASE db connection times-out when performing long operations (e.g. deleting a large number of alerts).�65536�Problems�0 +macro: Problems :: My BASE db connection times-out when performing long operations (e.g. deleting a large number of alerts). My IP address is assigned dynamically to my interface, can I use Snort with it?�65536�Configuring Snort�0 +macro: Configuring Snort :: My IP address is assigned dynamically to my interface, can I use Snort with it? My network spans multiple subnets. How do I define HOME\_NET?�65536�Configuring Snort�0 +macro: Configuring Snort :: My network spans multiple subnets. How do I define HOME\_NET? My snort crashes, how do I restart it?�65536�Problems�0 +macro: Problems :: My snort crashes, how do I restart it? On HPUX I get device lan0 open: recv\_ack: promisc\_phys: Invalid argument�65536�Problems�0 +macro: Problems :: On HPUX I get device lan0 open: recv\_ack: promisc\_phys: Invalid argument Portscans are not being logged to my database�65536�Problems�0 +macro: Problems :: Portscans are not being logged to my database Problems�64�0 +member: Problems Rules and Alerts�64�0 +member: Rules and Alerts SMB alerts aren't working, what's wrong?�65536�Problems�0 +macro: Problems :: SMB alerts aren't working, what's wrong? Snort complains about the ``react'' keyword...�65536�Getting Fancy�0 +macro: Getting Fancy :: Snort complains about the ``react'' keyword... Snort fails to respond to a kill signal on Linux. Why?�65536�Problems�0 +macro: Problems :: Snort fails to respond to a kill signal on Linux. Why? Snort is behind a firewall (ipf/pf/ipchains/ipfilter) and awfully quiet...�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Snort is behind a firewall (ipf/pf/ipchains/ipfilter) and awfully quiet... Snort is dying with a `can not create file' error and I have plenty of diskspace. What's wrong?�65536�Problems�0 +macro: Problems :: Snort is dying with a `can not create file' error and I have plenty of diskspace. What's wrong? Snort is not logging to my database�65536�Problems�0 +macro: Problems :: Snort is not logging to my database Snort is not logging to syslog�65536�Problems�0 +macro: Problems :: Snort is not logging to syslog Snort says BACKDOOR SIGNATURE... does my machine have a Trojan?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Snort says BACKDOOR SIGNATURE... does my machine have a Trojan? Snort says ``Garbage Packet with Null Pointer discarded!'' Huh?�65536�Problems�0 +macro: Problems :: Snort says ``Garbage Packet with Null Pointer discarded!'' Huh? Snort says ``Ran Out Of Space.'' Huh?�65536�Problems�0 +macro: Problems :: Snort says ``Ran Out Of Space.'' Huh? Snort says ``Rule IP addr (``1.1.1.1'') didn't x-late, WTF?''�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Snort says ``Rule IP addr (``1.1.1.1'') didn't x-late, WTF?'' Trying to install snort it says: ``bad interpreter: No such file or directory''�65536�Problems�0 +macro: Problems :: Trying to install snort it says: ``bad interpreter: No such file or directory'' What about `SMB Name Wildcard' alerts?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What about `SMB Name Wildcard' alerts? What about ``CGI Null Byte attacks?''�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What about ``CGI Null Byte attacks?'' What about all these false alarms?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What about all these false alarms? What are CIDR netmasks?�65536�Getting Started�0 +macro: Getting Started :: What are CIDR netmasks? What are HOME\_NET and EXTERNAL\_NET?�65536�Configuring Snort�0 +macro: Configuring Snort :: What are HOME\_NET and EXTERNAL\_NET? What are all these ICMP files in subdirectories under /var/log/snort?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What are all these ICMP files in subdirectories under /var/log/snort? What are all these ``ICMP destination unreachable'' alerts?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What are all these ``ICMP destination unreachable'' alerts? What are some resources that I can use to understand more about source addresses logged and where they are coming from?�65536�Getting Fancy�0 +macro: Getting Fancy :: What are some resources that I can use to understand more about source addresses logged and where they are coming from? What are these IDS codes in the alert names?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What are these IDS codes in the alert names? What do the numbers (ie: [116:56:1]) in front of a Snort alert mean?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What do the numbers (ie: [116:56:1]) in front of a Snort alert mean? What is the best way to use Snort to block attack traffic?�65536�Getting Fancy�0 +macro: Getting Fancy :: What is the best way to use Snort to block attack traffic? What is the difference between ``Alerting'' and ``Logging''?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What is the difference between ``Alerting'' and ``Logging''? What is the use of the ``-r'' switch to read tcpdump files?�65536�Getting Started�0 +macro: Getting Started :: What is the use of the ``-r'' switch to read tcpdump files? What the heck is a SYNFIN scan?�65536�Configuring Snort�0 +macro: Configuring Snort :: What the heck is a SYNFIN scan? What the heck is a SYNFIN scan?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: What the heck is a SYNFIN scan? What the heck is a ``Stealth scan''?�65536�Configuring Snort�0 +macro: Configuring Snort :: What the heck is a ``Stealth scan''? What version of Winpcap do I need?\label{winpcap}�65536�Getting Started�0 +macro: Getting Started :: What version of Winpcap do I need?\label{winpcap} What's this about a Snort drinking game?�65536�Miscellaneous�0 +macro: Miscellaneous :: What's this about a Snort drinking game? Where are my log files located? What are they named?�65536�Getting Started�0 +macro: Getting Started :: Where are my log files located? What are they named? Where can I get more reading and courses about IDS?\label{courses}�65536�Background�0 +macro: Background :: Where can I get more reading and courses about IDS?\label{courses} Where do I find binary packages for BlueHat BSD-Linux-RT?�65536�Getting Started�0 +macro: Getting Started :: Where do I find binary packages for BlueHat BSD-Linux-RT? Where do I get more help on Snort?�65536�Background�0 +macro: Background :: Where do I get more help on Snort? Where do I get the latest version of Winpcap?�65536�Getting Started�0 +macro: Getting Started :: Where do I get the latest version of Winpcap? Where do I get the latest version of libpcap?�65536�Getting Started�0 +macro: Getting Started :: Where do I get the latest version of libpcap? Where do the distance and within keywords work from to modify content searches in rules?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Where do the distance and within keywords work from to modify content searches in rules? Where does one obtain new/modifed rules? How do you merge them in?�65536�Configuring Snort�0 +macro: Configuring Snort :: Where does one obtain new/modifed rules? How do you merge them in? Where's a good place to physically put a Snort sensor?�65536�Getting Started�0 +macro: Getting Started :: Where's a good place to physically put a Snort sensor? Which takes precedence, commandline or rule file ?�65536�Configuring Snort�0 +macro: Configuring Snort :: Which takes precedence, commandline or rule file ? Why am I seeing so many ``SMTP RCPT TO overflow'' alerts ?�65536�Problems�0 +macro: Problems :: Why am I seeing so many ``SMTP RCPT TO overflow'' alerts ? Why are my unified alert times off by +/- N hours?�65536�Problems�0 +macro: Problems :: Why are my unified alert times off by +/- N hours? Why are there no subdirectories under /var/log/snort for IP addresses?�65536�Configuring Snort�0 +macro: Configuring Snort :: Why are there no subdirectories under /var/log/snort for IP addresses? Why can't snort see one of the 10Mbps or 100Mbps traffic on my autoswitch hub?�65536�Problems�0 +macro: Problems :: Why can't snort see one of the 10Mbps or 100Mbps traffic on my autoswitch hub? Why do certain alerts seem to have `unknown' IPs in BASE?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Why do certain alerts seem to have `unknown' IPs in BASE? Why do many Snort rules have the flags P (TCP PuSH) and A (TCP ACK) set?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Why do many Snort rules have the flags P (TCP PuSH) and A (TCP ACK) set? Why does Snort complain about /var/log/snort?�65536�Getting Started�0 +macro: Getting Started :: Why does Snort complain about /var/log/snort? Why does building Snort complain about missing references?�65536�Getting Started�0 +macro: Getting Started :: Why does building Snort complain about missing references? Why does building snort fail with errors about yylex and lex\_init?�65536�Getting Started�0 +macro: Getting Started :: Why does building snort fail with errors about yylex and lex\_init? Why does chrooted Snort die when I send it a SIGHUP? \label{chroot}�65536�Problems�0 +macro: Problems :: Why does chrooted Snort die when I send it a SIGHUP? \label{chroot} Why does snort report ``Packet loss statistics are unavailable under Linux?''�65536�Problems�0 +macro: Problems :: Why does snort report ``Packet loss statistics are unavailable under Linux?'' Why does the `error deleting alert' message occur when attempting to delete an alert with BASE?�65536�Problems�0 +macro: Problems :: Why does the `error deleting alert' message occur when attempting to delete an alert with BASE? Why does the portscan plugin log ``stealth'' packets even though the host is in the portscan-ignorehosts list?�65536�Configuring Snort�0 +macro: Configuring Snort :: Why does the portscan plugin log ``stealth'' packets even though the host is in the portscan-ignorehosts list? Why does the program generate alerts on packets that have pass rules?�65536�Rules and Alerts�0 +macro: Rules and Alerts :: Why does the program generate alerts on packets that have pass rules? \myquote�16�0 +function: \myquote \myref�16�0 +function: \myref center�1�0 +class: center document�1�0 +class: document enumerate�1�0 +class: enumerate itemize�1�0 +class: itemize latexonly�1�0 +class: latexonly stealth�2048�0 +struct: stealth stream4�2048�0 +struct: stream4 tabular�1�0 +class: tabular verbatim�1�0 +class: verbatim Modified: tests/ctags/68hc11.asm.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager COLD�256�0 +namespace: COLD INTERRUPTS�256�0 +namespace: INTERRUPTS PORTD�65536�0 +macro: PORTD PROMPT�256�0 +namespace: PROMPT SP�65536�0 +macro: SP TRAPP�256�0 +namespace: TRAPP sym1�65536�0 +macro: sym1 sym2�65536�0 +macro: sym2 sym3�256�0 +namespace: sym3 sym4�256�0 +namespace: sym4 Modified: tests/ctags/Package.pm.tags 13 lines changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -1,13 +1,24 @@ -# format=tagmanager CONST�2�0 +enum: CONST END�65536�0 +macro: END END2�65536�0 +macro: END2 Test�512�0 +package: Test Test::One�512�0 +package: Test::One Test::One::Two�512�0 +package: Test::One::Two dude�16�0 +function: dude init�16�0 +function: init quo�16�0 +function: quo quo�1024�0 +prototype: quo xtz�1024�0 +prototype: xtz xuz�1024�0 +prototype: xuz Modified: tests/ctags/actionscript/as-first-token.as.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager f1�16�0 +function: f1 Modified: tests/ctags/actionscript/classes.as.tags 13 lines changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -1,13 +1,24 @@ -# format=tagmanager C1�1�0 +class: C1 C2�1�0 +class: C2 C3�1�0 +class: C3 C4�1�0 +class: C4 C5�1�0 +class: C5 C6�1�0 +class: C6 C7�1�0 +class: C7 I1�32�0 +interface: I1 I2�32�0 +interface: I2 I3�32�0 +interface: I3 I4�32�0 +interface: I4 m1�128�C1�0 +method: C1 :: m1 Modified: tests/ctags/actionscript/const.as.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager AlarmClock�1�0 +class: AlarmClock MODE_AUDIO�65536�AlarmClock�0 +macro: AlarmClock :: MODE_AUDIO MODE_BOTH�65536�AlarmClock�0 +macro: AlarmClock :: MODE_BOTH MODE_VISUAL�65536�AlarmClock�0 +macro: AlarmClock :: MODE_VISUAL mode�16384�AlarmClock�0 +variable: AlarmClock :: mode Modified: tests/ctags/actionscript/const2.as.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager MIN_AGE�65536�0 +macro: MIN_AGE product_array�65536�0 +macro: product_array Modified: tests/ctags/actionscript/method-attributes.as.tags 10 lines changed, 9 insertions(+), 1 deletions(-) =================================================================== @@ -1,10 +1,18 @@ -# format=tagmanager C�1�0 +class: C f1�128�C�0 +method: C :: f1 f2�128�C�0 +method: C :: f2 f3�128�C�0 +method: C :: f3 f4�128�C�0 +method: C :: f4 f5�128�C�0 +method: C :: f5 f6�128�C�0 +method: C :: f6 f7�128�C�0 +method: C :: f7 f8�128�C�0 +method: C :: f8 Modified: tests/ctags/actionscript/packages.as.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager C1�1�P3�0 +class: P3 :: C1 P1�512�0 +package: P1 P2�512�0 +package: P2 P3�512�0 +package: P3 f1�16�P2�0 +function: P2 :: f1 qualified.test.pkg�512�0 +package: qualified.test.pkg Modified: tests/ctags/actionscript/sampler.as.tags 16 lines changed, 15 insertions(+), 1 deletions(-) =================================================================== @@ -1,16 +1,30 @@ -# format=tagmanager assert�128�sampleTypes�0 +method: sampleTypes :: assert b�16384�sampleTypes�0 +variable: sampleTypes :: b cpuSamples�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: cpuSamples delSamples�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: delSamples dos�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: dos flash.display.Sprite�32768�0 +externvar: flash.display.Sprite flash.sampler.*�32768�0 +externvar: flash.sampler.* flash.system.*�32768�0 +externvar: flash.system.* flash.utils.*�32768�0 +externvar: flash.utils.* ids�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: ids lastTime�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: lastTime newSamples�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: newSamples nos�16384�sampleTypes.sampleTypes�0 +variable: sampleTypes.sampleTypes :: nos sampleTypes�1�0 +class: sampleTypes sampleTypes�128�sampleTypes�0 +method: sampleTypes :: sampleTypes Modified: tests/ctags/ada-adb.adb.tags 20 lines changed, 19 insertions(+), 1 deletions(-) =================================================================== @@ -1,20 +1,38 @@ -# format=tagmanager Altivec�16�0 +function: Altivec Days�4096�Greet�0 +typedef: Greet :: Days Friday�4�Days�0 +enumerator: Days :: Friday Greet�16�0 +function: Greet M�16384�Greet�0 +variable: Greet :: M Monday�4�Days�0 +enumerator: Days :: Monday S�16384�Greet�0 +variable: Greet :: S Saturday�4�Days�0 +enumerator: Days :: Saturday Sunday�4�Days�0 +enumerator: Days :: Sunday Thursday�4�Days�0 +enumerator: Days :: Thursday Tuesday�4�Days�0 +enumerator: Days :: Tuesday Vector_A�65536�Altivec�0 +macro: Altivec :: Vector_A Vector_B�65536�Altivec�0 +macro: Altivec :: Vector_B Vector_C�16384�Altivec�0 +variable: Altivec :: Vector_C View_A�65536�Altivec�0 +macro: Altivec :: View_A View_B�65536�Altivec�0 +macro: Altivec :: View_B View_C�16384�Altivec�0 +variable: Altivec :: View_C Wednesday�4�Days�0 +enumerator: Days :: Wednesday Weekend_Days�4096�Greet�0 +typedef: Greet :: Weekend_Days Modified: tests/ctags/ada-ads.ads.tags 17 lines changed, 16 insertions(+), 1 deletions(-) =================================================================== @@ -1,17 +1,32 @@ -# format=tagmanager Adjust�1024�GenStack�0 +prototype: GenStack :: Adjust Data�64�Node�0 +member: Node :: Data Data_Ptr�4096�GenStack�0 +typedef: GenStack :: Data_Ptr Empty�1024�GenStack�0 +prototype: GenStack :: Empty Finalize�1024�GenStack�0 +prototype: GenStack :: Finalize GenStack�512�0 +package: GenStack Head�64�Stack�0 +member: Stack :: Head Initialize�1024�GenStack�0 +prototype: GenStack :: Initialize Next�64�Node�0 +member: Node :: Next Node�4096�GenStack�0 +typedef: GenStack :: Node Node_Ptr�4096�GenStack�0 +typedef: GenStack :: Node_Ptr Pop�1024�GenStack�0 +prototype: GenStack :: Pop Push�1024�GenStack�0 +prototype: GenStack :: Push Stack�4096�GenStack�0 +typedef: GenStack :: Stack StackData�4096�GenStack�0 +typedef: GenStack :: StackData Top�1024�GenStack�0 +prototype: GenStack :: Top Modified: tests/ctags/ada-expression-function-generic.adb.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager Digit_To_Character�16�Generic_Integer_Images�0 +function: Generic_Integer_Images :: Digit_To_Character Digit_To_Character�1024�Generic_Integer_Images�0 +prototype: Generic_Integer_Images :: Digit_To_Character Generic_Integer_Images�512�My_Package�0 +package: My_Package :: Generic_Integer_Images My_Package�16�0 +function: My_Package Signed_Address�4096�My_Package�0 +typedef: My_Package :: Signed_Address Modified: tests/ctags/ada-expression-function.adb.tags 10 lines changed, 9 insertions(+), 1 deletions(-) =================================================================== @@ -1,10 +1,18 @@ -# format=tagmanager Another_Boolean_As_String�16�Tagged_Procedure�0 +function: Tagged_Procedure :: Another_Boolean_As_String Boolean_As_String�16�Tagged_Procedure�0 +function: Tagged_Procedure :: Boolean_As_String My_Type�16384�Test�0 +variable: Test :: My_Type Not_Tagged_Procedure�16�Test�0 +function: Test :: Not_Tagged_Procedure Tagged_Procedure�16�Test�0 +function: Test :: Tagged_Procedure Test�16�0 +function: Test Yet_Boolean_As_String�16�Tagged_Procedure�0 +function: Tagged_Procedure :: Yet_Boolean_As_String p0�16�Tagged_Procedure�0 +function: Tagged_Procedure :: p0 p1�16�Tagged_Procedure�0 +function: Tagged_Procedure :: p1 Modified: tests/ctags/ada-overriding.ads.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager Input�512�0 +package: Input Inutile�1024�Input�0 +prototype: Input :: Inutile Tasche_T�1024�Input�0 +prototype: Input :: Tasche_T Modified: tests/ctags/ada-package-generic.ads.tags 10 lines changed, 9 insertions(+), 1 deletions(-) =================================================================== @@ -1,10 +1,18 @@ -# format=tagmanager Blue�4�Primary_Color�0 +enumerator: Primary_Color :: Blue Conversions�512�My_Package�0 +package: My_Package :: Conversions From_Big_Real�1024�Conversions�0 +prototype: Conversions :: From_Big_Real Green�4�Primary_Color�0 +enumerator: Primary_Color :: Green Missing_Tag�4096�My_Package�0 +typedef: My_Package :: Missing_Tag My_Package�512�0 +package: My_Package Num�64�Missing_Tag�0 +member: Missing_Tag :: Num Primary_Color�4096�My_Package�0 +typedef: My_Package :: Primary_Color Red�4�Primary_Color�0 +enumerator: Primary_Color :: Red Modified: tests/ctags/ada-task.adb.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager Show_Simple_Tasks�16�0 +function: Show_Simple_Tasks T�128�Show_Simple_Tasks�0 +method: Show_Simple_Tasks :: T T�1024�Show_Simple_Tasks�0 +prototype: Show_Simple_Tasks :: T T2�128�Show_Simple_Tasks�0 +method: Show_Simple_Tasks :: T2 T2�1024�Show_Simple_Tasks�0 +prototype: Show_Simple_Tasks :: T2 Modified: tests/ctags/angle_bracket.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager bar�16�(int value)�0�void +function: void bar(int value) bar2�16�(void)�0 +function: bar2(void) foo�16�(int nelem)�0�void +function: void foo(int nelem) Modified: tests/ctags/anonymous_functions.php.tags 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1,9 +1,16 @@ -# format=tagmanager _g�16384�0 +variable: _g a�16�()�0 +function: a() b�16�($x, $y)�0 +function: b($x, $y) c�16�()�0 +function: c() d�16�()�0 +function: d() e�16�()�0 +function: e() f�16�()�0 +function: f() f_sub�16�()�f�0 +function: f :: f_sub() Modified: tests/ctags/array-spec.f90.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager df_mb_data�64�df_type�0 +member: df_type :: df_mb_data df_mb_time�64�df_type�0 +member: df_type :: df_mb_time df_type�1�inm_df�0 +class: inm_df :: df_type df_wb_data�64�df_type�0 +member: df_type :: df_wb_data df_wb_time�64�df_type�0 +member: df_type :: df_wb_time inm_df�256�0 +namespace: inm_df Modified: tests/ctags/array_ref_and_out.cs.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager FillArray�128�(out int[] myArray)�TestOut�0�public void +method: public void TestOut :: FillArray(out int[] myArray) Main�128�()�TestOut�0�public void +method: public void TestOut :: Main() MyMethod�128�(out int[] arr)�0�public void +method: public void MyMethod(out int[] arr) MyMethod�128�(ref int[] arr)�0�public void +method: public void MyMethod(ref int[] arr) TestOut�1�0 +class: TestOut Modified: tests/ctags/array_spec.f90.tags 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1,9 +1,16 @@ -# format=tagmanager Global_Variables�256�0 +namespace: Global_Variables H�16384�Global_Variables�0 +variable: Global_Variables :: H H0�16384�Global_Variables�0 +variable: Global_Variables :: H0 H1�16384�Global_Variables�0 +variable: Global_Variables :: H1 H2�16384�Global_Variables�0 +variable: Global_Variables :: H2 H3�16384�Global_Variables�0 +variable: Global_Variables :: H3 H4�16384�Global_Variables�0 +variable: Global_Variables :: H4 H5�16384�Global_Variables�0 +variable: Global_Variables :: H5 Modified: tests/ctags/arraylist.js.tags 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1,9 +1,16 @@ -# format=tagmanager a�16384�0 +variable: a b�16384�0 +variable: b bar�64�class.test1�0 +member: class.test1 :: bar c�16384�0 +variable: c class�1�()�0 +class: class() foo�64�class.test1�0 +member: class.test1 :: foo test1�1�class�0 +class: class :: test1 test3�128�()�class�0 +method: class :: test3() Modified: tests/ctags/attributes.cs.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager Author�1�0 +class: Author Author�128�(string name)�Author�0 +method: Author :: Author(string name) MyDllimportClass�1�0 +class: MyDllimportClass TraceMethod�128�()�0�[][][][]void +method: [][][][]void TraceMethod() name�8�Author�0 +field: Author :: name version�8�Author�0�double +field: double Author :: version Modified: tests/ctags/auto.f.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager AUTO_TEST�2048�0 +struct: AUTO_TEST D�16384�AUTO_TEST�0 +variable: AUTO_TEST :: D P�16384�AUTO_TEST�0 +variable: AUTO_TEST :: P Q�16384�AUTO_TEST�0 +variable: AUTO_TEST :: Q Modified: tests/ctags/backslashes.c.tags 12 lines changed, 11 insertions(+), 1 deletions(-) =================================================================== @@ -1,12 +1,22 @@ -# format=tagmanager MACRO1�65536�0 +macro: MACRO1 MACRO2�131072�(x)�0 +macro_arg: MACRO2(x) MACRO3�131072�(y)�0 +macro_arg: MACRO3(y) T�4096�0�int +typedef: int T func1�1024�(int var1,int var2,...)�0�int +prototype: int func1(int var1,int var2,...) func2�1024�(int var1,int var2,...)�0�int +prototype: int func2(int var1,int var2,...) func3�1024�(T var1,T var2,...)�0�int +prototype: int func3(T var1,T var2,...) func4�1024�(T var1,T var2,...)�0�int +prototype: int func4(T var1,T var2,...) func5�1024�(int var1,int var2,...)�0�int +prototype: int func5(int var1,int var2,...) func6�1024�(void)�0�int +prototype: int func6(void) func7�1024�(int a)�0�int +prototype: int func7(int a) Modified: tests/ctags/bit_field.c.tags 24 lines changed, 23 insertions(+), 1 deletions(-) =================================================================== @@ -1,24 +1,46 @@ -# format=tagmanager a�64�bit_fields�0�unsigned int:1 +member: unsigned int:1 bit_fields :: a anon_struct_1�2048�1 +struct: anon_struct_1 flags: 1 b�64�bit_fields�0�unsigned int:1 +member: unsigned int:1 bit_fields :: b bad2�64�bitfield_flags�0�BYTE:1 +member: BYTE:1 bitfield_flags :: bad2 bit_fields�2048�0 +struct: bit_fields bitfield_flags�2048�0 +struct: bitfield_flags c�64�bit_fields�0�unsigned int:2 +member: unsigned int:2 bit_fields :: c exp�64�anon_struct_1�0�unsigned +member: unsigned anon_struct_1 :: exp frac0�64�anon_struct_1�0�unsigned +member: unsigned anon_struct_1 :: frac0 frac1�64�anon_struct_1�0�unsigned +member: unsigned anon_struct_1 :: frac1 group�64�bitfield_flags�0�BYTE:1 +member: BYTE:1 bitfield_flags :: group lower�64�shortname_info�0�unsigned char:1 +member: unsigned char:1 shortname_info :: lower mystruct�2048�0 +struct: mystruct personal�64�bitfield_flags�0�BYTE:1 +member: BYTE:1 bitfield_flags :: personal private�64�mystruct�0�BYTE +member: BYTE mystruct :: private public�64�bitfield_flags�0�BYTE:1 +member: BYTE:1 bitfield_flags :: public public�64�mystruct�0�BYTE +member: BYTE mystruct :: public shortname_info�2048�0 +struct: shortname_info sign�64�anon_struct_1�0�unsigned:1 +member: unsigned:1 anon_struct_1 :: sign that�64�mystruct�0�BYTE +member: BYTE mystruct :: that this�64�mystruct�0�BYTE +member: BYTE mystruct :: this upper�64�shortname_info�0�unsigned char:1 +member: unsigned char:1 shortname_info :: upper valid�64�shortname_info�0�unsigned char:1 +member: unsigned char:1 shortname_info :: valid Modified: tests/ctags/block.f90.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager Blocks�256�0 +namespace: Blocks Main�2048�0 +struct: Main MyFunc�16�Blocks�0 +function: Blocks :: MyFunc i�16384�Blocks�0 +variable: Blocks :: i moreint�16384�Main�0 +variable: Main :: moreint otherint�16384�Main�0 +variable: Main :: otherint Modified: tests/ctags/bracematch.js.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager Container�16�()�0 +function: Container() MyClass�1�0 +class: MyClass insert�128�(element, insertions)�MyClass�0 +method: MyClass :: insert(element, insertions) wrap�128�(element, wrapper, attributes)�MyClass�0 +method: MyClass :: wrap(element, wrapper, attributes) x�16�()�Container�0 +function: Container :: x() y�16�()�Container�0 +function: Container :: y() Modified: tests/ctags/bug1020715.c.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager f�16�()�0�void +function: void f() Modified: tests/ctags/bug1020715.cpp.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager f�16�()�0�void +function: void f() Modified: tests/ctags/bug1086609.c.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager func2�16�(int a)�0�int +function: int func2(int a) Modified: tests/ctags/bug1093123.cpp.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager main�16�()�0�int +function: int main() Modified: tests/ctags/bug1111214-j-chan.v.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager insig�16384�top�0 +variable: top :: insig outsig�16384�top�0 +variable: top :: outsig top�1�0 +class: top Modified: tests/ctags/bug1111214.v.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager wahoo�1�0 +class: wahoo Modified: tests/ctags/bug1201689.c.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager test�16�(a,...)�0 +function: test(a,...) Modified: tests/ctags/bug1447756.java.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager Foo�32�0 +interface: Foo bar�128�()�Foo�0�public T +method: public T Foo :: bar() Modified: tests/ctags/bug1458930.c.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager x�1024�()�0�char +prototype: char x() y�1024�()�0�wchar_t +prototype: wchar_t y() Modified: tests/ctags/bug1466117.c.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager a�64�mystruct�0�int +member: int mystruct :: a b�64�mystruct�0�int +member: int mystruct :: b mystruct�2048�0 +struct: mystruct Modified: tests/ctags/bug1491666.c.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager main�16�(void)�0�void +function: void main(void) my_struct�2048�0 +struct: my_struct x�64�my_struct�0�int +member: int my_struct :: x y�64�my_struct�0�float +member: float my_struct :: y Modified: tests/ctags/bug1515910.cs.tags 10 lines changed, 9 insertions(+), 1 deletions(-) =================================================================== @@ -1,10 +1,18 @@ -# format=tagmanager C�1�0 +class: C Enum1�2�0 +enum: Enum1 MyGenericClass1�1�0 +class: MyGenericClass1 Value1�4�Enum1�0 +enumerator: Enum1 :: Value1 Values�4�Enum1�0 +enumerator: Enum1 :: Values int1�8�C�0�int +field: int C :: int1 str1�8�C�0 +field: C :: str1 str2�8�C�0 +field: C :: str2 str3�8�C�0 +field: C :: str3 Modified: tests/ctags/bug1548443.cpp.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager TestStruct�2048�0 +struct: TestStruct TestUnion�8192�0 +union: TestUnion _number�64�TestStruct�0�int +member: int TestStruct :: _number _number�64�TestUnion�0�int +member: int TestUnion :: _number Modified: tests/ctags/bug1563476.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager IntroduceBitDef�2048�0 +struct: IntroduceBitDef f�16�()�IntroduceBitDef�0�int +function: int IntroduceBitDef :: f() g�16�()�0�int +function: int g() Modified: tests/ctags/bug1570779.sql.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager address�8�employees�0 +field: employees :: address employees�1�0 +class: employees id�8�employees�0 +field: employees :: id name�8�employees�0 +field: employees :: name Modified: tests/ctags/bug1575055.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager MyClass�1�TheNamespace�0 +class: TheNamespace :: MyClass TheNamespace�256�0 +namespace: TheNamespace variable�16384�TheNamespace�0�int +variable: int TheNamespace :: variable Modified: tests/ctags/bug1585745.cpp.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager Class5�1�0 +class: Class5 ~Class1�16�()�Class1�0 +function: Class1 :: ~Class1() ~Class2�16�()�Class2�0 +function: Class2 :: ~Class2() ~Class3�16�()�Class3�0 +function: Class3 :: ~Class3() ~Class4�16�()�Class4�0 +function: Class4 :: ~Class4() ~Class5�16�()�Class5�0 +function: Class5 :: ~Class5() Modified: tests/ctags/bug1611054.cs.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager C�1�0 +class: C a�128�()�C�0�public String +method: public String C :: a() b�128�()�C�0�public void +method: public void C :: b() Modified: tests/ctags/bug1691412.java.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager C�1�0 +class: C newInstance�128�()�C�0�@NonNull @CheckReturnValue public DefaultCipherDialog +method: @NonNull @CheckReturnValue public DefaultCipherDialog C :: newInstance() toString�128�()�C�0�@Override public String +method: @Override public String C :: toString() Modified: tests/ctags/bug1742588.rb.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager A�1�0 +class: A a�128�()�A�0 +method: A :: a() b�128�()�A�0 +method: A :: b() Modified: tests/ctags/bug1743330.v.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager dummy�1�0 +class: dummy Modified: tests/ctags/bug1764143.h.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager arch_reset�16�(char mode)�0�void +function: void arch_reset(char mode) omap1_arch_reset�16�(char mode)�0�void +function: void omap1_arch_reset(char mode) Modified: tests/ctags/bug1764148.py.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager PyFunc�16�(msg)�0 +function: PyFunc(msg) Modified: tests/ctags/bug1770479.cpp.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager foo�16�(int i)�0�int +function: int foo(int i) main�16�(int argc,char ** argv)�0�int +function: int main(int argc,char ** argv) Modified: tests/ctags/bug1773926.cpp.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager ERROR_HAPPENED�65536�0 +macro: ERROR_HAPPENED NEXT_DEFINE�65536�0 +macro: NEXT_DEFINE OK�65536�0 +macro: OK main�16�(int argc,char * argv[])�0�int +function: int main(int argc,char * argv[]) Modified: tests/ctags/bug1777344.java.tags 10 lines changed, 9 insertions(+), 1 deletions(-) =================================================================== @@ -1,10 +1,18 @@ -# format=tagmanager V�128�()�bug1777344�0� +method: bug1777344 :: V() b�8�bug1777344�0�boolean +field: boolean bug1777344 :: b bug1777344�1�0 +class: bug1777344 c�8�bug1777344�0�boolean +field: boolean bug1777344 :: c d�8�bug1777344�0�boolean +field: boolean bug1777344 :: d e�8�bug1777344�0�boolean +field: boolean bug1777344 :: e map1�8�bug1777344�0�HashMap +field: HashMap bug1777344 :: map1 map2�8�bug1777344�0�HashMap +field: HashMap bug1777344 :: map2 map3�8�bug1777344�0�HashMap +field: HashMap bug1777344 :: map3 Modified: tests/ctags/bug1799340.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager f1�16�()�0�std::string & +function: std::string & f1() f2�16�()�0�const std::string & +function: const std::string & f2() f3�16�()�0�std::string const & +function: std::string const & f3() Modified: tests/ctags/bug1799343-1.cpp.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager C�2048�0 +struct: C D�16�()�D�0 +function: D :: D() D�2048�0 +struct: D main�16�(void)�0�int +function: int main(void) x�64�C�0�int +member: int C :: x ~D�16�()�D�0 +function: D :: ~D() Modified: tests/ctags/bug1799343-2.cpp.tags 15 lines changed, 14 insertions(+), 1 deletions(-) =================================================================== @@ -1,15 +1,28 @@ -# format=tagmanager A�256�0 +namespace: A B�256�0 +namespace: B C�256�A�0 +namespace: A :: C P�1�0 +class: P P�1�A�0 +class: A :: P Q�1�A�0 +class: A :: Q R�1�A::C�0 +class: A::C :: R S�1�B�0 +class: B :: S f�16�(int v)�A::C::R�0�int +function: int A::C::R :: f(int v) t�64�B::S�0�int +member: int B::S :: t x�64�A::P�0�int +member: int A::P :: x x�64�P�0�int +member: int P :: x y�64�A::Q�0�int +member: int A::Q :: y z�64�A::C::R�0�int +member: int A::C::R :: z Modified: tests/ctags/bug1800065.cs.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager C�1�0 +class: C title�8�C�0 +field: C :: title window�8�C�0�Gtk +field: Gtk C :: window Modified: tests/ctags/bug1809024.py.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager detach�16�(self)�0 +function: detach(self) Modified: tests/ctags/bug1830343.cs.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager ForEachTest�1�0 +class: ForEachTest Main�128�(string[] args)�ForEachTest�0�void +method: void ForEachTest :: Main(string[] args) Modified: tests/ctags/bug1830344.cs.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager C�1�0 +class: C m�128�()�C�0�public void +method: public void C :: m() Modified: tests/ctags/bug1856363.py.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager main�16�()�0 +function: main() Modified: tests/ctags/bug1906062.py.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager dummy�1�0 +class: dummy include_file�16384�0 +variable: include_file Modified: tests/ctags/bug1907083.cpp.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager m1�16�()�C�0�C::T * +function: C::T * C :: m1() m2�16�()�C�0�C::T * const +function: C::T * const C :: m2() m3�16�()�C�0�C::T const * +function: C::T const * C :: m3() m4�16�()�C�0�C::T const * const +function: C::T const * const C :: m4() Modified: tests/ctags/bug1924919.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager MajorVersion�16384�mud�0�std::string +variable: std::string mud :: MajorVersion MinorVersion�16384�mud�0�std::string +variable: std::string mud :: MinorVersion mud�256�0 +namespace: mud Modified: tests/ctags/bug1938565.sql.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager demo_pkg�512�0 +package: demo_pkg func1�16�demo_pkg�0 +function: demo_pkg :: func1 func1_proto�1024�demo_pkg�0 +prototype: demo_pkg :: func1_proto func2�16�demo_pkg�0 +function: demo_pkg :: func2 func2_proto�1024�demo_pkg�0 +prototype: demo_pkg :: func2_proto Modified: tests/ctags/bug1944150.sql.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager tr_d_cash_trade_comment�65536�cash_trade_comment�0 +macro: cash_trade_comment :: tr_d_cash_trade_comment Modified: tests/ctags/bug1950327.js.tags 14 lines changed, 13 insertions(+), 1 deletions(-) =================================================================== @@ -1,14 +1,26 @@ -# format=tagmanager *�64�container.dirtyTab�0 +member: container.dirtyTab :: * Different�1�0 +class: Different TabChrome�1�0 +class: TabChrome createTabTile�128�(browser)�Different�0 +method: Different :: createTabTile(browser) createTabTile�128�(browser)�TabChrome�0 +method: TabChrome :: createTabTile(browser) destroyTabTile�128�(tile)�Different�0 +method: Different :: destroyTabTile(tile) destroyTabTile�128�(tile)�TabChrome�0 +method: TabChrome :: destroyTabTile(tile) dirtyTab�1�container�0 +class: container :: dirtyTab init�128�()�Different�0 +method: Different :: init() init�128�()�TabChrome�0 +method: TabChrome :: init() snapshot�64�container.dirtyTab�0 +member: container.dirtyTab :: snapshot title�64�container.dirtyTab�0 +member: container.dirtyTab :: title url�64�container.dirtyTab�0 +member: container.dirtyTab :: url Modified: tests/ctags/bug1988026.py.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager im_a_function�16�()�0 +function: im_a_function() main�128�()�testClass�0 +method: testClass :: main() my_var�16384�testClass�0 +variable: testClass :: my_var testClass�1�0 +class: testClass Modified: tests/ctags/bug1988027.py.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager dummy�1�0 +class: dummy Modified: tests/ctags/bug1988130.py.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager main�16�()�0 +function: main() testFunc�16�()�0 +function: testFunc() Modified: tests/ctags/bug2049723.java.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager bug2049723�1�0 +class: bug2049723 m1�128�(String arg)�bug2049723�0�public void +method: public void bug2049723 :: m1(String arg) m2�128�(@Nonnull String arg)�bug2049723�0�public void +method: public void bug2049723 :: m2(@Nonnull String arg) Modified: tests/ctags/bug2075402.py.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager x�16384�0 +variable: x y�16384�0 +variable: y Modified: tests/ctags/bug2117073.java.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager AAssignmentExp�1�0 +class: AAssignmentExp AAssignmentExp�128�(@SuppressWarnings() TAssign _token_, @SuppressWarnings() PLvalue _lvalue_, @SuppressWarnings() PExp _exp_)�AAssignmentExp�0 +method: AAssignmentExp :: AAssignmentExp(@SuppressWarnings() TAssign _token_, @SuppressWarnings() PLvalue _lvalue_, @SuppressWarnings() PExp _exp_) removeChild�128�(@SuppressWarnings() Node child)�AAssignmentExp�0�@Override void +method: @Override void AAssignmentExp :: removeChild(@SuppressWarnings() Node child) Modified: tests/ctags/bug2374109.vhd.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager Pow2�16�0 +function: Pow2 Result�16384�Pow2�0 +variable: Pow2 :: Result Modified: tests/ctags/bug2411878.cs.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager C�1�0 +class: C m_name�8�C�0�System +field: System C :: m_name Modified: tests/ctags/bug2747828.v.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager ramaddr_0�16384�0 +variable: ramaddr_0 Modified: tests/ctags/bug2777310.js.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager a�16384�0 +variable: a b�16384�0 +variable: b x�16384�0 +variable: x y�16384�0 +variable: y z�16384�0 +variable: z Modified: tests/ctags/bug2781264.rb.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager Foo�1�0 +class: Foo bar�128�()�Foo�0 +method: Foo :: bar() foo�128�()�Foo�0 +method: Foo :: foo() Modified: tests/ctags/bug2886870.tex.tags 40 lines changed, 39 insertions(+), 1 deletions(-) =================================================================== @@ -1,40 +1,78 @@ -# format=tagmanager Common Greek letters�65536�Special Symbols�0 +macro: Special Symbols :: Common Greek letters Equations�64�0 +member: Equations Figures�64�0 +member: Figures Introduction�64�0 +member: Introduction Lists�64�0 +member: Lists Literal text�64�0 +member: Literal text Special Symbols�64�0 +member: Special Symbols Special symbols�65536�Special Symbols�0 +macro: Special Symbols :: Special symbols Tables�64�0 +member: Tables Test for ctags�16384�Special Symbols""Common Greek letters�0 +variable: Special Symbols""Common Greek letters :: Test for ctags \color{red}Use of Color�64�0 +member: \color{red}Use of Color \label{morefig}Subfigures�64�0 +member: \label{morefig}Subfigures \lb�16�0 +function: \lb \rb�16�0 +function: \rb \rv�16�0 +function: \rv align�1�0 +class: align cases�1�0 +class: cases center�1�0 +class: center comment�1�0 +class: comment document�1�0 +class: document enumerate�1�0 +class: enumerate eq:fine�2048�0 +struct: eq:fine eq:ising�2048�0 +struct: eq:ising eq:mdiv�2048�0 +struct: eq:mdiv equation�1�0 +class: equation fig:lj�2048�0 +struct: fig:lj fig:qm/complexfunctions�2048�0 +struct: fig:qm/complexfunctions fig:typical�2048�0 +struct: fig:typical figure�1�0 +class: figure itemize�1�0 +class: itemize latex�8�0 +field: latex pmatrix�1�0 +class: pmatrix subequations�1�0 +class: subequations tab:5/tc�2048�0 +struct: tab:5/tc table�1�0 +class: table tabular�1�0 +class: tabular thebibliography�1�0 +class: thebibliography verbatim�1�0 +class: verbatim website�8�0 +field: website Modified: tests/ctags/bug2888482.js.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager onsubmit�16�()�editFormEl�0 +function: editFormEl :: onsubmit() scrollEditBox�16�()�0 +function: scrollEditBox() Modified: tests/ctags/bug3036476.js.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager container�16384�0 +variable: container method1�16�()�container.object�0 +function: container.object :: method1() method2�16�()�container.object�0 +function: container.object :: method2() object�16�()�container�0 +function: container :: object() Modified: tests/ctags/bug3168705.py.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager A�1�0 +class: A func1�128�()�A�0 +method: A :: func1() func2�128�()�A�0 +method: A :: func2() Modified: tests/ctags/bug3571233.js.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager MyClass�1�0 +class: MyClass MyClass�16�()�0 +function: MyClass() function1�16�()�0 +function: function1() function2�16�()�0 +function: function2() method2�128�()�MyClass�0 +method: MyClass :: method2() nestedFunction1�16�()�MyClass.method2�0 +function: MyClass.method2 :: nestedFunction1() nestedFunction2�16�()�MyClass.method2�0 +function: MyClass.method2 :: nestedFunction2() nestedFunction3�16�()�function1�0 +function: function1 :: nestedFunction3() nestedFunction4�16�()�function2�0 +function: function2 :: nestedFunction4() nestedFunction5�16�()�function2�0 +function: function2 :: nestedFunction5() Modified: tests/ctags/bug507864.c.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager func1�16�(ENTSEQNO (seq))�0�FUNCSTS +function: FUNCSTS func1(ENTSEQNO (seq)) func2�16�(MEMTXT (form_msg),MEMTXT (text),MEMTXT (mail))�0�FUNCSTS +function: FUNCSTS func2(MEMTXT (form_msg),MEMTXT (text),MEMTXT (mail)) Modified: tests/ctags/bug538629.asm.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager MYMACRO�65536�0 +macro: MYMACRO Modified: tests/ctags/bug556645.c.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager A1�131072�(_type,_length)�0 +macro_arg: A1(_type,_length) Qtype�4096�0 +typedef: Qtype Modified: tests/ctags/bug556646.c.tags 21 lines changed, 20 insertions(+), 1 deletions(-) =================================================================== @@ -1,21 +1,40 @@ -# format=tagmanager A�4�task_indx_type�0 +enumerator: task_indx_type :: A INDX_C1�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_C1 INDX_C2�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_C2 INDX_IM1�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_IM1 INDX_IM2�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_IM2 INDX_L�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_L INDX_L2�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_L2 INDX_M�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_M INDX_NIL�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_NIL INDX_P�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_P INDX_R�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_R INDX_R2�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_R2 INDX_S�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_S INDX_S1�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_S1 INDX_S2�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_S2 INDX_S3�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_S3 INDX_S4�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_S4 INDX_T�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_T INDX_T2�4�task_indx_type�0 +enumerator: task_indx_type :: INDX_T2 task_indx_type�2�0 +enum: task_indx_type Modified: tests/ctags/bug565813.f90.tags 8 lines changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -1,8 +1,14 @@ -# format=tagmanager N�16384�ctags_bug�0 +variable: ctags_bug :: N bar�64�foo_t�0 +member: foo_t :: bar ctags_bug�256�0 +namespace: ctags_bug foo_getbar�16�ctags_bug�0 +function: ctags_bug :: foo_getbar foo_set_bar�128�(f, b)�ctags_bug�0 +method: ctags_bug :: foo_set_bar(f, b) foo_setbar�128�(f, b)�ctags_bug�0 +method: ctags_bug :: foo_setbar(f, b) foo_t�1�ctags_bug�0 +class: ctags_bug :: foo_t Modified: tests/ctags/bug612019.pas.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager Test1�16�()�0 +function: Test1() Test2�16�()�0 +function: Test2() Test3�16�()�0 +function: Test3() Modified: tests/ctags/bug612621.pl.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager bar�16�0 +function: bar foo�16�0 +function: foo Modified: tests/ctags/bug620288.f.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager bar�16�0 +function: bar foo�16�0 +function: foo Modified: tests/ctags/bug639639.h.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager Namespace1�256�0 +namespace: Namespace1 anon2�4�anon_enum_1�0 +enumerator: anon_enum_1 :: anon2 anon_enum_1�2�1 +enum: anon_enum_1 flags: 1 function2�1024�(char * str)�Namespace1�0�int +prototype: int Namespace1 :: function2(char * str) Modified: tests/ctags/bug639644.hpp.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager anon_namespace_1�256�1 +namespace: anon_namespace_1 flags: 1 foo�16384�anon_namespace_1�0�int +variable: int anon_namespace_1 :: foo Modified: tests/ctags/bug665086.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager C12�1�N1::N2�0 +class: N1::N2 :: C12 N1�256�0 +namespace: N1 N2�256�N1�0 +namespace: N1 :: N2 Modified: tests/ctags/bug670433.f90.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager bar�128�(n)�foobar�0 +method: foobar :: bar(n) f�16�foo�0 +function: foo :: f foo�16�foobar�0 +function: foobar :: foo foobar�256�0 +namespace: foobar Modified: tests/ctags/bug699171.py.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager HEADER_TEMPLATE�16384�0 +variable: HEADER_TEMPLATE Quit�16�(msg, exitcode=0)�0 +function: Quit(msg, exitcode=0) Modified: tests/ctags/bug722501.sql.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager foo�256�0 +namespace: foo Modified: tests/ctags/bug726712.f90.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager sub1�128�(a)�0 +method: sub1(a) sub2�128�(a)�0 +method: sub2(a) tagstest_ctrl�128�()�0 +method: tagstest_ctrl() Modified: tests/ctags/bug726875.f90.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager coma�65536�0 +macro: coma comb�65536�0 +macro: comb comc�65536�0 +macro: comc Modified: tests/ctags/bug734933.f90.tags 17 lines changed, 16 insertions(+), 1 deletions(-) =================================================================== @@ -1,17 +1,32 @@ -# format=tagmanager ADD_COMPONENTS�128�MDCOMPONENTS�0 +method: MDCOMPONENTS :: ADD_COMPONENTS COMP�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: COMP COMPONENT�1�MDCOMPONENTS�0 +class: MDCOMPONENTS :: COMPONENT COMPONENTS�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: COMPONENTS COMPONENTS_TMP�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: COMPONENTS_TMP COMPONENT_POINTER�1�MDCOMPONENTS�0 +class: MDCOMPONENTS :: COMPONENT_POINTER COMP_TMP�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: COMP_TMP LIM_COMPONENTS�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: LIM_COMPONENTS MDCOMPONENTS�256�0 +namespace: MDCOMPONENTS MEMDEALLOC�32�MDCOMPONENTS�0 +interface: MDCOMPONENTS :: MEMDEALLOC NAME�64�COMPONENT�0 +member: COMPONENT :: NAME NCOMP�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: NCOMP NUM_COMPONENTS�16384�MDCOMPONENTS�0 +variable: MDCOMPONENTS :: NUM_COMPONENTS NUM_PART�64�COMPONENT�0 +member: COMPONENT :: NUM_PART P�64�COMPONENT_POINTER�0 +member: COMPONENT_POINTER :: P PART_LIST�64�COMPONENT�0 +member: COMPONENT :: PART_LIST Modified: tests/ctags/bug762027.v.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager N_83�16384�0 +variable: N_83 N_84�16384�0 +variable: N_84 Modified: tests/ctags/bug814263.java.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager bug814263�1�0 +class: bug814263 map1�8�bug814263�0�java +field: java bug814263 :: map1 map2�8�bug814263�0�Map +field: Map bug814263 :: map2 Modified: tests/ctags/bug823000.sql.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager TEST�512�0 +package: TEST TestFunc1�256�TEST�0 +namespace: TEST :: TestFunc1 TestFunc2�256�TEST�0 +namespace: TEST :: TestFunc2 Modified: tests/ctags/bug842077.pl.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager test�16�0 +function: test Modified: tests/ctags/bug849591.cpp.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager Foo�16�()�MainClass�0�void +function: void MainClass :: Foo() Modified: tests/ctags/bug852368.cpp.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager foo�1024�(std::vector<float> &)�0�void +prototype: void foo(std::vector<float> &) Modified: tests/ctags/bug858165.f90.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager a�16384�test�0 +variable: test :: a b�16384�test�0 +variable: test :: b c�16384�test�0 +variable: test :: c d�16384�test�0 +variable: test :: d test�2048�0 +struct: test Modified: tests/ctags/bug872494.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager FooClass2�1�0 +class: FooClass2 TemplClass�1�0 +class: TemplClass i�64�TemplClass�0�int +member: int TemplClass :: i Modified: tests/ctags/bug877956.f90.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager c2�16384�test�0 +variable: test :: c2 cm1�16384�test�0 +variable: test :: cm1 test�2048�0 +struct: test Modified: tests/ctags/bug960316.v.tags 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,12 @@ -# format=tagmanager fail_define_2�16384�0 +variable: 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_func_1�16�0 +function: pass_func_1 pass_task_1�16�0 +function: pass_task_1 Modified: tests/ctags/bug961001.v.tags 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1,9 +1,16 @@ -# format=tagmanager 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 Modified: tests/ctags/byte.f.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager A�16384�byte_test�0 +variable: byte_test :: A A1�16384�byte_test�0 +variable: byte_test :: A1 A2�16384�byte_test�0 +variable: byte_test :: A2 B�16384�byte_test�0 +variable: byte_test :: B B1�16384�byte_test�0 +variable: byte_test :: B1 B2�16384�byte_test�0 +variable: byte_test :: B2 C�16384�byte_test�0 +variable: byte_test :: C C1�16384�byte_test�0 +variable: byte_test :: C1 C2�16384�byte_test�0 +variable: byte_test :: C2 byte_test�2048�0 +struct: byte_test Modified: tests/ctags/c-digraphs.c.tags 12 lines changed, 11 insertions(+), 1 deletions(-) =================================================================== @@ -1,12 +1,22 @@ -# format=tagmanager A�65536�0 +macro: A B�65536�0 +macro: B M3_INIT�131072�(a,b,c)�0 +macro_arg: M3_INIT(a,b,c) STRINGIFY�131072�(x)�0 +macro_arg: STRINGIFY(x) STRINGIFY_INTERN�131072�(x)�0 +macro_arg: STRINGIFY_INTERN(x) buf�64�str�0�char * +member: char * str :: buf len�64�str�0�unsigned int +member: unsigned int str :: len main�16�(void)�0�int +function: int main(void) matrix3�4096�0�int[3] +typedef: int[3] matrix3 size�64�str�0�unsigned int +member: unsigned int str :: size str�2048�0 +struct: str Modified: tests/ctags/c-trigraphs.c.tags 15 lines changed, 14 insertions(+), 1 deletions(-) =================================================================== @@ -1,15 +1,28 @@ -# format=tagmanager A�65536�0 +macro: A B�65536�0 +macro: B D�65536�0 +macro: D E�65536�0 +macro: E F�65536�0 +macro: F M3_INIT�131072�(a,b,c)�0 +macro_arg: M3_INIT(a,b,c) STRINGIFY�131072�(x)�0 +macro_arg: STRINGIFY(x) STRINGIFY_INTERN�131072�(x)�0 +macro_arg: STRINGIFY_INTERN(x) buf�64�str�0�char * +member: char * str :: buf len�64�str�0�unsigned int +member: unsigned int str :: len main�16�(void)�0�int +function: int main(void) matrix3�4096�0�int[3] +typedef: int[3] matrix3 size�64�str�0�unsigned int +member: unsigned int str :: size str�2048�0 +struct: str Modified: tests/ctags/case_sensitivity.php.tags 17 lines changed, 16 insertions(+), 1 deletions(-) =================================================================== @@ -1,17 +1,32 @@ -# format=tagmanager A�1�0 +class: A B�1�0 +class: B C�1�0 +class: C D�1�0 +class: D a�16�()�0 +function: a() b�16�()�0 +function: b() c�16�()�0 +function: c() d�16�()�0 +function: d() iA�32�0 +interface: iA iB�32�0 +interface: iB iC�32�0 +interface: iC iD�32�0 +interface: iD tA�2048�0 +struct: tA tB�2048�0 +struct: tB tC�2048�0 +struct: tC tD�2048�0 +struct: tD Modified: tests/ctags/char-selector.f90.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager MXDDI�16384�OUT_RD5�0 +variable: OUT_RD5 :: MXDDI OUT_RD5�256�0 +namespace: OUT_RD5 fpshape�16384�OUT_RD5�0 +variable: OUT_RD5 :: fpshape fpshape2�16384�OUT_RD5�0 +variable: OUT_RD5 :: fpshape2 last�16384�OUT_RD5�0 +variable: OUT_RD5 :: last list�16384�OUT_RD5�0 +variable: OUT_RD5 :: list nout�16384�OUT_RD5�0 +variable: OUT_RD5 :: nout temp�16384�OUT_RD5�0 +variable: OUT_RD5 :: temp titles�16384�OUT_RD5�0 +variable: OUT_RD5 :: titles units�16384�OUT_RD5�0 +variable: OUT_RD5 :: units Modified: tests/ctags/classes.php.tags 8 lines changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -1,8 +1,14 @@ -# format=tagmanager Bar�1�0 +class: Bar Foo�1�0 +class: Foo __construct�16�()�Bar�0 +function: Bar :: __construct() __construct�16�($a, $b)�Foo�0 +function: Foo :: __construct($a, $b) method1�16�()�Bar�0 +function: Bar :: method1() method1�16�($arg)�Foo�0 +function: Foo :: method1($arg) method2�16�()�Foo�0 +function: Foo :: method2() Modified: tests/ctags/cobol/helloworld.cbl.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager 00-MAIN�65536�0 +macro: 00-MAIN CONFIGURATION�256�0 +namespace: CONFIGURATION DATA�32�0 +interface: DATA ENVIRONMENT�32�0 +interface: ENVIRONMENT HELLO�1�0 +class: HELLO IDENTIFICATION�32�0 +interface: IDENTIFICATION OBJECT-COMPUTER�65536�0 +macro: OBJECT-COMPUTER PROCEDURE�32�0 +interface: PROCEDURE SOURCE-COMPUTER�65536�0 +macro: SOURCE-COMPUTER SPECIAL-NAMES�65536�0 +macro: SPECIAL-NAMES Modified: tests/ctags/cobol/helloworld2.cbl.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager 00-MAIN�65536�0 +macro: 00-MAIN CONFIGURATION�256�0 +namespace: CONFIGURATION DATA�32�0 +interface: DATA ENVIRONMENT�32�0 +interface: ENVIRONMENT HELLO WORLD�1�0 +class: HELLO WORLD IDENTIFICATION�32�0 +interface: IDENTIFICATION OBJECT-COMPUTER�65536�0 +macro: OBJECT-COMPUTER PROCEDURE�32�0 +interface: PROCEDURE SOURCE-COMPUTER�65536�0 +macro: SOURCE-COMPUTER SPECIAL-NAMES�65536�0 +macro: SPECIAL-NAMES Modified: tests/ctags/cobol/levels.cbl.tags 22 lines changed, 21 insertions(+), 1 deletions(-) =================================================================== @@ -1,22 +1,42 @@ -# format=tagmanager DATA�32�0 +interface: DATA EVEN�16384�RECORD1.ITEM2�0 +variable: RECORD1.ITEM2 :: EVEN G1�2048�REC2�0 +struct: REC2 :: G1 IDENTIFICATION�32�0 +interface: IDENTIFICATION ITEM1�16384�REC2.G1�0 +variable: REC2.G1 :: ITEM1 ITEM1�16384�RECORD1�0 +variable: RECORD1 :: ITEM1 ITEM2�16384�REC2.G1�0 +variable: REC2.G1 :: ITEM2 ITEM2�16384�RECORD1�0 +variable: RECORD1 :: ITEM2 ITEM3�16384�RECORD1�0 +variable: RECORD1 :: ITEM3 MAIN-PROCEDURE�65536�0 +macro: MAIN-PROCEDURE ODD�16384�RECORD1.ITEM2�0 +variable: RECORD1.ITEM2 :: ODD OTHERNAME1�16384�REC2�0 +variable: REC2 :: OTHERNAME1 OTHERNAME2�16384�REC2�0 +variable: REC2 :: OTHERNAME2 PROCEDURE�32�0 +interface: PROCEDURE RDITEM4�16384�RECORD1�0 +variable: RECORD1 :: RDITEM4 RDITEM5�16384�RECORD1�0 +variable: RECORD1 :: RDITEM5 REC2�2048�0 +struct: REC2 RECORD1�2048�0 +struct: RECORD1 STDLN1�16384�0 +variable: STDLN1 Test-Items�1�0 +class: Test-Items WORKING-STORAGE�256�0 +namespace: WORKING-STORAGE Modified: tests/ctags/cobol/quoted-program-id.cbl.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager IDENTIFICATION�32�0 +interface: IDENTIFICATION MAIN�65536�0 +macro: MAIN PROCEDURE�32�0 +interface: PROCEDURE Test program name�1�0 +class: Test program name Modified: tests/ctags/cobol/simple.cbl.tags 22 lines changed, 21 insertions(+), 1 deletions(-) =================================================================== @@ -1,22 +1,42 @@ -# format=tagmanager AUTHOR�65536�0 +macro: AUTHOR Begin�65536�0 +macro: Begin DATA�32�0 +interface: DATA DW-DAYS-IN-MONTH�16384�Group-Name.Data-Item1.DW-DAYS-IN-MONTHS�0 +variable: Group-Name.Data-Item1.DW-DAYS-IN-MONTHS :: DW-DAYS-IN-MONTH DW-DAYS-IN-MONTHS�16384�Group-Name.Data-Item1�0 +variable: Group-Name.Data-Item1 :: DW-DAYS-IN-MONTHS Data-Item1�16384�Group-Name�0 +variable: Group-Name :: Data-Item1 ENVIRONMENT�32�0 +interface: ENVIRONMENT FILE�256�0 +namespace: FILE FILE-CONTROL�65536�0 +macro: FILE-CONTROL File-Data-Item�16384�File-Group-Name�0 +variable: File-Group-Name :: File-Data-Item File-Group-Name�2048�0 +struct: File-Group-Name File-Name�16�0 +function: File-Name Group-Name�2048�0 +struct: Group-Name IDENTIFICATION�32�0 +interface: IDENTIFICATION INPUT-OUPUT�256�0 +namespace: INPUT-OUPUT PROCEDURE�32�0 +interface: PROCEDURE Program-Name�1�0 +class: Program-Name SH-WORK-MMDDYYYY�16384�Group-Name.Data-Item1�0 +variable: Group-Name.Data-Item1 :: SH-WORK-MMDDYYYY SH-WORK-MMDDYYYY-2�16384�Group-Name.Data-Item1�0 +variable: Group-Name.Data-Item1 :: SH-WORK-MMDDYYYY-2 Subprogram-Name�65536�0 +macro: Subprogram-Name WORKING-STORAGE�256�0 +namespace: WORKING-STORAGE Modified: tests/ctags/common.f.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager common1�65536�main�0 +macro: main :: common1 common2�65536�main�0 +macro: main :: common2 common3�65536�main�0 +macro: main :: common3 main�2048�0 +struct: main Modified: tests/ctags/complex-return.js.tags 20 lines changed, 19 insertions(+), 1 deletions(-) =================================================================== @@ -1,20 +1,38 @@ -# format=tagmanager anon_function_1�16�()�class2.c2m1�1 +function: class2.c2m1 :: anon_function_1() flags: 1 anon_function_2�16�(n)�class3.c3m1�1 +function: class3.c3m1 :: anon_function_2(n) flags: 1 c2m1�128�()�class2�0 +method: class2 :: c2m1() c2m2�128�(f)�class2�0 +method: class2 :: c2m2(f) c2m3�128�(f)�class2�0 +method: class2 :: c2m3(f) c3m1�128�()�class3�0 +method: class3 :: c3m1() c3m2�128�()�class3�0 +method: class3 :: c3m2() class1�1�()�0 +class: class1() class2�1�()�0 +class: class2() class3�1�()�0 +class: class3() class4�1�()�0 +class: class4() func1�16�()�0 +function: func1() func2�16�()�0 +function: func2() method1�128�()�class1�0 +method: class1 :: method1() method1�128�()�class4�0 +method: class4 :: method1() method2�128�()�class1�0 +method: class1 :: method2() method2�128�()�class4�0 +method: class4 :: method2() method3�128�()�class1�0 +method: class1 :: method3() method4�128�()�class1�0 +method: class1 :: method4() Modified: tests/ctags/continuation.f90.tags 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ -# format=tagmanager para_a�16384�test�0 +variable: test :: para_a para_b�16384�test�0 +variable: test :: para_b para_c�16384�test�0 +variable: test :: para_c test�256�0 +namespace: test Modified: tests/ctags/continuation.mak.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager A�65536�0 +macro: A B�65536�0 +macro: B Modified: tests/ctags/countall.sql.tags 8 lines changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -1,8 +1,14 @@ -# format=tagmanager row_count�16384�0 +variable: row_count stat�16384�0 +variable: stat t_c1_tname�16384�0 +variable: t_c1_tname t_cid�16384�0 +variable: t_cid t_command�16384�0 +variable: t_command t_limit�16384�0 +variable: t_limit t_total_records�16384�0 +variable: t_total_records Modified: tests/ctags/cpp_destructor.cpp.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager ~A�16�()�A�0 +function: A :: ~A() ~B�16�()�B�0 +function: B :: ~B() ~C�16�()�C�0 +function: C :: ~C() Modified: tests/ctags/css-at-rules.css.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager body�2048�0 +struct: body html�2048�0 +struct: html Modified: tests/ctags/css-at-supports.css.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ -# format=tagmanager html�2048�0 +struct: html Modified: tests/ctags/css-attribute-selectors.css.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager a[href^="http://"]�2048�0 +struct: a[href^="http://"] a[href^="https://"]�2048�0 +struct: a[href^="https://"] a[lang~=en]�2048�0 +struct: a[lang~=en] body�2048�0 +struct: body p�2048�0 +struct: p Modified: tests/ctags/css-comma-no-space.css.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager input�2048�0 +struct: input textarea�2048�0 +struct: textarea Modified: tests/ctags/css-namespace-selectors.css.tags 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ -# format=tagmanager *|div�2048�0 +struct: *|div svg|a�2048�0 +struct: svg|a |a�2048�0 +struct: |a Modified: tests/ctags/css-pseudo-classes.css.tags 12 lines changed, 11 insertions(+), 1 deletions(-) =================================================================== @@ -1,12 +1,22 @@ -# format=tagmanager a:lang(en):after�2048�0 +struct: a:lang(en):after body :not(span)�2048�0 +struct: body :not(span) span:not(:first-child)�2048�0 +struct: span:not(:first-child) span:nth-child(-n+3)�2048�0 +struct: span:nth-child(-n+3) span:nth-child(0n+1)�2048�0 +struct: span:nth-child(0n+1) span:nth-child(1)�2048�0 +struct: span:nth-child(1) tr:nth-child(10n+0)�2048�0 +struct: tr:nth-child(10n+0) tr:nth-child(2n)�2048�0 +struct: tr:nth-child(2n) tr:nth-child(2n+1)�2048�0 +struct: tr:nth-child(2n+1) tr:nth-child(even)�2048�0 +struct: tr:nth-child(even) tr:nth-child(odd)�2048�0 +struct: tr:nth-child(odd) Modified: tests/ctags/css-simple.css.tags 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -1,11 +1,20 @@ -# format=tagmanager #footer�16384�0 +variable: #footer *�2048�0 +struct: * .foo a�2048�0 +struct: .foo a .foo b�2048�0 +struct: .foo b .header�1�0 +class: .header .red�1�0 +class: .red div.magic�1�0 +class: div.magic html�2048�0 +struct: html ul > li > a�2048�0 +struct: ul > li > a ul li�2048�0 +struct: ul li Modified: tests/ctags/css-singlequote-in-comment-issue2.css.tags 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,4 @@ -# format=tagmanager a�2048�0 +struct: a b�2048�0 +struct: b Modified: tests/ctags/css-tag-types.css.tags 37 lines changed, 36 insertions(+), 1 deletions(-) =================================================================== @@ -1,37 +1,72 @@ -# format=tagmanager #a #foo�16384�0 +variable: #a #foo #a #foo #bar�16384�0 +variable: #a #foo #bar #a #foo .bar�1�0 +class: #a #foo .bar #a #foo bar�2048�0 +struct: #a #foo bar #a .foo�1�0 +class: #a .foo #a .foo #bar�16384�0 +variable: #a .foo #bar #a .foo .bar�1�0 +class: #a .foo .bar #a .foo bar�2048�0 +struct: #a .foo bar #a foo�2048�0 +struct: #a foo #a foo #bar�16384�0 +variable: #a foo #bar #a foo .bar�1�0 +class: #a foo .bar #a foo bar�2048�0 +struct: #a foo bar .a #foo�16384�0 +variable: .a #foo .a #foo #bar�16384�0 +variable: .a #foo #bar .a #foo .bar�1�0 +class: .a #foo .bar .a #foo bar�2048�0 +struct: .a #foo bar .a .foo�1�0 +class: .a .foo .a .foo #bar�16384�0 +variable: .a .foo #bar .a .foo .bar�1�0 +class: .a .foo .bar .a .foo bar�2048�0 +struct: .a .foo bar .a foo�2048�0 +struct: .a foo .a foo #bar�16384�0 +variable: .a foo #bar .a foo .bar�1�0 +class: .a foo .bar .a foo bar�2048�0 +struct: .a foo bar a #foo�16384�0 +variable: a #foo a #foo #bar�16384�0 +variable: a #foo #bar a #foo .bar�1�0 +class: a #foo .bar a #foo bar�2048�0 +struct: a #foo bar a .foo�1�0 +class: a .foo a .foo #bar�16384�0 +variable: a .foo #bar a .foo .bar�1�0 +class: a .foo .bar a .foo bar�2048�0 +struct: a .foo bar a foo�2048�0 +struct: a foo a foo #bar�16384�0 +variable: a foo #bar a foo .bar�1�0 +class: a foo .bar a foo bar�2048�0 +struct: a foo bar Modified: tests/ctags/css-trivial.css.tags 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,10 @@ -# format=tagmanager a�2048�0 +struct: a html�2048�0 +struct: html input�2048�0 +struct: input p�2048�0 +struct: p textarea�2048�0 +struct: textarea Modified: tests/ctags/cxx11-f@@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] def160: Merge PR #1813
by Thomas Martitz 08 Jun '22

08 Jun '22

Branch: refs/heads/master Author: Thomas Martitz <thomas.martitz(a)mailbox.org> Committer: GitHub <noreply(a)github.com> Date: Wed, 08 Jun 2022 12:47:23 UTC Commit: def1600a5bcdcf2729f9580b04f531179f5f5f13 https://github.com/geany/geany/commit/def1600a5bcdcf2729f9580b04f531179f5f5… Log Message: ----------- Merge PR #1813 This adds a tree view mode to the document list in the sidebar and enables it by default. Based on previous work by Pavel Roschin <roshin(a)scriptumplus.ru>, see #259 Modified Paths: -------------- NEWS configure.ac doc/Makefile.am doc/geany.txt doc/images/sidebar_documents_only.png doc/images/sidebar_show_paths.png doc/images/sidebar_show_tree.png doc/meson.build m4/geany-gtk.m4 meson.build src/Makefile.am src/keyfile.c src/libmain.c src/main.h src/sidebar.c src/sidebar.h src/ui_utils.c src/ui_utils.h src/utils.c src/utils.h tests/Makefile.am tests/meson.build tests/test_sidebar.c Modified: NEWS 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,7 @@ Geany 1.39 (unreleased) - + Interface + * The document list in the sidebar has a new tree view. This mode is the + new default and existing installations automatically use it (PR#1813). Geany 1.38 (October 09, 2021) Modified: configure.ac 20 lines changed, 2 insertions(+), 18 deletions(-) =================================================================== @@ -88,24 +88,8 @@ AC_CHECK_DECLS([_NSGetEnviron],,,[[#include <crt_externs.h>]]) GEANY_CHECK_REVISION([dnl force debug mode for a VCS working copy CFLAGS="-g -DGEANY_DEBUG $CFLAGS"]) -# GTK/GLib/GIO checks -gtk_modules="gtk+-3.0 >= 3.0 glib-2.0 >= 2.32" -gtk_modules_private="gio-2.0 >= 2.32 gmodule-no-export-2.0" -PKG_CHECK_MODULES([GTK], [$gtk_modules $gtk_modules_private]) -AC_SUBST([DEPENDENCIES], [$gtk_modules]) -AS_VAR_APPEND([GTK_CFLAGS], [" -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"]) -dnl Disable all GTK deprecations -AS_VAR_APPEND([GTK_CFLAGS], [" -DGDK_DISABLE_DEPRECATION_WARNINGS"]) -AC_SUBST([GTK_CFLAGS]) -AC_SUBST([GTK_LIBS]) -GTK_VERSION=`$PKG_CONFIG --modversion gtk+-3.0` -AC_SUBST([GTK_VERSION]) -GEANY_STATUS_ADD([Using GTK version], [${GTK_VERSION}]) -# GTHREAD checks -gthread_modules="gthread-2.0" -PKG_CHECK_MODULES([GTHREAD], [$gthread_modules]) -AC_SUBST([GTHREAD_CFLAGS]) -AC_SUBST([GTHREAD_LIBS]) +GEANY_CHECK_GTK +GEANY_CHECK_GTK_FUNCS([g_strv_equal]) # --disable-deprecated switch for GTK purification AC_ARG_ENABLE([deprecated], Modified: doc/Makefile.am 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -23,7 +23,10 @@ dist_htmldocimages_DATA = \ images/pref_dialog_tools.png \ images/pref_dialog_various.png \ images/pref_dialog_vte.png \ - images/replace_dialog.png + images/replace_dialog.png \ + images/sidebar_documents_only.png \ + images/sidebar_show_paths.png \ + images/sidebar_show_tree.png endif doc_DATA = \ Modified: doc/geany.txt 44 lines changed, 43 insertions(+), 1 deletions(-) =================================================================== @@ -229,7 +229,7 @@ The workspace has the following parts: * An optional toolbar. * An optional sidebar that can show the following tabs: - * Documents - A document list, and + * Documents - A document list, see `Document list views`_. * Symbols - A list of symbols in your code. * The main editor window. @@ -513,6 +513,48 @@ order. It is not alphabetical as shown in the documents list See the `Notebook tab keybindings`_ section for useful shortcuts including for Most-Recently-Used document switching. +Document list views +^^^^^^^^^^^^^^^^^^^ + +There are three different ways to display documents on the sidebar if *Show +documents list* is active. To switch between views press the right mouse button +on the documents list and select one of these items: + +Documents Only + Show only file names of open documents in sorted order. + + .. image:: ./images/sidebar_documents_only.png + +Show Paths + Show open documents as a two-level tree in which first level is the paths + of directories containing open files and the second level is the file names of + the documents open in that path. All documents with the same path are grouped + together under the same first level item. Paths are in sorted order and + documents are sorted within each group. + + .. image:: ./images/sidebar_show_paths.png + +Show Tree + Show paths as above, but as a multiple level partial tree. The tree is only + expanded at positions where two or more directory paths to open documents + share the same prefix. The common prefix is shown as a parent level, and + the remainder of those paths are shown as child levels. This applies + recursively down the paths making a tree to the file names of open documents, + which are grouped in sorted order as an additional level below the last path + segment. + + For convenience two common file locations are handled specially, open + files below the users home directory and open files below an open project + base path. Each of these is moved to its own top level tree instead of + being in place in the normal tree. The top level of these trees are each + labelled differently. For the home directory tree the path of the home + directory is shown as ``~``, and for the project tree the path to the project + base path is shown simply as the project name. + + .. image:: ./images/sidebar_show_tree.png + +In all cases paths and file names that do not fit in the width available are ellipsised. + Cloning documents ^^^^^^^^^^^^^^^^^ The `Document->Clone` menu item copies the current document's text, Modified: doc/images/sidebar_documents_only.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: doc/images/sidebar_show_paths.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: doc/images/sidebar_show_tree.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: doc/meson.build 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -39,6 +39,9 @@ if tarball.returncode() == 0 or rst2html.found() 'images/pref_dialog_various.png', 'images/pref_dialog_vte.png', 'images/replace_dialog.png', + 'images/sidebar_documents_only.png', + 'images/sidebar_show_paths.png', + 'images/sidebar_show_tree.png', install_dir: join_paths(cdata.get('GEANY_DOC_DIR'), 'html', 'images') ) if tarball.returncode() == 0 Modified: m4/geany-gtk.m4 33 lines changed, 33 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,33 @@ +dnl GEANY_CHECK_GTK +dnl Checks whether the GTK stack is available and new enough. Sets GTK_CFLAGS and GTK_LIBS. +AC_DEFUN([GEANY_CHECK_GTK], +[ + gtk_modules="gtk+-3.0 >= 3.0 glib-2.0 >= 2.32" + gtk_modules_private="gio-2.0 >= 2.32 gmodule-no-export-2.0 gthread-2.0" + + PKG_CHECK_MODULES([GTK], [$gtk_modules $gtk_modules_private]) + AC_SUBST([DEPENDENCIES], [$gtk_modules]) + AS_VAR_APPEND([GTK_CFLAGS], [" -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"]) + dnl Disable all GTK deprecations + AS_VAR_APPEND([GTK_CFLAGS], [" -DGDK_DISABLE_DEPRECATION_WARNINGS"]) + AC_SUBST([GTK_CFLAGS]) + AC_SUBST([GTK_LIBS]) + AC_SUBST([GTK_VERSION],[`$PKG_CONFIG --modversion gtk+-3.0`]) + + GEANY_STATUS_ADD([Using GTK version], [${GTK_VERSION}]) +]) + +dnl GEANY_CHECK_GTK_FUNCS +dnl Like AC_CHECK_FUNCS but adds GTK flags so that tests for GLib/GTK functions may succeed. +AC_DEFUN([GEANY_CHECK_GTK_FUNCS], +[ + AC_REQUIRE([GEANY_CHECK_GTK]) + + CFLAGS_save=$CFLAGS + CFLAGS=$GTK_CFLAGS + LIBS_save=$LIBS + LIBS=$GTK_LIBS + AC_CHECK_FUNCS([$1]) + CFLAGS=$CFLAGS_save + LIBS=$LIBS_save +]) Modified: meson.build 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -87,7 +87,7 @@ check_functions = [ ['truncate', '#include <unistd.h>'], ['wcrtomb', '#include <wchar.h>'], ['wcscoll', '#include <wchar.h>'], - + ['g_strv_equal', '#include <glib.h>'] ] foreach h : check_headers @@ -102,7 +102,7 @@ endforeach foreach f : check_functions define = 'HAVE_' + f.get(0).underscorify().to_upper() ccprefix = '\n'.join([gnu_source ? '#define _GNU_SOURCE' : '', f.get(1)]) - if cc.has_function(f.get(0), prefix : ccprefix) + if cc.has_function(f.get(0), prefix: ccprefix, dependencies: deps) cdata.set(define, 1) else cdata.set(define, false) @@ -857,7 +857,7 @@ libgeany = shared_library('geany', ) dep_libgeany = declare_dependency( link_with: libgeany, - include_directories: [igeany] + include_directories: [iscintilla, itagmanager, igeany] ) executable('geany', Modified: src/Makefile.am 5 lines changed, 2 insertions(+), 3 deletions(-) =================================================================== @@ -20,14 +20,14 @@ AM_CPPFLAGS = \ -DGTK \ -DGEANY_PRIVATE \ -DG_LOG_DOMAIN=\""Geany"\" \ - @GTK_CFLAGS@ @GTHREAD_CFLAGS@ \ + @GTK_CFLAGS@ \ $(MAC_INTEGRATION_CFLAGS) bin_PROGRAMS = geany lib_LTLIBRARIES = libgeany.la geany_SOURCES = main.c -geany_LDADD = libgeany.la $(GTK_LIBS) $(GTHREAD_LIBS) $(INTLLIBS) +geany_LDADD = libgeany.la $(GTK_LIBS) $(INTLLIBS) geany_LDFLAGS = if ENABLE_BINRELOC @@ -124,7 +124,6 @@ libgeany_la_LIBADD = \ $(top_builddir)/scintilla/libscintilla.la \ $(builddir)/tagmanager/libtagmanager.la \ @GTK_LIBS@ \ - @GTHREAD_LIBS@ \ $(MAC_INTEGRATION_LIBS) \ $(INTLLIBS) Modified: src/keyfile.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -187,7 +187,7 @@ static void init_pref_groups(void) stash_group_add_toggle_button(group, &file_prefs.tab_close_switch_to_mru, "tab_close_switch_to_mru", FALSE, "check_tab_close_switch_to_mru"); stash_group_add_integer(group, &interface_prefs.tab_pos_sidebar, "tab_pos_sidebar", GTK_POS_TOP); - stash_group_add_integer(group, &interface_prefs.documents_show_paths, "documents_show_paths", SHOW_PATHS_LIST); + stash_group_add_integer(group, &interface_prefs.openfiles_path_mode, "openfiles_path_mode", -1); stash_group_add_radio_buttons(group, &interface_prefs.sidebar_pos, "sidebar_pos", GTK_POS_LEFT, "radio_sidebar_left", GTK_POS_LEFT, Modified: src/libmain.c 25 lines changed, 16 insertions(+), 9 deletions(-) =================================================================== @@ -1018,20 +1018,12 @@ static const gchar *get_locale(void) GEANY_EXPORT_SYMBOL -gint main_lib(gint argc, gchar **argv) +void main_init_headless(void) { - GeanyDocument *doc; - gint config_dir_result; - const gchar *locale; - gchar *utf8_configdir; - gchar *os_info; - #if ! GLIB_CHECK_VERSION(2, 36, 0) g_type_init(); #endif - log_handlers_init(); - app = g_new0(GeanyApp, 1); memset(&main_status, 0, sizeof(GeanyStatus)); memset(&prefs, 0, sizeof(GeanyPrefs)); @@ -1043,6 +1035,21 @@ gint main_lib(gint argc, gchar **argv) memset(&template_prefs, 0, sizeof(GeanyTemplatePrefs)); memset(&ui_prefs, 0, sizeof(UIPrefs)); memset(&ui_widgets, 0, sizeof(UIWidgets)); +} + + +GEANY_EXPORT_SYMBOL +gint main_lib(gint argc, gchar **argv) +{ + GeanyDocument *doc; + gint config_dir_result; + const gchar *locale; + gchar *utf8_configdir; + gchar *os_info; + + main_init_headless(); + + log_handlers_init(); setup_paths(); Modified: src/main.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -76,6 +76,8 @@ void main_load_project_from_command_line(const gchar *locale_filename, gboolean gint main_lib(gint argc, gchar **argv); +void main_init_headless(void); + #endif /* GEANY_PRIVATE */ G_END_DECLS Modified: src/sidebar.c 818 lines changed, 651 insertions(+), 167 deletions(-) =================================================================== @@ -56,12 +56,12 @@ static struct GtkWidget *close; GtkWidget *save; GtkWidget *reload; - GtkWidget *show_paths; + GtkWidget *show_paths[OPENFILES_PATHS_COUNT]; GtkWidget *find_in_files; GtkWidget *expand_all; GtkWidget *collapse_all; } -doc_items = {NULL, NULL, NULL, NULL, NULL, NULL, NULL}; +doc_items; enum { @@ -76,17 +76,7 @@ enum OPENFILES_ACTION_RELOAD }; -/* documents tree model columns */ -enum -{ - DOCUMENTS_ICON, - DOCUMENTS_SHORTNAME, /* dirname for parents, basename for children */ - DOCUMENTS_DOCUMENT, - DOCUMENTS_COLOR, - DOCUMENTS_FILENAME /* full filename */ -}; - -static GtkTreeStore *store_openfiles; +static GtkTreeStore *store_openfiles; static GtkWidget *openfiles_popup_menu; static GtkWidget *tag_window; /* scrolled window that holds the symbol list GtkTreeView */ @@ -199,8 +189,8 @@ void sidebar_update_tag_list(GeanyDocument *doc, gboolean update) /* changes the tree view to the given one, trying not to do useless changes */ #define CHANGE_TREE(new_child) \ G_STMT_START { \ - /* only change the tag tree if it's actually not the same (to avoid flickering) and if - * it's the one of the current document (to avoid problems when e.g. reloading + /* only change the tag tree if it's actually not the same (to avoid flickering) and if \ + * it's the one of the current document (to avoid problems when e.g. reloading \ * configuration files */ \ if (child != new_child && doc == document_get_current()) \ { \ @@ -253,23 +243,161 @@ void sidebar_update_tag_list(GeanyDocument *doc, gboolean update) static gint documents_sort_func(GtkTreeModel *model, GtkTreeIter *iter_a, GtkTreeIter *iter_b, gpointer data) { - gchar *key_a, *key_b; gchar *name_a, *name_b; + GeanyDocument *doc_a, *doc_b; gint cmp; - gtk_tree_model_get(model, iter_a, DOCUMENTS_SHORTNAME, &name_a, -1); - key_a = g_utf8_collate_key_for_filename(name_a, -1); - g_free(name_a); - gtk_tree_model_get(model, iter_b, DOCUMENTS_SHORTNAME, &name_b, -1); - key_b = g_utf8_collate_key_for_filename(name_b, -1); + gtk_tree_model_get(model, iter_a, DOCUMENTS_SHORTNAME, &name_a, DOCUMENTS_DOCUMENT, &doc_a, -1); + gtk_tree_model_get(model, iter_b, DOCUMENTS_SHORTNAME, &name_b, DOCUMENTS_DOCUMENT, &doc_b, -1); + + /* sort dirs after files (within a directory node) */ + if (!doc_a && doc_b) + cmp = 1; + else if (doc_a && !doc_b) + cmp = -1; + else + { + gchar *key_a, *key_b; + /* g_utf8_collate_key_for_filename() seems to ignore ~. As a result, ~/dev <=> /data + * compares as /dev > /data while ~/dev <=> /etc compares as /dev < /etc. Thus, for sorting + * purposes, treat leading ~ as . which is documented to be special-cased to sort before + * anything else. The side effect, that documents under ~ are always first is actually + * welcome. + */ + name_a[0] = name_a[0] == '~' ? '.' : name_a[0]; + name_b[0] = name_b[0] == '~' ? '.' : name_b[0]; + key_a = g_utf8_collate_key_for_filename(name_a, -1); + key_b = g_utf8_collate_key_for_filename(name_b, -1); + cmp = strcmp(key_a, key_b); + g_free(key_b); + g_free(key_a); + } + g_free(name_b); - cmp = strcmp(key_a, key_b); - g_free(key_b); - g_free(key_a); + g_free(name_a); return cmp; } +GEANY_EXPORT_SYMBOL +GtkTreeStore *sidebar_create_store_openfiles(void) +{ + GtkTreeSortable *sortable; + GtkTreeStore *store; + /* store the icon and the short filename to show, and the index as reference, + * the colour (black/red/green) and the full name for the tooltip */ + store = gtk_tree_store_new(6, G_TYPE_ICON, G_TYPE_STRING, + G_TYPE_POINTER, GDK_TYPE_COLOR, G_TYPE_STRING, G_TYPE_BOOLEAN); + + /* sort opened filenames in the store_openfiles treeview */ + sortable = GTK_TREE_SORTABLE(GTK_TREE_MODEL(store)); + gtk_tree_sortable_set_sort_func(sortable, DOCUMENTS_SHORTNAME, documents_sort_func, NULL, NULL); + gtk_tree_sortable_set_sort_column_id(sortable, DOCUMENTS_SHORTNAME, GTK_SORT_ASCENDING); + + store_openfiles = store; + return store; +} + + +static void store_fold_recurse(GtkTreeView *view, + GtkTreeIter *iter, + GtkTreeModel *model) +{ + GeanyDocument *doc; + gboolean fold, valid; + GtkTreePath *path; + GtkTreeIter child_iter; + + gtk_tree_model_get(model, iter, DOCUMENTS_DOCUMENT, &doc, -1); + if (doc) /* document rows are not foldable */ + return; + + path = gtk_tree_model_get_path(model, iter); + fold = !gtk_tree_view_row_expanded(view, path); + gtk_tree_store_set(GTK_TREE_STORE(model), iter, DOCUMENTS_FOLD, fold, -1); + gtk_tree_path_free(path); + + /* After storing the fold state for *this* row, recursively do the same for its children. + * We need do do this only for expanded children because all children of folded rows are + * folded as well. + */ + if (fold) + return; + + valid = gtk_tree_model_iter_children(model, &child_iter, iter); + while (valid) + { + store_fold_recurse(view, &child_iter, model); + valid = gtk_tree_model_iter_next(model, &child_iter); + } +} + + +static gboolean on_row_expand(GtkTreeView *view, + GtkTreeIter *iter, + GtkTreePath *path, + gpointer user_data) +{ + GtkTreeModel *model; + + model = gtk_tree_view_get_model(view); + gtk_tree_store_set(GTK_TREE_STORE(model), iter, DOCUMENTS_FOLD, FALSE, -1); + return FALSE; +} + + +static gboolean on_row_collapse(GtkTreeView *view, + GtkTreeIter *iter, + GtkTreePath *path, + gpointer user_data) +{ + GtkTreeModel *model; + GtkTreeIter child_iter; + gboolean valid; + + model = gtk_tree_view_get_model(view); + gtk_tree_store_set(GTK_TREE_STORE(model), iter, DOCUMENTS_FOLD, TRUE, -1); + + valid = gtk_tree_model_iter_children(model, &child_iter, iter); + while (valid) + { + store_fold_recurse(view, &child_iter, model); + valid = gtk_tree_model_iter_next(model, &child_iter); + } + + return FALSE; +} + + +static void on_row_expanded(GtkTreeView *view, + GtkTreeIter *iter, + GtkTreePath *path_, + gpointer user_data) +{ + GtkTreeIter child_iter; + GtkTreeModel *model; + GtkTreePath *path; + gboolean valid; + GeanyDocument *doc; + + model = gtk_tree_view_get_model(view); + + valid = gtk_tree_model_iter_children(model, &child_iter, iter); + while (valid) + { + gboolean fold; + + gtk_tree_model_get(model, &child_iter, DOCUMENTS_DOCUMENT, &doc, DOCUMENTS_FOLD, &fold, -1); + path = gtk_tree_model_get_path(model, &child_iter); + + if (!doc && !fold) + gtk_tree_view_expand_row(view, path, FALSE); + + valid = gtk_tree_model_iter_next(model, &child_iter); + gtk_tree_path_free(path); + } +} + /* does some preparing things to the open files list widget */ static void prepare_openfiles(void) @@ -278,16 +406,21 @@ static void prepare_openfiles(void) GtkCellRenderer *text_renderer; GtkTreeViewColumn *column; GtkTreeSelection *selection; - GtkTreeSortable *sortable; tv.tree_openfiles = ui_lookup_widget(main_widgets.window, "treeview6"); - /* store the icon and the short filename to show, and the index as reference, - * the colour (black/red/green) and the full name for the tooltip */ - store_openfiles = gtk_tree_store_new(5, G_TYPE_ICON, G_TYPE_STRING, - G_TYPE_POINTER, GDK_TYPE_COLOR, G_TYPE_STRING); + sidebar_create_store_openfiles(); + gtk_tree_view_set_model(GTK_TREE_VIEW(tv.tree_openfiles), GTK_TREE_MODEL(store_openfiles)); + /* These two implement "remember fold state of rows when their parents are folded". Normally + * GTK does not remember the fold state and can only expand all or no children when + * expanding a row. Maybe this can be useful for other tree views as well? + */ + g_signal_connect_after(GTK_TREE_VIEW(tv.tree_openfiles), "test-expand-row", G_CALLBACK(on_row_expand), NULL); + g_signal_connect_after(GTK_TREE_VIEW(tv.tree_openfiles), "test-collapse-row", G_CALLBACK(on_row_collapse), NULL); + g_signal_connect_after(GTK_TREE_VIEW(tv.tree_openfiles), "row-expanded", G_CALLBACK(on_row_expanded), NULL); + /* set policy settings for the scolledwindow around the treeview again, because glade * doesn't keep the settings */ gtk_scrolled_window_set_policy( @@ -310,11 +443,6 @@ static void prepare_openfiles(void) gtk_tree_view_set_search_column(GTK_TREE_VIEW(tv.tree_openfiles), DOCUMENTS_SHORTNAME); - /* sort opened filenames in the store_openfiles treeview */ - sortable = GTK_TREE_SORTABLE(GTK_TREE_MODEL(store_openfiles)); - gtk_tree_sortable_set_sort_func(sortable, DOCUMENTS_SHORTNAME, documents_sort_func, NULL, NULL); - gtk_tree_sortable_set_sort_column_id(sortable, DOCUMENTS_SHORTNAME, GTK_SORT_ASCENDING); - ui_widget_modify_font_from_string(tv.tree_openfiles, interface_prefs.tagbar_font); /* tooltips */ @@ -332,28 +460,6 @@ static void prepare_openfiles(void) } -/* iter should be toplevel */ -static gboolean find_tree_iter_dir(GtkTreeIter *iter, const gchar *dir) -{ - GeanyDocument *doc; - gchar *name; - gboolean result; - - if (utils_str_equal(dir, ".")) - dir = GEANY_STRING_UNTITLED; - - gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_DOCUMENT, &doc, -1); - g_return_val_if_fail(!doc, FALSE); - - gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_SHORTNAME, &name, -1); - - result = utils_filenamecmp(name, dir) == 0; - g_free(name); - - return result; -} - - static gboolean utils_filename_has_prefix(const gchar *str, const gchar *prefix) { gchar *head = g_strndup(str, strlen(prefix)); @@ -364,12 +470,10 @@ static gboolean utils_filename_has_prefix(const gchar *str, const gchar *prefix) } -static gchar *get_doc_folder(const gchar *path) +static gchar *get_project_folder(const gchar *path) { - gchar *tmp_dirname = g_strdup(path); gchar *project_base_path; gchar *dirname = NULL; - const gchar *home_dir = g_get_home_dir(); const gchar *rest; /* replace the project base path with the project name */ @@ -384,20 +488,32 @@ static gchar *get_doc_folder(const gchar *path) project_base_path[--len] = '\0'; /* check whether the dir name matches or uses the project base path */ - if (utils_filename_has_prefix(tmp_dirname, project_base_path)) + if (utils_filename_has_prefix(path, project_base_path)) { - rest = tmp_dirname + len; + rest = path + len; if (*rest == G_DIR_SEPARATOR || *rest == '\0') { dirname = g_strdup_printf("%s%s", app->project->name, rest); } } g_free(project_base_path); } + + return dirname; +} + + +static gchar *get_doc_folder(const gchar *path) +{ + gchar *dirname = get_project_folder(path); + const gchar *rest; + if (dirname == NULL) { - dirname = tmp_dirname; + const gchar *home_dir = g_get_home_dir(); + gchar *tmp_dirname = g_strdup(path); + dirname = tmp_dirname; /* If matches home dir, replace with tilde */ if (!EMPTY(home_dir) && utils_filename_has_prefix(dirname, home_dir)) { @@ -409,99 +525,454 @@ static gchar *get_doc_folder(const gchar *path) } } } - else - g_free(tmp_dirname); return dirname; } -static GtkTreeIter *get_doc_parent(GeanyDocument *doc) +static gchar *parent_dir_name(GtkTreeStore *tree, GtkTreeIter *parent, const gchar *path) { - gchar *path; - gchar *dirname = NULL; - static GtkTreeIter parent; - GtkTreeModel *model = GTK_TREE_MODEL(store_openfiles); - static GIcon *dir_icon = NULL; + gsize parent_len = 0; + gchar *dirname; + gchar *pathname = NULL; + + if (parent) + { + gchar *parent_dir; + GtkTreeModel *model = GTK_TREE_MODEL(tree); - if (!interface_prefs.documents_show_paths) - return NULL; + gtk_tree_model_get(model, parent, DOCUMENTS_FILENAME, &parent_dir, -1); + if (parent_dir) + { + pathname = get_doc_folder(parent_dir); + parent_len = strlen(pathname) + 1; + g_free(parent_dir); + } + } - path = g_path_get_dirname(DOC_FILENAME(doc)); dirname = get_doc_folder(path); + if (parent_len) + { + gsize len; + dirname = get_doc_folder(path); + len = strlen(dirname); + /* Maybe parent is /home but dirname is ~ (after substitution from /home/user) */ + if (pathname[0] == dirname[0]) + memmove(dirname, dirname + parent_len, len - parent_len + 1); + } + + g_free(pathname); + + return dirname; +} + + +static void tree_copy_node(GtkTreeStore *tree, GtkTreeIter *new_node, GtkTreeIter *node, GtkTreeIter *parent_new) +{ + GIcon *icon; + gchar *filename; + gchar *shortname; + GdkColor *color; + GeanyDocument *doc; + GtkTreeModel *model = GTK_TREE_MODEL(tree); + gboolean fold; + + gtk_tree_store_append(tree, new_node, parent_new); + gtk_tree_model_get(model, node, + DOCUMENTS_ICON, &icon, + DOCUMENTS_SHORTNAME, &shortname, + DOCUMENTS_DOCUMENT, &doc, + DOCUMENTS_COLOR, &color, + DOCUMENTS_FILENAME, &filename, + DOCUMENTS_FOLD, &fold, + -1); + + if (doc) + doc->priv->iter = *new_node; + else + SETPTR(shortname, parent_dir_name(tree, parent_new, filename)); + + gtk_tree_store_set(tree, new_node, + DOCUMENTS_ICON, icon, + DOCUMENTS_SHORTNAME, shortname, + DOCUMENTS_DOCUMENT, doc, + DOCUMENTS_COLOR, color, + DOCUMENTS_FILENAME, filename, + DOCUMENTS_FOLD, fold, + -1); + g_free(filename); + g_free(shortname); + if (color) + gdk_color_free(color); +} + - if (gtk_tree_model_get_iter_first(model, &parent)) +/* Helper that implements the recursive part of tree_reparent() */ +static void tree_reparent_recurse(GtkTreeStore *tree, GtkTreeIter *node, GtkTreeIter *parent_new, GtkTreeIter *new_node) +{ + GtkTreeModel *model = GTK_TREE_MODEL(tree); + GtkTreeIter child; + + /* Start by copying the node itself. It becomes parent_new for the children to be copied. */ + tree_copy_node(tree, new_node, node, parent_new); + if (gtk_tree_model_iter_nth_child(model, &child, node, 0)) { - do - { - if (find_tree_iter_dir(&parent, dirname)) - { - g_free(dirname); - g_free(path); - return &parent; - } + do { + GtkTreeIter new_child; + tree_reparent_recurse(tree, &child, new_node, &new_child); } - while (gtk_tree_model_iter_next(model, &parent)); + while (gtk_tree_model_iter_next(model, &child)); } - /* no match, add dir parent */ +} + + +/* + * Copy node and all of its children to a new parent, and then remove the old node. + * + * It is done by reparenting the node itself to the new parent, creating a copy of it, + * and then recursively reparenting all children to the copy of the node. + * + * Finally, the new location will be written back to node so it's readily available, + * e.g. to unfold it. + * */ +static void tree_reparent(GtkTreeStore *tree, GtkTreeIter *node, GtkTreeIter *parent_new) +{ + GtkTreeIter new_node; + tree_reparent_recurse(tree, node, parent_new, &new_node); + gtk_tree_store_remove(tree, node); + *node = new_node; +} + + +static void tree_add_new_dir(GtkTreeStore *tree, GtkTreeIter *child, GtkTreeIter *parent, const gchar *file) +{ + static GIcon *dir_icon = NULL; + gchar *dirname = parent_dir_name(tree, parent, file); + if (!dir_icon) dir_icon = ui_get_mime_icon("inode/directory"); - gtk_tree_store_append(store_openfiles, &parent, NULL); - gtk_tree_store_set(store_openfiles, &parent, DOCUMENTS_ICON, dir_icon, - DOCUMENTS_FILENAME, path, - DOCUMENTS_SHORTNAME, doc->file_name ? dirname : GEANY_STRING_UNTITLED, -1); + gtk_tree_store_append(tree, child, parent); + gtk_tree_store_set(tree, child, + DOCUMENTS_ICON, dir_icon, + DOCUMENTS_FILENAME, file, + DOCUMENTS_SHORTNAME, dirname, + DOCUMENTS_FOLD, TRUE, /* GTK inserts folded by default, caller may expand */ + -1); g_free(dirname); +} + + +/* + * Returns the position of dir delimiter where paths don't match + * */ +static guint pathcmp(const gchar *s1, const gchar *s2) +{ + guint i = 0; + gchar *a; + gchar *b; + + g_return_val_if_fail(s1 != NULL, 0); + g_return_val_if_fail(s2 != NULL, 0); + +#ifdef G_OS_WIN32 + a = utils_utf8_strdown(s1); + if (NULL == a) + return 0; + b = utils_utf8_strdown(s2); + if (NULL == b) + { + g_free(a); + return 0; + } +#else + a = (gchar*)s1; + b = (gchar*)s2; +#endif + + while (a[i] && b[i] && a[i] == b[i]) + i++; + if (a[i] == '\0' && b[i] == '\0') + return i; /* strings are equal: a/b/c == a/b/c */ + if ((a[i] == '\0' && b[i] == G_DIR_SEPARATOR) || + (b[i] == '\0' && a[i] == G_DIR_SEPARATOR)) + return i; /* subdir case: a/b/c == a/b */ + while (i > 0 && (a[i] != G_DIR_SEPARATOR || b[i] != G_DIR_SEPARATOR)) + i--; /* last slash: a/b/boo == a/b/bar */ + +#ifdef G_OS_WIN32 + g_free(a); + g_free(b); +#endif + + return i; +} + + +typedef struct TreeForeachData { + gchar *needle; + gsize best_len; + gsize needle_len; + GtkTreeIter best_iter; + enum { + TREE_CASE_NONE, + TREE_CASE_EQUALS, + TREE_CASE_CHILD_OF, + TREE_CASE_PARENT_OF, + TREE_CASE_HAVE_SAME_PARENT + } best_case; +} TreeForeachData; + + +static gboolean tree_foreach_callback(GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) +{ + gchar *name; + gchar *dirname; + guint diff; + gsize name_len; + GeanyDocument *doc; + TreeForeachData *data = (TreeForeachData*) user_data; + + gtk_tree_model_get(model, iter, DOCUMENTS_FILENAME, &name, DOCUMENTS_DOCUMENT, &doc, -1); + + if (doc) /* skip documents */ + goto finally; + + dirname = get_doc_folder(name); + if (dirname) + SETPTR(name, dirname); + + diff = pathcmp(name, data->needle); + name_len = strlen(name); + + if (diff == 0) + goto finally; + + if (data->best_len < diff) + { + gint best_case; + gboolean tree = interface_prefs.openfiles_path_mode == OPENFILES_PATHS_TREE; + + /* there are four cases */ + /* first case: exact match. File is from already opened dir */ + if (name_len == diff && data->needle_len == name_len) + best_case = TREE_CASE_EQUALS; + /* second case: split current dir. File is from deeper level */ + else if (name_len == diff && tree) + best_case = TREE_CASE_CHILD_OF; + /* third case: split parent dir. File is from one of existing level */ + else if (data->needle_len == diff && tree) + best_case = TREE_CASE_PARENT_OF; + /* fourth case: both dirs have same parent */ + else if (tree) + best_case = TREE_CASE_HAVE_SAME_PARENT; + else + goto finally; + data->best_len = diff; + data->best_case = best_case; + data->best_iter = *iter; + } +finally: + g_free(name); + return FALSE; +} + + +/* Returns TRUE if parent points to a newly added row, + * caller might want to expand the relevant rows in the tree view */ +static gboolean get_parent_for_file(GtkTreeStore *tree, const gchar *file, GtkTreeIter *parent) +{ + gchar *path; + GtkTreeIter iter; + gint name_diff = 0; + gboolean has_parent; + GtkTreeModel *model = GTK_TREE_MODEL(tree); + TreeForeachData data = {NULL, 0, 0, {0}, TREE_CASE_NONE}; + gboolean new_row; + + path = g_path_get_dirname(file); + + /* find best opened dir */ + data.needle = get_doc_folder(path); + data.needle_len = strlen(data.needle); + name_diff = strlen(path) - data.needle_len; + gtk_tree_model_foreach(model, tree_foreach_callback, (gpointer)&data); + + switch (data.best_case) + { + case TREE_CASE_EQUALS: + { + *parent = data.best_iter; + /* dir already open */ + new_row = FALSE; + break; + } + case TREE_CASE_CHILD_OF: + { + /* This dir is longer than existing so just add child */ + tree_add_new_dir(tree, parent, &data.best_iter, path); + new_row = TRUE; + break; + } + case TREE_CASE_PARENT_OF: + { + /* More complicated logic. This dir should be a parent + * of existing, so reparent existing dir. + */ + has_parent = gtk_tree_model_iter_parent(model, &iter, &data.best_iter); + tree_add_new_dir(tree, parent, has_parent ? &iter : NULL, path); + tree_reparent(tree, &data.best_iter, parent); + new_row = TRUE; + break; + } + case TREE_CASE_HAVE_SAME_PARENT: + { + /* Even more complicated logic. Both dirs have same + * parent, so create new parent and reparent them + */ + GtkTreeIter new_parent; + gchar *newpath = g_strndup(path, data.best_len + name_diff); + + has_parent = gtk_tree_model_iter_parent(model, &iter, &data.best_iter); + tree_add_new_dir(tree, &new_parent, has_parent ? &iter : NULL, newpath); + tree_reparent(tree, &data.best_iter, &new_parent); + tree_add_new_dir(tree, parent, &new_parent, path); + + g_free(newpath); + new_row = TRUE; + break; + } + default: + { + tree_add_new_dir(tree, parent, NULL, path); + new_row = TRUE; + break; + } + } + + g_free(data.needle); g_free(path); - return &parent; + + return new_row; +} + + +/* Returns true when parent points to a newly added row. */ +static gboolean sidebar_openfiles_add_iter(GtkTreeStore *tree, const gchar *file, + GtkTreeIter *iter, GtkTreeIter *parent) +{ + gboolean new_row; + /* get_parent_for_file() might add rows for parent directories */ + new_row = get_parent_for_file(tree, file, parent); + /* insert row for this file */ + gtk_tree_store_append(tree, iter, parent); + + return new_row; +} + + +static void expand_iter(GtkTreeIter *iter) +{ + GtkTreePath *path; + + path = gtk_tree_model_get_path(GTK_TREE_MODEL(store_openfiles), iter); + gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tv.tree_openfiles), path); + gtk_tree_path_free(path); } /* Also sets doc->priv->iter. * This is called recursively in sidebar_openfiles_update_all(). */ +GEANY_EXPORT_SYMBOL void sidebar_openfiles_add(GeanyDocument *doc) { GtkTreeIter *iter = &doc->priv->iter; - GtkTreeIter *parent = get_doc_parent(doc); + GtkTreeIter parent; + const gchar *filename = DOC_FILENAME(doc); gchar *basename; const GdkColor *color = document_get_status_color(doc); static GIcon *file_icon = NULL; + gboolean expand = FALSE; - gtk_tree_store_append(store_openfiles, iter, parent); - - /* check if new parent */ - if (parent && gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store_openfiles), parent) == 1) - { - GtkTreePath *path; + if (interface_prefs.openfiles_path_mode != OPENFILES_PATHS_NONE) + expand = sidebar_openfiles_add_iter(store_openfiles, filename, iter, &parent); + else + gtk_tree_store_append(store_openfiles, iter, NULL); - /* expand parent */ - path = gtk_tree_model_get_path(GTK_TREE_MODEL(store_openfiles), parent); - gtk_tree_view_expand_row(GTK_TREE_VIEW(tv.tree_openfiles), path, TRUE); - gtk_tree_path_free(path); - } if (!file_icon) file_icon = ui_get_mime_icon("text/plain"); - basename = g_path_get_basename(DOC_FILENAME(doc)); + basename = g_path_get_basename(filename); gtk_tree_store_set(store_openfiles, iter, DOCUMENTS_ICON, (doc->file_type && doc->file_type->icon) ? doc->file_type->icon : file_icon, DOCUMENTS_SHORTNAME, basename, DOCUMENTS_DOCUMENT, doc, DOCUMENTS_COLOR, color, - DOCUMENTS_FILENAME, DOC_FILENAME(doc), -1); + DOCUMENTS_FILENAME, DOC_FILENAME(doc), + DOCUMENTS_FOLD, FALSE, + -1); g_free(basename); + + /* Expand new parent if necessary. Beware: this is executed by unit tests + * which don't create the tree view. */ + if (expand && G_LIKELY(tv.tree_openfiles)) + expand_iter(&parent); } -static void openfiles_remove(GeanyDocument *doc) +/* Returns true if new_node points to a reparented directory, as a result of merging empty + * directories. + */ +void sidebar_openfiles_remove_iter(GtkTreeStore *tree, GtkTreeIter *iter_) { - GtkTreeIter *iter = &doc->priv->iter; + GtkTreeIter iter = *iter_; GtkTreeIter parent; + GtkTreeModel *model = GTK_TREE_MODEL(store_openfiles); + + /* walk on top and close all orphaned parents */ + while (gtk_tree_model_iter_parent(model, &parent, &iter) + && gtk_tree_model_iter_n_children(model, &parent) == 1) + { + iter = parent; + } + gtk_tree_store_remove(store_openfiles, &iter); + + /* If, after removing, there is a single silbling left and it represents + * a directory, it can be merged with the parent directory row, + * essentially to reverse the effect of TREE_CASE_PARENT_OF and TREE_CASE_HAVE_SAME_PARENT + * in get_doc_parent(). Inherit fold state from the merged child as well. + */ + if (gtk_tree_store_iter_is_valid(store_openfiles, &parent) + && gtk_tree_model_iter_n_children(model, &parent) == 1) + { + GeanyDocument *other_doc; + GtkTreeIter child, pparent; + gboolean fold, has_parent; + + gtk_tree_model_iter_nth_child(model, &child, &parent, 0); + gtk_tree_model_get(model, &child, DOCUMENTS_DOCUMENT, &other_doc, -1); + if (!other_doc) + { + has_parent = gtk_tree_model_iter_parent(model, &pparent, &parent); + tree_reparent(store_openfiles, &child, has_parent ? &pparent : NULL); + gtk_tree_store_remove(store_openfiles, &parent); + /* Expand if the child node was expanded before the merge. */ + gtk_tree_model_get(model, &child, DOCUMENTS_FOLD, &fold, -1); + if (!fold) + expand_iter(&child); + } + } +} + - if (gtk_tree_model_iter_parent(GTK_TREE_MODEL(store_openfiles), &parent, iter) && - gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store_openfiles), &parent) == 1) - gtk_tree_store_remove(store_openfiles, &parent); +static void openfiles_remove(GeanyDocument *doc) +{ + if (interface_prefs.openfiles_path_mode != OPENFILES_PATHS_NONE) + sidebar_openfiles_remove_iter(store_openfiles, &doc->priv->iter); else - gtk_tree_store_remove(store_openfiles, iter); + gtk_tree_store_remove(store_openfiles, &doc->priv->iter); } @@ -619,10 +1090,13 @@ void sidebar_add_common_menu_items(GtkMenu *menu) g_signal_connect(item, "activate", G_CALLBACK(on_hide_sidebar), NULL); } + static void on_openfiles_show_paths_activate(GtkCheckMenuItem *item, gpointer user_data) { - interface_prefs.documents_show_paths = gtk_check_menu_item_get_active(item); + interface_prefs.openfiles_path_mode = GPOINTER_TO_INT(user_data); sidebar_openfiles_update_all(); + gtk_tree_view_expand_all(GTK_TREE_VIEW(tv.tree_openfiles)); + sidebar_select_openfiles_item(document_get_current()); } @@ -678,6 +1152,28 @@ static void on_openfiles_expand_collapse(GtkMenuItem *menuitem, gpointer user_da } +static void create_show_paths_popup_menu(void) +{ + GSList *group = NULL; + const gchar *items[OPENFILES_PATHS_COUNT] = { + [OPENFILES_PATHS_NONE] = _("D_ocuments Only"), + [OPENFILES_PATHS_LIST] = _("Show _Paths"), + [OPENFILES_PATHS_TREE] = _("Show _Tree") + }; + + for (guint i = 0; i < G_N_ELEMENTS(items); i++) + { + GtkWidget *w = gtk_radio_menu_item_new_with_mnemonic(group, items[i]); + group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(w)); + gtk_widget_show(w); + gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), w); + g_signal_connect(w, "activate", + G_CALLBACK(on_openfiles_show_paths_activate), GINT_TO_POINTER(i)); + doc_items.show_paths[i] = w; + } +} + + static void create_openfiles_popup_menu(void) { GtkWidget *item; @@ -725,12 +1221,7 @@ static void create_openfiles_popup_menu(void) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); - doc_items.show_paths = gtk_check_menu_item_new_with_mnemonic(_("Show _Paths")); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(doc_items.show_paths), interface_prefs.documents_show_paths); - gtk_widget_show(doc_items.show_paths); - gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), doc_items.show_paths); - g_signal_connect(doc_items.show_paths, "activate", - G_CALLBACK(on_openfiles_show_paths_activate), NULL); + create_show_paths_popup_menu(); item = gtk_separator_menu_item_new(); gtk_widget_show(item); @@ -752,38 +1243,25 @@ static void create_openfiles_popup_menu(void) } -static void unfold_parent(GtkTreeIter *iter) -{ - GtkTreeIter parent; - - if (gtk_tree_model_iter_parent(GTK_TREE_MODEL(store_openfiles), &parent, iter)) - { - GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store_openfiles), &parent); - gtk_tree_view_expand_row(GTK_TREE_VIEW(tv.tree_openfiles), path, TRUE); - gtk_tree_path_free(path); - } -} - - /* compares the given data with the doc pointer from the selected row of openfiles * treeview, in case of a match the row is selected and TRUE is returned * (called indirectly from gtk_tree_model_foreach()) */ -static gboolean tree_model_find_node(GtkTreeModel *model, GtkTreePath *path, - GtkTreeIter *iter, gpointer data) +static gboolean tree_model_find_node(GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) { GeanyDocument *doc; - gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_DOCUMENT, &doc, -1); - + gtk_tree_model_get(model, iter, DOCUMENTS_DOCUMENT, &doc, -1); if (doc == data) { - /* unfolding also prevents a strange bug where the selection gets stuck on the parent - * when it is collapsed and then switching documents */ - unfold_parent(iter); + gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tv.tree_openfiles), path); gtk_tree_view_set_cursor(GTK_TREE_VIEW(tv.tree_openfiles), path, NULL, FALSE); return TRUE; } - else return FALSE; + + return FALSE; } @@ -821,36 +1299,38 @@ static void document_action(GeanyDocument *doc, gint action) } +static void on_openfiles_document_action_apply(GtkTreeModel *model, GtkTreeIter iter, gint action) +{ + GeanyDocument *doc; + gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, -1); + if (doc) + { + document_action(doc, action); + } + else + { + /* parent item selected */ + GtkTreeIter child; + gint i = gtk_tree_model_iter_n_children(model, &iter) - 1; + + while (i >= 0 && gtk_tree_model_iter_nth_child(model, &child, &iter, i)) + { + on_openfiles_document_action_apply(model, child, action); + i--; + } + } +} + + static void on_openfiles_document_action(GtkMenuItem *menuitem, gpointer user_data) { GtkTreeIter iter; GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); GtkTreeModel *model; - GeanyDocument *doc; gint action = GPOINTER_TO_INT(user_data); if (gtk_tree_selection_get_selected(selection, &model, &iter)) - { - gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, -1); - if (doc) - { - document_action(doc, action); - } - else - { - /* parent item selected */ - GtkTreeIter child; - gint i = gtk_tree_model_iter_n_children(model, &iter) - 1; - - while (i >= 0 && gtk_tree_model_iter_nth_child(model, &child, &iter, i)) - { - gtk_tree_model_get(model, &child, DOCUMENTS_DOCUMENT, &doc, -1); - - document_action(doc, action); - i--; - } - } - } + on_openfiles_document_action_apply(model, iter, action); } @@ -1034,8 +1514,10 @@ static void documents_menu_update(GtkTreeSelection *selection) sel = gtk_tree_selection_get_selected(selection, &model, &iter); if (sel) { - gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, - DOCUMENTS_SHORTNAME, &shortname, -1); + gtk_tree_model_get(model, &iter, + DOCUMENTS_DOCUMENT, &doc, + DOCUMENTS_SHORTNAME, &shortname, + -1); } path = !EMPTY(shortname) && (g_path_is_absolute(shortname) || @@ -1048,16 +1530,20 @@ static void documents_menu_update(GtkTreeSelection *selection) gtk_widget_set_sensitive(doc_items.find_in_files, sel); g_free(shortname); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(doc_items.show_paths), interface_prefs.documents_show_paths); - gtk_widget_set_sensitive(doc_items.expand_all, interface_prefs.documents_show_paths); - gtk_widget_set_sensitive(doc_items.collapse_all, interface_prefs.documents_show_paths); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(doc_items.show_paths[interface_prefs.openfiles_path_mode]), TRUE); + gtk_widget_set_sensitive(doc_items.expand_all, interface_prefs.openfiles_path_mode); + gtk_widget_set_sensitive(doc_items.collapse_all, interface_prefs.openfiles_path_mode); } static StashGroup *stash_group = NULL; static void on_load_settings(void) { + if (interface_prefs.openfiles_path_mode < 0 + || interface_prefs.openfiles_path_mode >= OPENFILES_PATHS_COUNT) + interface_prefs.openfiles_path_mode = OPENFILES_PATHS_TREE; + tag_window = ui_lookup_widget(main_widgets.window, "scrolledwindow2"); prepare_openfiles(); @@ -1092,7 +1578,7 @@ void sidebar_init(void) configuration_add_session_group(group, FALSE); stash_group = group; - /* delay building documents treeview until sidebar font has been read */ + /* Delay building documents treeview until sidebar font has been read and prefs are sanitized */ g_signal_connect(geany_object, "load-settings", on_load_settings, NULL); g_signal_connect(geany_object, "save-settings", on_save_settings, NULL); @@ -1105,8 +1591,6 @@ void sidebar_init(void) G_CALLBACK(sidebar_tabs_show_hide), NULL); g_signal_connect_after(main_widgets.sidebar_notebook, "switch-page", G_CALLBACK(on_sidebar_switch_page), NULL); - - sidebar_tabs_show_hide(GTK_NOTEBOOK(main_widgets.sidebar_notebook), NULL, 0, NULL); } #define WIDGET(w) w && GTK_IS_WIDGET(w) Modified: src/sidebar.h 23 lines changed, 21 insertions(+), 2 deletions(-) =================================================================== @@ -27,6 +27,8 @@ #include "gtkcompat.h" +#ifdef GEANY_PRIVATE + G_BEGIN_DECLS typedef struct SidebarTreeviews @@ -50,8 +52,21 @@ enum enum { - SHOW_PATHS_NONE, - SHOW_PATHS_LIST + OPENFILES_PATHS_NONE, + OPENFILES_PATHS_LIST, + OPENFILES_PATHS_TREE, + OPENFILES_PATHS_COUNT +}; + +/* documents tree model columns */ +enum +{ + DOCUMENTS_ICON, + DOCUMENTS_SHORTNAME, /* dirname for parents, basename for children */ + DOCUMENTS_DOCUMENT, + DOCUMENTS_COLOR, + DOCUMENTS_FILENAME, /* full filename */ + DOCUMENTS_FOLD, /* fold state stored when folding parent rows */ }; void sidebar_init(void); @@ -76,6 +91,10 @@ void sidebar_focus_openfiles_tab(void); void sidebar_focus_symbols_tab(void); +GtkTreeStore *sidebar_create_store_openfiles(void); +#endif + G_END_DECLS + #endif /* GEANY_SIDEBAR_H */ Modified: src/ui_utils.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -68,7 +68,7 @@ "filetype: %f " \ "scope: %S") -GeanyInterfacePrefs interface_prefs; +GEANY_EXPORT_SYMBOL GeanyInterfacePrefs interface_prefs; GeanyMainWidgets main_widgets; UIPrefs ui_prefs; Modified: src/ui_utils.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -71,7 +71,7 @@ typedef struct GeanyInterfacePrefs gint symbols_sort_mode; /**< symbol list sorting mode */ /** whether to show a warning when closing a project to open a new one */ gboolean warn_on_project_close; - gint documents_show_paths; + gint openfiles_path_mode; } GeanyInterfacePrefs; Modified: src/utils.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -468,7 +468,7 @@ gdouble utils_scale_round(gdouble val, gdouble factor) /* like g_utf8_strdown() but if @str is not valid UTF8, convert it from locale first. * returns NULL on charset conversion failure */ -static gchar *utf8_strdown(const gchar *str) +gchar *utils_utf8_strdown(const gchar *str) { gchar *down; @@ -512,10 +512,10 @@ gint utils_str_casecmp(const gchar *s1, const gchar *s2) g_return_val_if_fail(s2 != NULL, -1); /* ensure strings are UTF-8 and lowercase */ - tmp1 = utf8_strdown(s1); + tmp1 = utils_utf8_strdown(s1); if (! tmp1) return 1; - tmp2 = utf8_strdown(s2); + tmp2 = utils_utf8_strdown(s2); if (! tmp2) { g_free(tmp1); Modified: src/utils.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -194,6 +194,8 @@ gboolean utils_spawn_async(const gchar *dir, gchar **argv, gchar **env, GSpawnFl GSpawnChildSetupFunc child_setup, gpointer user_data, GPid *child_pid, GError **error); +gchar *utils_utf8_strdown(const gchar *str); + gint utils_str_casecmp(const gchar *s1, const gchar *s2); gchar *utils_get_date_time(const gchar *format, time_t *time_to_use); Modified: tests/Makefile.am 12 lines changed, 7 insertions(+), 5 deletions(-) =================================================================== @@ -1,13 +1,15 @@ SUBDIRS = ctags -AM_CPPFLAGS = -DGEANY_PRIVATE -DG_LOG_DOMAIN=\""Geany"\" @GTK_CFLAGS@ @GTHREAD_CFLAGS@ -AM_CPPFLAGS += -I$(top_srcdir)/src +AM_CPPFLAGS = -DGTK -DGEANY_PRIVATE -DG_LOG_DOMAIN=\""Geany"\" +AM_CPPFLAGS += -I$(top_srcdir)/scintilla/include -I$(top_srcdir)/scintilla/lexilla/include +AM_CPPFLAGS += -I$(top_srcdir)/src/tagmanager -I$(top_srcdir)/src +AM_CFLAGS = $(GTK_CFLAGS) +AM_LDFLAGS = $(GTK_LIBS) $(INTLLIBS) -no-install -AM_LDFLAGS = $(GTK_LIBS) $(GTHREAD_LIBS) $(INTLLIBS) -no-install - -check_PROGRAMS = test_utils +check_PROGRAMS = test_utils test_sidebar test_utils_LDADD = $(top_builddir)/src/libgeany.la +test_sidebar_LDADD = $(top_builddir)/src/libgeany.la TESTS = $(check_PROGRAMS) Modified: tests/meson.build 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,6 @@ test_deps = declare_dependency(compile_args: geany_cflags + [ '-DG_LOG_DOMAIN="Geany"' ], - dependencies: [deps, dep_libgeany]) + dependencies: [deps, dep_libgeany], + include_directories: '..') ctags_tests = files([ 'ctags/1795612.js.tags', @@ -366,3 +367,4 @@ test('ctags/processing-order', runner, args: [join_paths(meson.build_root(), 'geany'), '--result', process_order_sources], env: ['top_srcdir='+meson.source_root(), 'top_builddir='+meson.build_root()]) test('utils', executable('test_utils', 'test_utils.c', dependencies: test_deps)) +test('sidebar', executable('test_sidebar', 'test_sidebar.c', dependencies: test_deps)) Modified: tests/test_sidebar.c 154 lines changed, 154 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,154 @@ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "document.h" +#include "documentprivate.h" +#include "keyfile.h" +#include "main.h" +#include "sidebar.h" +#include "ui_utils.h" +#include "utils.h" + +#define SIDEBAR_TEST_ADD(path, func) g_test_add_func("/sidebar/" path, func); + +static void openfiles_add(const gchar **file_names) +{ + const gchar *file; + + while ((file = *file_names++)) + { + GeanyDocument *doc = g_new0(GeanyDocument, 1); + + doc->priv = g_new0(GeanyDocumentPrivate, 1); + doc->file_name = strdup(file); + + sidebar_openfiles_add(doc); + } +} + + +static gboolean tree_count_cb(GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer data_in) +{ + gint *c = (gint *) data_in; + + *c = *c + 1; + return FALSE; +} + + +static gboolean tree_strings_cb(GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer data_in) +{ + gchar **data = (gchar **) data_in; + gchar *file; + + gtk_tree_model_get(model, iter, DOCUMENTS_SHORTNAME, &file, -1); + data[g_strv_length(data)] = file; + + printf("%s\n", file); + return FALSE; +} + +void do_test_sidebar_openfiles(const gchar **test_data, const gchar **expected) +{ +#ifdef HAVE_G_STRV_EQUAL + int count = 0; + GtkTreeStore *store; + gchar **data; + + store = sidebar_create_store_openfiles(); + + openfiles_add(test_data); + + gtk_tree_model_foreach(GTK_TREE_MODEL(store), tree_count_cb, (gpointer) &count); + data = g_new0(gchar *, count + 1); + gtk_tree_model_foreach(GTK_TREE_MODEL(store), tree_strings_cb, (gpointer) data); + g_assert_true(g_strv_equal(expected, (const gchar * const *) data)); +#else + g_test_skip("Need g_strv_equal(), since GLib 2.60"); +#endif +} + +void test_sidebar_openfiles_none(void) +{ + const gchar *files[] = { + "/tmp/x", + "/tmp/b/a", + "/tmp/b/b", + NULL + }; + const gchar *expected[] = { + "a", + "b", + "x", + NULL + }; + + interface_prefs.openfiles_path_mode = OPENFILES_PATHS_NONE; + do_test_sidebar_openfiles(files, expected); +} + + +void test_sidebar_openfiles_path(void) +{ + const gchar *files[] = { + "/tmp/x", + "/tmp/b/a", + "/tmp/b/b", + NULL + }; + const gchar *expected[] = { + "/tmp", + "x", + "/tmp/b", + "a", + "b", + NULL + }; + + interface_prefs.openfiles_path_mode = OPENFILES_PATHS_LIST; + do_test_sidebar_openfiles(files, expected); +} + + +void test_sidebar_openfiles_tree(void) +{ + const gchar *files[] = { + "/tmp/x", + "/tmp/b/a", + "/tmp/b/b", + NULL + }; + const gchar *expected[] = { + "/tmp", + "x", + "b", + "a", + "b", + NULL + }; + + interface_prefs.openfiles_path_mode = OPENFILES_PATHS_TREE; + do_test_sidebar_openfiles(files, expected); +} + +int main(int argc, char **argv) +{ + g_test_init(&argc, &argv, NULL); + /* Not sure if we can really continue without DISPLAY. Fake X display perhaps? + * + * This test seems to work, at least. + */ + gtk_init_check(&argc, &argv); + + main_init_headless(); + + SIDEBAR_TEST_ADD("openfiles_none", test_sidebar_openfiles_none); + SIDEBAR_TEST_ADD("openfiles_path", test_sidebar_openfiles_path); + SIDEBAR_TEST_ADD("openfiles_tree", test_sidebar_openfiles_tree); + + return g_test_run(); +} -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 893230: Add item to NEWS for tree view of open documents
by Thomas Martitz 08 Jun '22

08 Jun '22

1 0

[geany/geany] 20bd9c: Add a unit test program to check the new sidebar documents tree view
by Thomas Martitz 08 Jun '22

08 Jun '22

Branch: refs/heads/master Author: Thomas Martitz <thomas.martitz(a)mailbox.org> Committer: Thomas Martitz <thomas.martitz(a)mailbox.org> Date: Wed, 08 Jun 2022 05:54:00 UTC Commit: 20bd9c44ea638fb7c29dc6df374f39df4947cd3f https://github.com/geany/geany/commit/20bd9c44ea638fb7c29dc6df374f39df4947c… Log Message: ----------- Add a unit test program to check the new sidebar documents tree view The test program checks if open documents are grouped correctly by their parent directory. The older modes (plain document list and two-level tree) also get a distinct test. For this to work some symbols must become visible from libgeany. The test uses g_strv_length() which is relatively new. Autoconf and meson checks are added as needed. Modified Paths: -------------- configure.ac m4/geany-gtk.m4 meson.build src/Makefile.am src/libmain.c src/main.h src/sidebar.c src/sidebar.h src/ui_utils.c tests/Makefile.am tests/meson.build tests/test_sidebar.c Modified: configure.ac 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -89,6 +89,7 @@ GEANY_CHECK_REVISION([dnl force debug mode for a VCS working copy CFLAGS="-g -DGEANY_DEBUG $CFLAGS"]) GEANY_CHECK_GTK +GEANY_CHECK_GTK_FUNCS([g_strv_equal]) # --disable-deprecated switch for GTK purification AC_ARG_ENABLE([deprecated], Modified: m4/geany-gtk.m4 15 lines changed, 15 insertions(+), 0 deletions(-) =================================================================== @@ -16,3 +16,18 @@ AC_DEFUN([GEANY_CHECK_GTK], GEANY_STATUS_ADD([Using GTK version], [${GTK_VERSION}]) ]) + +dnl GEANY_CHECK_GTK_FUNCS +dnl Like AC_CHECK_FUNCS but adds GTK flags so that tests for GLib/GTK functions may succeed. +AC_DEFUN([GEANY_CHECK_GTK_FUNCS], +[ + AC_REQUIRE([GEANY_CHECK_GTK]) + + CFLAGS_save=$CFLAGS + CFLAGS=$GTK_CFLAGS + LIBS_save=$LIBS + LIBS=$GTK_LIBS + AC_CHECK_FUNCS([$1]) + CFLAGS=$CFLAGS_save + LIBS=$LIBS_save +]) Modified: meson.build 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -85,7 +85,7 @@ check_functions = [ ['truncate', '#include <unistd.h>'], ['wcrtomb', '#include <wchar.h>'], ['wcscoll', '#include <wchar.h>'], - + ['g_strv_equal', '#include <glib.h>'] ] foreach h : check_headers @@ -100,7 +100,7 @@ endforeach foreach f : check_functions define = 'HAVE_' + f.get(0).underscorify().to_upper() ccprefix = '\n'.join([gnu_source ? '#define _GNU_SOURCE' : '', f.get(1)]) - if cc.has_function(f.get(0), prefix : ccprefix) + if cc.has_function(f.get(0), prefix: ccprefix, dependencies: deps) cdata.set(define, 1) else cdata.set(define, false) @@ -846,7 +846,7 @@ libgeany = shared_library('geany', ) dep_libgeany = declare_dependency( link_with: libgeany, - include_directories: [igeany] + include_directories: [iscintilla, itagmanager, igeany] ) executable('geany', Modified: src/Makefile.am 5 lines changed, 2 insertions(+), 3 deletions(-) =================================================================== @@ -20,14 +20,14 @@ AM_CPPFLAGS = \ -DGTK \ -DGEANY_PRIVATE \ -DG_LOG_DOMAIN=\""Geany"\" \ - @GTK_CFLAGS@ @GTHREAD_CFLAGS@ \ + @GTK_CFLAGS@ \ $(MAC_INTEGRATION_CFLAGS) bin_PROGRAMS = geany lib_LTLIBRARIES = libgeany.la geany_SOURCES = main.c -geany_LDADD = libgeany.la $(GTK_LIBS) $(GTHREAD_LIBS) $(INTLLIBS) +geany_LDADD = libgeany.la $(GTK_LIBS) $(INTLLIBS) geany_LDFLAGS = if ENABLE_BINRELOC @@ -124,7 +124,6 @@ libgeany_la_LIBADD = \ $(top_builddir)/scintilla/libscintilla.la \ $(builddir)/tagmanager/libtagmanager.la \ @GTK_LIBS@ \ - @GTHREAD_LIBS@ \ $(MAC_INTEGRATION_LIBS) \ $(INTLLIBS) Modified: src/libmain.c 25 lines changed, 16 insertions(+), 9 deletions(-) =================================================================== @@ -1018,20 +1018,12 @@ static const gchar *get_locale(void) GEANY_EXPORT_SYMBOL -gint main_lib(gint argc, gchar **argv) +void main_init_headless(void) { - GeanyDocument *doc; - gint config_dir_result; - const gchar *locale; - gchar *utf8_configdir; - gchar *os_info; - #if ! GLIB_CHECK_VERSION(2, 36, 0) g_type_init(); #endif - log_handlers_init(); - app = g_new0(GeanyApp, 1); memset(&main_status, 0, sizeof(GeanyStatus)); memset(&prefs, 0, sizeof(GeanyPrefs)); @@ -1043,6 +1035,21 @@ gint main_lib(gint argc, gchar **argv) memset(&template_prefs, 0, sizeof(GeanyTemplatePrefs)); memset(&ui_prefs, 0, sizeof(UIPrefs)); memset(&ui_widgets, 0, sizeof(UIWidgets)); +} + + +GEANY_EXPORT_SYMBOL +gint main_lib(gint argc, gchar **argv) +{ + GeanyDocument *doc; + gint config_dir_result; + const gchar *locale; + gchar *utf8_configdir; + gchar *os_info; + + main_init_headless(); + + log_handlers_init(); setup_paths(); Modified: src/main.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -76,6 +76,8 @@ void main_load_project_from_command_line(const gchar *locale_filename, gboolean gint main_lib(gint argc, gchar **argv); +void main_init_headless(void); + #endif /* GEANY_PRIVATE */ G_END_DECLS Modified: src/sidebar.c 32 lines changed, 7 insertions(+), 25 deletions(-) =================================================================== @@ -51,14 +51,6 @@ SidebarTreeviews tv = {NULL, NULL, NULL}; /* while typeahead searching, editor should not get focus */ static gboolean may_steal_focus = FALSE; -enum -{ - OPENFILES_PATHS_NONE, - OPENFILES_PATHS_LIST, - OPENFILES_PATHS_TREE, - OPENFILES_PATHS_COUNT -}; - static struct { GtkWidget *close; @@ -84,19 +76,6 @@ enum OPENFILES_ACTION_RELOAD }; - -/* documents tree model columns */ -enum -{ - DOCUMENTS_ICON, - DOCUMENTS_SHORTNAME, /* dirname for parents, basename for children */ - DOCUMENTS_DOCUMENT, - DOCUMENTS_COLOR, - DOCUMENTS_FILENAME, /* full filename */ - DOCUMENTS_FOLD, /* fold state stored when folding parent rows */ -}; - - static GtkTreeStore *store_openfiles; static GtkWidget *openfiles_popup_menu; static GtkWidget *tag_window; /* scrolled window that holds the symbol list GtkTreeView */ @@ -300,8 +279,8 @@ static gint documents_sort_func(GtkTreeModel *model, GtkTreeIter *iter_a, return cmp; } - -static void sidebar_create_store_openfiles(void) +GEANY_EXPORT_SYMBOL +GtkTreeStore *sidebar_create_store_openfiles(void) { GtkTreeSortable *sortable; GtkTreeStore *store; @@ -316,6 +295,7 @@ static void sidebar_create_store_openfiles(void) gtk_tree_sortable_set_sort_column_id(sortable, DOCUMENTS_SHORTNAME, GTK_SORT_ASCENDING); store_openfiles = store; + return store; } @@ -907,6 +887,7 @@ static void expand_iter(GtkTreeIter *iter) /* Also sets doc->priv->iter. * This is called recursively in sidebar_openfiles_update_all(). */ +GEANY_EXPORT_SYMBOL void sidebar_openfiles_add(GeanyDocument *doc) { GtkTreeIter *iter = &doc->priv->iter; @@ -934,8 +915,9 @@ void sidebar_openfiles_add(GeanyDocument *doc) -1); g_free(basename); - /* expand new parent if necessary */ - if (expand) + /* Expand new parent if necessary. Beware: this is executed by unit tests + * which don't create the tree view. */ + if (expand && G_LIKELY(tv.tree_openfiles)) expand_iter(&parent); } Modified: src/sidebar.h 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -27,6 +27,8 @@ #include "gtkcompat.h" +#ifdef GEANY_PRIVATE + G_BEGIN_DECLS typedef struct SidebarTreeviews @@ -48,6 +50,25 @@ enum SYMBOLS_N_COLUMNS }; +enum +{ + OPENFILES_PATHS_NONE, + OPENFILES_PATHS_LIST, + OPENFILES_PATHS_TREE, + OPENFILES_PATHS_COUNT +}; + +/* documents tree model columns */ +enum +{ + DOCUMENTS_ICON, + DOCUMENTS_SHORTNAME, /* dirname for parents, basename for children */ + DOCUMENTS_DOCUMENT, + DOCUMENTS_COLOR, + DOCUMENTS_FILENAME, /* full filename */ + DOCUMENTS_FOLD, /* fold state stored when folding parent rows */ +}; + void sidebar_init(void); void sidebar_finalize(void); @@ -70,6 +91,10 @@ void sidebar_focus_openfiles_tab(void); void sidebar_focus_symbols_tab(void); +GtkTreeStore *sidebar_create_store_openfiles(void); +#endif + G_END_DECLS + #endif /* GEANY_SIDEBAR_H */ Modified: src/ui_utils.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -68,7 +68,7 @@ "filetype: %f " \ "scope: %S") -GeanyInterfacePrefs interface_prefs; +GEANY_EXPORT_SYMBOL GeanyInterfacePrefs interface_prefs; GeanyMainWidgets main_widgets; UIPrefs ui_prefs; Modified: tests/Makefile.am 12 lines changed, 7 insertions(+), 5 deletions(-) =================================================================== @@ -1,13 +1,15 @@ SUBDIRS = ctags -AM_CPPFLAGS = -DGEANY_PRIVATE -DG_LOG_DOMAIN=\""Geany"\" @GTK_CFLAGS@ @GTHREAD_CFLAGS@ -AM_CPPFLAGS += -I$(top_srcdir)/src +AM_CPPFLAGS = -DGTK -DGEANY_PRIVATE -DG_LOG_DOMAIN=\""Geany"\" +AM_CPPFLAGS += -I$(top_srcdir)/scintilla/include -I$(top_srcdir)/scintilla/lexilla/include +AM_CPPFLAGS += -I$(top_srcdir)/src/tagmanager -I$(top_srcdir)/src +AM_CFLAGS = $(GTK_CFLAGS) +AM_LDFLAGS = $(GTK_LIBS) $(INTLLIBS) -no-install -AM_LDFLAGS = $(GTK_LIBS) $(GTHREAD_LIBS) $(INTLLIBS) -no-install - -check_PROGRAMS = test_utils +check_PROGRAMS = test_utils test_sidebar test_utils_LDADD = $(top_builddir)/src/libgeany.la +test_sidebar_LDADD = $(top_builddir)/src/libgeany.la TESTS = $(check_PROGRAMS) Modified: tests/meson.build 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,6 @@ test_deps = declare_dependency(compile_args: geany_cflags + [ '-DG_LOG_DOMAIN="Geany"' ], - dependencies: [deps, dep_libgeany]) + dependencies: [deps, dep_libgeany], + include_directories: '..') ctags_tests = files([ 'ctags/1795612.js.tags', @@ -352,3 +353,4 @@ test('ctags/processing-order', runner, args: [join_paths(meson.build_root(), 'geany'), '--result', process_order_sources], env: ['top_srcdir='+meson.source_root(), 'top_builddir='+meson.build_root()]) test('utils', executable('test_utils', 'test_utils.c', dependencies: test_deps)) +test('sidebar', executable('test_sidebar', 'test_sidebar.c', dependencies: test_deps)) Modified: tests/test_sidebar.c 154 lines changed, 154 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,154 @@ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "document.h" +#include "documentprivate.h" +#include "keyfile.h" +#include "main.h" +#include "sidebar.h" +#include "ui_utils.h" +#include "utils.h" + +#define SIDEBAR_TEST_ADD(path, func) g_test_add_func("/sidebar/" path, func); + +static void openfiles_add(const gchar **file_names) +{ + const gchar *file; + + while ((file = *file_names++)) + { + GeanyDocument *doc = g_new0(GeanyDocument, 1); + + doc->priv = g_new0(GeanyDocumentPrivate, 1); + doc->file_name = strdup(file); + + sidebar_openfiles_add(doc); + } +} + + +static gboolean tree_count_cb(GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer data_in) +{ + gint *c = (gint *) data_in; + + *c = *c + 1; + return FALSE; +} + + +static gboolean tree_strings_cb(GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer data_in) +{ + gchar **data = (gchar **) data_in; + gchar *file; + + gtk_tree_model_get(model, iter, DOCUMENTS_SHORTNAME, &file, -1); + data[g_strv_length(data)] = file; + + printf("%s\n", file); + return FALSE; +} + +void do_test_sidebar_openfiles(const gchar **test_data, const gchar **expected) +{ +#ifdef HAVE_G_STRV_EQUAL + int count = 0; + GtkTreeStore *store; + gchar **data; + + store = sidebar_create_store_openfiles(); + + openfiles_add(test_data); + + gtk_tree_model_foreach(GTK_TREE_MODEL(store), tree_count_cb, (gpointer) &count); + data = g_new0(gchar *, count + 1); + gtk_tree_model_foreach(GTK_TREE_MODEL(store), tree_strings_cb, (gpointer) data); + g_assert_true(g_strv_equal(expected, (const gchar * const *) data)); +#else + g_test_skip("Need g_strv_equal(), since GLib 2.60"); +#endif +} + +void test_sidebar_openfiles_none(void) +{ + const gchar *files[] = { + "/tmp/x", + "/tmp/b/a", + "/tmp/b/b", + NULL + }; + const gchar *expected[] = { + "a", + "b", + "x", + NULL + }; + + interface_prefs.openfiles_path_mode = OPENFILES_PATHS_NONE; + do_test_sidebar_openfiles(files, expected); +} + + +void test_sidebar_openfiles_path(void) +{ + const gchar *files[] = { + "/tmp/x", + "/tmp/b/a", + "/tmp/b/b", + NULL + }; + const gchar *expected[] = { + "/tmp", + "x", + "/tmp/b", + "a", + "b", + NULL + }; + + interface_prefs.openfiles_path_mode = OPENFILES_PATHS_LIST; + do_test_sidebar_openfiles(files, expected); +} + + +void test_sidebar_openfiles_tree(void) +{ + const gchar *files[] = { + "/tmp/x", + "/tmp/b/a", + "/tmp/b/b", + NULL + }; + const gchar *expected[] = { + "/tmp", + "x", + "b", + "a", + "b", + NULL + }; + + interface_prefs.openfiles_path_mode = OPENFILES_PATHS_TREE; + do_test_sidebar_openfiles(files, expected); +} + +int main(int argc, char **argv) +{ + g_test_init(&argc, &argv, NULL); + /* Not sure if we can really continue without DISPLAY. Fake X display perhaps? + * + * This test seems to work, at least. + */ + gtk_init_check(&argc, &argv); + + main_init_headless(); + + SIDEBAR_TEST_ADD("openfiles_none", test_sidebar_openfiles_none); + SIDEBAR_TEST_ADD("openfiles_path", test_sidebar_openfiles_path); + SIDEBAR_TEST_ADD("openfiles_tree", test_sidebar_openfiles_tree); + + return g_test_run(); +} -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9e1c79: Refactor GTK-related autoconf checks
by Thomas Martitz 08 Jun '22

08 Jun '22

Branch: refs/heads/master Author: Thomas Martitz <thomas.martitz(a)mailbox.org> Committer: Thomas Martitz <thomas.martitz(a)mailbox.org> Date: Wed, 08 Jun 2022 05:53:59 UTC Commit: 9e1c79079bc5cf22cb417831697a6a65c7e3d7e5 https://github.com/geany/geany/commit/9e1c79079bc5cf22cb417831697a6a65c7e3d… Log Message: ----------- Refactor GTK-related autoconf checks - Move to separate file geany-gtk.m4 - Merge gthread checks into the main gtk ones Modified Paths: -------------- configure.ac m4/geany-gtk.m4 Modified: configure.ac 19 lines changed, 1 insertions(+), 18 deletions(-) =================================================================== @@ -88,24 +88,7 @@ AC_CHECK_DECLS([_NSGetEnviron],,,[[#include <crt_externs.h>]]) GEANY_CHECK_REVISION([dnl force debug mode for a VCS working copy CFLAGS="-g -DGEANY_DEBUG $CFLAGS"]) -# GTK/GLib/GIO checks -gtk_modules="gtk+-3.0 >= 3.0 glib-2.0 >= 2.32" -gtk_modules_private="gio-2.0 >= 2.32 gmodule-no-export-2.0" -PKG_CHECK_MODULES([GTK], [$gtk_modules $gtk_modules_private]) -AC_SUBST([DEPENDENCIES], [$gtk_modules]) -AS_VAR_APPEND([GTK_CFLAGS], [" -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"]) -dnl Disable all GTK deprecations -AS_VAR_APPEND([GTK_CFLAGS], [" -DGDK_DISABLE_DEPRECATION_WARNINGS"]) -AC_SUBST([GTK_CFLAGS]) -AC_SUBST([GTK_LIBS]) -GTK_VERSION=`$PKG_CONFIG --modversion gtk+-3.0` -AC_SUBST([GTK_VERSION]) -GEANY_STATUS_ADD([Using GTK version], [${GTK_VERSION}]) -# GTHREAD checks -gthread_modules="gthread-2.0" -PKG_CHECK_MODULES([GTHREAD], [$gthread_modules]) -AC_SUBST([GTHREAD_CFLAGS]) -AC_SUBST([GTHREAD_LIBS]) +GEANY_CHECK_GTK # --disable-deprecated switch for GTK purification AC_ARG_ENABLE([deprecated], Modified: m4/geany-gtk.m4 18 lines changed, 18 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,18 @@ +dnl GEANY_CHECK_GTK +dnl Checks whether the GTK stack is available and new enough. Sets GTK_CFLAGS and GTK_LIBS. +AC_DEFUN([GEANY_CHECK_GTK], +[ + gtk_modules="gtk+-3.0 >= 3.0 glib-2.0 >= 2.32" + gtk_modules_private="gio-2.0 >= 2.32 gmodule-no-export-2.0 gthread-2.0" + + PKG_CHECK_MODULES([GTK], [$gtk_modules $gtk_modules_private]) + AC_SUBST([DEPENDENCIES], [$gtk_modules]) + AS_VAR_APPEND([GTK_CFLAGS], [" -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"]) + dnl Disable all GTK deprecations + AS_VAR_APPEND([GTK_CFLAGS], [" -DGDK_DISABLE_DEPRECATION_WARNINGS"]) + AC_SUBST([GTK_CFLAGS]) + AC_SUBST([GTK_LIBS]) + AC_SUBST([GTK_VERSION],[`$PKG_CONFIG --modversion gtk+-3.0`]) + + GEANY_STATUS_ADD([Using GTK version], [${GTK_VERSION}]) +]) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6dcdef: Add (and default to) tree view of open documents in the sidebar
by Thomas Martitz 08 Jun '22

08 Jun '22

Branch: refs/heads/master Author: Thomas Martitz <thomas.martitz(a)mailbox.org> Committer: Thomas Martitz <thomas.martitz(a)mailbox.org> Date: Wed, 08 Jun 2022 05:42:39 UTC Commit: 6dcdefc18547ee5ce4a56f78caa316689d86b309 https://github.com/geany/geany/commit/6dcdefc18547ee5ce4a56f78caa316689d86b… Log Message: ----------- Add (and default to) tree view of open documents in the sidebar Currently you can chose between a flat document list and a two-level tree that groups the files by their directory. With the new tree view the latter mode is extended to a true tree where directory rows only represent the direct parent directory of open documents. Except that single-child subtrees are collapsed to a single row. See the manual for glory details. The new mode allows to quickly close entire subtrees and is visually close to the file system layout. As with the two-level tree, the home directory and project base directory (if any project is open) are treated specially and usually get a distict row - home directory appears as "~" - project base directory path is replaced by the project name The new mode is the default. Existing installations will use the new mode because a new pref is introduced. Closes #259 Based on work by RPG <scriptum(a)users.noreply.github.com> Modified Paths: -------------- doc/Makefile.am doc/geany.txt doc/images/sidebar_documents_only.png doc/images/sidebar_show_paths.png doc/images/sidebar_show_tree.png doc/meson.build src/keyfile.c src/sidebar.c src/sidebar.h src/ui_utils.h src/utils.c src/utils.h Modified: doc/Makefile.am 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -23,7 +23,10 @@ dist_htmldocimages_DATA = \ images/pref_dialog_tools.png \ images/pref_dialog_various.png \ images/pref_dialog_vte.png \ - images/replace_dialog.png + images/replace_dialog.png \ + images/sidebar_documents_only.png \ + images/sidebar_show_paths.png \ + images/sidebar_show_tree.png endif doc_DATA = \ Modified: doc/geany.txt 44 lines changed, 43 insertions(+), 1 deletions(-) =================================================================== @@ -229,7 +229,7 @@ The workspace has the following parts: * An optional toolbar. * An optional sidebar that can show the following tabs: - * Documents - A document list, and + * Documents - A document list, see `Document list views`_. * Symbols - A list of symbols in your code. * The main editor window. @@ -513,6 +513,48 @@ order. It is not alphabetical as shown in the documents list See the `Notebook tab keybindings`_ section for useful shortcuts including for Most-Recently-Used document switching. +Document list views +^^^^^^^^^^^^^^^^^^^ + +There are three different ways to display documents on the sidebar if *Show +documents list* is active. To switch between views press the right mouse button +on the documents list and select one of these items: + +Documents Only + Show only file names of open documents in sorted order. + + .. image:: ./images/sidebar_documents_only.png + +Show Paths + Show open documents as a two-level tree in which first level is the paths + of directories containing open files and the second level is the file names of + the documents open in that path. All documents with the same path are grouped + together under the same first level item. Paths are in sorted order and + documents are sorted within each group. + + .. image:: ./images/sidebar_show_paths.png + +Show Tree + Show paths as above, but as a multiple level partial tree. The tree is only + expanded at positions where two or more directory paths to open documents + share the same prefix. The common prefix is shown as a parent level, and + the remainder of those paths are shown as child levels. This applies + recursively down the paths making a tree to the file names of open documents, + which are grouped in sorted order as an additional level below the last path + segment. + + For convenience two common file locations are handled specially, open + files below the users home directory and open files below an open project + base path. Each of these is moved to its own top level tree instead of + being in place in the normal tree. The top level of these trees are each + labelled differently. For the home directory tree the path of the home + directory is shown as ``~``, and for the project tree the path to the project + base path is shown simply as the project name. + + .. image:: ./images/sidebar_show_tree.png + +In all cases paths and file names that do not fit in the width available are ellipsised. + Cloning documents ^^^^^^^^^^^^^^^^^ The `Document->Clone` menu item copies the current document's text, Modified: doc/images/sidebar_documents_only.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: doc/images/sidebar_show_paths.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: doc/images/sidebar_show_tree.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: doc/meson.build 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -39,6 +39,9 @@ if tarball.returncode() == 0 or rst2html.found() 'images/pref_dialog_various.png', 'images/pref_dialog_vte.png', 'images/replace_dialog.png', + 'images/sidebar_documents_only.png', + 'images/sidebar_show_paths.png', + 'images/sidebar_show_tree.png', install_dir: join_paths(cdata.get('GEANY_DOC_DIR'), 'html', 'images') ) if tarball.returncode() == 0 Modified: src/keyfile.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -187,7 +187,7 @@ static void init_pref_groups(void) stash_group_add_toggle_button(group, &file_prefs.tab_close_switch_to_mru, "tab_close_switch_to_mru", FALSE, "check_tab_close_switch_to_mru"); stash_group_add_integer(group, &interface_prefs.tab_pos_sidebar, "tab_pos_sidebar", GTK_POS_TOP); - stash_group_add_integer(group, &interface_prefs.documents_show_paths, "documents_show_paths", SHOW_PATHS_LIST); + stash_group_add_integer(group, &interface_prefs.openfiles_path_mode, "openfiles_path_mode", -1); stash_group_add_radio_buttons(group, &interface_prefs.sidebar_pos, "sidebar_pos", GTK_POS_LEFT, "radio_sidebar_left", GTK_POS_LEFT, Modified: src/sidebar.c 820 lines changed, 661 insertions(+), 159 deletions(-) =================================================================== @@ -51,17 +51,25 @@ SidebarTreeviews tv = {NULL, NULL, NULL}; /* while typeahead searching, editor should not get focus */ static gboolean may_steal_focus = FALSE; +enum +{ + OPENFILES_PATHS_NONE, + OPENFILES_PATHS_LIST, + OPENFILES_PATHS_TREE, + OPENFILES_PATHS_COUNT +}; + static struct { GtkWidget *close; GtkWidget *save; GtkWidget *reload; - GtkWidget *show_paths; + GtkWidget *show_paths[OPENFILES_PATHS_COUNT]; GtkWidget *find_in_files; GtkWidget *expand_all; GtkWidget *collapse_all; } -doc_items = {NULL, NULL, NULL, NULL, NULL, NULL, NULL}; +doc_items; enum { @@ -76,17 +84,20 @@ enum OPENFILES_ACTION_RELOAD }; + /* documents tree model columns */ enum { DOCUMENTS_ICON, - DOCUMENTS_SHORTNAME, /* dirname for parents, basename for children */ + DOCUMENTS_SHORTNAME, /* dirname for parents, basename for children */ DOCUMENTS_DOCUMENT, DOCUMENTS_COLOR, - DOCUMENTS_FILENAME /* full filename */ + DOCUMENTS_FILENAME, /* full filename */ + DOCUMENTS_FOLD, /* fold state stored when folding parent rows */ }; -static GtkTreeStore *store_openfiles; + +static GtkTreeStore *store_openfiles; static GtkWidget *openfiles_popup_menu; static GtkWidget *tag_window; /* scrolled window that holds the symbol list GtkTreeView */ @@ -199,8 +210,8 @@ void sidebar_update_tag_list(GeanyDocument *doc, gboolean update) /* changes the tree view to the given one, trying not to do useless changes */ #define CHANGE_TREE(new_child) \ G_STMT_START { \ - /* only change the tag tree if it's actually not the same (to avoid flickering) and if - * it's the one of the current document (to avoid problems when e.g. reloading + /* only change the tag tree if it's actually not the same (to avoid flickering) and if \ + * it's the one of the current document (to avoid problems when e.g. reloading \ * configuration files */ \ if (child != new_child && doc == document_get_current()) \ { \ @@ -253,41 +264,183 @@ void sidebar_update_tag_list(GeanyDocument *doc, gboolean update) static gint documents_sort_func(GtkTreeModel *model, GtkTreeIter *iter_a, GtkTreeIter *iter_b, gpointer data) { - gchar *key_a, *key_b; gchar *name_a, *name_b; + GeanyDocument *doc_a, *doc_b; gint cmp; - gtk_tree_model_get(model, iter_a, DOCUMENTS_SHORTNAME, &name_a, -1); - key_a = g_utf8_collate_key_for_filename(name_a, -1); - g_free(name_a); - gtk_tree_model_get(model, iter_b, DOCUMENTS_SHORTNAME, &name_b, -1); - key_b = g_utf8_collate_key_for_filename(name_b, -1); + gtk_tree_model_get(model, iter_a, DOCUMENTS_SHORTNAME, &name_a, DOCUMENTS_DOCUMENT, &doc_a, -1); + gtk_tree_model_get(model, iter_b, DOCUMENTS_SHORTNAME, &name_b, DOCUMENTS_DOCUMENT, &doc_b, -1); + + /* sort dirs after files (within a directory node) */ + if (!doc_a && doc_b) + cmp = 1; + else if (doc_a && !doc_b) + cmp = -1; + else + { + gchar *key_a, *key_b; + /* g_utf8_collate_key_for_filename() seems to ignore ~. As a result, ~/dev <=> /data + * compares as /dev > /data while ~/dev <=> /etc compares as /dev < /etc. Thus, for sorting + * purposes, treat leading ~ as . which is documented to be special-cased to sort before + * anything else. The side effect, that documents under ~ are always first is actually + * welcome. + */ + name_a[0] = name_a[0] == '~' ? '.' : name_a[0]; + name_b[0] = name_b[0] == '~' ? '.' : name_b[0]; + key_a = g_utf8_collate_key_for_filename(name_a, -1); + key_b = g_utf8_collate_key_for_filename(name_b, -1); + cmp = strcmp(key_a, key_b); + g_free(key_b); + g_free(key_a); + } + g_free(name_b); - cmp = strcmp(key_a, key_b); - g_free(key_b); - g_free(key_a); + g_free(name_a); return cmp; } +static void sidebar_create_store_openfiles(void) +{ + GtkTreeSortable *sortable; + GtkTreeStore *store; + /* store the icon and the short filename to show, and the index as reference, + * the colour (black/red/green) and the full name for the tooltip */ + store = gtk_tree_store_new(6, G_TYPE_ICON, G_TYPE_STRING, + G_TYPE_POINTER, GDK_TYPE_COLOR, G_TYPE_STRING, G_TYPE_BOOLEAN); + + /* sort opened filenames in the store_openfiles treeview */ + sortable = GTK_TREE_SORTABLE(GTK_TREE_MODEL(store)); + gtk_tree_sortable_set_sort_func(sortable, DOCUMENTS_SHORTNAME, documents_sort_func, NULL, NULL); + gtk_tree_sortable_set_sort_column_id(sortable, DOCUMENTS_SHORTNAME, GTK_SORT_ASCENDING); + + store_openfiles = store; +} + + +static void store_fold_recurse(GtkTreeView *view, + GtkTreeIter *iter, + GtkTreeModel *model) +{ + GeanyDocument *doc; + gboolean fold, valid; + GtkTreePath *path; + GtkTreeIter child_iter; + + gtk_tree_model_get(model, iter, DOCUMENTS_DOCUMENT, &doc, -1); + if (doc) /* document rows are not foldable */ + return; + + path = gtk_tree_model_get_path(model, iter); + fold = !gtk_tree_view_row_expanded(view, path); + gtk_tree_store_set(GTK_TREE_STORE(model), iter, DOCUMENTS_FOLD, fold, -1); + gtk_tree_path_free(path); + + /* After storing the fold state for *this* row, recursively do the same for its children. + * We need do do this only for expanded children because all children of folded rows are + * folded as well. + */ + if (fold) + return; + + valid = gtk_tree_model_iter_children(model, &child_iter, iter); + while (valid) + { + store_fold_recurse(view, &child_iter, model); + valid = gtk_tree_model_iter_next(model, &child_iter); + } +} + + +static gboolean on_row_expand(GtkTreeView *view, + GtkTreeIter *iter, + GtkTreePath *path, + gpointer user_data) +{ + GtkTreeModel *model; + + model = gtk_tree_view_get_model(view); + gtk_tree_store_set(GTK_TREE_STORE(model), iter, DOCUMENTS_FOLD, FALSE, -1); + return FALSE; +} + + +static gboolean on_row_collapse(GtkTreeView *view, + GtkTreeIter *iter, + GtkTreePath *path, + gpointer user_data) +{ + GtkTreeModel *model; + GtkTreeIter child_iter; + gboolean valid; + + model = gtk_tree_view_get_model(view); + gtk_tree_store_set(GTK_TREE_STORE(model), iter, DOCUMENTS_FOLD, TRUE, -1); + + valid = gtk_tree_model_iter_children(model, &child_iter, iter); + while (valid) + { + store_fold_recurse(view, &child_iter, model); + valid = gtk_tree_model_iter_next(model, &child_iter); + } + + return FALSE; +} + + +static void on_row_expanded(GtkTreeView *view, + GtkTreeIter *iter, + GtkTreePath *path_, + gpointer user_data) +{ + GtkTreeIter child_iter; + GtkTreeModel *model; + GtkTreePath *path; + gboolean valid; + GeanyDocument *doc; + + model = gtk_tree_view_get_model(view); + + valid = gtk_tree_model_iter_children(model, &child_iter, iter); + while (valid) + { + gboolean fold; + + gtk_tree_model_get(model, &child_iter, DOCUMENTS_DOCUMENT, &doc, DOCUMENTS_FOLD, &fold, -1); + path = gtk_tree_model_get_path(model, &child_iter); + + if (!doc && !fold) + gtk_tree_view_expand_row(view, path, FALSE); + + valid = gtk_tree_model_iter_next(model, &child_iter); + gtk_tree_path_free(path); + } +} + + /* does some preparing things to the open files list widget */ static void prepare_openfiles(void) { GtkCellRenderer *icon_renderer; GtkCellRenderer *text_renderer; GtkTreeViewColumn *column; GtkTreeSelection *selection; - GtkTreeSortable *sortable; tv.tree_openfiles = ui_lookup_widget(main_widgets.window, "treeview6"); - /* store the icon and the short filename to show, and the index as reference, - * the colour (black/red/green) and the full name for the tooltip */ - store_openfiles = gtk_tree_store_new(5, G_TYPE_ICON, G_TYPE_STRING, - G_TYPE_POINTER, GDK_TYPE_COLOR, G_TYPE_STRING); + sidebar_create_store_openfiles(); + gtk_tree_view_set_model(GTK_TREE_VIEW(tv.tree_openfiles), GTK_TREE_MODEL(store_openfiles)); + /* These two implement "remember fold state of rows when their parents are folded". Normally + * GTK does not remember the fold state and can only expand all or no children when + * expanding a row. Maybe this can be useful for other tree views as well? + */ + g_signal_connect_after(GTK_TREE_VIEW(tv.tree_openfiles), "test-expand-row", G_CALLBACK(on_row_expand), NULL); + g_signal_connect_after(GTK_TREE_VIEW(tv.tree_openfiles), "test-collapse-row", G_CALLBACK(on_row_collapse), NULL); + g_signal_connect_after(GTK_TREE_VIEW(tv.tree_openfiles), "row-expanded", G_CALLBACK(on_row_expanded), NULL); + /* set policy settings for the scolledwindow around the treeview again, because glade * doesn't keep the settings */ gtk_scrolled_window_set_policy( @@ -310,11 +463,6 @@ static void prepare_openfiles(void) gtk_tree_view_set_search_column(GTK_TREE_VIEW(tv.tree_openfiles), DOCUMENTS_SHORTNAME); - /* sort opened filenames in the store_openfiles treeview */ - sortable = GTK_TREE_SORTABLE(GTK_TREE_MODEL(store_openfiles)); - gtk_tree_sortable_set_sort_func(sortable, DOCUMENTS_SHORTNAME, documents_sort_func, NULL, NULL); - gtk_tree_sortable_set_sort_column_id(sortable, DOCUMENTS_SHORTNAME, GTK_SORT_ASCENDING); - ui_widget_modify_font_from_string(tv.tree_openfiles, interface_prefs.tagbar_font); /* tooltips */ @@ -332,28 +480,6 @@ static void prepare_openfiles(void) } -/* iter should be toplevel */ -static gboolean find_tree_iter_dir(GtkTreeIter *iter, const gchar *dir) -{ - GeanyDocument *doc; - gchar *name; - gboolean result; - - if (utils_str_equal(dir, ".")) - dir = GEANY_STRING_UNTITLED; - - gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_DOCUMENT, &doc, -1); - g_return_val_if_fail(!doc, FALSE); - - gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_SHORTNAME, &name, -1); - - result = utils_filenamecmp(name, dir) == 0; - g_free(name); - - return result; -} - - static gboolean utils_filename_has_prefix(const gchar *str, const gchar *prefix) { gchar *head = g_strndup(str, strlen(prefix)); @@ -364,12 +490,10 @@ static gboolean utils_filename_has_prefix(const gchar *str, const gchar *prefix) } -static gchar *get_doc_folder(const gchar *path) +static gchar *get_project_folder(const gchar *path) { - gchar *tmp_dirname = g_strdup(path); gchar *project_base_path; gchar *dirname = NULL; - const gchar *home_dir = g_get_home_dir(); const gchar *rest; /* replace the project base path with the project name */ @@ -384,20 +508,32 @@ static gchar *get_doc_folder(const gchar *path) project_base_path[--len] = '\0'; /* check whether the dir name matches or uses the project base path */ - if (utils_filename_has_prefix(tmp_dirname, project_base_path)) + if (utils_filename_has_prefix(path, project_base_path)) { - rest = tmp_dirname + len; + rest = path + len; if (*rest == G_DIR_SEPARATOR || *rest == '\0') { dirname = g_strdup_printf("%s%s", app->project->name, rest); } } g_free(project_base_path); } + + return dirname; +} + + +static gchar *get_doc_folder(const gchar *path) +{ + gchar *dirname = get_project_folder(path); + const gchar *rest; + if (dirname == NULL) { - dirname = tmp_dirname; + const gchar *home_dir = g_get_home_dir(); + gchar *tmp_dirname = g_strdup(path); + dirname = tmp_dirname; /* If matches home dir, replace with tilde */ if (!EMPTY(home_dir) && utils_filename_has_prefix(dirname, home_dir)) { @@ -409,52 +545,363 @@ static gchar *get_doc_folder(const gchar *path) } } } - else - g_free(tmp_dirname); return dirname; } -static GtkTreeIter *get_doc_parent(GeanyDocument *doc) +static gchar *parent_dir_name(GtkTreeStore *tree, GtkTreeIter *parent, const gchar *path) { - gchar *path; - gchar *dirname = NULL; - static GtkTreeIter parent; - GtkTreeModel *model = GTK_TREE_MODEL(store_openfiles); - static GIcon *dir_icon = NULL; + gsize parent_len = 0; + gchar *dirname; + gchar *pathname = NULL; - if (!interface_prefs.documents_show_paths) - return NULL; + if (parent) + { + gchar *parent_dir; + GtkTreeModel *model = GTK_TREE_MODEL(tree); + + gtk_tree_model_get(model, parent, DOCUMENTS_FILENAME, &parent_dir, -1); + if (parent_dir) + { + pathname = get_doc_folder(parent_dir); + parent_len = strlen(pathname) + 1; + g_free(parent_dir); + } + } - path = g_path_get_dirname(DOC_FILENAME(doc)); dirname = get_doc_folder(path); + if (parent_len) + { + gsize len; + dirname = get_doc_folder(path); + len = strlen(dirname); + /* Maybe parent is /home but dirname is ~ (after substitution from /home/user) */ + if (pathname[0] == dirname[0]) + memmove(dirname, dirname + parent_len, len - parent_len + 1); + } + + g_free(pathname); + + return dirname; +} + + +static void tree_copy_node(GtkTreeStore *tree, GtkTreeIter *new_node, GtkTreeIter *node, GtkTreeIter *parent_new) +{ + GIcon *icon; + gchar *filename; + gchar *shortname; + GdkColor *color; + GeanyDocument *doc; + GtkTreeModel *model = GTK_TREE_MODEL(tree); + gboolean fold; + + gtk_tree_store_append(tree, new_node, parent_new); + gtk_tree_model_get(model, node, + DOCUMENTS_ICON, &icon, + DOCUMENTS_SHORTNAME, &shortname, + DOCUMENTS_DOCUMENT, &doc, + DOCUMENTS_COLOR, &color, + DOCUMENTS_FILENAME, &filename, + DOCUMENTS_FOLD, &fold, + -1); + + if (doc) + doc->priv->iter = *new_node; + else + SETPTR(shortname, parent_dir_name(tree, parent_new, filename)); + + gtk_tree_store_set(tree, new_node, + DOCUMENTS_ICON, icon, + DOCUMENTS_SHORTNAME, shortname, + DOCUMENTS_DOCUMENT, doc, + DOCUMENTS_COLOR, color, + DOCUMENTS_FILENAME, filename, + DOCUMENTS_FOLD, fold, + -1); + g_free(filename); + g_free(shortname); + if (color) + gdk_color_free(color); +} - if (gtk_tree_model_get_iter_first(model, &parent)) + +/* Helper that implements the recursive part of tree_reparent() */ +static void tree_reparent_recurse(GtkTreeStore *tree, GtkTreeIter *node, GtkTreeIter *parent_new, GtkTreeIter *new_node) +{ + GtkTreeModel *model = GTK_TREE_MODEL(tree); + GtkTreeIter child; + + /* Start by copying the node itself. It becomes parent_new for the children to be copied. */ + tree_copy_node(tree, new_node, node, parent_new); + if (gtk_tree_model_iter_nth_child(model, &child, node, 0)) { - do - { - if (find_tree_iter_dir(&parent, dirname)) - { - g_free(dirname); - g_free(path); - return &parent; - } + do { + GtkTreeIter new_child; + tree_reparent_recurse(tree, &child, new_node, &new_child); } - while (gtk_tree_model_iter_next(model, &parent)); + while (gtk_tree_model_iter_next(model, &child)); } - /* no match, add dir parent */ +} + + +/* + * Copy node and all of its children to a new parent, and then remove the old node. + * + * It is done by reparenting the node itself to the new parent, creating a copy of it, + * and then recursively reparenting all children to the copy of the node. + * + * Finally, the new location will be written back to node so it's readily available, + * e.g. to unfold it. + * */ +static void tree_reparent(GtkTreeStore *tree, GtkTreeIter *node, GtkTreeIter *parent_new) +{ + GtkTreeIter new_node; + tree_reparent_recurse(tree, node, parent_new, &new_node); + gtk_tree_store_remove(tree, node); + *node = new_node; +} + + +static void tree_add_new_dir(GtkTreeStore *tree, GtkTreeIter *child, GtkTreeIter *parent, const gchar *file) +{ + static GIcon *dir_icon = NULL; + gchar *dirname = parent_dir_name(tree, parent, file); + if (!dir_icon) dir_icon = ui_get_mime_icon("inode/directory"); - gtk_tree_store_append(store_openfiles, &parent, NULL); - gtk_tree_store_set(store_openfiles, &parent, DOCUMENTS_ICON, dir_icon, - DOCUMENTS_FILENAME, path, - DOCUMENTS_SHORTNAME, doc->file_name ? dirname : GEANY_STRING_UNTITLED, -1); + gtk_tree_store_append(tree, child, parent); + gtk_tree_store_set(tree, child, + DOCUMENTS_ICON, dir_icon, + DOCUMENTS_FILENAME, file, + DOCUMENTS_SHORTNAME, dirname, + DOCUMENTS_FOLD, TRUE, /* GTK inserts folded by default, caller may expand */ + -1); g_free(dirname); +} + + +/* + * Returns the position of dir delimiter where paths don't match + * */ +static guint pathcmp(const gchar *s1, const gchar *s2) +{ + guint i = 0; + gchar *a; + gchar *b; + + g_return_val_if_fail(s1 != NULL, 0); + g_return_val_if_fail(s2 != NULL, 0); + +#ifdef G_OS_WIN32 + a = utils_utf8_strdown(s1); + if (NULL == a) + return 0; + b = utils_utf8_strdown(s2); + if (NULL == b) + { + g_free(a); + return 0; + } +#else + a = (gchar*)s1; + b = (gchar*)s2; +#endif + + while (a[i] && b[i] && a[i] == b[i]) + i++; + if (a[i] == '\0' && b[i] == '\0') + return i; /* strings are equal: a/b/c == a/b/c */ + if ((a[i] == '\0' && b[i] == G_DIR_SEPARATOR) || + (b[i] == '\0' && a[i] == G_DIR_SEPARATOR)) + return i; /* subdir case: a/b/c == a/b */ + while (i > 0 && (a[i] != G_DIR_SEPARATOR || b[i] != G_DIR_SEPARATOR)) + i--; /* last slash: a/b/boo == a/b/bar */ + +#ifdef G_OS_WIN32 + g_free(a); + g_free(b); +#endif + + return i; +} + + +typedef struct TreeForeachData { + gchar *needle; + gsize best_len; + gsize needle_len; + GtkTreeIter best_iter; + enum { + TREE_CASE_NONE, + TREE_CASE_EQUALS, + TREE_CASE_CHILD_OF, + TREE_CASE_PARENT_OF, + TREE_CASE_HAVE_SAME_PARENT + } best_case; +} TreeForeachData; + + +static gboolean tree_foreach_callback(GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) +{ + gchar *name; + gchar *dirname; + guint diff; + gsize name_len; + GeanyDocument *doc; + TreeForeachData *data = (TreeForeachData*) user_data; + + gtk_tree_model_get(model, iter, DOCUMENTS_FILENAME, &name, DOCUMENTS_DOCUMENT, &doc, -1); + + if (doc) /* skip documents */ + goto finally; + + dirname = get_doc_folder(name); + if (dirname) + SETPTR(name, dirname); + + diff = pathcmp(name, data->needle); + name_len = strlen(name); + + if (diff == 0) + goto finally; + + if (data->best_len < diff) + { + gint best_case; + gboolean tree = interface_prefs.openfiles_path_mode == OPENFILES_PATHS_TREE; + + /* there are four cases */ + /* first case: exact match. File is from already opened dir */ + if (name_len == diff && data->needle_len == name_len) + best_case = TREE_CASE_EQUALS; + /* second case: split current dir. File is from deeper level */ + else if (name_len == diff && tree) + best_case = TREE_CASE_CHILD_OF; + /* third case: split parent dir. File is from one of existing level */ + else if (data->needle_len == diff && tree) + best_case = TREE_CASE_PARENT_OF; + /* fourth case: both dirs have same parent */ + else if (tree) + best_case = TREE_CASE_HAVE_SAME_PARENT; + else + goto finally; + data->best_len = diff; + data->best_case = best_case; + data->best_iter = *iter; + } +finally: + g_free(name); + return FALSE; +} + + +/* Returns TRUE if parent points to a newly added row, + * caller might want to expand the relevant rows in the tree view */ +static gboolean get_parent_for_file(GtkTreeStore *tree, const gchar *file, GtkTreeIter *parent) +{ + gchar *path; + GtkTreeIter iter; + gint name_diff = 0; + gboolean has_parent; + GtkTreeModel *model = GTK_TREE_MODEL(tree); + TreeForeachData data = {NULL, 0, 0, {0}, TREE_CASE_NONE}; + gboolean new_row; + + path = g_path_get_dirname(file); + + /* find best opened dir */ + data.needle = get_doc_folder(path); + data.needle_len = strlen(data.needle); + name_diff = strlen(path) - data.needle_len; + gtk_tree_model_foreach(model, tree_foreach_callback, (gpointer)&data); + + switch (data.best_case) + { + case TREE_CASE_EQUALS: + { + *parent = data.best_iter; + /* dir already open */ + new_row = FALSE; + break; + } + case TREE_CASE_CHILD_OF: + { + /* This dir is longer than existing so just add child */ + tree_add_new_dir(tree, parent, &data.best_iter, path); + new_row = TRUE; + break; + } + case TREE_CASE_PARENT_OF: + { + /* More complicated logic. This dir should be a parent + * of existing, so reparent existing dir. + */ + has_parent = gtk_tree_model_iter_parent(model, &iter, &data.best_iter); + tree_add_new_dir(tree, parent, has_parent ? &iter : NULL, path); + tree_reparent(tree, &data.best_iter, parent); + new_row = TRUE; + break; + } + case TREE_CASE_HAVE_SAME_PARENT: + { + /* Even more complicated logic. Both dirs have same + * parent, so create new parent and reparent them + */ + GtkTreeIter new_parent; + gchar *newpath = g_strndup(path, data.best_len + name_diff); + + has_parent = gtk_tree_model_iter_parent(model, &iter, &data.best_iter); + tree_add_new_dir(tree, &new_parent, has_parent ? &iter : NULL, newpath); + tree_reparent(tree, &data.best_iter, &new_parent); + tree_add_new_dir(tree, parent, &new_parent, path); + + g_free(newpath); + new_row = TRUE; + break; + } + default: + { + tree_add_new_dir(tree, parent, NULL, path); + new_row = TRUE; + break; + } + } + + g_free(data.needle); g_free(path); - return &parent; + + return new_row; +} + + +/* Returns true when parent points to a newly added row. */ +static gboolean sidebar_openfiles_add_iter(GtkTreeStore *tree, const gchar *file, + GtkTreeIter *iter, GtkTreeIter *parent) +{ + gboolean new_row; + /* get_parent_for_file() might add rows for parent directories */ + new_row = get_parent_for_file(tree, file, parent); + /* insert row for this file */ + gtk_tree_store_append(tree, iter, parent); + + return new_row; +} + + +static void expand_iter(GtkTreeIter *iter) +{ + GtkTreePath *path; + + path = gtk_tree_model_get_path(GTK_TREE_MODEL(store_openfiles), iter); + gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tv.tree_openfiles), path); + gtk_tree_path_free(path); } @@ -463,45 +910,87 @@ static GtkTreeIter *get_doc_parent(GeanyDocument *doc) void sidebar_openfiles_add(GeanyDocument *doc) { GtkTreeIter *iter = &doc->priv->iter; - GtkTreeIter *parent = get_doc_parent(doc); + GtkTreeIter parent; + const gchar *filename = DOC_FILENAME(doc); gchar *basename; const GdkColor *color = document_get_status_color(doc); static GIcon *file_icon = NULL; + gboolean expand = FALSE; - gtk_tree_store_append(store_openfiles, iter, parent); - - /* check if new parent */ - if (parent && gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store_openfiles), parent) == 1) - { - GtkTreePath *path; + if (interface_prefs.openfiles_path_mode != OPENFILES_PATHS_NONE) + expand = sidebar_openfiles_add_iter(store_openfiles, filename, iter, &parent); + else + gtk_tree_store_append(store_openfiles, iter, NULL); - /* expand parent */ - path = gtk_tree_model_get_path(GTK_TREE_MODEL(store_openfiles), parent); - gtk_tree_view_expand_row(GTK_TREE_VIEW(tv.tree_openfiles), path, TRUE); - gtk_tree_path_free(path); - } if (!file_icon) file_icon = ui_get_mime_icon("text/plain"); - basename = g_path_get_basename(DOC_FILENAME(doc)); + basename = g_path_get_basename(filename); gtk_tree_store_set(store_openfiles, iter, DOCUMENTS_ICON, (doc->file_type && doc->file_type->icon) ? doc->file_type->icon : file_icon, DOCUMENTS_SHORTNAME, basename, DOCUMENTS_DOCUMENT, doc, DOCUMENTS_COLOR, color, - DOCUMENTS_FILENAME, DOC_FILENAME(doc), -1); + DOCUMENTS_FILENAME, DOC_FILENAME(doc), + DOCUMENTS_FOLD, FALSE, + -1); g_free(basename); + + /* expand new parent if necessary */ + if (expand) + expand_iter(&parent); } -static void openfiles_remove(GeanyDocument *doc) +/* Returns true if new_node points to a reparented directory, as a result of merging empty + * directories. + */ +void sidebar_openfiles_remove_iter(GtkTreeStore *tree, GtkTreeIter *iter_) { - GtkTreeIter *iter = &doc->priv->iter; + GtkTreeIter iter = *iter_; GtkTreeIter parent; + GtkTreeModel *model = GTK_TREE_MODEL(store_openfiles); + + /* walk on top and close all orphaned parents */ + while (gtk_tree_model_iter_parent(model, &parent, &iter) + && gtk_tree_model_iter_n_children(model, &parent) == 1) + { + iter = parent; + } + gtk_tree_store_remove(store_openfiles, &iter); + + /* If, after removing, there is a single silbling left and it represents + * a directory, it can be merged with the parent directory row, + * essentially to reverse the effect of TREE_CASE_PARENT_OF and TREE_CASE_HAVE_SAME_PARENT + * in get_doc_parent(). Inherit fold state from the merged child as well. + */ + if (gtk_tree_store_iter_is_valid(store_openfiles, &parent) + && gtk_tree_model_iter_n_children(model, &parent) == 1) + { + GeanyDocument *other_doc; + GtkTreeIter child, pparent; + gboolean fold, has_parent; + + gtk_tree_model_iter_nth_child(model, &child, &parent, 0); + gtk_tree_model_get(model, &child, DOCUMENTS_DOCUMENT, &other_doc, -1); + if (!other_doc) + { + has_parent = gtk_tree_model_iter_parent(model, &pparent, &parent); + tree_reparent(store_openfiles, &child, has_parent ? &pparent : NULL); + gtk_tree_store_remove(store_openfiles, &parent); + /* Expand if the child node was expanded before the merge. */ + gtk_tree_model_get(model, &child, DOCUMENTS_FOLD, &fold, -1); + if (!fold) + expand_iter(&child); + } + } +} - if (gtk_tree_model_iter_parent(GTK_TREE_MODEL(store_openfiles), &parent, iter) && - gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store_openfiles), &parent) == 1) - gtk_tree_store_remove(store_openfiles, &parent); + +static void openfiles_remove(GeanyDocument *doc) +{ + if (interface_prefs.openfiles_path_mode != OPENFILES_PATHS_NONE) + sidebar_openfiles_remove_iter(store_openfiles, &doc->priv->iter); else - gtk_tree_store_remove(store_openfiles, iter); + gtk_tree_store_remove(store_openfiles, &doc->priv->iter); } @@ -619,10 +1108,13 @@ void sidebar_add_common_menu_items(GtkMenu *menu) g_signal_connect(item, "activate", G_CALLBACK(on_hide_sidebar), NULL); } + static void on_openfiles_show_paths_activate(GtkCheckMenuItem *item, gpointer user_data) { - interface_prefs.documents_show_paths = gtk_check_menu_item_get_active(item); + interface_prefs.openfiles_path_mode = GPOINTER_TO_INT(user_data); sidebar_openfiles_update_all(); + gtk_tree_view_expand_all(GTK_TREE_VIEW(tv.tree_openfiles)); + sidebar_select_openfiles_item(document_get_current()); } @@ -678,6 +1170,28 @@ static void on_openfiles_expand_collapse(GtkMenuItem *menuitem, gpointer user_da } +static void create_show_paths_popup_menu(void) +{ + GSList *group = NULL; + const gchar *items[OPENFILES_PATHS_COUNT] = { + [OPENFILES_PATHS_NONE] = _("D_ocuments Only"), + [OPENFILES_PATHS_LIST] = _("Show _Paths"), + [OPENFILES_PATHS_TREE] = _("Show _Tree") + }; + + for (guint i = 0; i < G_N_ELEMENTS(items); i++) + { + GtkWidget *w = gtk_radio_menu_item_new_with_mnemonic(group, items[i]); + group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(w)); + gtk_widget_show(w); + gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), w); + g_signal_connect(w, "activate", + G_CALLBACK(on_openfiles_show_paths_activate), GINT_TO_POINTER(i)); + doc_items.show_paths[i] = w; + } +} + + static void create_openfiles_popup_menu(void) { GtkWidget *item; @@ -725,12 +1239,7 @@ static void create_openfiles_popup_menu(void) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); - doc_items.show_paths = gtk_check_menu_item_new_with_mnemonic(_("Show _Paths")); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(doc_items.show_paths), interface_prefs.documents_show_paths); - gtk_widget_show(doc_items.show_paths); - gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), doc_items.show_paths); - g_signal_connect(doc_items.show_paths, "activate", - G_CALLBACK(on_openfiles_show_paths_activate), NULL); + create_show_paths_popup_menu(); item = gtk_separator_menu_item_new(); gtk_widget_show(item); @@ -752,38 +1261,25 @@ static void create_openfiles_popup_menu(void) } -static void unfold_parent(GtkTreeIter *iter) -{ - GtkTreeIter parent; - - if (gtk_tree_model_iter_parent(GTK_TREE_MODEL(store_openfiles), &parent, iter)) - { - GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store_openfiles), &parent); - gtk_tree_view_expand_row(GTK_TREE_VIEW(tv.tree_openfiles), path, TRUE); - gtk_tree_path_free(path); - } -} - - /* compares the given data with the doc pointer from the selected row of openfiles * treeview, in case of a match the row is selected and TRUE is returned * (called indirectly from gtk_tree_model_foreach()) */ -static gboolean tree_model_find_node(GtkTreeModel *model, GtkTreePath *path, - GtkTreeIter *iter, gpointer data) +static gboolean tree_model_find_node(GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) { GeanyDocument *doc; - gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_DOCUMENT, &doc, -1); - + gtk_tree_model_get(model, iter, DOCUMENTS_DOCUMENT, &doc, -1); if (doc == data) { - /* unfolding also prevents a strange bug where the selection gets stuck on the parent - * when it is collapsed and then switching documents */ - unfold_parent(iter); + gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tv.tree_openfiles), path); gtk_tree_view_set_cursor(GTK_TREE_VIEW(tv.tree_openfiles), path, NULL, FALSE); return TRUE; } - else return FALSE; + + return FALSE; } @@ -821,36 +1317,38 @@ static void document_action(GeanyDocument *doc, gint action) } +static void on_openfiles_document_action_apply(GtkTreeModel *model, GtkTreeIter iter, gint action) +{ + GeanyDocument *doc; + gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, -1); + if (doc) + { + document_action(doc, action); + } + else + { + /* parent item selected */ + GtkTreeIter child; + gint i = gtk_tree_model_iter_n_children(model, &iter) - 1; + + while (i >= 0 && gtk_tree_model_iter_nth_child(model, &child, &iter, i)) + { + on_openfiles_document_action_apply(model, child, action); + i--; + } + } +} + + static void on_openfiles_document_action(GtkMenuItem *menuitem, gpointer user_data) { GtkTreeIter iter; GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); GtkTreeModel *model; - GeanyDocument *doc; gint action = GPOINTER_TO_INT(user_data); if (gtk_tree_selection_get_selected(selection, &model, &iter)) - { - gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, -1); - if (doc) - { - document_action(doc, action); - } - else - { - /* parent item selected */ - GtkTreeIter child; - gint i = gtk_tree_model_iter_n_children(model, &iter) - 1; - - while (i >= 0 && gtk_tree_model_iter_nth_child(model, &child, &iter, i)) - { - gtk_tree_model_get(model, &child, DOCUMENTS_DOCUMENT, &doc, -1); - - document_action(doc, action); - i--; - } - } - } + on_openfiles_document_action_apply(model, iter, action); } @@ -1034,8 +1532,10 @@ static void documents_menu_update(GtkTreeSelection *selection) sel = gtk_tree_selection_get_selected(selection, &model, &iter); if (sel) { - gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, - DOCUMENTS_SHORTNAME, &shortname, -1); + gtk_tree_model_get(model, &iter, + DOCUMENTS_DOCUMENT, &doc, + DOCUMENTS_SHORTNAME, &shortname, + -1); } path = !EMPTY(shortname) && (g_path_is_absolute(shortname) || @@ -1048,16 +1548,20 @@ static void documents_menu_update(GtkTreeSelection *selection) gtk_widget_set_sensitive(doc_items.find_in_files, sel); g_free(shortname); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(doc_items.show_paths), interface_prefs.documents_show_paths); - gtk_widget_set_sensitive(doc_items.expand_all, interface_prefs.documents_show_paths); - gtk_widget_set_sensitive(doc_items.collapse_all, interface_prefs.documents_show_paths); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(doc_items.show_paths[interface_prefs.openfiles_path_mode]), TRUE); + gtk_widget_set_sensitive(doc_items.expand_all, interface_prefs.openfiles_path_mode); + gtk_widget_set_sensitive(doc_items.collapse_all, interface_prefs.openfiles_path_mode); } static StashGroup *stash_group = NULL; static void on_load_settings(void) { + if (interface_prefs.openfiles_path_mode < 0 + || interface_prefs.openfiles_path_mode >= OPENFILES_PATHS_COUNT) + interface_prefs.openfiles_path_mode = OPENFILES_PATHS_TREE; + tag_window = ui_lookup_widget(main_widgets.window, "scrolledwindow2"); prepare_openfiles(); @@ -1092,7 +1596,7 @@ void sidebar_init(void) configuration_add_session_group(group, FALSE); stash_group = group; - /* delay building documents treeview until sidebar font has been read */ + /* Delay building documents treeview until sidebar font has been read and prefs are sanitized */ g_signal_connect(geany_object, "load-settings", on_load_settings, NULL); g_signal_connect(geany_object, "save-settings", on_save_settings, NULL); @@ -1105,8 +1609,6 @@ void sidebar_init(void) G_CALLBACK(sidebar_tabs_show_hide), NULL); g_signal_connect_after(main_widgets.sidebar_notebook, "switch-page", G_CALLBACK(on_sidebar_switch_page), NULL); - - sidebar_tabs_show_hide(GTK_NOTEBOOK(main_widgets.sidebar_notebook), NULL, 0, NULL); } #define WIDGET(w) w && GTK_IS_WIDGET(w) Modified: src/sidebar.h 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -48,12 +48,6 @@ enum SYMBOLS_N_COLUMNS }; -enum -{ - SHOW_PATHS_NONE, - SHOW_PATHS_LIST -}; - void sidebar_init(void); void sidebar_finalize(void); Modified: src/ui_utils.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -71,7 +71,7 @@ typedef struct GeanyInterfacePrefs gint symbols_sort_mode; /**< symbol list sorting mode */ /** whether to show a warning when closing a project to open a new one */ gboolean warn_on_project_close; - gint documents_show_paths; + gint openfiles_path_mode; } GeanyInterfacePrefs; Modified: src/utils.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -468,7 +468,7 @@ gdouble utils_scale_round(gdouble val, gdouble factor) /* like g_utf8_strdown() but if @str is not valid UTF8, convert it from locale first. * returns NULL on charset conversion failure */ -static gchar *utf8_strdown(const gchar *str) +gchar *utils_utf8_strdown(const gchar *str) { gchar *down; @@ -512,10 +512,10 @@ gint utils_str_casecmp(const gchar *s1, const gchar *s2) g_return_val_if_fail(s2 != NULL, -1); /* ensure strings are UTF-8 and lowercase */ - tmp1 = utf8_strdown(s1); + tmp1 = utils_utf8_strdown(s1); if (! tmp1) return 1; - tmp2 = utf8_strdown(s2); + tmp2 = utils_utf8_strdown(s2); if (! tmp2) { g_free(tmp1); Modified: src/utils.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -194,6 +194,8 @@ gboolean utils_spawn_async(const gchar *dir, gchar **argv, gchar **env, GSpawnFl GSpawnChildSetupFunc child_setup, gpointer user_data, GPid *child_pid, GError **error); +gchar *utils_utf8_strdown(const gchar *str); + gint utils_str_casecmp(const gchar *s1, const gchar *s2); gchar *utils_get_date_time(const gchar *format, time_t *time_to_use); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 3bd2c1: Use notarytool instead of deprecated altool for notarization
by Jiří Techet 08 Jun '22

08 Jun '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 07 Jun 2022 18:58:56 UTC Commit: 3bd2c196928797e318a4f8a74e568b6e077fd2d2 https://github.com/geany/geany-osx/commit/3bd2c196928797e318a4f8a74e568b6e0… Log Message: ----------- Use notarytool instead of deprecated altool for notarization Modified Paths: -------------- notarize.sh Modified: notarize.sh 29 lines changed, 3 insertions(+), 26 deletions(-) =================================================================== @@ -1,11 +1,8 @@ #!/bin/sh -# -# Modified version of -# https://github.com/thommcgrath/Beacon/blob/master/Installers/Mac/Build.sh DMGFILE="${1}" APPLEID="${2}" -BUNDLEID="org.geany.geany" +TEAMID=$(echo $SIGN_CERTIFICATE | sed -n 's/Developer ID Application: .* ($.*$)/\1/p') # App-specific password, see https://support.apple.com/en-us/HT204397 stty -echo @@ -14,25 +11,5 @@ read PASSWORD stty echo printf "\n" -echo "Uploading disk image for notarization. This can take a while."; -xcrun altool --notarize-app -f "${DMGFILE}" --primary-bundle-id "${BUNDLEID}" -u "${APPLEID}" -p "${PASSWORD}" > ${TMPDIR}notarize_output 2>&1 || { cat ${TMPDIR}notarize_output; rm -f ${TMPDIR}notarize_output; exit $?; }; -cat ${TMPDIR}notarize_output; -REQUESTUUID=$(sed -n 's/RequestUUID = $.*$/\1/p' ${TMPDIR}notarize_output); -echo "Disk image has been uploaded. Request UUID is ${REQUESTUUID}. Checking status every 10 seconds:"; -STATUS="in progress"; -while [ "${STATUS}" = "in progress" ]; do - sleep 10; - xcrun altool --notarization-info "${REQUESTUUID}" -u "${APPLEID}" -p "${PASSWORD}" > ${TMPDIR}notarize_output 2>&1 || { cat ${TMPDIR}notarize_output; rm -f ${TMPDIR}notarize_output; echo "Failed to check on notarization status."; exit $?; }; - STATUS=$(sed -ne 's/^[[:space:]]*Status: $.*$$/\1/p' ${TMPDIR}notarize_output); - echo "Status: ${STATUS}" -done; -if [ "${STATUS}" = "success" ]; then - echo "Stapling file."; - xcrun stapler staple "${DMGFILE}"; -else - cat ${TMPDIR}notarize_output; - rm -f ${TMPDIR}notarize_output; - echo "Disk image WAS NOT NOTARIZED, status is ${STATUS}."; - exit 1; -fi; -rm -f ${TMPDIR}notarize_output; +xcrun notarytool submit "${DMGFILE}" --wait --apple-id "${APPLEID}" --password "${PASSWORD}" --team-id "${TEAMID}" && xcrun stapler staple "${DMGFILE}"; + -------------- 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 June 2022