Skip to content

Commit 29683b3

Browse files
committed
Правка синтаксиса для обновлённого AngelScript.
Close #50
1 parent d0b071d commit 29683b3

File tree

2 files changed

+71
-2
lines changed

2 files changed

+71
-2
lines changed

.editorconfig

Lines changed: 68 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,76 @@
11
root = true
22

3-
[*.{as,cpp,h,hpp,inl,txt,ts,js}]
3+
[*.{as,cpp,h,hpp,inl,txt}]
44
charset = utf-8-bom
55
end_of_line = lf
66
insert_final_newline = true
77
indent_style = space
88
indent_size = 4
99
trim_trailing_whitespace = true
10+
11+
[*.{as,c++,cc,cpp,cppm,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}]
12+
13+
# Visual C++ Code Style settings
14+
15+
cpp_generate_documentation_comments = xml
16+
17+
# Visual C++ Formatting settings
18+
19+
cpp_indent_braces = false
20+
cpp_indent_multi_line_relative_to = innermost_parenthesis
21+
cpp_indent_within_parentheses = indent
22+
cpp_indent_preserve_within_parentheses = true
23+
cpp_indent_case_contents = true
24+
cpp_indent_case_labels = false
25+
cpp_indent_case_contents_when_block = false
26+
cpp_indent_lambda_braces_when_parameter = true
27+
cpp_indent_goto_labels = one_left
28+
cpp_indent_preprocessor = one_left
29+
cpp_indent_access_specifiers = false
30+
cpp_indent_namespace_contents = false
31+
cpp_indent_preserve_comments = false
32+
cpp_new_line_before_open_brace_namespace = same_line
33+
cpp_new_line_before_open_brace_type = same_line
34+
cpp_new_line_before_open_brace_function = same_line
35+
cpp_new_line_before_open_brace_block = same_line
36+
cpp_new_line_before_open_brace_lambda = same_line
37+
cpp_new_line_scope_braces_on_separate_lines = true
38+
cpp_new_line_close_brace_same_line_empty_type = true
39+
cpp_new_line_close_brace_same_line_empty_function = false
40+
cpp_new_line_before_catch = false
41+
cpp_new_line_before_else = false
42+
cpp_new_line_before_while_in_do_while = false
43+
cpp_space_before_function_open_parenthesis = remove
44+
cpp_space_within_parameter_list_parentheses = false
45+
cpp_space_between_empty_parameter_list_parentheses = false
46+
cpp_space_after_keywords_in_control_flow_statements = true
47+
cpp_space_within_control_flow_statement_parentheses = false
48+
cpp_space_before_lambda_open_parenthesis = false
49+
cpp_space_within_cast_parentheses = false
50+
cpp_space_after_cast_close_parenthesis = false
51+
cpp_space_within_expression_parentheses = false
52+
cpp_space_before_block_open_brace = true
53+
cpp_space_between_empty_braces = false
54+
cpp_space_before_initializer_list_open_brace = false
55+
cpp_space_within_initializer_list_braces = true
56+
cpp_space_preserve_in_initializer_list = true
57+
cpp_space_before_open_square_bracket = false
58+
cpp_space_within_square_brackets = false
59+
cpp_space_before_empty_square_brackets = false
60+
cpp_space_between_empty_square_brackets = false
61+
cpp_space_group_square_brackets = true
62+
cpp_space_within_lambda_brackets = false
63+
cpp_space_between_empty_lambda_brackets = false
64+
cpp_space_before_comma = false
65+
cpp_space_after_comma = true
66+
cpp_space_remove_around_member_operators = true
67+
cpp_space_before_inheritance_colon = true
68+
cpp_space_before_constructor_colon = true
69+
cpp_space_remove_before_semicolon = true
70+
cpp_space_after_semicolon = true
71+
cpp_space_remove_around_unary_operator = true
72+
cpp_space_around_binary_operator = insert
73+
cpp_space_around_assignment_operator = insert
74+
cpp_space_pointer_reference_alignment = left
75+
cpp_space_around_ternary_operator = insert
76+
cpp_wrap_preserve_blocks = one_liners

engine/colorer.as

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1781,7 +1781,9 @@ class ScintillaEditor : TextEditorWindow, SelectionChangedReceiver {
17811781

17821782
BreakPointDef&& getBreakPointAtLine(int line) {
17831783
auto found = breakpoints.find(breakPointKey + line);
1784-
return found.isEnd() ? null : found.value;
1784+
if (found.isEnd())
1785+
return null;
1786+
return found.value;
17851787
}
17861788

17871789
LRESULT onNotifyParent(SCNotification& scn) {

0 commit comments

Comments
 (0)