内联注释对齐默认开启

Author: CppCXY

CodeService/src/Config/LuaStyle.cpp

@@ -165,6 +165,8 @@ void LuaStyle::ParseFromMap(std::map<std::string, std::string, std::less<>> &con
 
     BOOL_OPTION(align_array_table)
 
+    BOOL_OPTION(align_continuous_inline_comment)
+
     BOOL_OPTION(never_indent_before_if_condition)
 
     if (align_if_branch) {

CodeService/src/Diagnostic/DiagnosticBuilder.cpp

@@ -88,39 +88,20 @@ void DiagnosticBuilder::SpellCheck(const LuaSyntaxTree &t, CodeSpellChecker &spe
 void DiagnosticBuilder::DoDiagnosticResolve(LuaSyntaxNode syntaxNode, const LuaSyntaxTree &t, FormatResolve &resolve) {
     if (syntaxNode.IsToken(t)) {
         auto textRange = syntaxNode.GetTextRange(t);
-//        auto &file = t.GetFile();
+//        auto prevToken = syntaxNode.GetPrevToken(t);
+//        if (prevToken.GetEndLine(t) != syntaxNode.GetStartLine(t)) {
+//            auto &file = t.GetFile();
+//            auto indent = _state.GetCurrentIndent();
+//            auto currentIndent = file.GetIndentString(textRange.StartOffset);
+//
+//        }
+
         switch (resolve.GetPrevSpaceStrategy()) {
             case PrevSpaceStrategy::AlignPos: {
-//                auto pos = resolve.GetAlign();
-//                if (pos != file.GetLineOffset(textRange.StartOffset)) {
-//                    PushDiagnostic(DiagnosticType::Align,
-//                                   syntaxNode.GetPrevToken(t).GetIndex(),
-//                                   textRange,
-//                                   util::format(LText("should align to {}"),
-//                                                file.GetColumn(pos)
-//                                   )
-//                    );
-//                } else {
-//                    ClearDiagnostic(syntaxNode.GetPrevToken(t).GetIndex());
-//                }
                 ClearDiagnostic(syntaxNode.GetPrevToken(t).GetIndex());
                 break;
             }
             case PrevSpaceStrategy::AlignRelativeIndent: {
-//                auto relativePos = resolve.GetAlign();
-//                auto indentState = _state.GetCurrentIndent();
-//                auto pos = relativePos + indentState.SpaceSize + indentState.TabSize * _state.GetStyle().tab_width;
-//                if (pos != file.GetLineOffset(textRange.StartOffset)) {
-//                    PushDiagnostic(DiagnosticType::Align,
-//                                   syntaxNode.GetPrevToken(t).GetIndex(),
-//                                   textRange,
-//                                   util::format(LText("should align to {}"),
-//                                                file.GetColumn(pos)
-//                                   )
-//                    );
-//                } else {
-//                    ClearDiagnostic(syntaxNode.GetPrevToken(t).GetIndex());
-//                }
                 ClearDiagnostic(syntaxNode.GetPrevToken(t).GetIndex());
                 break;
             }
@@ -167,7 +148,7 @@ void DiagnosticBuilder::DoDiagnosticResolve(LuaSyntaxNode syntaxNode, const LuaS
                 auto nextToken = syntaxNode.GetNextToken(t);
                 if (nextToken.IsToken(t)
                     && nextToken.GetStartLine(t) == syntaxNode.GetEndLine(t)) {
-                    ProcessSpaceDiagnostic(syntaxNode, nextToken, t, resolve.GetNextSpace());
+                    ProcessSpaceDiagnostic(syntaxNode, nextToken, resolve.GetNextSpace(), t);
                 }
                 break;
             }
@@ -247,8 +228,8 @@ std::string DiagnosticBuilder::GetAdditionalNote(LuaSyntaxNode &left, LuaSyntaxN
     }
 }
 
-void DiagnosticBuilder::ProcessSpaceDiagnostic(LuaSyntaxNode &node, LuaSyntaxNode &next, const LuaSyntaxTree &t,
-                                               size_t shouldSpace) {
+void DiagnosticBuilder::ProcessSpaceDiagnostic(LuaSyntaxNode &node, LuaSyntaxNode &next, size_t shouldSpace,
+                                               const LuaSyntaxTree &t) {
     auto leftOffset = node.GetTextRange(t).EndOffset;
     auto rightOffset = next.GetTextRange(t).StartOffset;
     int diff = static_cast<int>(rightOffset - leftOffset) - 1;

CodeService/src/Format/Analyzer/AlignAnalyzer.cpp

@@ -2,6 +2,7 @@
 #include "LuaParser/Lexer/LuaTokenTypeDetail.h"
 #include "CodeService/Format/FormatState.h"
 #include "SyntaxNodeHelper.h"
+#include "Util/StringUtil.h"
 
 
 AlignAnalyzer::AlignAnalyzer() {
@@ -377,7 +378,8 @@ AlignAnalyzer::ResolveAlignGroup(FormatState &f, std::size_t groupIndex, AlignGr
                 if (comment.IsToken(t)) {
                     auto prev = comment.GetPrevToken(t);
                     auto newPos =
-                            file.GetColumn(prev.GetTextRange(t).EndOffset) + f.GetStyle().space_before_inline_comment + 1;
+                            file.GetColumn(prev.GetTextRange(t).EndOffset) + f.GetStyle().space_before_inline_comment +
+                            1;
                     if (newPos > maxDis) {
                         maxDis = newPos;
                     }
@@ -506,6 +508,12 @@ void AlignAnalyzer::AnalyzeInlineComment(FormatState &f, LuaSyntaxNode &syntaxNo
     if (prevToken.GetEndLine(t) != currentLine) {
         return;
     }
+
+    auto text = syntaxNode.GetText(t);
+    if (string_util::StartWith(text, "---@")) {
+        return;
+    }
+
     // now it is inline comment
     if (_inlineCommentGroup.empty()) {
         _inlineCommentGroup.emplace_back();

include/CodeService/Config/LuaStyle.h

@@ -100,7 +100,7 @@ class LuaStyle {
     // not implement now
     bool align_continuous_similar_call_args = false;
 
-    bool align_continuous_inline_comment = false;
+    bool align_continuous_inline_comment = true;
 
     bool align_array_table = true;
 

include/CodeService/Diagnostic/DiagnosticBuilder.h

@@ -37,11 +37,13 @@ class DiagnosticBuilder {
     void ClearDiagnostic(std::size_t leftIndex);
 
     void ProcessSpaceDiagnostic(LuaSyntaxNode &node, LuaSyntaxNode &next,
-                                const LuaSyntaxTree &t,
-                                size_t shouldSpace);
+                                size_t shouldSpace,
+                                const LuaSyntaxTree &t);
 
     std::string GetAdditionalNote(LuaSyntaxNode &left, LuaSyntaxNode &right, const LuaSyntaxTree &t);
 
+    void ProcessIndentDiagnostic(LuaSyntaxNode &node, IndentData indentData, const LuaSyntaxTree &t);
+
     FormatState _state;
     std::map<std::size_t, LuaDiagnostic> _nextDiagnosticMap;
     std::vector<LuaDiagnostic> _diagnostics;

lua.template.editorconfig

@@ -86,6 +86,8 @@ align_if_branch = false
 
 align_array_table = true
 
+align_continuous_inline_comment = true
+
 # [indent]
 
 never_indent_before_if_condition = false