godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27170 from timoschwarzer/allow-whitespaces-in-warning-ignore-comments

Browse Source 
Allow whitespaces in warning-ignore comments
This commit is contained in:
Rémi Verschelde 2019-04-10 18:16:10 +02:00 committed by GitHub
commit 07b76c0376
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/script_text_editor.cpp
View File

@ -286,7 +286,7 @@ void ScriptTextEditor::_warning_clicked(Variant p_line) {
code_editor->get_text_edit()->cursor_set_line(p_line.operator int64_t()); code_editor->get_text_edit()->cursor_set_line(p_line.operator int64_t());
} else if (p_line.get_type() == Variant::DICTIONARY) { } else if (p_line.get_type() == Variant::DICTIONARY) {
Dictionary meta = p_line.operator Dictionary(); Dictionary meta = p_line.operator Dictionary();
code_editor->get_text_edit()->insert_at("#warning-ignore:" + meta["code"].operator String(), meta["line"].operator int64_t() - 1); code_editor->get_text_edit()->insert_at("# warning-ignore:" + meta["code"].operator String(), meta["line"].operator int64_t() - 1);
_validate_script(); _validate_script();
} }
} }

11
modules/gdscript/gdscript_tokenizer.cpp
View File

@ -535,13 +535,14 @@ void GDScriptTokenizerText::_advance() {
} }
} }
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (comment.begins_with("#warning-ignore:")) { String comment_content = comment.trim_prefix("#").trim_prefix(" ");
String code = comment.get_slice(":", 1); if (comment_content.begins_with("warning-ignore:")) {
String code = comment_content.get_slice(":", 1);
warning_skips.push_back(Pair<int, String>(line, code.strip_edges().to_lower())); warning_skips.push_back(Pair<int, String>(line, code.strip_edges().to_lower()));
} else if (comment.begins_with("#warning-ignore-all:")) { } else if (comment_content.begins_with("warning-ignore-all:")) {
String code = comment.get_slice(":", 1); String code = comment_content.get_slice(":", 1);
warning_global_skips.insert(code.strip_edges().to_lower()); warning_global_skips.insert(code.strip_edges().to_lower());
} else if (comment.strip_edges() == "#warnings-disable") { } else if (comment_content.strip_edges() == "warnings-disable") {
ignore_warnings = true; ignore_warnings = true;
} }
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED