命名风格检查将same改为ignore

Author: CppCXY

CodeService/src/Config/LuaDiagnosticStyle.cpp

@@ -31,11 +31,21 @@ NameStyleRule MakeNameStyle(InfoNode n) {
                 return NameStyleRule(NameStyleType::PascalCase);
             } else if (type == "camel_case") {
                 return NameStyleRule(NameStyleType::CamelCase);
-            } else if (type == "same") {
+            } else if (type == "ignore") {
                 auto paramNode = n.GetValue("param");
+                std::set<std::string> ignores;
                 if (paramNode.IsString()) {
-                    return NameStyleRule(NameStyleType::Same, std::make_shared<SameNameStyleData>(paramNode.AsString()));
+                    ignores.insert(paramNode.AsString());
+                } else if (paramNode.IsArray()) {
+                    auto arr = paramNode.AsArray();
+                    for(auto item : arr){
+                        if(item.IsString()) {
+                            ignores.insert(item.AsString());
+                        }
+                    }
                 }
+
+                return NameStyleRule(NameStyleType::Ignore, std::make_shared<IgnoreNameStyleData>(ignores));
             } else if (type == "pattern") {
                 auto paramNode = n.GetValue("param");
                 if (paramNode.IsString()) {

CodeService/src/Diagnostic/NameStyle/NameStyleChecker.cpp

@@ -444,15 +444,6 @@ std::string NameStyleChecker::MakeDiagnosticInfo(std::string_view ruleName, LuaS
                 ruleMessage.append("pascal-case");
                 break;
             }
-            case NameStyleType::Same: {
-                auto data = rule.Data;
-                if (data) {
-                    auto sameData = std::dynamic_pointer_cast<SameNameStyleData>(data);
-                    ruleMessage.append(util::format("same '{}'", sameData->Param));
-                }
-
-                break;
-            }
             case NameStyleType::Pattern: {
                 auto data = rule.Data;
                 if (data) {

CodeService/src/Diagnostic/NameStyle/NameStyleRuleMatcher.cpp

@@ -34,11 +34,11 @@ bool NameStyleRuleMatcher::Match(LuaSyntaxNode &n, const LuaSyntaxTree &t, const
                 }
                 break;
             }
-            case NameStyleType::Same: {
+            case NameStyleType::Ignore: {
                 auto data = rule.Data;
                 if (data) {
-                    auto sameData = std::dynamic_pointer_cast<SameNameStyleData>(data);
-                    if (Same(text, sameData->Param)) {
+                    auto ignoreData = std::dynamic_pointer_cast<IgnoreNameStyleData>(data);
+                    if (ignoreData->Param.count(text)){
                         return true;
                     }
                 }
@@ -313,10 +313,6 @@ bool NameStyleRuleMatcher::PascalCase(std::string_view text) {
     return true;
 }
 
-bool NameStyleRuleMatcher::Same(std::string_view text, std::string_view param) {
-    return text == param;
-}
-
 bool NameStyleRuleMatcher::PatternMatch(std::string_view text, std::shared_ptr<PatternNameStyleData> data) {
     std::match_results<std::string_view::const_iterator> mc;
     if (!std::regex_match(text.begin(), text.end(), mc, data->Re)) {

include/CodeService/Config/LuaDiagnosticStyle.h

@@ -35,7 +35,6 @@ class LuaDiagnosticStyle {
     };
 
     std::vector<NameStyleRule> module_name_style = {
-            NameStyleRule(NameStyleType::Same, std::make_unique<SameNameStyleData>("m")),
             NameStyleRule(NameStyleType::SnakeCase)
     };
 

include/CodeService/Config/NameStyleRule.h

@@ -2,14 +2,15 @@
 
 #include <regex>
 #include <string>
+#include <set>
 
 enum class NameStyleType {
     Off,
     CamelCase,
     PascalCase,
     SnakeCase,
     UpperSnakeCase,
-    Same,
+    Ignore,
     Pattern,
 };
 
@@ -29,10 +30,10 @@ struct NameStyleRule {
     std::shared_ptr<NameStyleData> Data;
 };
 
-struct SameNameStyleData : public NameStyleData {
-    explicit SameNameStyleData(std::string_view param)
-        : NameStyleData(), Param(param) {}
-    std::string Param;
+struct IgnoreNameStyleData : public NameStyleData {
+    explicit IgnoreNameStyleData(const std::set<std::string>& param)
+        : NameStyleData(), Param(param.begin(), param.end()) {}
+    std::set<std::string, std::less<>> Param;
 };
 
 struct PatternNameStyleData : public NameStyleData {

include/CodeService/Diagnostic/NameStyle/NameStyleRuleMatcher.h

@@ -19,7 +19,5 @@ class NameStyleRuleMatcher {
 
     static bool PascalCase(std::string_view text);
 
-    static bool Same(std::string_view text, std::string_view param);
-
     static bool PatternMatch(std::string_view text, std::shared_ptr<PatternNameStyleData> data);
 };