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

Test against the lexer instead of the filetype when computing

Browse Source 
indentation. This fixes Cython indentation.
This commit is contained in:
Alexander Eberspächer 2012-08-10 11:03:42 +02:00
parent 9a63e05f63
commit a17e37bcd8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/editor.c
View File

@ -1401,10 +1401,16 @@ static gint get_indent_size_after_line(GeanyEditor *editor, gint line)
gint additional_indent = 0; gint additional_indent = 0;
if (lexer_has_braces(sci)) if (lexer_has_braces(sci))
{
additional_indent = iprefs->width * get_brace_indent(sci, line); additional_indent = iprefs->width * get_brace_indent(sci, line);
}
else else
if (editor->document->file_type->id == GEANY_FILETYPES_PYTHON) {
additional_indent = iprefs->width * get_python_indent(sci, line); /* Instead of testing the filetype directly, test for the lexer being
* used. Otherwise Cython indentation will break. */
if (sci_get_lexer(sci) == SCLEX_PYTHON)
additional_indent = iprefs->width * get_python_indent(sci, line);
}
/* HTML lexer "has braces" because of PHP and JavaScript. If get_brace_indent() did not /* HTML lexer "has braces" because of PHP and JavaScript. If get_brace_indent() did not
* recommend us to insert additional indent, we are probably not in PHP/JavaScript chunk and * recommend us to insert additional indent, we are probably not in PHP/JavaScript chunk and