修改cli工具,check信息将输出到stdout上

Author: CppCXY

CMakeLists.txt

@@ -8,7 +8,6 @@ option(BuildAsLuaLib "Build for lua dll" OFF)
 option(BuildCodeFormat "Build CodeFormat" ON)
 option(BuildCodeFormatServer "Build CodeFormatServer" ON)
 option(EnableTest "Test project" ON)
-option(BuildInWordsDictionary "Use BuildInWordsDictionary" ON)
 
 if(APPLE)
 	include(CheckCCompilerFlag)

CodeFormat/src/CodeFormat.cpp

@@ -36,6 +36,7 @@ int main(int argc, char** argv)
 	);
 	cmd.AddTarget("format")
 	   .Add<std::string>("file", "f", "Specify the input file")
+	   .Add<std::string>("overwrite", "ow", "Format overwrite the input file")
 	   .Add<std::string>("workspace", "w",
 	                     "Specify workspace directory,if no input file is specified, bulk formatting is performed")
 	   .Add<int>("stdin", "i", "Read from stdin and specify read size")
@@ -71,6 +72,9 @@ int main(int argc, char** argv)
 	                     "Use file wildcards to specify how to ignore files\n"
 	                     "\t\tseparated by ';'"
 	   )
+	   // .Add<std::string>("output", "o",
+	   //                   "Diagnostic messages are output to file or standard io"
+	   //                   "\t\toptional filename/stdout/stderr, default is stderr")
 	   .EnableKeyValueArgs();
 
 
@@ -110,6 +114,10 @@ int main(int argc, char** argv)
 		{
 			luaFormat->SetOutputFile(cmd.Get<std::string>("outfile"));
 		}
+		else if (cmd.HasOption("overwrite"))
+		{
+			luaFormat->SetOutputFile(cmd.Get<std::string>("file"));
+		}
 
 		if (cmd.Get<bool>("detect-config"))
 		{

CodeFormat/src/LuaFormat.cpp

@@ -155,11 +155,10 @@ bool LuaFormat::Check(std::string_view workspace, std::shared_ptr<CodeSpellCheck
 	{
 		auto errors = _parser->GetErrors();
 
-		std::cerr << Util::format("Check {}\t{} error", inputFile, errors.size()) << std::endl;
-
+		std::cout << Util::format("Check {}\t{} error", inputFile, errors.size()) << std::endl;
+		auto luaFile = _parser->GetLuaFile();
 		for (auto& error : errors)
 		{
-			auto luaFile = _parser->GetLuaFile();
 			DiagnosisInspection(error.ErrorMessage, error.ErrorRange, luaFile, inputFile);
 		}
 
@@ -196,7 +195,7 @@ bool LuaFormat::Check(std::string_view workspace, std::shared_ptr<CodeSpellCheck
 	auto diagnosis = ctx.GetDiagnosisInfos();
 	if (!diagnosis.empty())
 	{
-		std::cerr << Util::format("Check {}\t{} warning", inputFile, diagnosis.size()) << std::endl;
+		std::cout << Util::format("Check {}\t{} warning", inputFile, diagnosis.size()) << std::endl;
 
 		for (auto& d : diagnosis)
 		{
@@ -222,6 +221,6 @@ void LuaFormat::DiagnosisInspection(std::string_view message, TextRange range, s
 	auto startChar = file->GetColumn(range.StartOffset);
 	auto endLine = file->GetLine(range.EndOffset);
 	auto endChar = file->GetColumn(range.EndOffset);
-	std::cerr << Util::format("{}({}:{} to {}:{}): {}", path, startLine + 1, startChar, endLine + 1, endChar,
+	std::cout << Util::format("\t{}({}:{} to {}:{}): {}", path, startLine + 1, startChar, endLine + 1, endChar,
 	                    message) << std::endl;
 }

CodeFormat/src/LuaWorkspaceFormat.cpp

@@ -64,6 +64,11 @@ void LuaWorkspaceFormat::SetKeyValues(std::map<std::string, std::string, std::le
 	}
 }
 
+// void LuaWorkspaceFormat::SetOutput(std::string_view out)
+// {
+// 	_output = out;
+// }
+
 void LuaWorkspaceFormat::ReformatWorkspace()
 {
 	if (_autoDetectConfig)

CodeFormat/src/LuaWorkspaceFormat.h

@@ -22,6 +22,8 @@ class LuaWorkspaceFormat
 
 	void SetKeyValues(std::map<std::string, std::string, std::less<>>& keyValues);
 
+	// void SetOutput(std::string_view out);
+
 	void ReformatWorkspace();
 
 	bool CheckWorkspace();
@@ -35,4 +37,5 @@ class LuaWorkspaceFormat
 	std::vector<std::pair<std::string, std::shared_ptr<LuaEditorConfig>>> _editorConfigVector;
 	std::shared_ptr<LuaCodeStyleOptions> _defaultOptions;
 	std::vector<std::string> _ignorePattern;
+	// std::string _output;
 };

Util/CMakeLists.txt

@@ -35,8 +35,4 @@ target_sources(Util
 )
 
 
-target_link_libraries(Util PUBLIC uriparser)
-
-if(BuildInWordsDictionary)
-	target_compile_definitions(Util PRIVATE -DUSE_BUILDIN_DICTIONARY)
-endif()
+target_link_libraries(Util PUBLIC uriparser)