优化显示信息

Author: CppCXY

CodeFormatServer/src/Service/CodeActionService.cpp

@@ -40,9 +40,9 @@ std::string CodeActionService::GetCode(DiagnosticCode code)
 {
 	switch (code)
 	{
-	case DiagnosticCode::Spell: return "EmmyLua [spell-check]";
-	case DiagnosticCode::Module: return "EmmyLua [module-check]";
-	case DiagnosticCode::Reformat: return "EmmyLua [style-check]";
+	case DiagnosticCode::Spell: return "spell-check";
+	case DiagnosticCode::Module: return "module-check";
+	case DiagnosticCode::Reformat: return "style-check";
 	}
 
 	return "";

CodeFormatServer/src/Service/CodeFormatService.cpp

@@ -52,6 +52,7 @@ std::vector<vscode::Diagnostic> CodeFormatService::Diagnose(std::string_view fil
 				diagnosisInfo.Range.End.Character
 			));
 		diagnosis.severity = vscode::DiagnosticSeverity::Warning;
+		diagnosis.source = "EmmyLua";
 		switch (diagnosisInfo.type)
 		{
 		case DiagnosisType::Indent:

CodeFormatServer/src/VSCode.cpp

@@ -74,6 +74,7 @@ nlohmann::json vscode::Diagnostic::Serialize()
 	object["severity"] = static_cast<int>(severity);
 	object["data"] = data;
 	object["code"] = code;
+	object["source"] = source;
 	return object;
 }
 

CodeService/src/FormatElement/BreakableElement.cpp

@@ -164,7 +164,7 @@ void FormatElement::GeneralIndentDiagnosis(DiagnosisContext& ctx, ChildIterator
 			if (ctx.GetOptions().indent_style != indentState.Style)
 			{
 				ctx.PushDiagnosis(
-					Util::format(LText("incorrect indentation style, expect {}, but here is {}"),
+					Util::format(LText("incorrect indentation style expected {} but found {}"),
 					       GetIndentStyleName(state.Style),
 					       GetIndentStyleName(indentState.Style)
 					),
@@ -180,7 +180,7 @@ void FormatElement::GeneralIndentDiagnosis(DiagnosisContext& ctx, ChildIterator
 				if (state.SpaceIndent != indentState.SpaceIndent)
 				{
 					ctx.PushDiagnosis(
-						Util::format(LText("incorrect indentation {}, here need {} space indentation"),
+						Util::format(LText("incorrect indentation {} expected {} space indentation"),
 						       indentState.SpaceIndent, state.SpaceIndent),
 						LuaDiagnosisPosition(line, 0),
 						LuaDiagnosisPosition(line, character),
@@ -194,7 +194,7 @@ void FormatElement::GeneralIndentDiagnosis(DiagnosisContext& ctx, ChildIterator
 				if (state.SpaceIndent != indentState.SpaceIndent || state.TabIndent != indentState.TabIndent)
 				{
 					ctx.PushDiagnosis(
-						Util::format(LText("incorrect indentation, here need {} tab and {} space indentation"),
+						Util::format(LText("incorrect indentation expected {} tab and {} space indentation"),
 						       state.TabIndent, state.SpaceIndent),
 						LuaDiagnosisPosition(line, 0),
 						LuaDiagnosisPosition(line, character),

CodeService/src/FormatElement/FormatElement.cpp

@@ -60,7 +60,7 @@ void KeepLineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt,
 
 			ctx.PushDiagnosis(
 				Util::format(
-					LText("expected {} blank lines, found {}"), _line,
+					LText("expected {} blank lines found {}"), _line,
 					(nextElementLine - lastElementLine - 1)),
 				LuaDiagnosisPosition(nextElementLine, character),
 				LuaDiagnosisPosition(nextElementLine + 1, 0), DiagnosisType::StatementLineSpace);

CodeService/src/FormatElement/KeepLineElement.cpp

@@ -58,7 +58,7 @@ void MaxLineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, Form
 	if (_line < (nextElementLine - lastElementLine - 1))
 	{
 		auto character = ctx.GetColumn(nextOffset);
-		ctx.PushDiagnosis(Util::format(LText("The maximum empty line here is {}"), _line),
+		ctx.PushDiagnosis(Util::format(LText("the maximum blank lines is {}, but found {}"), _line, (nextElementLine - lastElementLine - 1)),
 			LuaDiagnosisPosition(nextElementLine, character),
 			LuaDiagnosisPosition(nextElementLine + 1, 0), DiagnosisType::StatementLineSpace);
 	}

CodeService/src/FormatElement/MaxLineElement.cpp

@@ -57,6 +57,7 @@ void MaxSpaceElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, For
 
 	if (space > maxSpace)
 	{
-		ctx.PushDiagnosis(Util::format(LText("the maximum blank length here is {}"), maxSpace), TextRange(lastOffset, nextOffset), DiagnosisType::Blank);
+		ctx.PushDiagnosis(Util::format(LText("the maximum whitespace length is {}"), maxSpace),
+		                  TextRange(lastOffset, nextOffset), DiagnosisType::Blank);
 	}
 }

CodeService/src/FormatElement/MaxSpaceElement.cpp

@@ -59,7 +59,7 @@ void MinLineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, Form
 	if (_line > (nextElementLine - lastElementLine - 1))
 	{
 		auto character = ctx.GetColumn(nextOffset);
-		ctx.PushDiagnosis(Util::format(LText("here need at least {} empty line"), _line),
+		ctx.PushDiagnosis(Util::format(LText("at least {} blank lines is required"), _line),
 		                  LuaDiagnosisPosition(nextElementLine, character),
 		                  LuaDiagnosisPosition(nextElementLine + 1, 0), DiagnosisType::StatementLineSpace);
 	}

CodeService/src/FormatElement/MinLineElement.cpp

@@ -138,6 +138,7 @@ class Diagnostic : public Serializable
 	std::string message;
 	std::string code;
 	std::string data;
+	std::string source;
 
 	nlohmann::json Serialize() override;
 	void Deserialize(nlohmann::json json) override;