Merge pull request #187 from Koihik/dev

fix: avoid break line before shorter explist

Author: Koihik

CMakeLists.txt

@@ -61,6 +61,9 @@ if(NOT "${TEST_COMPILE_RESULT}" OR (NOT "${TEST_RUN_RESULT}" EQUAL 0))
   message(FATAL_ERROR "Your compiler does not fully support the C++17 standard and libraries")
 endif()
 
+if( ${CMAKE_BUILD_TYPE} MATCHES "Debug")
+  add_definitions(-DDEBUG)
+endif()
 
 include_directories(
   ${PROJECT_SOURCE_DIR}/generated/

src/FormatVisitor.cpp

@@ -8,10 +8,9 @@
 
 using namespace antlr4;
 
-// #define LOG_FLAG
 // #define LOG_FUNC_VISIT
 
-#ifdef LOG_FLAG
+#ifdef DEBUG
 
 static int logIndentSize = 0;
 static std::string LOG_INDENT = "  ";
@@ -50,7 +49,7 @@ void func_end(std::string funcName) {
 #endif
 
 void print_cost() {
-#ifdef LOG_FLAG
+#ifdef DEBUG
     for (auto p : countMp) {
         std::cout << p.first << " called " << p.second << " times" << std::endl;
     }
@@ -891,7 +890,8 @@ antlrcpp::Any FormatVisitor::visitExplist(LuaParser::ExplistContext* ctx) {
     // var:foo(xxxx .. xxxx) -- no break
     // longlonglonglongvar:foo(
     //     xxxx .. xxxx) --  break
-    if (lines > 1 && cur_columns() > config_.get<int>("column_limit") / 2) {
+    int column_limit = config_.get<int>("column_limit");
+    if (lines > 1 && cur_columns() > column_limit / 2 && expLength >= column_limit / 4) {
         beyondLimit = true;
     }
     if (!functioncallLpHasBreak_.empty() && functioncallLpHasBreak_.back()) {

test/test_format_file.cpp

@@ -83,6 +83,7 @@ TEST_FILE(PROJECT_PATH "/test/testdata/issues/issue-104.lua");
 TEST_FILE(PROJECT_PATH "/test/testdata/issues/issue-156.lua");
 TEST_FILE(PROJECT_PATH "/test/testdata/issues/issue-162.lua");
 TEST_FILE(PROJECT_PATH "/test/testdata/issues/issue-168.lua");
+TEST_FILE(PROJECT_PATH "/test/testdata/issues/issue-186.lua");
 
 TEST_FILE(PROJECT_PATH "/test/testdata/issues/PR-100.lua");
 TEST_FILE(PROJECT_PATH "/test/testdata/issues/PR-108.lua");

test/testdata/issues/_issue-186.lua

@@ -0,0 +1,12 @@
+self.buf, self.win, self.buf_closer = floatbuf({
+    win_width = self.rect.width,
+    win_height = self.rect.height,
+    x = self.rect.pos_x,
+    y = self.rect.pos_y,
+    loc = loc,
+    prompt = self.prompt,
+    enter = opts.enter,
+    ft = opts.ft,
+    syntax = opts.syntax,
+    relative = opts.relative
+})

test/testdata/issues/issue-186.lua

@@ -0,0 +1,12 @@
+self.buf, self.win, self.buf_closer = floatbuf({
+    win_width = self.rect.width,
+    win_height = self.rect.height,
+    x = self.rect.pos_x,
+    y = self.rect.pos_y,
+    loc = loc,
+    prompt = self.prompt,
+    enter = opts.enter,
+    ft = opts.ft,
+    syntax = opts.syntax,
+    relative = opts.relative
+  })