From 9357574b5c9478981e18c48f6455012ab7a5e4e0 Mon Sep 17 00:00:00 2001
From: JuanZoran <1430359574@qq.com>
Date: Sat, 1 Apr 2023 09:54:35 +0800
Subject: [PATCH] chore: sync

---
 lua/Trans/core/buffer.lua | 12 +++------
 lua/Trans/core/window.lua |  2 --
 lua/test/util_spec.lua    | 10 +++----
 lua/test/window_spec.lua  | 57 +++++++++++++++++++++++++++++----------
 4 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/lua/Trans/core/buffer.lua b/lua/Trans/core/buffer.lua
index 22b9c9a..0294352 100644
--- a/lua/Trans/core/buffer.lua
+++ b/lua/Trans/core/buffer.lua
@@ -91,11 +91,7 @@ end
 ---@return integer
 function buffer:line_count()
     local line_count = api.nvim_buf_line_count(self.bufnr)
-    if line_count == 1 and self[1] == '' then
-        return 0
-    end
-
-    return line_count
+    return line_count == 1 and self[1] == '' and 0 or line_count
 end
 
 ---Set line content
@@ -151,11 +147,11 @@ buffer.__index = function(self, key)
     end
 end
 
-buffer.__newindex = function(self, key, nodes)
+buffer.__newindex = function(self, key, values)
     if type(key) == 'number' then
-        self:setline(nodes, key)
+        self:setline(values, key)
     else
-        rawset(self, key, nodes)
+        rawset(self, key, values)
     end
 end
 
diff --git a/lua/Trans/core/window.lua b/lua/Trans/core/window.lua
index 731c6a2..082171e 100644
--- a/lua/Trans/core/window.lua
+++ b/lua/Trans/core/window.lua
@@ -164,8 +164,6 @@ window.__index = window
 ---|{style: string, border: string, focusable: boolean, noautocmd?: boolean, relative: 'mouse'|'cursor'|'editor'|'win', width: integer, height: integer, col: integer, row: integer, zindex?: integer, title?: table | string}
 
 
-
-
 ---@class TransWindow
 ---@field buffer TransBuffer attached buffer object
 ---@field win_opts table window config [**When open**]
diff --git a/lua/test/util_spec.lua b/lua/test/util_spec.lua
index f9e2bff..adf8c41 100644
--- a/lua/test/util_spec.lua
+++ b/lua/test/util_spec.lua
@@ -23,10 +23,10 @@ describe('util.display_height', function()
 
         -- Unicode width test
         local u_lines = {
-             '12345678👍', -- 10
-             'あうえお', -- 8
-             '𠮷野い𠮷家野家家', -- 16
-             '👍👍👍お家', -- 10
+            '12345678👍', -- 10
+            'あうえお', -- 8
+            '𠮷野い𠮷家野家家', -- 16
+            '👍👍👍お家', -- 10
         }
 
         assert.are.equal(4, util.display_height(u_lines, 20))
@@ -82,9 +82,9 @@ describe('util.is_word', function()
         for test, value in pairs {
             ['あうえお'] = false,
             ['hello']        = true,
+            [' hello']       = false,
             ['hello world']  = false,
             ['test_cool']    = false,
-            [' hello']       = false,
         } do
             assert.are.same(util.is_word(test), value)
         end
diff --git a/lua/test/window_spec.lua b/lua/test/window_spec.lua
index 8452db0..1870c61 100644
--- a/lua/test/window_spec.lua
+++ b/lua/test/window_spec.lua
@@ -29,20 +29,24 @@ describe('window', with_buffer(function(buffer)
 
     describe('smooth_expand', function()
         it('can work well when no pass animation table', function()
-            window:smooth_expand { field = 'width', to = 10 }
-            assert.are.same(window:width(), 10)
-
-            window:smooth_expand { field = 'width', to = 6 }
-            assert.are.same(window:width(), 6)
-
-            window:smooth_expand { field = 'height', to = 10 }
-            assert.are.same(window:height(), 10)
-
-            window:smooth_expand { field = 'height', to = 6 }
-            assert.are.same(window:height(), 6)
-
-            window:smooth_expand { field = 'height', to = 6 }
-            assert.are.same(window:height(), 6)
+            for field, values in pairs {
+                width = {
+                    10,
+                    6,
+                    8,
+                    5,
+                },
+                height = {
+                    10,
+                    6,
+                    3,
+                },
+            } do
+                for _, value in ipairs(values) do
+                    window:smooth_expand { field = field, to = value }
+                    assert.are.same(value, window[field](window))
+                end
+            end
         end)
 
         it("don't change window wrap option", function()
@@ -68,4 +72,29 @@ describe('window', with_buffer(function(buffer)
         window:resize { width = 5, height = 5 }
         assert.is_true(window:option 'wrap')
     end)
+
+    it('adjust_height() can auto adjust window height to buffer display height', function()
+        for idx, content in ipairs {
+            'cool',
+            'co10',
+            '家👍',
+            '👍ol',
+            'cあl',
+            '家野',
+        } do
+            buffer[idx] = content
+        end
+
+        local max_height = vim.o.lines - 2
+        for width, expect in ipairs {
+            [2] = 12,
+            [3] = 12,
+            [4] = 6,
+            [5] = 6,
+        } do
+            window:smooth_expand { field = 'width', to = width }
+            window:adjust_height()
+            assert.are.same(math.min(expect, max_height), window:height())
+        end
+    end)
 end))