From dbb1550aaf9223d85636b863468ba82d182c088b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Boczar?= <yendreij@gmail.com>
Date: Thu, 22 Apr 2021 23:46:30 +0200
Subject: [PATCH] tests/indent: move common code out of main lua/ directory

---
 tests/indent/c_spec.lua                                     | 4 ++--
 .../test_utils.lua => tests/indent/common.lua               | 6 +++---
 tests/indent/cpp_spec.lua                                   | 4 ++--
 tests/indent/lua_spec.lua                                   | 4 ++--
 tests/indent/python_spec.lua                                | 4 ++--
 tests/indent/rust_spec.lua                                  | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)
 rename lua/nvim-treesitter/test_utils.lua => tests/indent/common.lua (96%)

diff --git a/tests/indent/c_spec.lua b/tests/indent/c_spec.lua
index 1089ee4eb..f93d7ee22 100644
--- a/tests/indent/c_spec.lua
+++ b/tests/indent/c_spec.lua
@@ -1,5 +1,5 @@
-local whole_file = require('nvim-treesitter.test_utils').indent_whole_file
-local new_line = require('nvim-treesitter.test_utils').indent_new_line
+local whole_file = require('tests.indent.common').indent_whole_file
+local new_line = require('tests.indent.common').indent_new_line
 local scan_dir = require('plenary.scandir').scan_dir
 
 local opts = {
diff --git a/lua/nvim-treesitter/test_utils.lua b/tests/indent/common.lua
similarity index 96%
rename from lua/nvim-treesitter/test_utils.lua
rename to tests/indent/common.lua
index a84e0db1d..96caf17f9 100644
--- a/lua/nvim-treesitter/test_utils.lua
+++ b/tests/indent/common.lua
@@ -63,7 +63,7 @@ local function compare_indent(before, after)
   assert:remove_formatter(format_indent)
 end
 
-function M.set_buf_indent_opts(opts)
+local function set_buf_indent_opts(opts)
   local optnames = {'tabstop', 'shiftwidth', 'softtabstop', 'expandtab', 'filetype'}
   for _, opt in ipairs(optnames) do
     if opts[opt] ~= nil then
@@ -80,7 +80,7 @@ function M.run_indent_test(file, runner, opts)
   local before = vim.api.nvim_buf_get_lines(0, 0, -1, true)
 
   assert.are.same('nvim_treesitter#indent()', vim.bo.indentexpr)
-  M.set_buf_indent_opts(opts)
+  set_buf_indent_opts(opts)
 
   -- perform the test
   runner()
@@ -108,7 +108,7 @@ end
 --   on_line: line on which `normal o` is executed
 --   text: text inserted in the new line
 --   indent: expected indent before the inserted text (string or int)
--- @param opts buffer options passed to M.set_buf_indent_opts
+-- @param opts buffer options passed to set_buf_indent_opts
 function M.indent_new_line(file, spec, opts)
   local before, after = M.run_indent_test(file, function()
     -- move to the line and input the new one
diff --git a/tests/indent/cpp_spec.lua b/tests/indent/cpp_spec.lua
index 261c00499..b3a7e7454 100644
--- a/tests/indent/cpp_spec.lua
+++ b/tests/indent/cpp_spec.lua
@@ -1,5 +1,5 @@
-local whole_file = require('nvim-treesitter.test_utils').indent_whole_file
-local new_line = require('nvim-treesitter.test_utils').indent_new_line
+local whole_file = require('tests.indent.common').indent_whole_file
+local new_line = require('tests.indent.common').indent_new_line
 local scan_dir = require('plenary.scandir').scan_dir
 local Path = require('plenary.path')
 
diff --git a/tests/indent/lua_spec.lua b/tests/indent/lua_spec.lua
index 0a6a3b29a..b1d3bfae2 100644
--- a/tests/indent/lua_spec.lua
+++ b/tests/indent/lua_spec.lua
@@ -1,5 +1,5 @@
-local whole_file = require('nvim-treesitter.test_utils').indent_whole_file
-local new_line = require('nvim-treesitter.test_utils').indent_new_line
+local whole_file = require('tests.indent.common').indent_whole_file
+local new_line = require('tests.indent.common').indent_new_line
 local scan_dir = require('plenary.scandir').scan_dir
 
 local opts = {
diff --git a/tests/indent/python_spec.lua b/tests/indent/python_spec.lua
index 85c3bc3bf..9bb80c2b2 100644
--- a/tests/indent/python_spec.lua
+++ b/tests/indent/python_spec.lua
@@ -1,5 +1,5 @@
-local whole_file = require('nvim-treesitter.test_utils').indent_whole_file
-local new_line = require('nvim-treesitter.test_utils').indent_new_line
+local whole_file = require('tests.indent.common').indent_whole_file
+local new_line = require('tests.indent.common').indent_new_line
 local scan_dir = require('plenary.scandir').scan_dir
 
 local opts = {
diff --git a/tests/indent/rust_spec.lua b/tests/indent/rust_spec.lua
index 6009c7fb8..468abe004 100644
--- a/tests/indent/rust_spec.lua
+++ b/tests/indent/rust_spec.lua
@@ -1,5 +1,5 @@
-local whole_file = require('nvim-treesitter.test_utils').indent_whole_file
-local new_line = require('nvim-treesitter.test_utils').indent_new_line
+local whole_file = require('tests.indent.common').indent_whole_file
+local new_line = require('tests.indent.common').indent_new_line
 local scan_dir = require('plenary.scandir').scan_dir
 
 local opts = {