Merge pull request #24 from stsewd/use-stylua

Use stylua to auto format code

Author: theHamsta

.github/workflows/lint.yml

@@ -16,3 +16,14 @@ jobs:
           sudo luarocks install luacheck
       - name: Run Luacheck
         run: bash scripts/style-check.sh
+
+  stylua:
+    name: StyLua
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Lint with stylua
+      uses: JohnnyMorganz/stylua-action@1.0.0
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        args: --check .

.stylua.toml

@@ -0,0 +1,3 @@
+indent_type = "Spaces"
+indent_width = 2
+no_call_parentheses = true

lua/nvim-treesitter-refactor.lua

@@ -3,31 +3,31 @@ local queries = require "nvim-treesitter.query"
 local M = {}
 
 function M.init()
-  require "nvim-treesitter".define_modules {
+  require("nvim-treesitter").define_modules {
     refactor = {
       highlight_definitions = {
-        module_path = 'nvim-treesitter-refactor.highlight_definitions',
+        module_path = "nvim-treesitter-refactor.highlight_definitions",
         enable = false,
         disable = {},
-        is_supported = queries.has_locals
+        is_supported = queries.has_locals,
       },
       highlight_current_scope = {
-        module_path = 'nvim-treesitter-refactor.highlight_current_scope',
+        module_path = "nvim-treesitter-refactor.highlight_current_scope",
         enable = false,
         disable = {},
         is_supported = queries.has_locals,
       },
       smart_rename = {
-        module_path = 'nvim-treesitter-refactor.smart_rename',
+        module_path = "nvim-treesitter-refactor.smart_rename",
         enable = false,
         disable = {},
         is_supported = queries.has_locals,
         keymaps = {
-          smart_rename = "grr"
-        }
+          smart_rename = "grr",
+        },
       },
       navigation = {
-        module_path = 'nvim-treesitter-refactor.navigation',
+        module_path = "nvim-treesitter-refactor.navigation",
         enable = false,
         disable = {},
         is_supported = queries.has_locals,
@@ -37,9 +37,9 @@ function M.init()
           list_definitions_toc = "gO",
           goto_next_usage = "<a-*>",
           goto_previous_usage = "<a-#>",
-        }
-      }
-    }
+        },
+      },
+    },
   }
 end
 

lua/nvim-treesitter-refactor/highlight_current_scope.lua

@@ -1,13 +1,13 @@
 -- This module highlights the current scope of at the cursor position
 
-local ts_utils = require'nvim-treesitter.ts_utils'
-local locals = require'nvim-treesitter.locals'
+local ts_utils = require "nvim-treesitter.ts_utils"
+local locals = require "nvim-treesitter.locals"
 local api = vim.api
 local cmd = api.nvim_command
 
 local M = {}
 
-local current_scope_namespace = api.nvim_create_namespace('nvim-treesitter-current-scope')
+local current_scope_namespace = api.nvim_create_namespace "nvim-treesitter-current-scope"
 
 function M.highlight_current_scope(bufnr)
   M.clear_highlights(bufnr)
@@ -19,7 +19,7 @@ function M.highlight_current_scope(bufnr)
     local start_line = current_scope:start()
 
     if start_line ~= 0 then
-      ts_utils.highlight_node(current_scope, bufnr, current_scope_namespace, 'TSCurrentScope')
+      ts_utils.highlight_node(current_scope, bufnr, current_scope_namespace, "TSCurrentScope")
     end
   end
 end
@@ -29,19 +29,31 @@ function M.clear_highlights(bufnr)
 end
 
 function M.attach(bufnr)
-  cmd(string.format('augroup NvimTreesitterCurrentScope_%d', bufnr))
-  cmd 'au!'
+  cmd(string.format("augroup NvimTreesitterCurrentScope_%d", bufnr))
+  cmd "au!"
   -- luacheck: push ignore 631
-  cmd(string.format([[autocmd CursorMoved <buffer=%d> lua require'nvim-treesitter-refactor.highlight_current_scope'.highlight_current_scope(%d)]], bufnr, bufnr))
-  cmd(string.format([[autocmd BufLeave <buffer=%d> lua require'nvim-treesitter-refactor.highlight_current_scope'.clear_highlights(%d)]], bufnr, bufnr))
+  cmd(
+    string.format(
+      [[autocmd CursorMoved <buffer=%d> lua require'nvim-treesitter-refactor.highlight_current_scope'.highlight_current_scope(%d)]],
+      bufnr,
+      bufnr
+    )
+  )
+  cmd(
+    string.format(
+      [[autocmd BufLeave <buffer=%d> lua require'nvim-treesitter-refactor.highlight_current_scope'.clear_highlights(%d)]],
+      bufnr,
+      bufnr
+    )
+  )
   -- luacheck: pop
-  cmd 'augroup END'
+  cmd "augroup END"
 end
 
 function M.detach(bufnr)
   M.clear_highlights(bufnr)
-  cmd(string.format('autocmd! NvimTreesitterCurrentScope_%d CursorMoved', bufnr))
-  cmd(string.format('autocmd! NvimTreesitterCurrentScope_%d BufLeave', bufnr))
+  cmd(string.format("autocmd! NvimTreesitterCurrentScope_%d CursorMoved", bufnr))
+  cmd(string.format("autocmd! NvimTreesitterCurrentScope_%d BufLeave", bufnr))
 end
 
 return M

lua/nvim-treesitter-refactor/highlight_definitions.lua

@@ -1,14 +1,14 @@
 -- This module highlights reference usages and the corresponding
 -- definition on cursor hold.
 
-local ts_utils = require'nvim-treesitter.ts_utils'
-local locals = require'nvim-treesitter.locals'
+local ts_utils = require "nvim-treesitter.ts_utils"
+local locals = require "nvim-treesitter.locals"
 local api = vim.api
 local cmd = api.nvim_command
 
 local M = {}
 
-local usage_namespace = api.nvim_create_namespace('nvim-treesitter-usages')
+local usage_namespace = api.nvim_create_namespace "nvim-treesitter-usages"
 
 function M.highlight_usages(bufnr)
   M.clear_usage_highlights(bufnr)
@@ -25,12 +25,12 @@ function M.highlight_usages(bufnr)
 
   for _, usage_node in ipairs(usages) do
     if usage_node ~= node_at_point then
-      ts_utils.highlight_node(usage_node, bufnr, usage_namespace, 'TSDefinitionUsage')
+      ts_utils.highlight_node(usage_node, bufnr, usage_namespace, "TSDefinitionUsage")
     end
   end
 
   if def_node ~= node_at_point then
-    ts_utils.highlight_node(def_node, bufnr, usage_namespace, 'TSDefinition')
+    ts_utils.highlight_node(def_node, bufnr, usage_namespace, "TSDefinition")
   end
 end
 
@@ -39,21 +39,39 @@ function M.clear_usage_highlights(bufnr)
 end
 
 function M.attach(bufnr)
-  cmd(string.format('augroup NvimTreesitterUsages_%d', bufnr))
-  cmd 'au!'
+  cmd(string.format("augroup NvimTreesitterUsages_%d", bufnr))
+  cmd "au!"
   -- luacheck: push ignore 631
-  cmd(string.format([[autocmd CursorHold <buffer=%d> lua require'nvim-treesitter-refactor.highlight_definitions'.highlight_usages(%d)]], bufnr, bufnr))
-  cmd(string.format([[autocmd CursorMoved <buffer=%d> lua require'nvim-treesitter-refactor.highlight_definitions'.clear_usage_highlights(%d)]], bufnr, bufnr))
-  cmd(string.format([[autocmd InsertEnter <buffer=%d> lua require'nvim-treesitter-refactor.highlight_definitions'.clear_usage_highlights(%d)]], bufnr, bufnr))
+  cmd(
+    string.format(
+      [[autocmd CursorHold <buffer=%d> lua require'nvim-treesitter-refactor.highlight_definitions'.highlight_usages(%d)]],
+      bufnr,
+      bufnr
+    )
+  )
+  cmd(
+    string.format(
+      [[autocmd CursorMoved <buffer=%d> lua require'nvim-treesitter-refactor.highlight_definitions'.clear_usage_highlights(%d)]],
+      bufnr,
+      bufnr
+    )
+  )
+  cmd(
+    string.format(
+      [[autocmd InsertEnter <buffer=%d> lua require'nvim-treesitter-refactor.highlight_definitions'.clear_usage_highlights(%d)]],
+      bufnr,
+      bufnr
+    )
+  )
   -- luacheck: pop
-  cmd 'augroup END'
+  cmd "augroup END"
 end
 
 function M.detach(bufnr)
   M.clear_usage_highlights(bufnr)
-  cmd(string.format('autocmd! NvimTreesitterUsages_%d CursorHold', bufnr))
-  cmd(string.format('autocmd! NvimTreesitterUsages_%d CursorMoved', bufnr))
-  cmd(string.format('autocmd! NvimTreesitterUsages_%d InsertEnter', bufnr))
+  cmd(string.format("autocmd! NvimTreesitterUsages_%d CursorHold", bufnr))
+  cmd(string.format("autocmd! NvimTreesitterUsages_%d CursorMoved", bufnr))
+  cmd(string.format("autocmd! NvimTreesitterUsages_%d InsertEnter", bufnr))
 end
 
 return M