Skip to content

Commit bbf5833

Browse files
CppCXYCppCXY
committed
fix crash when editorconfig digit error
1 parent 14ef905 commit bbf5833

File tree

2 files changed

+27
-28
lines changed

2 files changed

+27
-28
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
cmake --install . --config Release --prefix ${{ github.workspace }}/artifact/
6262
6363
- name: Upload
64-
uses: actions/upload-artifact@v2
64+
uses: actions/upload-artifact@v3
6565
with:
6666
name: ${{ matrix.platform }}
6767
path: ${{ github.workspace }}/artifact/

‎CodeFormatCore/src/Config/LuaStyle.cpp‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
#include "CodeFormatCore/Config/LuaStyle.h"
2-
#include <map>
32
#include "FunctionOption.h"
3+
#include <map>
44

55
bool IsNumber(std::string_view source) {
6+
if (source.empty()) {
7+
return false;
8+
}
69
for (auto c: source) {
710
if (c > '9' || c < '0') {
811
return false;
@@ -11,13 +14,15 @@ bool IsNumber(std::string_view source) {
1114
return true;
1215
}
1316

14-
#define BOOL_OPTION(op) if (configMap.count(#op)) {\
15-
op = configMap.at(#op) == "true";\
16-
}
17+
#define BOOL_OPTION(op) \
18+
if (configMap.count(#op)) { \
19+
op = configMap.at(#op) == "true"; \
20+
}
1721

18-
#define NUMBER_OPTION(op) if (configMap.count(#op) && IsNumber(configMap.at(#op))) {\
19-
op = std::stoi(configMap.at(#op));\
20-
}
22+
#define NUMBER_OPTION(op) \
23+
if (configMap.count(#op) && IsNumber(configMap.at(#op))) { \
24+
op = std::stoi(configMap.at(#op)); \
25+
}
2126

2227
void LuaStyle::ParseFromMap(std::map<std::string, std::string, std::less<>> &configMap) {
2328
if (configMap.count("indent_style")) {
@@ -158,25 +163,21 @@ void LuaStyle::ParseFromMap(std::map<std::string, std::string, std::less<>> &con
158163
BOOL_OPTION(align_function_params)
159164

160165
if (configMap.count("align_continuous_assign_statement")) {
161-
if (configMap.at("align_continuous_assign_statement") == "true"
162-
|| configMap.at("align_continuous_assign_statement") == "when_extra_space") {
166+
if (configMap.at("align_continuous_assign_statement") == "true" || configMap.at("align_continuous_assign_statement") == "when_extra_space") {
163167
align_continuous_assign_statement = ContinuousAlign::WhenExtraSpace;
164168
} else if (configMap.at("align_continuous_assign_statement") == "always") {
165169
align_continuous_assign_statement = ContinuousAlign::Always;
166-
} else if (configMap.at("align_continuous_assign_statement") == "false"
167-
|| configMap.at("align_continuous_assign_statement") == "none") {
170+
} else if (configMap.at("align_continuous_assign_statement") == "false" || configMap.at("align_continuous_assign_statement") == "none") {
168171
align_continuous_assign_statement = ContinuousAlign::None;
169172
}
170173
}
171174

172175
if (configMap.count("align_continuous_rect_table_field")) {
173-
if (configMap.at("align_continuous_rect_table_field") == "true"
174-
|| configMap.at("align_continuous_rect_table_field") == "when_extra_space") {
176+
if (configMap.at("align_continuous_rect_table_field") == "true" || configMap.at("align_continuous_rect_table_field") == "when_extra_space") {
175177
align_continuous_rect_table_field = ContinuousAlign::WhenExtraSpace;
176178
} else if (configMap.at("align_continuous_rect_table_field") == "always") {
177179
align_continuous_rect_table_field = ContinuousAlign::Always;
178-
} else if (configMap.at("align_continuous_rect_table_field") == "false"
179-
|| configMap.at("align_continuous_rect_table_field") == "none") {
180+
} else if (configMap.at("align_continuous_rect_table_field") == "false" || configMap.at("align_continuous_rect_table_field") == "none") {
180181
align_continuous_rect_table_field = ContinuousAlign::None;
181182
}
182183
}
@@ -186,13 +187,11 @@ void LuaStyle::ParseFromMap(std::map<std::string, std::string, std::less<>> &con
186187
BOOL_OPTION(align_if_branch)
187188

188189
if (configMap.count("align_array_table")) {
189-
if (configMap.at("align_array_table") == "true"
190-
|| configMap.at("align_array_table") == "normal") {
190+
if (configMap.at("align_array_table") == "true" || configMap.at("align_array_table") == "normal") {
191191
align_array_table = AlignArrayTable::Normal;
192192
} else if (configMap.at("align_array_table") == "contain_curly") {
193193
align_array_table = AlignArrayTable::ContainCurly;
194-
} else if (configMap.at("align_array_table") == "false"
195-
|| configMap.at("align_array_table") == "none") {
194+
} else if (configMap.at("align_array_table") == "false" || configMap.at("align_array_table") == "none") {
196195
align_array_table = AlignArrayTable::None;
197196
}
198197
}
@@ -220,15 +219,15 @@ void LuaStyle::ParseFromMap(std::map<std::string, std::string, std::less<>> &con
220219
BOOL_OPTION(never_indent_comment_on_if_branch)
221220

222221
std::vector<std::pair<std::string, LineSpace &>> fieldList = {
223-
{"line_space_after_if_statement", line_space_after_if_statement},
224-
{"line_space_after_do_statement", line_space_after_do_statement},
225-
{"line_space_after_while_statement", line_space_after_while_statement},
226-
{"line_space_after_repeat_statement", line_space_after_repeat_statement},
227-
{"line_space_after_for_statement", line_space_after_for_statement},
222+
{"line_space_after_if_statement", line_space_after_if_statement },
223+
{"line_space_after_do_statement", line_space_after_do_statement },
224+
{"line_space_after_while_statement", line_space_after_while_statement },
225+
{"line_space_after_repeat_statement", line_space_after_repeat_statement },
226+
{"line_space_after_for_statement", line_space_after_for_statement },
228227
{"line_space_after_local_or_assign_statement", line_space_after_local_or_assign_statement},
229-
{"line_space_after_function_statement", line_space_after_function_statement},
230-
{"line_space_after_expression_statement", line_space_after_expression_statement},
231-
{"line_space_after_comment", line_space_after_comment}
228+
{"line_space_after_function_statement", line_space_after_function_statement },
229+
{"line_space_after_expression_statement", line_space_after_expression_statement },
230+
{"line_space_after_comment", line_space_after_comment }
232231
};
233232

234233
for (auto &lineOption: fieldList) {

0 commit comments

Comments
 (0)