修改格式检查信息

Author: CppCXY

CodeService/src/FormatElement/AlignmentElement.cpp

@@ -33,6 +33,6 @@ void AlignmentElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, Fo
 	if (character != _alignmentPosition)
 	{
 		ctx.PushDiagnosis(Util::format(LText("'=' should align to character {}"), _alignmentPosition),
-		                  TextRange(nextOffset, nextOffset + 1), DiagnosisType::Align);
+		                  TextRange(nextOffset, nextOffset), DiagnosisType::Align);
 	}
 }

CodeService/src/FormatElement/KeepBlankElement.cpp

@@ -36,9 +36,16 @@ void KeepBlankElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, Fo
 
 	if (nextElementLine == lastElementLine)
 	{
-		if (nextOffset - lastOffset - 1 != _blank)
+		if (nextOffset - lastOffset - 1 < _blank)
 		{
-			ctx.PushDiagnosis(Util::format(LText("here need keep {} space"), _blank), TextRange(lastOffset, nextOffset),
+			ctx.PushDiagnosis(Util::format(LText("{} space should be reserved here"), _blank),
+			                  TextRange(lastOffset, nextOffset),
+			                  DiagnosisType::Blank);
+		}
+		else
+		{
+			ctx.PushDiagnosis(Util::format(LText("{} space should be kept here"), _blank),
+			                  TextRange(lastOffset + 1, nextOffset - 1),
 			                  DiagnosisType::Blank);
 		}
 	}

CodeService/src/FormatElement/KeepElement.cpp

@@ -68,10 +68,17 @@ void KeepElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt,
 
 	if (nextElementLine == lastElementLine)
 	{
-		if (nextOffset - lastOffset - 1 != _keepBlank)
+		if (nextOffset - lastOffset - 1 < _keepBlank)
 		{
-			ctx.PushDiagnosis(Util::format(LText("here need keep {} space"), _keepBlank),
-			                  TextRange(lastOffset, nextOffset), DiagnosisType::Blank);
+			ctx.PushDiagnosis(Util::format(LText("missing whitespace")),
+			                  TextRange(lastOffset, nextOffset),
+			                  DiagnosisType::Blank);
+		}
+		else
+		{
+			ctx.PushDiagnosis(Util::format(LText("multiple spaces")),
+			                  TextRange(lastOffset + 1, nextOffset - 1),
+			                  DiagnosisType::Blank);
 		}
 	}
 	else
@@ -82,7 +89,7 @@ void KeepElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt,
 
 void KeepElement::AllowBreakLineSerialize(SerializeContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
-	if(!_allowContinueIndent)
+	if (!_allowContinueIndent)
 	{
 		return Serialize(ctx, selfIt, parent);
 	}

CodeService/src/FormatElement/KeepLineElement.cpp

@@ -58,9 +58,11 @@ void KeepLineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt,
 		{
 			auto character = ctx.GetColumn(nextElementOffset);
 
-			ctx.PushDiagnosis(Util::format(LText("here need keep {} empty line"), _line),
-			                  LuaDiagnosisPosition(nextElementLine, character),
-			                  LuaDiagnosisPosition(nextElementLine + 1, 0), DiagnosisType::StatementLineSpace);
+			ctx.PushDiagnosis(
+				Util::format(
+					LText("expected {} blank lines, found {}"), _line, (nextElementLine - lastElementLine - 1)),
+				LuaDiagnosisPosition(nextElementLine, character),
+				LuaDiagnosisPosition(nextElementLine + 1, 0), DiagnosisType::StatementLineSpace);
 		}
 	}
 }