Merge branch 'master' of github.com:CppCXY/EmmyLuaCodeStyle

CppCXY · CppCXY · commit c0f34dd58daa · 2022-05-10T11:21:47.000+08:00
diff --git a/Util/src/StringUtil.cpp b/Util/src/StringUtil.cpp
@@ -150,7 +150,8 @@ std::string_view StringUtil::GetFileRelativePath(std::string_view workspace, std
 		}
 	}
 
-	if (i < filePath.size() && filePath[i] == '\\' || filePath[i] == '/')
+	if (i < filePath.size() 
+		&& (filePath[i] == '\\' || filePath[i] == '/'))
 	{
 		i++;
 	}
@@ -185,7 +186,7 @@ bool StringUtil::FileWildcardMatch(std::string_view sourceFile, std::string_view
 
 	if(!match)
 	{
-		match = wildcards::match(sourceFile, pattern, equal_to()).res;
+		match = wildcards::match(sourceFile, pattern, eq).res;
 	}
 	return match;
 }

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,8 @@ std::string_view StringUtil::GetFileRelativePath(std::string_view workspace, std`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
`153`		`- if (i < filePath.size() && filePath[i] == '\\' \|\| filePath[i] == '/')`
	`153`	`+ if (i < filePath.size()`
	`154`	`+ && (filePath[i] == '\\' \|\| filePath[i] == '/'))`
`154`	`155`	`{`
`155`	`156`	`i++;`
`156`	`157`	`}`
`@@ -185,7 +186,7 @@ bool StringUtil::FileWildcardMatch(std::string_view sourceFile, std::string_view`
`185`	`186`
`186`	`187`	`if(!match)`
`187`	`188`	`{`
`188`		`- match = wildcards::match(sourceFile, pattern, equal_to()).res;`
	`189`	`+ match = wildcards::match(sourceFile, pattern, eq).res;`
`189`	`190`	`}`
`190`	`191`	`return match;`
`191`	`192`	`}`