Merge pull request #81 from Koihik/dev

fix: comment visit twice in some case
Koihik · Jan 11, 2020 · a9aa804 · a9aa804
2 parents 310cecb + 6f0843c
commit a9aa804
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/src/FormatVisitor.cpp b/src/FormatVisitor.cpp
@@ -1077,7 +1077,9 @@ antlrcpp::Any FormatVisitor::visitPrefixexp(LuaParser::PrefixexpContext* ctx) {
     visitVarOrExp(ctx->varOrExp());
 
     string ws = buildFirstArgumentWs(ctx->nameAndArgs());
-    cur_writer() << commentAfter(ctx->varOrExp(), ws);
+    if (ctx->nameAndArgs().size() > 0) {
+        cur_writer() << commentAfter(ctx->varOrExp(), ws);
+    }
 
     buildArguments(ctx->nameAndArgs());
 

diff --git a/test/test_format_file.cpp b/test/test_format_file.cpp
@@ -78,6 +78,7 @@ TEST_FILE(PROJECT_PATH "/test/testdata/issues/issue-62_1.lua");
 TEST_FILE(PROJECT_PATH "/test/testdata/issues/issue-62_2.lua");
 TEST_FILE(PROJECT_PATH "/test/testdata/issues/issue-62_3.lua");
 TEST_FILE(PROJECT_PATH "/test/testdata/issues/issue-70.lua");
+TEST_FILE(PROJECT_PATH "/test/testdata/issues/issue-80.lua");
 
 TEST_FILE(PROJECT_PATH "/test/testdata/keep_simple_block_one_line/default.lua");
 TEST_FILE(PROJECT_PATH "/test/testdata/keep_simple_block_one_line/keep_simple_function_one_line_false.lua");

diff --git a/test/testdata/issues/_issue-80.lua b/test/testdata/issues/_issue-80.lua
@@ -0,0 +1,2 @@
+local x =
+    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -- hello there
diff --git a/test/testdata/issues/issue-80.lua b/test/testdata/issues/issue-80.lua
@@ -0,0 +1 @@
+local x = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -- hello there
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		local x =
		aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -- hello there
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		local x = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -- hello there