test udpate

lua/tests/go_ts_node_spec.lua

@@ -1,6 +1,4 @@
-function self:methodName()
-
-endlocal eq = assert.are.same
+local eq = assert.are.same
 local input = {
   "package a", "", "type x struct {", "\tFoo int", "\tbar int", "\ty struct {", "\t\tFoo int",
   "\t\tbar int", "\t}", "}", "type z struct{}"
@@ -18,140 +16,179 @@ local output_inner = {
   '\t\tFoo int `xx:"foo"`', '\t\tbar int `xx:"bar"`', "}", ""
 }
 
-describe("should get nodes  ", function()
-  vim.cmd([[silent exe 'e tags.go']])
-  vim.fn.append(0, input)
-  local bufn = vim.fn.bufnr("")
-  status = require("plenary.reload").reload_module("go.nvim")
-  status = require("plenary.reload").reload_module("nvim-treesitter/nvim-treesitter")
-  _GO_NVIM_CFG.verbose = true
-  local cur_dir = vim.fn.expand("%:p:h")
-  local nodes = require("go.ts.nodes")
-  it("get all nodes should get struct x", function()
-    vim.fn.setpos(".", {bufn, 4, 1, 0})
-    local query = require("go.ts.go").query_struct_block
-    local ns = nodes.get_all_nodes(query, "go", default, bufn)
-    eq("x", ns[1].name)
-  end)
-  it("it should get struct y", function()
-    vim.fn.setpos(".", {bufn, 8, 1, 0})
-    local query = require("go.ts.go").query_struct_block .. require("go.ts.go").query_em_struct_block
-    -- local query = require('go.ts.go').query_em_struct
-    local ns = nodes.get_all_nodes(query, "go", default, bufn)
-    eq("y", ns[2].name)
-  end)
-  it("node at cursor should get struct x", function()
-    vim.fn.setpos(".", {bufn, 4, 1, 0})
-    local query = require("go.ts.go").query_struct_block
-    local ns = nodes.nodes_at_cursor(query, default, bufn)
-    eq("x", ns[1].name)
-  end)
-  it("it should get struct y", function()
-    vim.fn.setpos(".", {bufn, 8, 1, 0})
-    local query = require("go.ts.go").query_struct_block .. require("go.ts.go").query_em_struct_block
-    -- local query = require('go.ts.go').query_em_struct
-    local ns = nodes.nodes_at_cursor(query, default, bufn)
-    eq("y", ns[#ns].name)
-  end)
-  it("struct at pos should get struct y", function()
-    vim.fn.setpos(".", {bufn, 8, 4, 0})
-    local ns = require("go.ts.go").get_struct_node_at_pos(8, 1)
-    print(vim.inspect(ns))
-    eq("y", ns.name)
-  end)
-  it("should get function name", function()
-    local name = vim.fn.tempname() .. ".go"
-    print("tmp:" .. name)
-    --
-    local path = cur_dir .. "/lua/tests/fixtures/ts/playlist.go" -- %:p:h ? %:p
-    print("test:" .. path)
-    local lines = vim.fn.readfile(path)
-    vim.fn.writefile(lines, name)
-    local cmd = " silent exe 'e " .. name .. "'"
-    vim.cmd(cmd)
-    vim.fn.setpos(".", {bufn, 21, 5, 0})
-    local ns = require("go.ts.go").get_func_method_node_at_pos(21, 5)
-    print(vim.inspect(ns))
-    eq("createPlaylist", ns.name)
-  end)
-  it("should get method (with par list) name", function()
-    local path = cur_dir .. "/lua/tests/fixtures/ts/playlist.go" -- %:p:h ? %:p
-    print("test:" .. path)
-    local cmd = " silent exe 'e " .. path .. "'"
-    vim.cmd(cmd)
-    vim.fn.setpos(".", {bufn, 33, 21, 0})
-    local ns = require("go.ts.go").get_func_method_node_at_pos(33, 21)
-    print(vim.inspect(ns))
-    eq("addSong", ns.name)
-  end)
-  it("should get method (no par) name", function()
-    local path = cur_dir .. "/lua/tests/fixtures/ts/playlist.go" -- %:p:h ? %:p
-    print("test:" .. path)
-    local cmd = " silent exe 'e " .. path .. "'"
-    vim.cmd(cmd)
-    vim.fn.setpos(".", {bufn, 48, 3, 0})
-    local ns = require("go.ts.go").get_func_method_node_at_pos(48, 3)
-    print(vim.inspect(ns))
-    eq("showAllSongs", ns.name)
-  end)
-  it("should get interface name", function()
-    local name = vim.fn.tempname() .. ".go"
-    print("tmp:" .. name)
-    --
-    local path = cur_dir .. "/lua/tests/fixtures/ts/interfaces.go" -- %:p:h ? %:p
-    print("test:" .. path)
-    local lines = vim.fn.readfile(path)
-    vim.fn.writefile(lines, name)
-    local cmd = " silent exe 'e " .. name .. "'"
-    vim.cmd(cmd)
-    vim.fn.setpos(".", {bufn, 11, 6, 0})
-    local ns = require("go.ts.go").get_interface_node_at_pos(11, 6)
-    print(vim.inspect(ns))
-    eq("Geometry", ns.name)
-  end)
-  it("should get interface method name", function()
-    local name = vim.fn.tempname() .. ".go"
-    print("tmp:" .. name)
-    --
-    local path = cur_dir .. "/lua/tests/fixtures/ts/interfaces.go" -- %:p:h ? %:p
-    print("test:" .. path)
-    local lines = vim.fn.readfile(path)
-    vim.fn.writefile(lines, name)
-    local cmd = " silent exe 'e " .. name .. "'"
-    vim.cmd(cmd)
-    vim.fn.setpos(".", {bufn, 11, 5, 0})
-    local ns = require("go.ts.go").get_interface_method_node_at_pos(11, 5)
-    print(vim.inspect(ns))
-    eq("Area", ns.name)
-  end)
-  it("should get package name", function()
-    local name = vim.fn.tempname() .. ".go"
-    print("tmp:" .. name)
-    --
-    local path = cur_dir .. "/lua/tests/fixtures/ts/interfaces.go" -- %:p:h ? %:p
-    print("test:" .. path)
-    local lines = vim.fn.readfile(path)
-    vim.fn.writefile(lines, name)
-    local cmd = " silent exe 'e " .. name .. "'"
-    vim.cmd(cmd)
-    vim.fn.setpos(".", {bufn, 3, 5, 0})
-    local ns = require("go.ts.go").get_package_node_at_pos(3, 5)
-    print(vim.inspect(ns))
-    eq("main", ns.name)
-  end)
-  it("should get package name", function()
-    local name = vim.fn.tempname() .. ".go"
-    print("tmp:" .. name)
-    --
-    local path = cur_dir .. "/lua/tests/fixtures/ts/interfaces.go" -- %:p:h ? %:p
-    print("test:" .. path)
-    local lines = vim.fn.readfile(path)
-    vim.fn.writefile(lines, name)
-    local cmd = " silent exe 'e " .. name .. "'"
-    vim.cmd(cmd)
-    vim.fn.setpos(".", {bufn, 3, 1, 0})
-    local ns = require("go.ts.go").get_package_node_at_pos(3, 1)
-    print(vim.inspect(ns))
-    eq("main", ns.name)
-  end)
-end)
+describe(
+  "should get nodes  ",
+  function()
+    vim.cmd([[silent exe 'e tags.go']])
+    vim.fn.append(0, input)
+    local bufn = vim.fn.bufnr("")
+    status = require("plenary.reload").reload_module("go.nvim")
+    status = require("plenary.reload").reload_module("nvim-treesitter/nvim-treesitter")
+    _GO_NVIM_CFG.verbose = true
+    local cur_dir = vim.fn.expand("%:p:h")
+    local nodes = require("go.ts.nodes")
+    it(
+      "get all nodes should get struct x",
+      function()
+        vim.fn.setpos(".", {bufn, 4, 1, 0})
+        local query = require("go.ts.go").query_struct_block
+        local ns = nodes.get_all_nodes(query, "go", default, bufn)
+        eq("x", ns[1].name)
+      end
+    )
+    it(
+      "it should get struct y",
+      function()
+        vim.fn.setpos(".", {bufn, 8, 1, 0})
+        local query = require("go.ts.go").query_struct_block .. require("go.ts.go").query_em_struct_block
+        -- local query = require('go.ts.go').query_em_struct
+        local ns = nodes.get_all_nodes(query, "go", default, bufn)
+        eq("y", ns[2].name)
+      end
+    )
+    it(
+      "node at cursor should get struct x",
+      function()
+        vim.fn.setpos(".", {bufn, 4, 1, 0})
+        local query = require("go.ts.go").query_struct_block
+        local ns = nodes.nodes_at_cursor(query, default, bufn)
+        eq("x", ns[1].name)
+      end
+    )
+    it(
+      "it should get struct y",
+      function()
+        vim.fn.setpos(".", {bufn, 8, 1, 0})
+        local query = require("go.ts.go").query_struct_block .. require("go.ts.go").query_em_struct_block
+        -- local query = require('go.ts.go').query_em_struct
+        local ns = nodes.nodes_at_cursor(query, default, bufn)
+        eq("y", ns[#ns].name)
+      end
+    )
+    it(
+      "struct at pos should get struct y",
+      function()
+        vim.fn.setpos(".", {bufn, 8, 4, 0})
+        local ns = require("go.ts.go").get_struct_node_at_pos(8, 1)
+        print(vim.inspect(ns))
+        eq("y", ns.name)
+      end
+    )
+    it(
+      "should get function name",
+      function()
+        local name = vim.fn.tempname() .. ".go"
+        print("tmp:" .. name)
+        --
+        local path = cur_dir .. "/lua/tests/fixtures/ts/playlist.go" -- %:p:h ? %:p
+        print("test:" .. path)
+        local lines = vim.fn.readfile(path)
+        vim.fn.writefile(lines, name)
+        local cmd = " silent exe 'e " .. name .. "'"
+        vim.cmd(cmd)
+        vim.fn.setpos(".", {bufn, 21, 5, 0})
+        local ns = require("go.ts.go").get_func_method_node_at_pos(21, 5)
+        print(vim.inspect(ns))
+        eq("createPlaylist", ns.name)
+      end
+    )
+    it(
+      "should get method (with par list) name",
+      function()
+        local path = cur_dir .. "/lua/tests/fixtures/ts/playlist.go" -- %:p:h ? %:p
+        print("test:" .. path)
+        local cmd = " silent exe 'e " .. path .. "'"
+        vim.cmd(cmd)
+        vim.fn.setpos(".", {bufn, 33, 21, 0})
+        local ns = require("go.ts.go").get_func_method_node_at_pos(33, 21)
+        print(vim.inspect(ns))
+        eq("addSong", ns.name)
+      end
+    )
+    it(
+      "should get method (no par) name",
+      function()
+        local path = cur_dir .. "/lua/tests/fixtures/ts/playlist.go" -- %:p:h ? %:p
+        print("test:" .. path)
+        local cmd = " silent exe 'e " .. path .. "'"
+        vim.cmd(cmd)
+        vim.fn.setpos(".", {bufn, 48, 3, 0})
+        local ns = require("go.ts.go").get_func_method_node_at_pos(48, 3)
+        print(vim.inspect(ns))
+        eq("showAllSongs", ns.name)
+      end
+    )
+    it(
+      "should get interface name",
+      function()
+        local name = vim.fn.tempname() .. ".go"
+        print("tmp:" .. name)
+        --
+        local path = cur_dir .. "/lua/tests/fixtures/ts/interfaces.go" -- %:p:h ? %:p
+        print("test:" .. path)
+        local lines = vim.fn.readfile(path)
+        vim.fn.writefile(lines, name)
+        local cmd = " silent exe 'e " .. name .. "'"
+        vim.cmd(cmd)
+        vim.fn.setpos(".", {bufn, 11, 6, 0})
+        local ns = require("go.ts.go").get_interface_node_at_pos(11, 6)
+        print(vim.inspect(ns))
+        eq("Geometry", ns.name)
+      end
+    )
+    it(
+      "should get interface method name",
+      function()
+        local name = vim.fn.tempname() .. ".go"
+        print("tmp:" .. name)
+        --
+        local path = cur_dir .. "/lua/tests/fixtures/ts/interfaces.go" -- %:p:h ? %:p
+        print("test:" .. path)
+        local lines = vim.fn.readfile(path)
+        vim.fn.writefile(lines, name)
+        local cmd = " silent exe 'e " .. name .. "'"
+        vim.cmd(cmd)
+        vim.fn.setpos(".", {bufn, 11, 5, 0})
+        local ns = require("go.ts.go").get_interface_method_node_at_pos(11, 5)
+        print(vim.inspect(ns))
+        eq("Area", ns.name)
+      end
+    )
+    it(
+      "should get package name",
+      function()
+        local name = vim.fn.tempname() .. ".go"
+        print("tmp:" .. name)
+        --
+        local path = cur_dir .. "/lua/tests/fixtures/ts/interfaces.go" -- %:p:h ? %:p
+        print("test:" .. path)
+        local lines = vim.fn.readfile(path)
+        vim.fn.writefile(lines, name)
+        local cmd = " silent exe 'e " .. name .. "'"
+        vim.cmd(cmd)
+        vim.fn.setpos(".", {bufn, 3, 5, 0})
+        local ns = require("go.ts.go").get_package_node_at_pos(3, 5)
+        print(vim.inspect(ns))
+        eq("main", ns.name)
+      end
+    )
+    it(
+      "should get package name",
+      function()
+        local name = vim.fn.tempname() .. ".go"
+        print("tmp:" .. name)
+        --
+        local path = cur_dir .. "/lua/tests/fixtures/ts/interfaces.go" -- %:p:h ? %:p
+        print("test:" .. path)
+        local lines = vim.fn.readfile(path)
+        vim.fn.writefile(lines, name)
+        local cmd = " silent exe 'e " .. name .. "'"
+        vim.cmd(cmd)
+        vim.fn.setpos(".", {bufn, 3, 1, 0})
+        local ns = require("go.ts.go").get_package_node_at_pos(3, 1)
+        print(vim.inspect(ns))
+        eq("main", ns.name)
+      end
+    )
+  end
+)