Skip to content

Commit 9d0c090

Browse files
committed
修复codeformatlib的关于spell check的错误报告
1 parent dd24e04 commit 9d0c090

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

CodeFormat/src/LuaFormat.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,8 @@ bool LuaFormat::Check(std::string_view workspace, std::shared_ptr<CodeSpellCheck
191191
spellChecker->Analysis(ctx);
192192
}
193193

194+
ctx.DiagnoseLine();
195+
194196
auto diagnosis = ctx.GetDiagnosisInfos();
195197
if (!diagnosis.empty())
196198
{

CodeFormatLib/src/LuaCodeFormat.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ std::pair<bool, std::vector<LuaDiagnosisInfo>> LuaCodeFormat::Diagnose(const std
148148
styleChecker.Analysis();
149149
}
150150

151+
ctx.DiagnoseLine();
152+
151153
return std::make_pair(true, ctx.GetDiagnosisInfos());
152154
}
153155

CodeFormatServer/src/Service/CodeFormatService.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ std::vector<vscode::Diagnostic> CodeFormatService::Diagnose(std::string_view fil
3535
_spellChecker->Analysis(ctx, _customDictionary);
3636
}
3737

38+
ctx.DiagnoseLine();
39+
3840
auto diagnosisInfos = ctx.GetDiagnosisInfos();
3941
for (auto diagnosisInfo : diagnosisInfos)
4042
{

CodeService/src/FormatElement/DiagnosisContext.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,31 @@ void DiagnosisContext::SetLineMaxLength(int line, int character)
3131
_lineMaxLengthMap[line] = character;
3232
}
3333

34-
std::vector<LuaDiagnosisInfo> DiagnosisContext::GetDiagnosisInfos()
34+
void DiagnosisContext::DiagnoseLine()
3535
{
3636
if (!_lineMaxLengthMap.empty())
3737
{
3838
for (auto& [line, character] : _lineMaxLengthMap)
3939
{
4040
LuaDiagnosisPosition start(line, _options.max_line_length);
4141
LuaDiagnosisPosition end(line, character);
42-
PushDiagnosis(Util::format(LText("The line width should not exceed {}"), _options.max_line_length), start, end,
43-
DiagnosisType::MaxLineWidth);
42+
PushDiagnosis(Util::format(LText("The line width should not exceed {}"), _options.max_line_length), start,
43+
end,
44+
DiagnosisType::MaxLineWidth);
4445
}
4546
_lineMaxLengthMap.clear();
4647
}
4748

4849
if (_options.insert_final_newline && !_parser->IsEmptyLine(_parser->GetTotalLine()))
4950
{
5051
LuaDiagnosisPosition start(_parser->GetTotalLine(), _parser->GetColumn(
51-
static_cast<int>(_parser->GetSource().size())));
52+
static_cast<int>(_parser->GetSource().size())));
5253
LuaDiagnosisPosition end(_parser->GetTotalLine() + 1, 0);
5354
PushDiagnosis(LText("The code must end with a new line"), start, end, DiagnosisType::EndWithNewLine);
5455
}
56+
}
57+
58+
std::vector<LuaDiagnosisInfo> DiagnosisContext::GetDiagnosisInfos()
59+
{
5560
return _diagnosisInfos;
56-
}
61+
}

0 commit comments

Comments
 (0)