Skip to content

Commit 533d11e

Browse files
committed
提供连续行界定的设置
1 parent 4487f9e commit 533d11e

File tree

6 files changed

+9
-279
lines changed

6 files changed

+9
-279
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
release:
6969
name: Upload Release
7070
needs: [build]
71-
runs-on: [ubuntu-18.04]
71+
runs-on: [ubuntu-latest]
7272
steps:
7373
- name: Download
7474
uses: actions/download-artifact@v2

CodeService/src/Config/LuaStyle.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ void LuaStyle::ParseFromMap(std::map<std::string, std::string, std::less<>> &con
181181
}
182182
}
183183

184+
NUMBER_OPTION(align_continuous_line_space)
185+
184186
BOOL_OPTION(align_if_branch)
185187

186188
if (configMap.count("align_array_table")) {

CodeService/src/Format/Analyzer/AlignAnalyzer.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ AlignAnalyzer::AnalyzeContinuousLocalOrAssign(FormatState &f, LuaSyntaxNode &syn
152152

153153
if (stmt.GetTokenKind(t) == TK_SHORT_COMMENT) {
154154
auto line = stmt.GetStartLine(t);
155-
if (line - lastLine > 2) {
155+
if (line - lastLine > f.GetStyle().align_continuous_line_space) {
156156
if (group.size() > 1) {
157157
PushAlignGroup(strategy, group);
158158
}
@@ -166,7 +166,7 @@ AlignAnalyzer::AnalyzeContinuousLocalOrAssign(FormatState &f, LuaSyntaxNode &syn
166166
if (kind == LuaSyntaxNodeKind::LocalStatement
167167
|| kind == LuaSyntaxNodeKind::AssignStatement) {
168168
auto line = stmt.GetStartLine(t);
169-
if (line - lastLine <= 2) {
169+
if (line - lastLine <= f.GetStyle().align_continuous_line_space) {
170170
group.push_back(stmt.GetIndex());
171171
} else {
172172
if (group.size() > 1) {
@@ -220,7 +220,7 @@ void AlignAnalyzer::AnalyzeContinuousRectField(FormatState &f, LuaSyntaxNode &sy
220220
auto tokenKind = field.GetTokenKind(t);
221221
if (tokenKind != 0) {
222222
if (tokenKind == TK_SHORT_COMMENT) {
223-
if (line - lastLine > 2) {
223+
if (line - lastLine > f.GetStyle().align_continuous_line_space) {
224224
if (group.size() > 1) {
225225
PushAlignGroup(strategy, group);
226226
}
@@ -237,7 +237,7 @@ void AlignAnalyzer::AnalyzeContinuousRectField(FormatState &f, LuaSyntaxNode &sy
237237
group.clear();
238238
lastLine++;
239239
continue;
240-
} else if (line - lastLine <= 2) {
240+
} else if (line - lastLine <= f.GetStyle().align_continuous_line_space) {
241241
group.push_back(field.GetIndex());
242242
} else {
243243
if (group.size() > 1) {

LuaParser/src/Lexer/LuaDocTokenParser.cpp

Lines changed: 0 additions & 227 deletions
This file was deleted.

include/CodeService/Config/LuaStyle.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ class LuaStyle {
9696

9797
ContinuousAlign align_continuous_rect_table_field = ContinuousAlign::WhenExtraSpace;
9898

99+
std::size_t align_continuous_line_space = 2;
100+
99101
bool align_if_branch = false;
100102
// not implement now
101103
bool align_continuous_similar_call_args = false;

include/LuaParser/Lexer/LuaDocTokenParser.h

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)