Enable disable-next to control nodes of finer granularity

Author: CppCXY

CodeFormatCore/src/Format/Analyzer/FormatDocAnalyze.cpp

@@ -11,10 +11,8 @@ void FormatDocAnalyze::Analyze(FormatState &f, const LuaSyntaxTree &t) {
     for (auto syntaxNode: t.GetSyntaxNodes()) {
         switch (syntaxNode.GetTokenKind(t)) {
             case TK_SHORT_COMMENT: {
-                if (syntaxNode.GetParent(t).GetSyntaxKind(t) == LuaSyntaxNodeKind::Block) {
-                    AnalyzeDocFormat(syntaxNode, f, t);
-                    break;
-                }
+                AnalyzeDocFormat(syntaxNode, f, t);
+                break;
             }
             default: {
                 break;
@@ -100,7 +98,7 @@ void FormatDocAnalyze::AnalyzeDocFormat(LuaSyntaxNode n, FormatState &f, const L
                         break;
                     } else if (action == "disable-next") {
                         auto nextNode = n.GetNextSibling(t);
-                        while (!nextNode.IsNull(t) && !detail::multi_match::StatementMatch(nextNode.GetSyntaxKind(t))) {
+                        while (!nextNode.IsNull(t) && nextNode.GetTokenKind(t) == TK_SHORT_COMMENT) {
                             nextNode.ToNext(t);
                         }
                         if (nextNode.IsNode(t)) {

Test/src/FormatResult_unitest.cpp

@@ -870,6 +870,27 @@ local t=123
 end
 
 local t = 123
+)"));
+    EXPECT_TRUE(TestHelper::TestFormatted(
+        R"(
+local t = {
+    ---@format disable-next
+
+    aa  = 123,
+    ---@format disable-next
+    lcc             =           123,
+    gjopepgo = 123,
+}
+)",
+        R"(
+local t = {
+    ---@format disable-next
+
+    aa  = 123,
+    ---@format disable-next
+    lcc             =           123,
+    gjopepgo = 123,
+}
 )"));
 }