Commits June 2009

commits@lists.geany.org

3 participants
80 discussions

SF.net SVN: geany:[3857] trunk/
by eht16＠users.sourceforge.net 11 Jun '09

11 Jun '09

Revision: 3857 http://geany.svn.sourceforge.net/geany/?rev=3857&view=rev Author: eht16 Date: 2009-06-11 09:11:31 +0000 (Thu, 11 Jun 2009) Log Message: ----------- Ignore Waf cache files. Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - Makefile Makefile.in aclocal.m4 config.h config.h.in config.log config.status configure libtool stamp-h stamp-h1 stamp-h.in global.tags.old autom4te.cache config.guess config.sub depcomp install-sh ltmain.sh missing mkinstalldirs codenames geany.glade.bak geany.gladep.bak TODO.* RUN make_deb.sh build-stamp geany.1 geany.spec geany.desktop *.tar.* debian intltool intltool-* geany.pc + Makefile Makefile.in aclocal.m4 config.h config.h.in config.log config.status configure libtool stamp-h stamp-h1 stamp-h.in global.tags.old autom4te.cache config.guess config.sub depcomp install-sh ltmain.sh missing mkinstalldirs codenames geany.glade.bak geany.gladep.bak TODO.* RUN make_deb.sh build-stamp geany.1 geany.spec geany.desktop *.tar.* debian intltool intltool-* geany.pc _build_ .lock-wscript .waf-* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3856] trunk/scripts/create_py_tags.py
by eht16＠users.sourceforge.net 11 Jun '09

11 Jun '09

Revision: 3856 http://geany.svn.sourceforge.net/geany/?rev=3856&view=rev Author: eht16 Date: 2009-06-11 09:01:54 +0000 (Thu, 11 Jun 2009) Log Message: ----------- Fix typo. Modified Paths: -------------- trunk/scripts/create_py_tags.py Modified: trunk/scripts/create_py_tags.py =================================================================== --- trunk/scripts/create_py_tags.py 2009-06-11 09:01:11 UTC (rev 3855) +++ trunk/scripts/create_py_tags.py 2009-06-11 09:01:54 UTC (rev 3856) @@ -37,7 +37,7 @@ return for test in tags: if test.startswith(tagname): - # check wether we find a tag line which starts with the same name, + # check whether we find a tag line which starts with the same name, # include the separating TA_TYPE character to ensure we don't match # writelines() and write() return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3855] trunk
by eht16＠users.sourceforge.net 11 Jun '09

11 Jun '09

Revision: 3855 http://geany.svn.sourceforge.net/geany/?rev=3855&view=rev Author: eht16 Date: 2009-06-11 09:01:11 +0000 (Thu, 11 Jun 2009) Log Message: ----------- Update Waf to 1.5.7. Modified Paths: -------------- trunk/ChangeLog trunk/waf Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-06-10 20:36:21 UTC (rev 3854) +++ trunk/ChangeLog 2009-06-11 09:01:11 UTC (rev 3855) @@ -1,3 +1,9 @@ +2009-06-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * waf: + Update Waf to 1.5.7. + + 2009-06-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/editor.c: Modified: trunk/waf =================================================================== --- trunk/waf 2009-06-10 20:36:21 UTC (rev 3854) +++ trunk/waf 2009-06-11 09:01:11 UTC (rev 3855) @@ -31,22 +31,31 @@ """ import os, sys -if sys.hexversion<0x203000f: raise "Waf requires Python >= 2.3" +if sys.hexversion<0x203000f: raise ImportError("Waf requires Python >= 2.3") if 'PSYCOWAF' in os.environ: try:import psyco;psyco.full() except:pass -VERSION="1.5.3" -REVISION="acc5828c66ed33800741f39f185080dd" -INSTALL=sys.platform=='win32' and 'c:/temp' or '/usr/local' -C1='#(' -C2='#&' +VERSION="1.5.7" +REVISION="8edda22ed216daab7aed3d430dc291cf" +INSTALL='' +C1='#+' +C2='#)' cwd = os.getcwd() join = os.path.join +WAF='waf' +def b(x): + return x + +if sys.hexversion>0x300000f: + WAF='waf3' + def b(x): + return x.encode() + def err(m): - print ('\033[91mError: %s\033[0m' % m) + print(('\033[91mError: %s\033[0m' % m)) sys.exit(1) def unpack_wafdir(dir): @@ -55,13 +64,13 @@ while 1: line = f.readline() if not line: err("run waf-light from a folder containing wafadmin") - if line == '#==>\n': + if line == b('#==>\n'): txt = f.readline() if not txt: err(c % 1) - if f.readline()!='#<==\n': err(c % 2) + if f.readline()!=b('#<==\n'): err(c % 2) break if not txt: err(c % 3) - txt = txt[1:-1].replace(C1, '\n').replace(C2, '\r') + txt = txt[1:-1].replace(b(C1), b('\n')).replace(b(C2), b('\r')) import shutil, tarfile try: shutil.rmtree(dir) @@ -75,13 +84,25 @@ t.write(txt) t.close() - t = tarfile.open(tmp) - for x in t: t.extract(x) - t.close() + try: + t = tarfile.open(tmp) + for x in t: t.extract(x) + t.close() + except: + os.chdir(cwd) + try: shutil.rmtree(dir) + except OSError: pass + err("Waf cannot be unpacked, check that bzip2 support is present") os.chmod(join('wafadmin','Tools'), 493) os.unlink(tmp) + + if sys.hexversion>0x300000f: + sys.path = [join(dir, 'wafadmin')] + sys.path + import py3kfixes + py3kfixes.fixdir(dir) + os.chdir(cwd) def test(dir): @@ -102,15 +123,15 @@ if w: return w err("waf-light requires wafadmin -> export WAFDIR=/folder") - dir = "/lib/waf-%s-%s/" % (VERSION, REVISION) + dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION) for i in [INSTALL,'/usr','/usr/local','/opt']: w = test(i+dir) if w: return w #waf-local - s = '.waf-%s-%s' + s = '.%s-%s-%s' if sys.platform == 'win32': s = s[1:] - dir = join(base, s % (VERSION, REVISION)) + dir = join(base, s % (WAF, VERSION, REVISION)) w = test(dir) if w: return w @@ -125,7 +146,8 @@ import Scripting Scripting.prepare(t, cwd, VERSION, wafdir) +sys.exit(0) #==> @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3854] trunk
by eht16＠users.sourceforge.net 10 Jun '09

10 Jun '09

Revision: 3854 http://geany.svn.sourceforge.net/geany/?rev=3854&view=rev Author: eht16 Date: 2009-06-10 20:36:21 +0000 (Wed, 10 Jun 2009) Log Message: ----------- Fix doxygen warnings. Modified Paths: -------------- trunk/ChangeLog trunk/doc/Doxyfile.in trunk/tagmanager/include/tm_source_file.h trunk/tagmanager/include/tm_work_object.h trunk/tagmanager/include/tm_workspace.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-06-10 18:42:13 UTC (rev 3853) +++ trunk/ChangeLog 2009-06-10 20:36:21 UTC (rev 3854) @@ -3,8 +3,13 @@ * src/editor.c: Display calltips for Pascal symbols in the Pascal way (#2803945). * tagmanager/pascal.c: - Fix wrongly set return values for procedures (closes #2803945. + Fix wrongly set return values for procedures (closes #2803945). + * doc/Doxyfile.in, tagmanager/include/tm_work_object.h, + tagmanager/include/tm_source_file.h, + tagmanager/include/tm_workspace.h: + Fix doxygen warnings. + 2009-06-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/editor.c, tagmanager/include/tm_workspace.h, Modified: trunk/doc/Doxyfile.in =================================================================== --- trunk/doc/Doxyfile.in 2009-06-10 18:42:13 UTC (rev 3853) +++ trunk/doc/Doxyfile.in 2009-06-10 20:36:21 UTC (rev 3854) @@ -50,7 +50,7 @@ SIP_SUPPORT = NO DISTRIBUTE_GROUP_DOC = NO SUBGROUPING = YES -TYPEDEF_HIDES_STRUCT = YES +TYPEDEF_HIDES_STRUCT = NO #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- Modified: trunk/tagmanager/include/tm_source_file.h =================================================================== --- trunk/tagmanager/include/tm_source_file.h 2009-06-10 18:42:13 UTC (rev 3853) +++ trunk/tagmanager/include/tm_source_file.h 2009-06-10 20:36:21 UTC (rev 3854) @@ -37,7 +37,7 @@ The TMSourceFile structure is derived from TMWorkObject and contains all it's attributes, plus an integer representing the language of the file. */ -typedef struct _TMSourceFile +typedef struct { TMWorkObject work_object; /*!< The base work object */ langType lang; /*!< Programming language used */ Modified: trunk/tagmanager/include/tm_work_object.h =================================================================== --- trunk/tagmanager/include/tm_work_object.h 2009-06-10 18:42:13 UTC (rev 3853) +++ trunk/tagmanager/include/tm_work_object.h 2009-06-10 20:36:21 UTC (rev 3854) @@ -31,12 +31,12 @@ time when the file was analyzed (for caching) and an array of tags which should be populated when the object is analyzed. */ -typedef struct _TMWorkObject +typedef struct TMWorkObject { guint type; /*!< The type of object. Can be a source file or a project */ char *file_name; /*!< Full file name (inc. path) of the work object */ char *short_name; /*!< Just the name of the file (without the path) */ - struct _TMWorkObject *parent; + struct TMWorkObject *parent; time_t analyze_time; /*!< UNUSED Time when the object was last analyzed */ GPtrArray *tags_array; /*!< Tags obtained by parsing the object */ } TMWorkObject; Modified: trunk/tagmanager/include/tm_workspace.h =================================================================== --- trunk/tagmanager/include/tm_workspace.h 2009-06-10 18:42:13 UTC (rev 3853) +++ trunk/tagmanager/include/tm_workspace.h 2009-06-10 20:36:21 UTC (rev 3854) @@ -28,11 +28,11 @@ created. This contains global tags gleaned from /usr/include, etc. and should be used for autocompletion, calltips, etc. */ -typedef struct _TMWorkspace +typedef struct { - TMWorkObject work_object; /*!< The parent work object */ - GPtrArray *global_tags; /*!< Global tags loaded at startup */ - GPtrArray *work_objects; /*!< An array of TMWorkObject pointers */ + TMWorkObject work_object; /*!< The parent work object */ + GPtrArray *global_tags; /*!< Global tags loaded at startup */ + GPtrArray *work_objects; /*!< An array of TMWorkObject pointers */ } TMWorkspace; /* Since TMWorkspace is a singleton, you should not create multiple @@ -90,7 +90,7 @@ \return TRUE on success, FALSE on failure. */ gboolean tm_workspace_create_global_tags(const char *config_dir, const char *pre_process, - const char **includes, int includes_count, const char *tags_file, int lang); + const char **includes, int includes_count, const char *tags_file, int lang); /* Recreates the tag array of the workspace by collecting the tags of all member work objects. You shouldn't have to call this directly since @@ -137,20 +137,20 @@ */ const GPtrArray * tm_workspace_find_scoped (const char *name, const char *scope, gint type, - TMTagAttrType *attrs, gboolean partial, langType lang, gboolean global_search); + TMTagAttrType *attrs, gboolean partial, langType lang, gboolean global_search); /* Returns all matching members tags found in given struct/union/class name. \param name Name of the struct/union/class. \param file_tags A GPtrArray of edited file TMTag pointers (for search speedup, can be NULL). \return A GPtrArray of TMTag pointers to struct/union/class members */ const GPtrArray *tm_workspace_find_scope_members(const GPtrArray *file_tags, - const char *scope_name, - gboolean find_global, - gboolean no_definitions); + const char *scope_name, + gboolean find_global, + gboolean no_definitions); const GPtrArray * tm_workspace_find_namespace_members (const GPtrArray * file_tags, const char *name, - gboolean search_global); + gboolean search_global); /* Returns TMTag to function which "own" given line \param line Current line in edited file. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3853] trunk
by eht16＠users.sourceforge.net 10 Jun '09

10 Jun '09

Revision: 3853 http://geany.svn.sourceforge.net/geany/?rev=3853&view=rev Author: eht16 Date: 2009-06-10 18:42:13 +0000 (Wed, 10 Jun 2009) Log Message: ----------- Fix wrongly set return values for procedures (closes #2803945. Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/pascal.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-06-10 18:24:44 UTC (rev 3852) +++ trunk/ChangeLog 2009-06-10 18:42:13 UTC (rev 3853) @@ -1,9 +1,10 @@ 2009-06-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * tagmanager/editor.c: + * src/editor.c: Display calltips for Pascal symbols in the Pascal way (#2803945). + * tagmanager/pascal.c: + Fix wrongly set return values for procedures (closes #2803945. - 2009-06-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/editor.c, tagmanager/include/tm_workspace.h, Modified: trunk/tagmanager/pascal.c =================================================================== --- trunk/tagmanager/pascal.c 2009-06-10 18:24:44 UTC (rev 3852) +++ trunk/tagmanager/pascal.c 2009-06-10 18:42:13 UTC (rev 3853) @@ -281,7 +281,7 @@ if (kind == K_FUNCTION) eFree(vartype); parseArglist((const char*) cp, &arglist, (kind == K_FUNCTION) ? &vartype : NULL); - createPascalTag (&tag, name, kind, arglist, vartype); + createPascalTag (&tag, name, kind, arglist, (kind == K_FUNCTION) ? vartype : NULL); dbp = cp; /* set dbp to e-o-token */ get_tagname = FALSE; found_tag = TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3852] trunk
by eht16＠users.sourceforge.net 10 Jun '09

10 Jun '09

Revision: 3852 http://geany.svn.sourceforge.net/geany/?rev=3852&view=rev Author: eht16 Date: 2009-06-10 18:24:44 +0000 (Wed, 10 Jun 2009) Log Message: ----------- Display calltips for Pascal symbols in the Pascal way (#2803945). Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-06-10 15:14:22 UTC (rev 3851) +++ trunk/ChangeLog 2009-06-10 18:24:44 UTC (rev 3852) @@ -1,3 +1,9 @@ +2009-06-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * tagmanager/editor.c: + Display calltips for Pascal symbols in the Pascal way (#2803945). + + 2009-06-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/editor.c, tagmanager/include/tm_workspace.h, Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-06-10 15:14:22 UTC (rev 3851) +++ trunk/src/editor.c 2009-06-10 18:24:44 UTC (rev 3852) @@ -1442,27 +1442,42 @@ if (! tag->atts.entry.arglist) return FALSE; - if (tag->atts.entry.var_type) - { - guint i; + if (ft_id != GEANY_FILETYPES_PASCAL) + { /* usual calltips: "retval tagname (arglist)" */ + if (tag->atts.entry.var_type) + { + guint i; - g_string_append(str, tag->atts.entry.var_type); - for (i = 0; i < tag->atts.entry.pointerOrder; i++) + g_string_append(str, tag->atts.entry.var_type); + for (i = 0; i < tag->atts.entry.pointerOrder; i++) + { + g_string_append_c(str, '*'); + } + g_string_append_c(str, ' '); + } + if (tag->atts.entry.scope) { - g_string_append_c(str, '*'); + const gchar *cosep = symbols_get_context_separator(ft_id); + + g_string_append(str, tag->atts.entry.scope); + g_string_append(str, cosep); } + g_string_append(str, tag->name); g_string_append_c(str, ' '); + g_string_append(str, tag->atts.entry.arglist); } - if (tag->atts.entry.scope) - { - const gchar *cosep = symbols_get_context_separator(ft_id); + else + { /* special case Pascal calltips: "tagname (arglist) : retval" */ + g_string_append(str, tag->name); + g_string_append_c(str, ' '); + g_string_append(str, tag->atts.entry.arglist); - g_string_append(str, tag->atts.entry.scope); - g_string_append(str, cosep); + if (NZV(tag->atts.entry.var_type)) + { + g_string_append(str, " : "); + g_string_append(str, tag->atts.entry.var_type); + } } - g_string_append(str, tag->name); - g_string_append_c(str, ' '); - g_string_append(str, tag->atts.entry.arglist); return TRUE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3851] trunk/tagmanager/include/tm_workspace.h
by ntrel＠users.sourceforge.net 10 Jun '09

10 Jun '09

Revision: 3851 http://geany.svn.sourceforge.net/geany/?rev=3851&view=rev Author: ntrel Date: 2009-06-10 15:14:22 +0000 (Wed, 10 Jun 2009) Log Message: ----------- Don't include tm_workspace_find_scope_members() in the plugin API docs. Modified Paths: -------------- trunk/tagmanager/include/tm_workspace.h Modified: trunk/tagmanager/include/tm_workspace.h =================================================================== --- trunk/tagmanager/include/tm_workspace.h 2009-06-10 12:36:13 UTC (rev 3850) +++ trunk/tagmanager/include/tm_workspace.h 2009-06-10 15:14:22 UTC (rev 3851) @@ -139,7 +139,7 @@ tm_workspace_find_scoped (const char *name, const char *scope, gint type, TMTagAttrType *attrs, gboolean partial, langType lang, gboolean global_search); -/*! Returns all matching members tags found in given struct/union/class name. +/* Returns all matching members tags found in given struct/union/class name. \param name Name of the struct/union/class. \param file_tags A GPtrArray of edited file TMTag pointers (for search speedup, can be NULL). \return A GPtrArray of TMTag pointers to struct/union/class members */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3850] trunk
by ntrel＠users.sourceforge.net 10 Jun '09

10 Jun '09

Revision: 3850 http://geany.svn.sourceforge.net/geany/?rev=3850&view=rev Author: ntrel Date: 2009-06-10 12:36:13 +0000 (Wed, 10 Jun 2009) Log Message: ----------- Autocomplete scoped fields like struct members when typing '.' (and also '->' or '::' in C/C++). Save all tag types for C/C++ when generating a global tags file, so we can use autocompletion for structs also. Merge tm_workspace_find_scope_members(), tm_workspace_find_namespace_members() (currently not built) from Anjuta 2.24.1 tagmanager. Modified Paths: -------------- trunk/ChangeLog trunk/TODO trunk/src/editor.c trunk/tagmanager/include/tm_workspace.h trunk/tagmanager/tm_workspace.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-06-09 21:02:46 UTC (rev 3849) +++ trunk/ChangeLog 2009-06-10 12:36:13 UTC (rev 3850) @@ -1,3 +1,16 @@ +2009-06-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c, tagmanager/include/tm_workspace.h, + tagmanager/tm_workspace.c, TODO: + Autocomplete scoped fields like struct members when typing '.' (and + also '->' or '::' in C/C++). + Save all tag types for C/C++ when generating a global tags file, so + we can use autocompletion for structs also. + Merge tm_workspace_find_scope_members(), + tm_workspace_find_namespace_members() (currently not built) from + Anjuta 2.24.1 tagmanager. + + 2009-06-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * tagmanager/pascal.c: Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-06-09 21:02:46 UTC (rev 3849) +++ trunk/TODO 2009-06-10 12:36:13 UTC (rev 3850) @@ -41,5 +41,4 @@ o (better tags support for popular languages? - this is a moving target...) o Some kind of support for CTags tags files - o Scope resolution for object members o Python plugin interface (different concept from Lua scripting) Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-06-09 21:02:46 UTC (rev 3849) +++ trunk/src/editor.c 2009-06-10 12:36:13 UTC (rev 3850) @@ -431,6 +431,103 @@ } +static void show_autocomplete(ScintillaObject *sci, gint rootlen, const gchar *words) +{ + /* store whether a calltip is showing, so we can reshow it after autocompletion */ + calltip.set = SSM(sci, SCI_CALLTIPACTIVE, 0, 0); + SSM(sci, SCI_AUTOCSHOW, rootlen, (sptr_t) words); +} + + +static void show_tags_list(GeanyEditor *editor, const GPtrArray *tags, gsize rootlen) +{ + ScintillaObject *sci = editor->sci; + + g_return_if_fail(tags); + + if (tags->len > 0) + { + GString *words = g_string_sized_new(150); + guint j; + + for (j = 0; j < tags->len; ++j) + { + if (j > 0) + g_string_append_c(words, '\n'); + + if (j == editor_prefs.autocompletion_max_entries) + { + g_string_append(words, "..."); + break; + } + g_string_append(words, ((TMTag *) tags->pdata[j])->name); + } + show_autocomplete(sci, rootlen, words->str); + g_string_free(words, TRUE); + } +} + + +/* do not use with long strings */ +static gboolean match_last_chars(ScintillaObject *sci, gint pos, const gchar *str) +{ + gsize len = strlen(str); + gchar *buf; + + g_return_val_if_fail(len < 100, FALSE); + + buf = g_alloca(len + 1); + sci_get_text_range(sci, pos - len, pos, buf); + return strcmp(str, buf) == 0; +} + + +static void autocomplete_scope(GeanyEditor *editor) +{ + ScintillaObject *sci = editor->sci; + gint pos = sci_get_current_position(editor->sci); + gchar typed = sci_get_char_at(sci, pos - 1); + gchar *name; + const GPtrArray *tags = NULL; + const TMTag *tag; + gint ft_id = FILETYPE_ID(editor->document->file_type); + + if (ft_id == GEANY_FILETYPES_C || ft_id == GEANY_FILETYPES_CPP) + { + if (match_last_chars(sci, pos, "->") || match_last_chars(sci, pos, "::")) + pos--; + else if (typed != '.') + return; + } + else if (typed != '.') + return; + + /* allow for a space between word and operator */ + if (isspace(sci_get_char_at(sci, pos - 2))) + pos--; + name = editor_get_word_at_pos(editor, pos - 1, NULL); + if (!name) + return; + + tags = tm_workspace_find(name, tm_tag_max_t, NULL, FALSE, -1); + g_free(name); + if (!tags || tags->len == 0) + return; + + tag = g_ptr_array_index(tags, 0); + name = tag->atts.entry.var_type; + if (name) + { + TMWorkObject *obj = editor->document->tm_file; + + tags = tm_workspace_find_scope_members(obj ? obj->tags_array : NULL, + name, TRUE, FALSE); + if (tags) + show_tags_list(editor, tags, 0); + } +} + + static void on_char_added(GeanyEditor *editor, SCNotification *nt) { ScintillaObject *sci = editor->sci; @@ -450,6 +547,8 @@ break; } case '>': + editor_start_auto_complete(editor, pos, FALSE); /* C/C++ ptr-> scope completion */ + /* fall through */ case '/': { /* close xml-tags */ handle_xml(editor, pos, nt->ch); @@ -489,6 +588,10 @@ close_block(editor, pos - 1); break; } + /* scope autocompletion */ + case '.': + case ':': /* C/C++ class:: syntax */ + /* tag autocompletion */ default: editor_start_auto_complete(editor, pos, FALSE); } @@ -1520,14 +1623,6 @@ } -static void show_autocomplete(ScintillaObject *sci, gint rootlen, const gchar *words) -{ - /* store whether a calltip is showing, so we can reshow it after autocompletion */ - calltip.set = SSM(sci, SCI_CALLTIPACTIVE, 0, 0); - SSM(sci, SCI_AUTOCSHOW, rootlen, (sptr_t) words); -} - - static gboolean autocomplete_html(ScintillaObject *sci, const gchar *root, gsize rootlen) { /* HTML entities auto completion */ @@ -1566,35 +1661,15 @@ { TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 }; const GPtrArray *tags; - ScintillaObject *sci; GeanyDocument *doc; g_return_val_if_fail(editor != NULL && editor->document->file_type != NULL, FALSE); - sci = editor->sci; doc = editor->document; tags = tm_workspace_find(root, tm_tag_max_t, attrs, TRUE, doc->file_type->lang); - if (NULL != tags && tags->len > 0) - { - GString *words = g_string_sized_new(150); - guint j; - - for (j = 0; j < tags->len; ++j) - { - if (j > 0) - g_string_append_c(words, '\n'); - - if (j == editor_prefs.autocompletion_max_entries) - { - g_string_append(words, "..."); - break; - } - g_string_append(words, ((TMTag *) tags->pdata[j])->name); - } - show_autocomplete(sci, rootlen, words->str); - g_string_free(words, TRUE); - } + if (tags) + show_tags_list(editor, tags, rootlen); return TRUE; } @@ -1658,6 +1733,8 @@ if (!force && !is_code_style(lexer, style)) return FALSE; + autocomplete_scope(editor); + linebuf = sci_get_line(sci, line); if (ft->id == GEANY_FILETYPES_LATEX) Modified: trunk/tagmanager/include/tm_workspace.h =================================================================== --- trunk/tagmanager/include/tm_workspace.h 2009-06-09 21:02:46 UTC (rev 3849) +++ trunk/tagmanager/include/tm_workspace.h 2009-06-10 12:36:13 UTC (rev 3850) @@ -139,6 +139,19 @@ tm_workspace_find_scoped (const char *name, const char *scope, gint type, TMTagAttrType *attrs, gboolean partial, langType lang, gboolean global_search); +/*! Returns all matching members tags found in given struct/union/class name. + \param name Name of the struct/union/class. + \param file_tags A GPtrArray of edited file TMTag pointers (for search speedup, can be NULL). + \return A GPtrArray of TMTag pointers to struct/union/class members */ +const GPtrArray *tm_workspace_find_scope_members(const GPtrArray *file_tags, + const char *scope_name, + gboolean find_global, + gboolean no_definitions); + +const GPtrArray * +tm_workspace_find_namespace_members (const GPtrArray * file_tags, const char *name, + gboolean search_global); + /* Returns TMTag to function which "own" given line \param line Current line in edited file. \param file_tags A GPtrArray of edited file TMTag pointers. Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2009-06-09 21:02:46 UTC (rev 3849) +++ trunk/tagmanager/tm_workspace.c 2009-06-10 12:36:13 UTC (rev 3850) @@ -257,22 +257,6 @@ } } -static gint get_global_tag_type_mask(gint lang) -{ - switch (lang) - { - case 0: - case 1: - /* C/C++ */ - return tm_tag_class_t | tm_tag_typedef_t | tm_tag_enum_t | tm_tag_enumerator_t | - tm_tag_prototype_t | - tm_tag_function_t | tm_tag_method_t | /* for inline functions */ - tm_tag_macro_t | tm_tag_macro_with_arg_t; - default: - return tm_tag_max_t; - } -} - gboolean tm_workspace_create_global_tags(const char *config_dir, const char *pre_process, const char **includes, int includes_count, const char *tags_file, int lang) { @@ -415,7 +399,7 @@ tm_source_file_free(source_file); return FALSE; } - tags_array = tm_tags_extract(source_file->tags_array, get_global_tag_type_mask(lang)); + tags_array = tm_tags_extract(source_file->tags_array, tm_tag_max_t); if ((NULL == tags_array) || (0 == tags_array->len)) { if (tags_array) @@ -752,6 +736,461 @@ } +static int +find_scope_members_tags (const GPtrArray * all, GPtrArray * tags, + const langType langJava, const char *name, + const char *filename, gboolean no_definitions) +{ + GPtrArray *local = g_ptr_array_new (); + unsigned int i; + TMTag *tag; + size_t len = strlen (name); + for (i = 0; (i < all->len); ++i) + { + tag = TM_TAG (all->pdata[i]); + if (no_definitions && filename && tag->atts.entry.file && + 0 != strcmp (filename, + tag->atts.entry.file->work_object.short_name)) + { + continue; + } + if (tag && tag->atts.entry.scope && tag->atts.entry.scope[0] != '\0') + { + if (0 == strncmp (name, tag->atts.entry.scope, len)) + { + g_ptr_array_add (local, tag); + } + } + } + if (local->len > 0) + { + unsigned int j; + TMTag *tag2; + char backup = 0; + char *s_backup = NULL; + char *var_type = NULL; + char *scope; + for (i = 0; (i < local->len); ++i) + { + tag = TM_TAG (local->pdata[i]); + scope = tag->atts.entry.scope; + if (scope && 0 == strcmp (name, scope)) + { + g_ptr_array_add (tags, tag); + continue; + } + s_backup = NULL; + j = 0; /* someone could write better code :P */ + while (scope) + { + if (s_backup) + { + backup = s_backup[0]; + s_backup[0] = '\0'; + if (0 == strcmp (name, tag->atts.entry.scope)) + { + j = local->len; + s_backup[0] = backup; + break; + } + } + if (tag->atts.entry.file + && tag->atts.entry.file->lang == langJava) + { + scope = strrchr (tag->atts.entry.scope, '.'); + if (scope) + var_type = scope + 1; + } + else + { + scope = strrchr (tag->atts.entry.scope, ':'); + if (scope) + { + var_type = scope + 1; + scope--; + } + } + if (s_backup) + { + s_backup[0] = backup; + } + if (scope) + { + if (s_backup) + { + backup = s_backup[0]; + s_backup[0] = '\0'; + } + for (j = 0; (j < local->len); ++j) + { + if (i == j) + continue; + tag2 = TM_TAG (local->pdata[j]); + if (tag2->atts.entry.var_type && + 0 == strcmp (var_type, tag2->atts.entry.var_type)) + { + break; + } + } + if (s_backup) + s_backup[0] = backup; + } + if (j < local->len) + { + break; + } + s_backup = scope; + } + if (j == local->len) + { + g_ptr_array_add (tags, tag); + } + } + } + g_ptr_array_free (local, TRUE); + return (int) tags->len; +} + + +#if 0 +static int +find_namespace_members_tags (const GPtrArray * all, GPtrArray * tags, + const langType langJava, const char *name, + const char *filename) +{ + GPtrArray *local = g_ptr_array_new (); + unsigned int i; + TMTag *tag; + size_t len = strlen (name); + + g_return_val_if_fail (all != NULL, 0); + + for (i = 0; (i < all->len); ++i) + { + tag = TM_TAG (all->pdata[i]); + if (filename && tag->atts.entry.file && + 0 != strcmp (filename, + tag->atts.entry.file->work_object.short_name)) + { + continue; + } + + if (tag && tag->atts.entry.scope && tag->atts.entry.scope[0] != '\0') + { + if (0 == strncmp (name, tag->atts.entry.scope, len)) + { + g_ptr_array_add (local, tag); + } + } + } + + if (local->len > 0) + { + char *scope; + for (i = 0; (i < local->len); ++i) + { + tag = TM_TAG (local->pdata[i]); + scope = tag->atts.entry.scope; + + /* if we wanna complete something like + * namespace1:: + * we'll just return the tags that have "namespace1" + * as their scope. So we won't return classes/members/namespaces + * under, for example, namespace2, where namespace1::namespace2 + */ + if (scope && 0 == strcmp (name, scope)) + { + g_ptr_array_add (tags, tag); + } + } + } + + g_ptr_array_free (local, TRUE); + return (int) tags->len; +} + +const GPtrArray * +tm_workspace_find_namespace_members (const GPtrArray * file_tags, const char *name, + gboolean search_global) +{ + static GPtrArray *tags = NULL; + GPtrArray *local = NULL; + char *new_name = (char *) name; + char *filename = NULL; + int found = 0, del = 0; + static langType langJava = -1; + TMTag *tag = NULL; + + g_return_val_if_fail ((theWorkspace && name && name[0] != '\0'), NULL); + + if (!tags) + tags = g_ptr_array_new (); + + while (1) + { + const GPtrArray *tags2; + int got = 0, types = (tm_tag_class_t | tm_tag_namespace_t | + tm_tag_struct_t | tm_tag_typedef_t | + tm_tag_union_t | tm_tag_enum_t); + + if (file_tags) + { + g_ptr_array_set_size (tags, 0); + got = fill_find_tags_array (tags, file_tags, + new_name, NULL, types, FALSE, -1, FALSE); + } + + + if (got) + { + tags2 = tags; + } + else + { + TMTagAttrType attrs[] = { + tm_tag_attr_name_t, tm_tag_attr_type_t, + tm_tag_attr_none_t + }; + tags2 = tm_workspace_find (new_name, types, attrs, FALSE, -1); + } + + if ((tags2) && (tags2->len == 1) && (tag = TM_TAG (tags2->pdata[0]))) + { + if (tag->type == tm_tag_typedef_t && tag->atts.entry.var_type + && tag->atts.entry.var_type[0] != '\0') + { + new_name = tag->atts.entry.var_type; + continue; + } + filename = (tag->atts.entry.file ? + tag->atts.entry.file->work_object.short_name : NULL); + if (tag->atts.entry.scope && tag->atts.entry.scope[0] != '\0') + { + del = 1; + if (tag->atts.entry.file && + tag->atts.entry.file->lang == langJava) + { + new_name = g_strdup_printf ("%s.%s", + tag->atts.entry.scope, + new_name); + } + else + { + new_name = g_strdup_printf ("%s::%s", + tag->atts.entry.scope, + new_name); + } + } + break; + } + else + { + return NULL; + } + } + + g_ptr_array_set_size (tags, 0); + + if (tag && tag->atts.entry.file) + { + local = tm_tags_extract (tag->atts.entry.file->work_object.tags_array, + (tm_tag_function_t | + tm_tag_field_t | tm_tag_enumerator_t | + tm_tag_namespace_t | tm_tag_class_t )); + } + else + { + local = tm_tags_extract (theWorkspace->work_object.tags_array, + (tm_tag_function_t | tm_tag_prototype_t | + tm_tag_member_t | + tm_tag_field_t | tm_tag_enumerator_t | + tm_tag_namespace_t | tm_tag_class_t )); + } + + if (local) + { + found = find_namespace_members_tags (local, tags, + langJava, new_name, filename); + g_ptr_array_free (local, TRUE); + } + + + if (!found && search_global) + { + GPtrArray *global = tm_tags_extract (theWorkspace->global_tags, + (tm_tag_member_t | + tm_tag_prototype_t | + tm_tag_field_t | + tm_tag_method_t | + tm_tag_function_t | + tm_tag_enumerator_t | + tm_tag_namespace_t | + tm_tag_class_t )); + + if (global) + { + find_namespace_members_tags (global, tags, langJava, + new_name, filename); +/*/ + DEBUG_PRINT ("returning these"); + gint i; + for (i=0; i < tags->len; i++) { + TMTag *cur_tag; + + cur_tag = (TMTag*)g_ptr_array_index (tags, i); + tm_tag_print (cur_tag, stdout ); + } +/*/ + g_ptr_array_free (global, TRUE); + } + } + + + if (del) + { + g_free (new_name); + } + + return tags; +} +#endif + +const GPtrArray * +tm_workspace_find_scope_members (const GPtrArray * file_tags, const char *name, + gboolean search_global, gboolean no_definitions) +{ + static GPtrArray *tags = NULL; + GPtrArray *local = NULL; + char *new_name = (char *) name; + char *filename = NULL; + int found = 0, del = 0; + static langType langJava = -1; + TMTag *tag = NULL; + + /* FIXME */ + /* langJava = getNamedLanguage ("Java"); */ + + g_return_val_if_fail ((theWorkspace && name && name[0] != '\0'), NULL); + + if (!tags) + tags = g_ptr_array_new (); + + while (1) + { + const GPtrArray *tags2; + int got = 0, types = (tm_tag_class_t | tm_tag_namespace_t | + tm_tag_struct_t | tm_tag_typedef_t | + tm_tag_union_t | tm_tag_enum_t); + + if (file_tags) + { + g_ptr_array_set_size (tags, 0); + got = fill_find_tags_array (tags, file_tags, + new_name, NULL, types, FALSE, -1, FALSE); + } + if (got) + { + tags2 = tags; + } + else + { + TMTagAttrType attrs[] = { + tm_tag_attr_name_t, tm_tag_attr_type_t, + tm_tag_attr_none_t + }; + tags2 = tm_workspace_find (new_name, types, attrs, FALSE, -1); + } + + if ((tags2) && (tags2->len == 1) && (tag = TM_TAG (tags2->pdata[0]))) + { + if (tag->type == tm_tag_typedef_t && tag->atts.entry.var_type + && tag->atts.entry.var_type[0] != '\0') + { + char *tmp_name; + tmp_name = tag->atts.entry.var_type; + if (strcmp(tmp_name, new_name) == 0) { + new_name = NULL; + } + else { + new_name = tmp_name; + } + continue; + } + filename = (tag->atts.entry.file ? + tag->atts.entry.file->work_object.short_name : NULL); + if (tag->atts.entry.scope && tag->atts.entry.scope[0] != '\0') + { + del = 1; + if (tag->atts.entry.file && + tag->atts.entry.file->lang == langJava) + { + new_name = g_strdup_printf ("%s.%s", + tag->atts.entry.scope, + new_name); + } + else + { + new_name = g_strdup_printf ("%s::%s", + tag->atts.entry.scope, + new_name); + } + } + break; + } + else + { + return NULL; + } + } + + g_ptr_array_set_size (tags, 0); + + if (no_definitions && tag && tag->atts.entry.file) + { + local = tm_tags_extract (tag->atts.entry.file->work_object.tags_array, + (tm_tag_function_t | tm_tag_prototype_t | + tm_tag_member_t | tm_tag_field_t | + tm_tag_method_t | tm_tag_enumerator_t)); + } + else + { + local = tm_tags_extract (theWorkspace->work_object.tags_array, + (tm_tag_function_t | tm_tag_prototype_t | + tm_tag_member_t | tm_tag_field_t | + tm_tag_method_t | tm_tag_enumerator_t)); + } + if (local) + { + found = find_scope_members_tags (local, tags, langJava, new_name, + filename, no_definitions); + g_ptr_array_free (local, TRUE); + } + if (!found && search_global) + { + GPtrArray *global = tm_tags_extract (theWorkspace->global_tags, + (tm_tag_member_t | + tm_tag_prototype_t | + tm_tag_field_t | + tm_tag_method_t | + tm_tag_function_t | + tm_tag_enumerator_t + |tm_tag_struct_t | tm_tag_typedef_t | + tm_tag_union_t | tm_tag_enum_t)); + if (global) + { + find_scope_members_tags (global, tags, langJava, new_name, + filename, no_definitions); + g_ptr_array_free (global, TRUE); + } + } + if (del) + { + g_free (new_name); + } + + return tags; +} + const GPtrArray *tm_workspace_get_parents(const gchar *name) { static TMTagAttrType type[] = { tm_tag_attr_name_t, tm_tag_attr_none_t }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3849] trunk
by eht16＠users.sourceforge.net 09 Jun '09

09 Jun '09

Revision: 3849 http://geany.svn.sourceforge.net/geany/?rev=3849&view=rev Author: eht16 Date: 2009-06-09 21:02:46 +0000 (Tue, 09 Jun 2009) Log Message: ----------- Parse Pascal calltips (closes #2802640). Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/pascal.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-06-09 14:39:28 UTC (rev 3848) +++ trunk/ChangeLog 2009-06-09 21:02:46 UTC (rev 3849) @@ -1,3 +1,9 @@ +2009-06-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * tagmanager/pascal.c: + Parse Pascal calltips (closes #2802640). + + 2009-06-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/filetypes.c, src/ui_utils.c: Modified: trunk/tagmanager/pascal.c =================================================================== --- trunk/tagmanager/pascal.c 2009-06-09 14:39:28 UTC (rev 3848) +++ trunk/tagmanager/pascal.c 2009-06-09 21:02:46 UTC (rev 3849) @@ -20,6 +20,7 @@ #include "entry.h" #include "parse.h" #include "read.h" +#include "main.h" #include "vstring.h" /* @@ -30,7 +31,7 @@ } pascalKind; static kindOption PascalKinds [] = { - { TRUE, 'f', "function", "functions"}, + { TRUE, 'f', "function", "functions"}, { TRUE, 'f', "function", "procedures"} }; @@ -39,7 +40,8 @@ */ static void createPascalTag (tagEntryInfo* const tag, - const vString* const name, const int kind) + const vString* const name, const int kind, + const char *arglist, const char *vartype) { if (PascalKinds [kind].enabled && name != NULL && vStringLength (name) > 0) { @@ -47,6 +49,8 @@ tag->kindName = PascalKinds [kind].name; tag->kind = PascalKinds [kind].letter; + tag->extensionFields.arglist = arglist; + tag->extensionFields.varType = vartype; } else initTagEntry (tag, NULL); @@ -79,6 +83,69 @@ return result; } +static void parseArglist(const char *buf, char **arglist, char **vartype) +{ + char *c, *start, *end; + int level; + + if (NULL == buf || NULL == arglist) + return; + + c = strdup(buf); + /* parse argument list which can be missing like in "function ginit:integer;" */ + if (NULL != (start = strchr(c, '('))) + { + for (level = 1, end = start + 1; level > 0; ++end) + { + if ('\0' == *end) + break; + else if ('(' == *end) + ++ level; + else if (')' == *end) + -- level; + } + } + else /* if no argument list was found, continue looking for a return value */ + { + start = "()"; + end = c; + } + + /* parse return type if requested by passing a non-NULL vartype argument */ + if (NULL != vartype) + { + char *var, *var_start; + + *vartype = NULL; + + if (NULL != (var = strchr(end, ':'))) + { + var++; /* skip ':' */ + while (isspace((int) *var)) + ++var; + + if (starttoken(*var)) + { + var_start = var; + var++; + while (intoken(*var)) + var++; + if (endtoken(*var)) + { + *var = '\0'; + *vartype = strdup(var_start); + } + } + } + } + + *end = '\0'; + *arglist = strdup(start); + + eFree(c); +} + + /* Algorithm adapted from from GNU etags. * Locates tags for procedures & functions. Doesn't do any type- or * var-definitions. It does look for the keyword "extern" or "forward" @@ -89,6 +156,8 @@ { vString *name = vStringNew (); tagEntryInfo tag; + char *arglist = NULL; + char *vartype = NULL; pascalKind kind = K_FUNCTION; /* each of these flags is TRUE iff: */ boolean incomment = FALSE; /* point is inside a comment */ @@ -208,7 +277,11 @@ for (cp = dbp ; *cp != '\0' && !endtoken (*cp) ; cp++) continue; vStringNCopyS (name, (const char*) dbp, cp - dbp); - createPascalTag (&tag, name, kind); + eFree(arglist); + if (kind == K_FUNCTION) + eFree(vartype); + parseArglist((const char*) cp, &arglist, (kind == K_FUNCTION) ? &vartype : NULL); + createPascalTag (&tag, name, kind, arglist, vartype); dbp = cp; /* set dbp to e-o-token */ get_tagname = FALSE; found_tag = TRUE; @@ -254,8 +327,11 @@ } break; } - } /* while not eof */ + } /* while not eof */ } + eFree(arglist); + eFree(vartype); + vStringDelete(name); } extern parserDefinition* PascalParser (void) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3848] trunk
by ntrel＠users.sourceforge.net 09 Jun '09

09 Jun '09

Revision: 3848 http://geany.svn.sourceforge.net/geany/?rev=3848&view=rev Author: ntrel Date: 2009-06-09 14:39:28 +0000 (Tue, 09 Jun 2009) Log Message: ----------- Add filetypes.common Configuration Files menu item. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-06-08 19:59:48 UTC (rev 3847) +++ trunk/ChangeLog 2009-06-09 14:39:28 UTC (rev 3848) @@ -1,3 +1,9 @@ +2009-06-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/filetypes.c, src/ui_utils.c: + Add filetypes.common Configuration Files menu item. + + 2009-06-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/callbacks.c: Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2009-06-08 19:59:48 UTC (rev 3847) +++ trunk/src/filetypes.c 2009-06-09 14:39:28 UTC (rev 3848) @@ -655,6 +655,10 @@ if (utils_str_equal(doc->real_path, utils_build_path(app->configdir, "filetype_extensions.conf", NULL))) filetypes_read_extensions(); + else if (utils_str_equal(doc->real_path, + utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.common", NULL))) + ui_set_statusbar(FALSE, "%s", + _("For all changes you make in this file to take effect, you need to restart Geany.")); } @@ -662,6 +666,8 @@ { ui_add_config_file_menu_item( utils_build_path(app->configdir, "filetype_extensions.conf", NULL), NULL, NULL); + ui_add_config_file_menu_item( + utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.common", NULL), NULL, NULL); g_signal_connect(geany_object, "document-save", G_CALLBACK(on_document_save), NULL); } Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2009-06-08 19:59:48 UTC (rev 3847) +++ trunk/src/ui_utils.c 2009-06-09 14:39:28 UTC (rev 3848) @@ -1700,9 +1700,13 @@ static void on_config_file_clicked(GtkWidget *widget, gpointer user_data) { const gchar *file_name = user_data; + GeanyFiletype *ft = NULL; + if (strstr(file_name, G_DIR_SEPARATOR_S "filetypes.")) + ft = filetypes[GEANY_FILETYPES_CONF]; + if (g_file_test(file_name, G_FILE_TEST_EXISTS)) - document_open_file(file_name, FALSE, NULL, NULL); + document_open_file(file_name, FALSE, ft, NULL); else { gchar *utf8 = utils_get_utf8_from_locale(file_name); @@ -1715,7 +1719,7 @@ if (g_file_test(global_file, G_FILE_TEST_EXISTS)) g_file_get_contents(global_file, &global_content, NULL, NULL); - document_new_file(utf8, NULL, global_content); + document_new_file(utf8, ft, global_content); utils_free_pointers(4, utf8, base_name, global_file, global_content, NULL); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2009