Commits March 2016

commits@lists.geany.org

1 participants
100 discussions

[geany/geany] a71dbc: ruby: Use NULL for initialize an pointer variable
by Masatake YAMATO 14 Mar '16

14 Mar '16

Branch: refs/heads/master Author: Masatake YAMATO <yamato(a)redhat.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 14 Mar 2016 18:27:21 UTC Commit: a71dbcbeca82a4368d24873fb2d3497c443ccc3b https://github.com/geany/geany/commit/a71dbcbeca82a4368d24873fb2d3497c443cc… Log Message: ----------- ruby: Use NULL for initialize an pointer variable Suppress a warning reported by sparse. Signed-off-by: Masatake YAMATO <yamato(a)redhat.com> Modified Paths: -------------- tagmanager/ctags/ruby.c Modified: tagmanager/ctags/ruby.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -41,7 +41,7 @@ static kindOption RubyKinds [] = { { TRUE, 'C', "context", "contexts" } }; -static stringList* nesting = 0; +static stringList* nesting = NULL; /* * FUNCTION DEFINITIONS @@ -113,10 +113,10 @@ static boolean parseRubyOperator (vString* name, const unsigned char** cp) "<=", "<", ">", ">=", "<=>", "==", "===", "!=", "=~", "!~", "`", - 0 + NULL }; int i; - for (i = 0; RUBY_OPERATORS[i] != 0; ++i) + for (i = 0; RUBY_OPERATORS[i] != NULL; ++i) { if (canMatch (cp, RUBY_OPERATORS[i])) { @@ -160,7 +160,7 @@ static void emitRubyTag (vString* name, rubyKind kind) /* Tests whether 'ch' is a character in 'list'. */ static boolean charIsIn (char ch, const char* list) { - return (strchr (list, ch) != 0); + return (strchr (list, ch) != NULL); } /* Advances 'cp' over leading whitespace. */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 68322f: ruby: fix wrong memory access in catMatch
by Masatake YAMATO 14 Mar '16

14 Mar '16

Branch: refs/heads/master Author: Masatake YAMATO <yamato(a)redhat.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 14 Mar 2016 18:27:21 UTC Commit: 68322fcb54bda53137429321c58000b2683fc2d8 https://github.com/geany/geany/commit/68322fcb54bda53137429321c58000b2683fc… Log Message: ----------- ruby: fix wrong memory access in catMatch fuzz target reports canMatch access wrong memory area when php-anonymous_functions.d/input.php is given as input. This patch fixes it. Signed-off-by: Masatake YAMATO <yamato(a)redhat.com> Modified Paths: -------------- tagmanager/ctags/ruby.c Modified: tagmanager/ctags/ruby.c 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -81,6 +81,11 @@ static vString* stringListToScope (const stringList* list) static boolean canMatch (const unsigned char** s, const char* literal) { const int literal_length = strlen (literal); + const int s_length = strlen ((const char *)*s); + + if (s_length < literal_length) + return FALSE; + const unsigned char next_char = *(*s + literal_length); if (strncmp ((const char*) *s, literal, literal_length) != 0) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e12904: Honor --ruby-kinds option in ruby.c
by Artem Nezvigin 14 Mar '16

14 Mar '16

Branch: refs/heads/master Author: Artem Nezvigin <artem(a)artnez.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 14 Mar 2016 18:26:54 UTC Commit: e129043c9810cbbcb87b811d5f5b2bfd7842405a https://github.com/geany/geany/commit/e129043c9810cbbcb87b811d5f5b2bfd78424… Log Message: ----------- Honor --ruby-kinds option in ruby.c Fixes universal-ctags/ctags#49 Modified Paths: -------------- tagmanager/ctags/ruby.c Modified: tagmanager/ctags/ruby.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -135,6 +135,10 @@ static void emitRubyTag (vString* name, rubyKind kind) tagEntryInfo tag; vString* scope; + if (!RubyKinds[kind].enabled) { + return; + } + vStringTerminate (name); scope = stringListToScope (nesting); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2269c4: RSpec Code added. Courtesy: mortice
by Ram Singla 14 Mar '16

14 Mar '16

Branch: refs/heads/master Author: Ram Singla <ram.singla(a)gmail.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 14 Mar 2016 14:18:14 UTC Commit: 2269c42dde2ea76228ee150cf0cc9796340877ac https://github.com/geany/geany/commit/2269c42dde2ea76228ee150cf0cc979634087… Log Message: ----------- RSpec Code added. Courtesy: mortice Modified Paths: -------------- tagmanager/ctags/ruby.c Modified: tagmanager/ctags/ruby.c 28 lines changed, 25 insertions(+), 3 deletions(-) =================================================================== @@ -26,7 +26,7 @@ * DATA DECLARATIONS */ typedef enum { - K_UNDEFINED = -1, K_CLASS, K_METHOD, K_MODULE, K_SINGLETON + K_UNDEFINED = -1, K_CLASS, K_METHOD, K_MODULE, K_SINGLETON, K_DESCRIBE, K_CONTEXT } rubyKind; /* @@ -36,7 +36,9 @@ static kindOption RubyKinds [] = { { TRUE, 'c', "class", "classes" }, { TRUE, 'f', "method", "methods" }, { TRUE, 'm', "namespace", "modules" }, - { TRUE, 'F', "member", "singleton methods" } + { TRUE, 'F', "member", "singleton methods" }, + { TRUE, 'd', "describe", "describes" }, + { TRUE, 'C', "context", "contexts" } }; static stringList* nesting = 0; @@ -178,7 +180,19 @@ static rubyKind parseIdentifier ( * point or equals sign. These are all part of the name. * A method name may also contain a period if it's a singleton method. */ - const char* also_ok = (kind == K_METHOD) ? "_.?!=" : "_"; + const char* also_ok; + if (kind == K_METHOD) + { + also_ok = "_.?!="; + } + else if (kind == K_DESCRIBE || kind == K_CONTEXT) + { + also_ok = " ,\".#_?!='/-"; + } + else + { + also_ok = "_"; + } skipWhitespace (cp); @@ -349,6 +363,14 @@ static void findRubyTags (void) { readAndEmitTag (&cp, K_METHOD); } + else if (canMatch (&cp, "describe")) + { + readAndEmitTag (&cp, K_DESCRIBE); + } + else if (canMatch (&cp, "context")) + { + readAndEmitTag (&cp, K_CONTEXT); + } while (*cp != '\0') { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0bafb0: gtkdoc: fix gtkdoc header script for structs with inline types
by Thomas Martitz 14 Mar '16

14 Mar '16

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Mon, 14 Mar 2016 07:26:45 UTC Commit: 0bafb067b9ce0b1d5218f7523473052bcd0dab75 https://github.com/geany/geany/commit/0bafb067b9ce0b1d5218f7523473052bcd0da… Log Message: ----------- gtkdoc: fix gtkdoc header script for structs with inline types Doxygen adds unhandled xml output for structs that define types inline, for example struct Foo { enum { FOO, BAR } baz; }. A type definitions precedes the members. The script wrongly assumed the first sectiondef child of compounddef would contain all members, but actually this is the case for sectiondefs with kind=public-attrib (the sectiondef defining the type has kind=public-type). Modified Paths: -------------- scripts/gen-api-gtkdoc.py Modified: scripts/gen-api-gtkdoc.py 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -292,9 +292,9 @@ class DoxyStruct(DoxyElement): @staticmethod def from_compounddef(xml, typedefs=[]): name = xml.find("compoundname").text - section = xml.find("sectiondef") d = "struct %s {\n" % name - for p in section.findall("memberdef"): + memberdefs = xml.xpath(".//sectiondef[@kind='public-attrib']/memberdef") + for p in memberdefs: # workaround for struct members. g-ir-scanner can't properly map struct members # (beginning with struct GeanyFoo) to the typedef and assigns a generic type for them # thus we fix that up here and enforce usage of the typedef. These are written @@ -314,7 +314,7 @@ def from_compounddef(xml, typedefs=[]): d += "};\n" e = DoxyStruct(name, d) e.add_brief(xml.find("briefdescription")) - for p in section.findall("memberdef"): + for p in memberdefs: e.add_member(p) return e -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3640b3: Move *.tags files to the tags directory
by Jiří Techet 13 Mar '16

13 Mar '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 13 Mar 2016 16:35:14 UTC Commit: 3640b3bc4461f302cc2375e4998c58f7729493eb https://github.com/geany/geany/commit/3640b3bc4461f302cc2375e4998c58f772949… Log Message: ----------- Move *.tags files to the tags directory ignore.tags is still in ~/.config/geany Modified Paths: -------------- data/Makefile.am data/tags/c99.tags data/tags/html_entities.tags data/tags/pascal.tags data/tags/php.tags data/tags/python.tags src/geany.h src/symbols.c Modified: data/Makefile.am 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -73,11 +73,11 @@ filetypes = \ filedefs/filetypes.zephir tagfiles = \ - c99.tags \ - php.tags \ - python.tags \ - pascal.tags \ - html_entities.tags + tags/c99.tags \ + tags/php.tags \ + tags/python.tags \ + tags/pascal.tags \ + tags/html_entities.tags template_files = \ templates/files/file.html \ Modified: data/tags/c99.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/tags/html_entities.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/tags/pascal.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/tags/php.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/tags/python.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: src/geany.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -41,6 +41,7 @@ G_BEGIN_DECLS * listed in the documentation should not be changed */ #define GEANY_FILEDEFS_SUBDIR "filedefs" #define GEANY_TEMPLATES_SUBDIR "templates" +#define GEANY_TAGS_SUBDIR "tags" #define GEANY_CODENAME "Malvek" #define GEANY_HOMEPAGE "http://www.geany.org/" #define GEANY_WIKI "http://wiki.geany.org/" Modified: src/symbols.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -243,7 +243,7 @@ void symbols_global_tags_loaded(guint file_type_idx) if (! tfi->tags_loaded) { - gchar *fname = g_build_filename(app->datadir, tfi->tag_file, NULL); + gchar *fname = g_build_filename(app->datadir, GEANY_TAGS_SUBDIR, tfi->tag_file, NULL); symbols_load_global_tags(fname, filetypes[file_type_idx]); tfi->tags_loaded = TRUE; @@ -263,7 +263,7 @@ static void html_tags_loaded(void) tfi = &tag_file_info[GTF_HTML_ENTITIES]; if (! tfi->tags_loaded) { - gchar *file = g_build_filename(app->datadir, tfi->tag_file, NULL); + gchar *file = g_build_filename(app->datadir, GEANY_TAGS_SUBDIR, tfi->tag_file, NULL); html_entities = utils_read_file_in_array(file); tfi->tags_loaded = TRUE; @@ -1762,13 +1762,13 @@ static void init_user_tags(void) const GSList *node; gchar *dir; - dir = g_build_filename(app->configdir, "tags", NULL); + dir = g_build_filename(app->configdir, GEANY_TAGS_SUBDIR, NULL); /* create the user tags dir for next time if it doesn't exist */ if (! g_file_test(dir, G_FILE_TEST_IS_DIR)) utils_mkdir(dir, FALSE); file_list = utils_get_file_list_full(dir, TRUE, FALSE, NULL); - SETPTR(dir, g_build_filename(app->datadir, "tags", NULL)); + SETPTR(dir, g_build_filename(app->datadir, GEANY_TAGS_SUBDIR, NULL)); list = utils_get_file_list_full(dir, TRUE, FALSE, NULL); g_free(dir); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e513e5: Move filetypes.* to the filedefs directory
by Jiří Techet 13 Mar '16

13 Mar '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 13 Mar 2016 16:35:08 UTC Commit: e513e5a099db21cfb518483b459d433d509c948c https://github.com/geany/geany/commit/e513e5a099db21cfb518483b459d433d509c9… Log Message: ----------- Move filetypes.* to the filedefs directory Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.CUDA.conf data/filedefs/filetypes.Clojure.conf data/filedefs/filetypes.Cython.conf data/filedefs/filetypes.Genie.conf data/filedefs/filetypes.Graphviz.conf data/filedefs/filetypes.JSON.conf data/filedefs/filetypes.Scala.conf data/filedefs/filetypes.abaqus data/filedefs/filetypes.abc data/filedefs/filetypes.actionscript data/filedefs/filetypes.ada data/filedefs/filetypes.asciidoc data/filedefs/filetypes.asm data/filedefs/filetypes.batch data/filedefs/filetypes.c data/filedefs/filetypes.caml data/filedefs/filetypes.cmake data/filedefs/filetypes.cobol data/filedefs/filetypes.coffeescript data/filedefs/filetypes.common data/filedefs/filetypes.conf data/filedefs/filetypes.cpp data/filedefs/filetypes.cs data/filedefs/filetypes.css data/filedefs/filetypes.d data/filedefs/filetypes.diff data/filedefs/filetypes.docbook data/filedefs/filetypes.erlang data/filedefs/filetypes.f77 data/filedefs/filetypes.ferite data/filedefs/filetypes.forth data/filedefs/filetypes.fortran data/filedefs/filetypes.freebasic data/filedefs/filetypes.glsl data/filedefs/filetypes.go data/filedefs/filetypes.haskell data/filedefs/filetypes.haxe data/filedefs/filetypes.html data/filedefs/filetypes.java data/filedefs/filetypes.javascript data/filedefs/filetypes.latex data/filedefs/filetypes.lisp data/filedefs/filetypes.lua data/filedefs/filetypes.makefile data/filedefs/filetypes.markdown data/filedefs/filetypes.matlab data/filedefs/filetypes.nsis data/filedefs/filetypes.objectivec data/filedefs/filetypes.pascal data/filedefs/filetypes.perl data/filedefs/filetypes.php data/filedefs/filetypes.po data/filedefs/filetypes.powershell data/filedefs/filetypes.python data/filedefs/filetypes.r data/filedefs/filetypes.restructuredtext data/filedefs/filetypes.ruby data/filedefs/filetypes.rust data/filedefs/filetypes.sh data/filedefs/filetypes.sql data/filedefs/filetypes.tcl data/filedefs/filetypes.txt2tags data/filedefs/filetypes.vala data/filedefs/filetypes.verilog data/filedefs/filetypes.vhdl data/filedefs/filetypes.xml data/filedefs/filetypes.yaml data/filedefs/filetypes.zephir src/filetypes.c src/libmain.c tests/ctags/runner.sh Modified: data/Makefile.am 136 lines changed, 68 insertions(+), 68 deletions(-) =================================================================== @@ -3,74 +3,74 @@ colorschemes = \ colorschemes/alt.conf filetypes = \ - filetypes.abaqus \ - filetypes.abc \ - filetypes.actionscript \ - filetypes.ada \ - filetypes.asciidoc \ - filetypes.asm \ - filetypes.batch \ - filetypes.c \ - filetypes.caml \ - filetypes.Clojure.conf \ - filetypes.cmake \ - filetypes.cobol \ - filetypes.coffeescript \ - filetypes.common \ - filetypes.conf \ - filetypes.cpp \ - filetypes.cs \ - filetypes.css \ - filetypes.CUDA.conf \ - filetypes.Cython.conf \ - filetypes.d \ - filetypes.diff \ - filetypes.docbook \ - filetypes.erlang \ - filetypes.f77 \ - filetypes.ferite \ - filetypes.forth \ - filetypes.fortran \ - filetypes.freebasic \ - filetypes.Genie.conf \ - filetypes.glsl \ - filetypes.go \ - filetypes.Graphviz.conf \ - filetypes.haskell \ - filetypes.haxe \ - filetypes.html \ - filetypes.java \ - filetypes.javascript \ - filetypes.JSON.conf \ - filetypes.latex \ - filetypes.lisp \ - filetypes.lua \ - filetypes.makefile \ - filetypes.markdown \ - filetypes.matlab \ - filetypes.nsis \ - filetypes.objectivec \ - filetypes.pascal \ - filetypes.perl \ - filetypes.php \ - filetypes.po \ - filetypes.powershell \ - filetypes.python \ - filetypes.r \ - filetypes.restructuredtext \ - filetypes.ruby \ - filetypes.rust \ - filetypes.Scala.conf \ - filetypes.sh \ - filetypes.sql \ - filetypes.tcl \ - filetypes.txt2tags \ - filetypes.vala \ - filetypes.verilog \ - filetypes.vhdl \ - filetypes.xml \ - filetypes.yaml \ - filetypes.zephir + filedefs/filetypes.abaqus \ + filedefs/filetypes.abc \ + filedefs/filetypes.actionscript \ + filedefs/filetypes.ada \ + filedefs/filetypes.asciidoc \ + filedefs/filetypes.asm \ + filedefs/filetypes.batch \ + filedefs/filetypes.c \ + filedefs/filetypes.caml \ + filedefs/filetypes.Clojure.conf \ + filedefs/filetypes.cmake \ + filedefs/filetypes.cobol \ + filedefs/filetypes.coffeescript \ + filedefs/filetypes.common \ + filedefs/filetypes.conf \ + filedefs/filetypes.cpp \ + filedefs/filetypes.cs \ + filedefs/filetypes.css \ + filedefs/filetypes.CUDA.conf \ + filedefs/filetypes.Cython.conf \ + filedefs/filetypes.d \ + filedefs/filetypes.diff \ + filedefs/filetypes.docbook \ + filedefs/filetypes.erlang \ + filedefs/filetypes.f77 \ + filedefs/filetypes.ferite \ + filedefs/filetypes.forth \ + filedefs/filetypes.fortran \ + filedefs/filetypes.freebasic \ + filedefs/filetypes.Genie.conf \ + filedefs/filetypes.glsl \ + filedefs/filetypes.go \ + filedefs/filetypes.Graphviz.conf \ + filedefs/filetypes.haskell \ + filedefs/filetypes.haxe \ + filedefs/filetypes.html \ + filedefs/filetypes.java \ + filedefs/filetypes.javascript \ + filedefs/filetypes.JSON.conf \ + filedefs/filetypes.latex \ + filedefs/filetypes.lisp \ + filedefs/filetypes.lua \ + filedefs/filetypes.makefile \ + filedefs/filetypes.markdown \ + filedefs/filetypes.matlab \ + filedefs/filetypes.nsis \ + filedefs/filetypes.objectivec \ + filedefs/filetypes.pascal \ + filedefs/filetypes.perl \ + filedefs/filetypes.php \ + filedefs/filetypes.po \ + filedefs/filetypes.powershell \ + filedefs/filetypes.python \ + filedefs/filetypes.r \ + filedefs/filetypes.restructuredtext \ + filedefs/filetypes.ruby \ + filedefs/filetypes.rust \ + filedefs/filetypes.Scala.conf \ + filedefs/filetypes.sh \ + filedefs/filetypes.sql \ + filedefs/filetypes.tcl \ + filedefs/filetypes.txt2tags \ + filedefs/filetypes.vala \ + filedefs/filetypes.verilog \ + filedefs/filetypes.vhdl \ + filedefs/filetypes.xml \ + filedefs/filetypes.yaml \ + filedefs/filetypes.zephir tagfiles = \ c99.tags \ Modified: data/filedefs/filetypes.CUDA.conf 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.Clojure.conf 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.Cython.conf 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.Genie.conf 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.Graphviz.conf 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.JSON.conf 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.Scala.conf 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.abaqus 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.abc 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.actionscript 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.ada 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.asciidoc 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.asm 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.batch 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.c 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.caml 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.cmake 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.cobol 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.coffeescript 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.common 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.conf 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.cpp 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.cs 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.css 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.d 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.diff 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.docbook 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.erlang 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.f77 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.ferite 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.forth 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.fortran 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.freebasic 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.glsl 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.go 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.haskell 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.haxe 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.html 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.java 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.javascript 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.latex 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.lisp 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.lua 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.makefile 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.markdown 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.matlab 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.nsis 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.objectivec 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.pascal 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.perl 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.php 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.po 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.powershell 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.python 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.r 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.restructuredtext 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.ruby 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.rust 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.sh 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.sql 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.tcl 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.txt2tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.vala 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.verilog 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.vhdl 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.xml 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.yaml 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: data/filedefs/filetypes.zephir 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: src/filetypes.c 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -346,7 +346,9 @@ void filetypes_init_types(void) { filetype_add(filetypes[ft_id]); } - init_custom_filetypes(app->datadir); + f = g_build_filename(app->datadir, GEANY_FILEDEFS_SUBDIR, NULL); + init_custom_filetypes(f); + g_free(f); f = g_build_filename(app->configdir, GEANY_FILEDEFS_SUBDIR, NULL); init_custom_filetypes(f); g_free(f); @@ -536,7 +538,7 @@ static GeanyFiletype *check_builtin_filenames(const gchar *utf8_filename) if (g_str_has_prefix(lfn, path)) found = TRUE; - SETPTR(path, g_build_filename(app->datadir, "filetypes.", NULL)); + SETPTR(path, g_build_filename(app->datadir, GEANY_FILEDEFS_SUBDIR, "filetypes.", NULL)); if (g_str_has_prefix(lfn, path)) found = TRUE; @@ -1012,7 +1014,7 @@ static gchar *filetypes_get_filename(GeanyFiletype *ft, gboolean user) if (user) file_name = g_build_filename(app->configdir, GEANY_FILEDEFS_SUBDIR, base_name, NULL); else - file_name = g_build_filename(app->datadir, base_name, NULL); + file_name = g_build_filename(app->datadir, GEANY_FILEDEFS_SUBDIR, base_name, NULL); g_free(ext); g_free(base_name); Modified: src/libmain.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -704,7 +704,7 @@ static gint create_config_dir(void) if (saved_errno == 0 && ! g_file_test(filedefs_readme, G_FILE_TEST_EXISTS)) { gchar *text = g_strconcat( -"Copy files from ", app->datadir, " to this directory to overwrite " +"Copy files from ", app->datadir, "/filedefs to this directory to overwrite " "them. To use the defaults, just delete the file in this directory.\nFor more information read " "the documentation (in ", app->docdir, G_DIR_SEPARATOR_S "index.html or visit " GEANY_HOMEPAGE ").", NULL); utils_write_file(filedefs_readme, text); Modified: tests/ctags/runner.sh 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -15,7 +15,7 @@ trap 'rm -rf "$TMPDIR"' EXIT mkdir -p "$CONFDIR" || exit 99 mkdir -p "$CONFDIR/filedefs/" || exit 99 cp "${srcdir:-.}"/../../data/filetype_extensions.conf "$CONFDIR" || exit 99 -cp "${srcdir:-.}"/../../data/filetypes.* "$CONFDIR/filedefs/" || exit 99 +cp "${srcdir:-.}"/../../data/filedefs/filetypes.* "$CONFDIR/filedefs/" || exit 99 result="$1" source="${result%.*}" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 0adc11: Update modules
by Jiří Techet 13 Mar '16

13 Mar '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 13 Mar 2016 15:26:28 UTC Commit: 0adc11341250f619e4dcee75cdfd13b548b23170 https://github.com/geany/geany-osx/commit/0adc11341250f619e4dcee75cdfd13b54… Log Message: ----------- Update modules Modified Paths: -------------- geany.modules Modified: geany.modules 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -50,9 +50,9 @@ <cmake id="libgit2" cmakeargs="-DTHREADSAFE:BOOL=1"> <branch repo="download.github.com" - module="libgit2/libgit2/archive/v0.23.3.tar.gz" - checkoutdir="libgit2-0.23.3" - version="0.23.3"/> + module="libgit2/libgit2/archive/v0.24.0.tar.gz" + checkoutdir="libgit2-0.24.0" + version="0.24.0"/> </cmake>  @@ -102,8 +102,8 @@ <autotools id="geany-release" autogenargs="--enable-mac-integration"> <branch repo="download.geany.org" - module="geany-1.26.tar.bz2" - version="1.26"/> + module="geany-1.27.tar.bz2" + version="1.27"/> <dependencies> <dep package="geany-deps" /> </dependencies> @@ -133,8 +133,8 @@  <autotools id="geany-plugins-release"> <branch repo="download.geany.org" - module="geany-plugins/geany-plugins-1.26.tar.bz2" - version="1.26"/> + module="geany-plugins/geany-plugins-1.27.tar.bz2" + version="1.27"/> <dependencies> <dep package="geany-release" /> <dep package="geany-plugins-deps" /> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 24f919: Update Scintilla to version 3.6.4
by Colomban Wendling 13 Mar '16

13 Mar '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 13 Mar 2016 14:50:36 UTC Commit: 24f91981c057a7e212c09da66fb974c3ccc85bd6 https://github.com/geany/geany/commit/24f91981c057a7e212c09da66fb974c3ccc85… Log Message: ----------- Update Scintilla to version 3.6.4 Modified Paths: -------------- scintilla/gtk/ScintillaGTK.cxx scintilla/include/ScintillaWidget.h scintilla/lexers/LexCPP.cxx scintilla/lexers/LexHTML.cxx scintilla/lexers/LexRuby.cxx scintilla/lexers/LexRust.cxx scintilla/scintilla_changes.patch scintilla/src/Document.cxx scintilla/src/Document.h scintilla/src/EditView.cxx scintilla/src/Editor.cxx scintilla/src/MarginView.cxx scintilla/version.txt Modified: scintilla/gtk/ScintillaGTK.cxx 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -2485,7 +2485,9 @@ void ScintillaGTK::PreeditChangedInlineThis() { MoveImeCarets( - (imeCharPos[preeditStr.uniStrLen]) + imeCharPos[preeditStr.cursor_pos]); if (KoreanIME()) { +#if !PLAT_GTK_WIN32 MoveImeCarets( - imeCharPos[1]); // always 2 bytes for DBCS or 3 bytes for UTF8. +#endif view.imeCaretBlockOverride = true; } @@ -3053,7 +3055,7 @@ sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_ } GEANY_API_SYMBOL -sptr_t scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) { +gintptr scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) { return scintilla_send_message(sci, iMessage, wParam, lParam); } Modified: scintilla/include/ScintillaWidget.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,7 @@ struct _ScintillaClass { GType scintilla_object_get_type (void); GtkWidget* scintilla_object_new (void); -long scintilla_object_send_message (ScintillaObject *sci, unsigned int iMessage, guintptr wParam, gintptr lParam); +gintptr scintilla_object_send_message (ScintillaObject *sci, unsigned int iMessage, guintptr wParam, gintptr lParam); #ifndef G_IR_SCANNING /* The legacy names confuse the g-ir-scanner program */ Modified: scintilla/lexers/LexCPP.cxx 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1349,14 +1349,14 @@ void SCI_METHOD LexerCPP::Fold(Sci_PositionU startPos, Sci_Position length, int } } if (options.foldSyntaxBased && (style == SCE_C_OPERATOR)) { - if (ch == '{' || ch == '[') { + if (ch == '{' || ch == '[' || ch == '(') { // Measure the minimum before a '{' to allow // folding on "} else {" if (levelMinCurrent > levelNext) { levelMinCurrent = levelNext; } levelNext++; - } else if (ch == '}' || ch == ']') { + } else if (ch == '}' || ch == ']' || ch == ')') { levelNext--; } } Modified: scintilla/lexers/LexHTML.cxx 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -828,7 +828,7 @@ static void ColouriseHyperTextDoc(Sci_PositionU startPos, Sci_Position length, i // handle end of Mako comment line else if (isMako && makoComment && (ch == '\r' || ch == '\n')) { makoComment = 0; - styler.ColourTo(i, StateToPrint); + styler.ColourTo(i - 1, StateToPrint); if (scriptLanguage == eScriptPython) { state = SCE_HP_DEFAULT; } else { Modified: scintilla/lexers/LexRuby.cxx 46 lines changed, 45 insertions(+), 1 deletions(-) =================================================================== @@ -433,6 +433,32 @@ static bool haveTargetMatch(Sci_Position currPos, return true; } +// Finds the start position of the expression containing @p pos +// @p min_pos should be a known expression start, e.g. the start of the line +static Sci_Position findExpressionStart(Sci_Position pos, + Sci_Position min_pos, + Accessor &styler) { + int depth = 0; + for (; pos > min_pos; pos -= 1) { + int style = styler.StyleAt(pos - 1); + if (style == SCE_RB_OPERATOR) { + int ch = styler[pos - 1]; + if (ch == '}' || ch == ')' || ch == ']') { + depth += 1; + } else if (ch == '{' || ch == '(' || ch == '[') { + if (depth == 0) { + break; + } else { + depth -= 1; + } + } else if (ch == ';' && depth == 0) { + break; + } + } + } + return pos; +} + // We need a check because the form // [identifier] <<[target] // is ambiguous. The Ruby lexer/parser resolves it by @@ -458,14 +484,18 @@ static bool sureThisIsNotHeredoc(Sci_Position lt2StartPos, const bool definitely_not_a_here_doc = true; const bool looks_like_a_here_doc = false; + // find the expression start rather than the line start + Sci_Position exprStartPosn = findExpressionStart(lt2StartPos, lineStartPosn, styler); + // Find the first word after some whitespace - Sci_Position firstWordPosn = skipWhitespace(lineStartPosn, lt2StartPos, styler); + Sci_Position firstWordPosn = skipWhitespace(exprStartPosn, lt2StartPos, styler); if (firstWordPosn >= lt2StartPos) { return definitely_not_a_here_doc; } prevStyle = styler.StyleAt(firstWordPosn); // If we have '<<' following a keyword, it's not a heredoc if (prevStyle != SCE_RB_IDENTIFIER + && prevStyle != SCE_RB_SYMBOL && prevStyle != SCE_RB_INSTANCE_VAR && prevStyle != SCE_RB_CLASS_VAR) { return definitely_not_a_here_doc; @@ -503,6 +533,16 @@ static bool sureThisIsNotHeredoc(Sci_Position lt2StartPos, } // Skip next batch of white-space firstWordPosn = skipWhitespace(firstWordPosn, lt2StartPos, styler); + // possible symbol for an implicit hash argument + if (firstWordPosn < lt2StartPos && styler.StyleAt(firstWordPosn) == SCE_RB_SYMBOL) { + for (; firstWordPosn <= lt2StartPos; firstWordPosn += 1) { + if (styler.StyleAt(firstWordPosn) != SCE_RB_SYMBOL) { + break; + } + } + // Skip next batch of white-space + firstWordPosn = skipWhitespace(firstWordPosn, lt2StartPos, styler); + } if (firstWordPosn != lt2StartPos) { // Have [[^ws[identifier]ws[*something_else*]ws<< return definitely_not_a_here_doc; @@ -1088,6 +1128,10 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init // <name>= is a name only when being def'd -- Get it the next time // This means that <name>=<name> is always lexed as // <name>, (op, =), <name> + } else if (ch == ':' + && isSafeWordcharOrHigh(chPrev) + && strchr(" \t\n\r", chNext) != NULL) { + state = SCE_RB_SYMBOL; } else if ((ch == '?' || ch == '!') && isSafeWordcharOrHigh(chPrev) && !isSafeWordcharOrHigh(chNext)) { Modified: scintilla/lexers/LexRust.cxx 26 lines changed, 24 insertions(+), 2 deletions(-) =================================================================== @@ -407,7 +407,18 @@ static void ScanCharacterLiteralOrLifetime(Accessor &styler, Sci_Position& pos, valid_char = ScanNumericEscape(styler, pos, 2, false); } else if (n == 'u' && !ascii_only) { pos += 2; - valid_char = ScanNumericEscape(styler, pos, 4, false); + if (styler.SafeGetCharAt(pos, '\0') != '{') { + // old-style + valid_char = ScanNumericEscape(styler, pos, 4, false); + } else { + int n_digits = 0; + while (IsADigit(styler.SafeGetCharAt(++pos, '\0'), 16) && n_digits++ < 6) { + } + if (n_digits > 0 && styler.SafeGetCharAt(pos, '\0') == '}') + pos++; + else + valid_char = false; + } } else if (n == 'U' && !ascii_only) { pos += 2; valid_char = ScanNumericEscape(styler, pos, 8, false); @@ -579,7 +590,18 @@ static void ResumeString(Accessor &styler, Sci_Position& pos, Sci_Position max, error = !ScanNumericEscape(styler, pos, 2, true); } else if (n == 'u' && !ascii_only) { pos += 2; - error = !ScanNumericEscape(styler, pos, 4, true); + if (styler.SafeGetCharAt(pos, '\0') != '{') { + // old-style + error = !ScanNumericEscape(styler, pos, 4, true); + } else { + int n_digits = 0; + while (IsADigit(styler.SafeGetCharAt(++pos, '\0'), 16) && n_digits++ < 6) { + } + if (n_digits > 0 && styler.SafeGetCharAt(pos, '\0') == '}') + pos++; + else + error = true; + } } else if (n == 'U' && !ascii_only) { pos += 2; error = !ScanNumericEscape(styler, pos, 8, true); Modified: scintilla/scintilla_changes.patch 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -15,7 +15,7 @@ index 0871ca2..49dc278 100644 } +GEANY_API_SYMBOL - sptr_t scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) { + gintptr scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) { return scintilla_send_message(sci, iMessage, wParam, lParam); } @@ -3062,6 +3064,7 @@ extern void Platform_Initialise(); Modified: scintilla/src/Document.cxx 36 lines changed, 18 insertions(+), 18 deletions(-) =================================================================== @@ -436,12 +436,12 @@ static bool IsSubordinate(int levelStart, int levelTry) { if (levelTry & SC_FOLDLEVELWHITEFLAG) return true; else - return (levelStart & SC_FOLDLEVELNUMBERMASK) < (levelTry & SC_FOLDLEVELNUMBERMASK); + return LevelNumber(levelStart) < LevelNumber(levelTry); } int Document::GetLastChild(int lineParent, int level, int lastLine) { if (level == -1) - level = GetLevel(lineParent) & SC_FOLDLEVELNUMBERMASK; + level = LevelNumber(GetLevel(lineParent)); int maxLine = LinesTotal(); int lookLastLine = (lastLine != -1) ? Platform::Minimum(LinesTotal() - 1, lastLine) : -1; int lineMaxSubord = lineParent; @@ -454,7 +454,7 @@ int Document::GetLastChild(int lineParent, int level, int lastLine) { lineMaxSubord++; } if (lineMaxSubord > lineParent) { - if (level > (GetLevel(lineMaxSubord + 1) & SC_FOLDLEVELNUMBERMASK)) { + if (level > LevelNumber(GetLevel(lineMaxSubord + 1))) { // Have chewed up some whitespace that belongs to a parent so seek back if (GetLevel(lineMaxSubord) & SC_FOLDLEVELWHITEFLAG) { lineMaxSubord--; @@ -465,16 +465,16 @@ int Document::GetLastChild(int lineParent, int level, int lastLine) { } int Document::GetFoldParent(int line) const { - int level = GetLevel(line) & SC_FOLDLEVELNUMBERMASK; + int level = LevelNumber(GetLevel(line)); int lineLook = line - 1; while ((lineLook > 0) && ( (!(GetLevel(lineLook) & SC_FOLDLEVELHEADERFLAG)) || - ((GetLevel(lineLook) & SC_FOLDLEVELNUMBERMASK) >= level)) + (LevelNumber(GetLevel(lineLook)) >= level)) ) { lineLook--; } if ((GetLevel(lineLook) & SC_FOLDLEVELHEADERFLAG) && - ((GetLevel(lineLook) & SC_FOLDLEVELNUMBERMASK) < level)) { + (LevelNumber(GetLevel(lineLook)) < level)) { return lineLook; } else { return -1; @@ -487,11 +487,11 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in int lookLine = line; int lookLineLevel = level; - int lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; + int lookLineLevelNum = LevelNumber(lookLineLevel); while ((lookLine > 0) && ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || - ((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum >= (GetLevel(lookLine + 1) & SC_FOLDLEVELNUMBERMASK))))) { + ((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum >= LevelNumber(GetLevel(lookLine + 1)))))) { lookLineLevel = GetLevel(--lookLine); - lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; + lookLineLevelNum = LevelNumber(lookLineLevel); } int beginFoldBlock = (lookLineLevel & SC_FOLDLEVELHEADERFLAG) ? lookLine : GetFoldParent(lookLine); @@ -505,7 +505,7 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in if (endFoldBlock < line) { lookLine = beginFoldBlock - 1; lookLineLevel = GetLevel(lookLine); - lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; + lookLineLevelNum = LevelNumber(lookLineLevel); while ((lookLine >= 0) && (lookLineLevelNum >= SC_FOLDLEVELBASE)) { if (lookLineLevel & SC_FOLDLEVELHEADERFLAG) { if (GetLastChild(lookLine, -1, lookLastLine) == line) { @@ -514,17 +514,17 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in firstChangeableLineBefore = line - 1; } } - if ((lookLine > 0) && (lookLineLevelNum == SC_FOLDLEVELBASE) && ((GetLevel(lookLine - 1) & SC_FOLDLEVELNUMBERMASK) > lookLineLevelNum)) + if ((lookLine > 0) && (lookLineLevelNum == SC_FOLDLEVELBASE) && (LevelNumber(GetLevel(lookLine - 1)) > lookLineLevelNum)) break; lookLineLevel = GetLevel(--lookLine); - lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; + lookLineLevelNum = LevelNumber(lookLineLevel); } } if (firstChangeableLineBefore == -1) { - for (lookLine = line - 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; + for (lookLine = line - 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = LevelNumber(lookLineLevel); lookLine >= beginFoldBlock; - lookLineLevel = GetLevel(--lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK) { - if ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || (lookLineLevelNum > (level & SC_FOLDLEVELNUMBERMASK))) { + lookLineLevel = GetLevel(--lookLine), lookLineLevelNum = LevelNumber(lookLineLevel)) { + if ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || (lookLineLevelNum > LevelNumber(level))) { firstChangeableLineBefore = lookLine; break; } @@ -534,10 +534,10 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in firstChangeableLineBefore = beginFoldBlock - 1; int firstChangeableLineAfter = -1; - for (lookLine = line + 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; + for (lookLine = line + 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = LevelNumber(lookLineLevel); lookLine <= endFoldBlock; - lookLineLevel = GetLevel(++lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK) { - if ((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum < (GetLevel(lookLine + 1) & SC_FOLDLEVELNUMBERMASK))) { + lookLineLevel = GetLevel(++lookLine), lookLineLevelNum = LevelNumber(lookLineLevel)) { + if ((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum < LevelNumber(GetLevel(lookLine + 1)))) { firstChangeableLineAfter = lookLine; break; } Modified: scintilla/src/Document.h 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -171,6 +171,10 @@ class HighlightDelimiter { class Document; +inline int LevelNumber(int level) { + return level & SC_FOLDLEVELNUMBERMASK; +} + class LexInterface { protected: Document *pdoc; Modified: scintilla/src/EditView.cxx 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1744,7 +1744,7 @@ static void DrawFoldLines(Surface *surface, const EditModel &model, const ViewSt const int level = model.pdoc->GetLevel(line); const int levelNext = model.pdoc->GetLevel(line + 1); if ((level & SC_FOLDLEVELHEADERFLAG) && - ((level & SC_FOLDLEVELNUMBERMASK) < (levelNext & SC_FOLDLEVELNUMBERMASK))) { + (LevelNumber(level) < LevelNumber(levelNext))) { // Paint the line above the fold if ((expanded && (model.foldFlags & SC_FOLDFLAG_LINEBEFORE_EXPANDED)) || Modified: scintilla/src/Editor.cxx 23 lines changed, 20 insertions(+), 3 deletions(-) =================================================================== @@ -5292,7 +5292,7 @@ void Editor::FoldExpand(int line, int action, int level) { if (expanding && (cs.HiddenLines() == 0)) // Nothing to do return; - int lineMaxSubord = pdoc->GetLastChild(line, level & SC_FOLDLEVELNUMBERMASK); + int lineMaxSubord = pdoc->GetLastChild(line, LevelNumber(level)); line++; cs.SetVisible(line, lineMaxSubord, expanding); while (line <= lineMaxSubord) { @@ -5399,7 +5399,7 @@ void Editor::FoldAll(int action) { for (int line = 0; line < maxLine; line++) { int level = pdoc->GetLevel(line); if ((level & SC_FOLDLEVELHEADERFLAG) && - (SC_FOLDLEVELBASE == (level & SC_FOLDLEVELNUMBERMASK))) { + (SC_FOLDLEVELBASE == LevelNumber(level))) { SetFoldExpanded(line, false); int lineMaxSubord = pdoc->GetLastChild(line, -1); if (lineMaxSubord > line) { @@ -5422,17 +5422,25 @@ void Editor::FoldChanged(int line, int levelNow, int levelPrev) { FoldExpand(line, SC_FOLDACTION_EXPAND, levelPrev); } } else if (levelPrev & SC_FOLDLEVELHEADERFLAG) { + const int prevLine = line - 1; + const int prevLineLevel = pdoc->GetLevel(prevLine); + + // Combining two blocks where the first block is collapsed (e.g. by deleting the line(s) which separate(s) the two blocks) + if ((LevelNumber(prevLineLevel) == LevelNumber(levelNow)) && !cs.GetVisible(prevLine)) + FoldLine(pdoc->GetFoldParent(prevLine), SC_FOLDACTION_EXPAND); + if (!cs.GetExpanded(line)) { // Removing the fold from one that has been contracted so should expand // otherwise lines are left invisible with no way to make them visible if (cs.SetExpanded(line, true)) { RedrawSelMargin(); } + // Combining two blocks where the second one is collapsed (e.g. by adding characters in the line which separates the two blocks) FoldExpand(line, SC_FOLDACTION_EXPAND, levelPrev); } } if (!(levelNow & SC_FOLDLEVELWHITEFLAG) && - ((levelPrev & SC_FOLDLEVELNUMBERMASK) > (levelNow & SC_FOLDLEVELNUMBERMASK))) { + (LevelNumber(levelPrev) > LevelNumber(levelNow))) { if (cs.HiddenLines()) { // See if should still be hidden int parentLine = pdoc->GetFoldParent(line); @@ -5443,6 +5451,15 @@ void Editor::FoldChanged(int line, int levelNow, int levelPrev) { } } } + + // Combining two blocks where the first one is collapsed (e.g. by adding characters in the line which separates the two blocks) + if (!(levelNow & SC_FOLDLEVELWHITEFLAG) && (LevelNumber(levelPrev) < LevelNumber(levelNow))) { + if (cs.HiddenLines()) { + const int parentLine = pdoc->GetFoldParent(line); + if (!cs.GetExpanded(parentLine) && cs.GetExpanded(line)) + FoldLine(parentLine, SC_FOLDACTION_EXPAND); + } + } } void Editor::NeedShown(int pos, int len) { Modified: scintilla/src/MarginView.cxx 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -243,7 +243,7 @@ void MarginView::PaintMargin(Surface *surface, int topLine, PRectangle rc, PRect levelPrev = model.pdoc->GetLevel(lineBack); } if (!(levelPrev & SC_FOLDLEVELHEADERFLAG)) { - if ((level & SC_FOLDLEVELNUMBERMASK) < (levelPrev & SC_FOLDLEVELNUMBERMASK)) + if (LevelNumber(level) < LevelNumber(levelPrev)) needWhiteClosure = true; } } @@ -279,8 +279,8 @@ void MarginView::PaintMargin(Surface *surface, int topLine, PRectangle rc, PRect // Decide which fold indicator should be displayed const int level = model.pdoc->GetLevel(lineDoc); const int levelNext = model.pdoc->GetLevel(lineDoc + 1); - const int levelNum = level & SC_FOLDLEVELNUMBERMASK; - const int levelNextNum = levelNext & SC_FOLDLEVELNUMBERMASK; + const int levelNum = LevelNumber(level); + const int levelNextNum = LevelNumber(levelNext); if (level & SC_FOLDLEVELHEADERFLAG) { if (firstSubLine) { if (levelNum < levelNextNum) { @@ -312,7 +312,7 @@ void MarginView::PaintMargin(Surface *surface, int topLine, PRectangle rc, PRect needWhiteClosure = false; const int firstFollowupLine = model.cs.DocFromDisplay(model.cs.DisplayFromDoc(lineDoc + 1)); const int firstFollowupLineLevel = model.pdoc->GetLevel(firstFollowupLine); - const int secondFollowupLineLevelNum = model.pdoc->GetLevel(firstFollowupLine + 1) & SC_FOLDLEVELNUMBERMASK; + const int secondFollowupLineLevelNum = LevelNumber(model.pdoc->GetLevel(firstFollowupLine + 1)); if (!model.cs.GetExpanded(lineDoc)) { if ((firstFollowupLineLevel & SC_FOLDLEVELWHITEFLAG) && (levelNum > secondFollowupLineLevelNum)) @@ -380,7 +380,7 @@ void MarginView::PaintMargin(Surface *surface, int topLine, PRectangle rc, PRect sprintf(number, "%c%c %03X %03X", (lev & SC_FOLDLEVELHEADERFLAG) ? 'H' : '_', (lev & SC_FOLDLEVELWHITEFLAG) ? 'W' : '_', - lev & SC_FOLDLEVELNUMBERMASK, + LevelNumber(lev), lev >> 16 ); } else { Modified: scintilla/version.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -363 +364 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3615f5: Fix a typo in NEWS
by Colomban Wendling 13 Mar '16

13 Mar '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 13 Mar 2016 13:32:44 UTC Commit: 3615f5a91c680e24717f0c93a29c6a94121247aa https://github.com/geany/geany/commit/3615f5a91c680e24717f0c93a29c6a9412124… Log Message: ----------- Fix a typo in NEWS Modified Paths: -------------- NEWS Modified: NEWS 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -61,7 +61,7 @@ Geany 1.27 (March 13, 2016) and `scintilla_new()` (Thomas Martitz, PR#874). Windows - * Project->Open Font now respects the native dialog setting (PR#961). + * Project->Open now respects the native dialog setting (PR#961). Geany 1.26 (November 15, 2015) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2016