Skip to content

Commit f88dcb0

Browse files
committed
修复缩进问题
1 parent 81e9248 commit f88dcb0

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

CodeService/src/Format/Analyzer/IndentationAnalyzer.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ void IndentationAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
6161
for (auto expr: exprList.GetChildren(t)) {
6262
Indenter(expr, t, IndentData(
6363
IndentType::WhenLineBreak,
64-
f.GetStyle().continuation_indent
64+
f.GetStyle().indent_style == IndentStyle::Space ?
65+
f.GetStyle().indent_size : f.GetStyle().tab_width
6566
));
6667
}
6768
}
@@ -123,7 +124,8 @@ void IndentationAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
123124
for (auto field: tableFieldList.GetChildren(t)) {
124125
Indenter(field, t, IndentData(
125126
IndentType::WhenLineBreak,
126-
f.GetStyle().continuation_indent
127+
f.GetStyle().indent_style == IndentStyle::Space ?
128+
f.GetStyle().indent_size : f.GetStyle().tab_width
127129
));
128130
}
129131

Test/src/FormatStyle_unitest.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,18 +175,12 @@ if a
175175
or c then
176176
177177
end
178-
table.insert(t, {
179-
aaa = 123
180-
})
181178
)",
182179
R"(
183180
if a
184181
or c then
185182
186183
end
187-
table.insert(t, {
188-
aaa = 123
189-
})
190184
)", style));
191185
}
192186

0 commit comments

Comments
 (0)