修改命令行算法和文件收集算法，使命令行工具能正确工作

Author: CppCXY

CodeFormat/src/LuaWorkspaceFormat.cpp

@@ -105,7 +105,7 @@ bool LuaWorkspaceFormat::CheckWorkspace()
 void LuaWorkspaceFormat::CollectEditorconfig()
 {
 	FileFinder finder(_workspace);
-	finder.AddFindExtension(".editorconfig");
+	finder.AddFindFile(".editorconfig");
 	finder.AddIgnoreDirectory(".git");
 	finder.AddIgnoreDirectory(".github");
 	finder.AddIgnoreDirectory(".svn");

Util/src/CommandLine.cpp

@@ -161,6 +161,18 @@ bool CommandLine::Parse(int argc, char** argv)
 			commandOption.Value = _argvs[++index];
 			commandOption.HasOption = true;
 		}
+		else if(index == argc - 1)
+		{
+			auto& commandOption = _options->_args.find(option)->second;
+			if (commandOption.Type == CommandLineValueType::Boolean)
+			{
+				commandOption.Value = "true";
+				commandOption.HasOption = true;
+				continue;
+			}
+			return false;
+		}
+
 	}
 	return true;
 }

Util/src/FileFinder.cpp

@@ -1,7 +1,7 @@
 #include "Util/FileFinder.h"
 
 FileFinder::FileFinder(std::filesystem::path root)
-	:_root(root)
+	: _root(root)
 {
 }
 
@@ -15,6 +15,11 @@ void FileFinder::AddFindExtension(const std::string& extension)
 	_findExtension.insert(extension);
 }
 
+void FileFinder::AddFindFile(const std::string& fileName)
+{
+	_findFile.insert(fileName);
+}
+
 std::vector<std::string> FileFinder::FindFiles()
 {
 	std::vector<std::string> files;
@@ -36,16 +41,28 @@ void FileFinder::CollectFile(std::filesystem::path directoryPath, std::vector<st
 		if (std::filesystem::is_directory(it.status()))
 		{
 			auto filename = it.path().filename().string();
-			if (_ignoreDirectory.count(filename) == 0) {
+			if (_ignoreDirectory.count(filename) == 0)
+			{
 				CollectFile(it.path(), paths);
 			}
 		}
-		else if(std::filesystem::is_regular_file(it.status()))
+		else if (std::filesystem::is_regular_file(it.status()))
 		{
-			std::string extension = it.path().extension().string();
-			if(_findExtension.count(extension) == 1)
+			if (!_findFile.empty())
+			{
+				auto filename = it.path().filename().string();
+				if (_findFile.count(filename) == 1)
+				{
+					paths.push_back(it.path().string());
+				}
+			}
+			if (!_findExtension.empty())
 			{
-				paths.push_back(it.path().string());
+				std::string extension = it.path().extension().string();
+				if (_findExtension.count(extension) == 1)
+				{
+					paths.push_back(it.path().string());
+				}
 			}
 		}
 	}

include/Util/FileFinder.h

@@ -15,6 +15,8 @@ class FileFinder
 
 	void AddFindExtension(const std::string& extension);
 
+	void AddFindFile(const std::string& fileName);
+
 	std::vector<std::string> FindFiles();
 
 private:
@@ -23,4 +25,5 @@ class FileFinder
 	std::filesystem::path _root;
 	std::set<std::string> _ignoreDirectory;
 	std::set<std::string> _findExtension;
+	std::set<std::string> _findFile;
 };