HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only autocomplete scope for scopes matching the current filetype's

Browse Source 
language.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3869 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2009-06-17 10:56:37 +00:00
parent e1ecc75f44
commit e386064d5a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,6 +3,9 @@
* src/filetypes.h, src/document.c, src/document.h, src/ui_utils.c:
Make GeanyDocument::file_type always be non-NULL, even for a new
document with no filetype set.
* src/editor.c:
Only autocomplete scope for scopes matching the current filetype's
language.
2009-06-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

6
src/editor.c
View File

@ -490,9 +490,9 @@ static void autocomplete_scope(GeanyEditor *editor)
gchar *name;
const GPtrArray *tags = NULL;
const TMTag *tag;
gint ft_id = FILETYPE_ID(editor->document->file_type);
GeanyFiletype *ft = editor->document->file_type;
if (ft_id == GEANY_FILETYPES_C || ft_id == GEANY_FILETYPES_CPP)
if (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP)
{
if (match_last_chars(sci, pos, "->") || match_last_chars(sci, pos, "::"))
pos--;
@ -509,7 +509,7 @@ static void autocomplete_scope(GeanyEditor *editor)
if (!name)
return;
tags = tm_workspace_find(name, tm_tag_max_t, NULL, FALSE, -1);
tags = tm_workspace_find(name, tm_tag_max_t, NULL, FALSE, ft->lang);
g_free(name);
if (!tags || tags->len == 0)
return;