mirror of
https://github.com/godotengine/godot
synced 2024-09-04 21:28:28 +00:00
Disallow using of both tabs and spaces for indentation in the same file
Closes #7898
This commit is contained in:
parent
adae2b0738
commit
f12f3cf726
|
@ -517,7 +517,22 @@ void GDScriptTokenizerText::_advance() {
|
|||
INCPOS(1);
|
||||
column = 1;
|
||||
int i = 0;
|
||||
while (GETCHAR(i) == ' ' || GETCHAR(i) == '\t') {
|
||||
while (true) {
|
||||
if (GETCHAR(i) == ' ') {
|
||||
if (file_indent_type == INDENT_NONE) file_indent_type = INDENT_SPACES;
|
||||
if (file_indent_type != INDENT_SPACES) {
|
||||
_make_error("Spaces used for indentation in tab-indented file!");
|
||||
return;
|
||||
}
|
||||
} else if (GETCHAR(i) == '\t') {
|
||||
if (file_indent_type == INDENT_NONE) file_indent_type = INDENT_TABS;
|
||||
if (file_indent_type != INDENT_TABS) {
|
||||
_make_error("Tabs used for indentation in space-indented file!");
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
break; // not indentation anymore
|
||||
}
|
||||
i++;
|
||||
}
|
||||
|
||||
|
@ -555,9 +570,25 @@ void GDScriptTokenizerText::_advance() {
|
|||
column = 1;
|
||||
line++;
|
||||
int i = 0;
|
||||
while (GETCHAR(i) == ' ' || GETCHAR(i) == '\t') {
|
||||
while (true) {
|
||||
if (GETCHAR(i) == ' ') {
|
||||
if (file_indent_type == INDENT_NONE) file_indent_type = INDENT_SPACES;
|
||||
if (file_indent_type != INDENT_SPACES) {
|
||||
_make_error("Spaces used for indentation in tab-indented file!");
|
||||
return;
|
||||
}
|
||||
} else if (GETCHAR(i) == '\t') {
|
||||
if (file_indent_type == INDENT_NONE) file_indent_type = INDENT_TABS;
|
||||
if (file_indent_type != INDENT_TABS) {
|
||||
_make_error("Tabs used for indentation in space-indented file!");
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
break; // not indentation anymore
|
||||
}
|
||||
i++;
|
||||
}
|
||||
|
||||
_make_newline(i);
|
||||
return;
|
||||
|
||||
|
@ -1082,6 +1113,7 @@ void GDScriptTokenizerText::set_code(const String &p_code) {
|
|||
ignore_warnings = false;
|
||||
#endif // DEBUG_ENABLED
|
||||
last_error = "";
|
||||
file_indent_type = INDENT_NONE;
|
||||
for (int i = 0; i < MAX_LOOKAHEAD + 1; i++)
|
||||
_advance();
|
||||
}
|
||||
|
|
|
@ -222,6 +222,12 @@ class GDScriptTokenizerText : public GDScriptTokenizer {
|
|||
int tk_rb_pos;
|
||||
String last_error;
|
||||
bool error_flag;
|
||||
enum {
|
||||
INDENT_NONE,
|
||||
INDENT_SPACES,
|
||||
INDENT_TABS,
|
||||
} file_indent_type;
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
Vector<Pair<int, String> > warning_skips;
|
||||
Set<String> warning_global_skips;
|
||||
|
|
Loading…
Reference in a new issue