griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for [#8408] Indentation error in text editor when typing a colon anywhere

Browse Source
This commit is contained in:
Campbell Barton
2008-03-01 12:31:00 +00:00
parent d1af95f4bb
commit d560b17088
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenkernel/intern/text.c
View File

@@ -2352,7 +2352,7 @@ int setcurr_tab (Text *text)
int test = 0;
char *word = ":";
char *comm = "#";
char back_words[3][7] = {"return", "break", "pass"};
char back_words[4][7] = {"return", "break", "pass", "yield"};
if (!text) return 0;
if (!text->curl) return 0;
@@ -2369,16 +2369,25 @@ int setcurr_tab (Text *text)
if(strstr(text->curl->line, word))
{
//if we find a : then add a tab but not if it is in a comment
if(strcspn(text->curl->line, word) < strcspn(text->curl->line, comm))
int a, indent = 0;
for(a=0; text->curl->line[a] != '\0'; a++)
{
if (text->curl->line[a]=='#') {
break;
} else if (text->curl->line[a]==':') {
indent = 1;
} else if (text->curl->line[a]==']') {
indent = 0;
}
}
if (indent) {
i++;
}
}
while(test < 3)
for(test=0; test < 4; test++)
{
//if there are these 3 key words then remove a tab because we are done with the block
//if there are these 4 key words then remove a tab because we are done with the block
if(strstr(text->curl->line, back_words[test]) && i > 0)
{
if(strcspn(text->curl->line, back_words[test]) < strcspn(text->curl->line, comm))
@@ -2386,7 +2395,6 @@ int setcurr_tab (Text *text)
i--;
}
}
test++;
}
return i;
}