godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 06:11:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Style: Enforce braces around if blocks and loops

Browse Source 
Using clang-tidy's `readability-braces-around-statements`.
https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
This commit is contained in:
Rémi Verschelde
2021-05-05 12:44:11 +02:00
parent b8d198eeed
commit 140350d767
694 changed files with 23283 additions and 12499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/gdscript/language_server/gdscript_extend_parser.cpp
View File

@@ -145,8 +145,9 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
r_symbol.script_path = path;
r_symbol.children.clear();
r_symbol.name = p_class->name;
if (r_symbol.name.empty())
if (r_symbol.name.empty()) {
r_symbol.name = path.get_file();
}
r_symbol.kind = lsp::SymbolKind::Class;
r_symbol.deprecated = false;
r_symbol.range.start.line = LINE_NUMBER_TO_INDEX(p_class->line);
@@ -395,8 +396,9 @@ String ExtendGDScriptParser::parse_documentation(int p_line, bool p_docs_down) {
int step = p_docs_down ? 1 : -1;
int start_line = p_docs_down ? p_line : p_line - 1;
for (int i = start_line; true; i += step) {
if (i < 0 || i >= lines.size())
if (i < 0 || i >= lines.size()) {
break;
}
String line_comment = lines[i].strip_edges(true, false);
if (line_comment.begins_with("#")) {
@@ -430,8 +432,9 @@ String ExtendGDScriptParser::get_text_for_completion(const lsp::Position &p_curs
longthing += lines[i];
}
if (i != len - 1)
if (i != len - 1) {
longthing += "\n";
}
}
return longthing;
@@ -467,8 +470,9 @@ String ExtendGDScriptParser::get_text_for_lookup_symbol(const lsp::Position &p_c
longthing += lines[i];
}
if (i != len - 1)
if (i != len - 1) {
longthing += "\n";
}
}
return longthing;

10
modules/gdscript/language_server/gdscript_language_protocol.cpp
View File

@@ -47,10 +47,11 @@ Error GDScriptLanguageProtocol::LSPeer::handle_data() {
ERR_FAIL_COND_V_MSG(true, ERR_OUT_OF_MEMORY, "Response header too big");
}
Error err = connection->get_partial_data(&req_buf[req_pos], 1, read);
if (err != OK)
if (err != OK) {
return FAILED;
else if (read != 1) // Busy, wait until next poll
} else if (read != 1) { // Busy, wait until next poll
return ERR_BUSY;
}
char *r = (char *)req_buf;
int l = req_pos;
@@ -75,10 +76,11 @@ Error GDScriptLanguageProtocol::LSPeer::handle_data() {
ERR_FAIL_COND_V_MSG(req_pos >= LSP_MAX_BUFFER_SIZE, ERR_OUT_OF_MEMORY, "Response content too big");
}
Error err = connection->get_partial_data(&req_buf[req_pos], 1, read);
if (err != OK)
if (err != OK) {
return FAILED;
else if (read != 1)
} else if (read != 1) {
return ERR_BUSY;
}
req_pos++;
}

9
modules/gdscript/language_server/gdscript_workspace.cpp
View File

@@ -196,8 +196,9 @@ Array GDScriptWorkspace::symbol(const Dictionary &p_params) {
}
Error GDScriptWorkspace::initialize() {
if (initialized)
if (initialized) {
return OK;
}
DocData *doc = EditorHelp::get_doc_data();
for (Map<String, DocData::ClassDoc>::Element *E = doc->class_list.front(); E; E = E->next()) {
@@ -386,8 +387,9 @@ void GDScriptWorkspace::publish_diagnostics(const String &p_path) {
}
void GDScriptWorkspace::_get_owners(EditorFileSystemDirectory *efsd, String p_path, List<String> &owners) {
if (!efsd)
if (!efsd) {
return;
}
for (int i = 0; i < efsd->get_subdir_count(); i++) {
_get_owners(efsd->get_subdir(i), p_path, owners);
@@ -402,8 +404,9 @@ void GDScriptWorkspace::_get_owners(EditorFileSystemDirectory *efsd, String p_pa
break;
}
}
if (!found)
if (!found) {
continue;
}
owners.push_back(efsd->get_file_path(i));
}

33
modules/gdscript/language_server/lsp.hpp
View File

@@ -280,8 +280,9 @@ struct Command {
Dictionary dict;
dict["title"] = title;
dict["command"] = command;
if (arguments.size())
if (arguments.size()) {
dict["arguments"] = arguments;
}
return dict;
}
};
@@ -945,20 +946,24 @@ struct CompletionItem {
dict["preselect"] = preselect;
dict["sortText"] = sortText;
dict["filterText"] = filterText;
if (commitCharacters.size())
if (commitCharacters.size()) {
dict["commitCharacters"] = commitCharacters;
}
dict["command"] = command.to_json();
}
return dict;
}
void load(const Dictionary &p_dict) {
if (p_dict.has("label"))
if (p_dict.has("label")) {
label = p_dict["label"];
if (p_dict.has("kind"))
}
if (p_dict.has("kind")) {
kind = p_dict["kind"];
if (p_dict.has("detail"))
}
if (p_dict.has("detail")) {
detail = p_dict["detail"];
}
if (p_dict.has("documentation")) {
Variant doc = p_dict["documentation"];
if (doc.get_type() == Variant::STRING) {
@@ -968,18 +973,24 @@ struct CompletionItem {
documentation.value = v["value"];
}
}
if (p_dict.has("deprecated"))
if (p_dict.has("deprecated")) {
deprecated = p_dict["deprecated"];
if (p_dict.has("preselect"))
}
if (p_dict.has("preselect")) {
preselect = p_dict["preselect"];
if (p_dict.has("sortText"))
}
if (p_dict.has("sortText")) {
sortText = p_dict["sortText"];
if (p_dict.has("filterText"))
}
if (p_dict.has("filterText")) {
filterText = p_dict["filterText"];
if (p_dict.has("insertText"))
}
if (p_dict.has("insertText")) {
insertText = p_dict["insertText"];
if (p_dict.has("data"))
}
if (p_dict.has("data")) {
data = p_dict["data"];
}
}
};