complete #94

Author: CppCXY

CodeService/src/Diagnostic/CodeStyle/CodeStyleChecker.cpp

@@ -80,7 +80,8 @@ void CodeStyleChecker::BasicResolve(LuaSyntaxNode syntaxNode, const LuaSyntaxTre
                 if (syntaxNode.GetTokenKind(t) == TK_STRING) {
                     auto text = syntaxNode.GetText(t);
                     if (text.size() >= 2
-                        && text.front() == '\"') {
+                        && text.front() == '\"'
+                        && !string_util::ExistDel('\'', text)) {
                         d.PushDiagnostic(DiagnosticType::StringQuote, textRange,
                                          LText("\" should be \' ")
                         );
@@ -93,7 +94,8 @@ void CodeStyleChecker::BasicResolve(LuaSyntaxNode syntaxNode, const LuaSyntaxTre
                 if (syntaxNode.GetTokenKind(t) == TK_STRING) {
                     auto text = syntaxNode.GetText(t);
                     if (text.size() >= 2
-                        && text.front() == '\'') {
+                        && text.front() == '\''
+                        && !string_util::ExistDel('\"', text)) {
                         d.PushDiagnostic(DiagnosticType::StringQuote, textRange,
                                          LText("\' should be \" ")
                         );

CodeService/src/Format/Analyzer/LineBreakAnalyzer.cpp

@@ -207,7 +207,7 @@ LineBreakAnalyzer::Query(FormatState &f, LuaSyntaxNode &syntaxNode, const LuaSyn
                 auto relationNode = LuaSyntaxNode(lineBreakData.Data.Index);
                 auto guessLineWidth = lineWidth + syntaxNode.GetFirstLineWidth(t) + relationNode.GetFirstLineWidth(t);
                 if (guessLineWidth > style.max_line_length) {
-                    resolve.SetNextLineBreak(LineSpace(1));
+                    resolve.SetNextLineBreak(LineSpace(1, LineBreakReason::ExceedMaxLine));
                 }
                 break;
             }

CodeService/src/Format/FormatBuilder.cpp

@@ -2,6 +2,7 @@
 #include "LuaParser/Lexer/LuaTokenTypeDetail.h"
 #include "CodeService/Format/Analyzer/AlignAnalyzer.h"
 #include "CodeService/Format/Analyzer/IndentationAnalyzer.h"
+#include "Util/StringUtil.h"
 
 
 FormatBuilder::FormatBuilder(LuaStyle &style) {
@@ -41,21 +42,6 @@ void FormatBuilder::WriteSyntaxNode(LuaSyntaxNode &syntaxNode, const LuaSyntaxTr
     }
 }
 
-bool ExistDel(char del, std::string_view text) {
-    text = text.substr(1, text.size() - 2);
-    char ch = '\0';
-    for (std::size_t i = 0; i < text.size(); ++i) {
-        ch = text[i];
-        if (ch == del) {
-            return true;
-        } else if (ch == '\\') {
-            ++i;
-        }
-    }
-
-    return false;
-}
-
 void FormatBuilder::DoResolve(LuaSyntaxNode &syntaxNode, const LuaSyntaxTree &t, FormatResolve &resolve) {
     if (syntaxNode.IsToken(t)) {
         if (_state.IsNewLine()) {
@@ -104,7 +90,7 @@ void FormatBuilder::DoResolve(LuaSyntaxNode &syntaxNode, const LuaSyntaxTree &t,
                     auto del = '\'';
                     if (text.size() >= 2
                         && text.front() == '\"'
-                        && !ExistDel(del, text)) {
+                        && !string_util::ExistDel(del, text)) {
                         WriteChar(del);
                         WriteText(text.substr(1, text.size() - 2));
                         WriteChar(del);
@@ -121,7 +107,7 @@ void FormatBuilder::DoResolve(LuaSyntaxNode &syntaxNode, const LuaSyntaxTree &t,
                     auto del = '\"';
                     if (text.size() >= 2
                         && text.front() == '\''
-                        && !ExistDel(del, text)) {
+                        && !string_util::ExistDel(del, text)) {
                         WriteChar(del);
                         WriteText(text.substr(1, text.size() - 2));
                         WriteChar(del);