🩹 Convert method declarations to regular functions

The colon syntax is meant for methods, which are functions that take
a ‘self’ parameter as first argument.
If a function is declared as a method, and it is later invoked with dot syntax,
the first argument could be replaced with an empty table.

Co-authored-by: smeikx <smeikx@noreply.codeberg.org>

Author: Freed-Wu

.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
     hooks:
       - id: remove-crlf
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         additional_dependencies:
@@ -37,23 +37,23 @@ repos:
         args:
           - --msg-filename
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: 3.0.3
+    rev: 3.2.0
     hooks:
       - id: editorconfig-checker
   - repo: https://github.com/jumanjihouse/pre-commit-hooks
     rev: 3.0.0
     hooks:
       - id: check-mailmap
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.6
+    rev: v1.7.7
     hooks:
       - id: actionlint
   - repo: https://github.com/adrienverge/yamllint
     rev: v1.35.1
     hooks:
       - id: yamllint
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.21
+    rev: 0.7.22
     hooks:
       - id: mdformat
         additional_dependencies:
@@ -67,7 +67,7 @@ repos:
           - mdformat-config
           - mdformat-web
   - repo: https://github.com/DavidAnson/markdownlint-cli2
-    rev: v0.17.1
+    rev: v0.17.2
     hooks:
       - id: markdownlint-cli2
         additional_dependencies:
@@ -77,6 +77,6 @@ repos:
     hooks:
       - id: luacheck
   - repo: https://github.com/NixOS/nixfmt
-    rev: 8d4bd690c247004d90d8554f0b746b1231fe2436
+    rev: e825e956ae967ee24aa502a90099956d1f8bc1ed
     hooks:
       - id: nixfmt

README.md

@@ -95,7 +95,7 @@ $ luarocks --lua-version 5.1 --local --tree ~/.local/share/nvim/rocks install ri
 Refer [config](https://rime-nvim.readthedocs.io/en/latest/modules/lua.rime.config.html):
 
 ```lua
-require('rime.nvim'):setup({
+require('rime.nvim').setup({
     -- ...
 })
 ```
@@ -111,7 +111,7 @@ any non-printable key will be passed to rime only if rime window is opened. If
 you want to pass a key to rime in any case, try:
 
 ```lua
-vim.keymap.set('i', '<C-\\>', require('rime.nvim'):callback('<C-\\>'))
+vim.keymap.set('i', '<C-\\>', require('rime.nvim').callback('<C-\\>'))
 ```
 
 It is useful for some key such as the key for switching input schema.
@@ -127,7 +127,7 @@ Because only printable key can be passed to rime when rime window is closed.
 Like [cmp-rime](https://github.com/Ninlives/cmp-rime):
 
 ```lua
-require('cmp'):setup {
+require('cmp').setup {
   -- ...
   sources = {
     -- ...
@@ -145,7 +145,7 @@ You can customize it. Such as:
 Only display input schema name in insert mode:
 
 ```lua
-require('rime.nvim'):setup({
+require('rime.nvim').setup({
   get_new_symbol = function (old, name)
     if old == M.airline_mode_map.i
       return name
@@ -160,7 +160,7 @@ See airline's `g:airline_mode_map` to know `i`, `R`, `s`, ...
 Disable this feature:
 
 ```lua
-require('rime.nvim'):setup({
+require('rime.nvim').setup({
   update_status_bar = function () end
 })
 ```

lua/rime/nvim/cmp.lua

@@ -28,16 +28,17 @@ function M.get_keyword_pattern()
     return '\\%([!-~]\\)*'
 end
 
--- luacheck: ignore 212/self
 ---complete
 ---@param request table
 ---@param callback table
-function M:complete(request, callback)
+-- luacheck: ignore 212/self
+---@diagnostic disable-next-line: unused-local
+function M.complete(self, request, callback)
     local keys = string.sub(request.context.cursor_before_line, request.offset)
     M._callback_table[request.context.id] = callback
     local cursor = request.context.cursor
     local context_id = request.context.id
-    local menu = nvim_rime:get_context_with_all_candidates(keys).menu
+    local menu = nvim_rime.get_context_with_all_candidates(keys).menu
     local items = {}
     for i, candidate in ipairs(menu.candidates) do
         local item = {

lua/rime/nvim/init.lua

@@ -1,20 +1,20 @@
 ---rime support for neovim
 ---@diagnostic disable: undefined-global
--- luacheck: ignore 112 113 212/self
+-- luacheck: ignore 112 113
 local rime = require "rime"
 local M = require "rime.config"
 
 ---setup
 ---@param conf table
-function M:setup(conf)
+function M.setup(conf)
     M = vim.tbl_deep_extend("keep", conf, M)
 end
 
 ---process key. wrap `lua.rime.utils.parse_key`()
 ---@param key string
 ---@param modifiers string[]
 ---@see process_keys
-function M:process_key(key, modifiers)
+function M.process_key(key, modifiers)
     modifiers = modifiers or {}
     local keycode, mask = require("rime.utils").parse_key(key, modifiers)
     return M.session_id:process_key(keycode, mask)
@@ -24,10 +24,10 @@ end
 ---@param keys string
 ---@param modifiers string[]
 ---@see process_key
-function M:process_keys(keys, modifiers)
+function M.process_keys(keys, modifiers)
     modifiers = modifiers or {}
     for key in keys:gmatch("(.)") do
-        if M:process_key(key, modifiers) == false then
+        if M.process_key(key, modifiers) == false then
             return false
         end
     end
@@ -36,27 +36,27 @@ end
 
 ---get callback for draw UI
 ---@param key string
-function M:callback(key)
+function M.callback(key)
     return function()
         if vim.b.rime_is_enabled then
-            return M:draw_ui(key)
+            return M.draw_ui(key)
         end
     end
 end
 
 ---get rime commit
-function M:get_commit_text()
+function M.get_commit_text()
     if M.session_id:commit_composition() then
         return M.session_id:get_commit().text
     end
     return ""
 end
 
 ---reset keymaps
-function M:reset_keymaps()
+function M.reset_keymaps()
     if M.preedit ~= "" and M.has_set_keymaps == false then
         for _, lhs in ipairs(M.keys.special) do
-            vim.keymap.set("i", lhs, M:callback(lhs), { buffer = 0, noremap = true, nowait = true, })
+            vim.keymap.set("i", lhs, M.callback(lhs), { buffer = 0, noremap = true, nowait = true, })
         end
         M.has_set_keymaps = true
     elseif M.preedit == "" and M.has_set_keymaps == true then
@@ -69,7 +69,7 @@ end
 
 ---feed keys
 ---@param text string
-function M:feed_keys(text)
+function M.feed_keys(text)
     if vim.v.char ~= "" then
         vim.v.char = text
     else
@@ -81,35 +81,35 @@ function M:feed_keys(text)
         vim.api.nvim_buf_set_text(0, r - 1, c, r - 1, c, { text })
         vim.api.nvim_win_set_cursor(0, { r, c + #text })
     end
-    M:win_close()
+    M.win_close()
     M.preedit = ""
-    M:reset_keymaps()
+    M.reset_keymaps()
 end
 
 ---draw UI. wrap `lua.rime.utils.draw_ui`()
 ---@param key string
-function M:draw_ui(key)
+function M.draw_ui(key)
     if key == "" then
         key = vim.v.char
     end
     if M.preedit == "" then
         for _, disable_key in ipairs(M.keys.disable) do
             if key == vim.keycode(disable_key) then
-                M:disable()
-                M:update_status_bar()
+                M.disable()
+                M.update_status_bar()
             end
         end
     end
-    if M:process_key(key, {}) == false then
+    if M.process_key(key, {}) == false then
         if #key == 1 then
-            M:feed_keys(key)
+            M.feed_keys(key)
         end
         return
     end
-    M:update_status_bar()
+    M.update_status_bar()
     local context = M.session_id:get_context()
     if context.menu.num_candidates == 0 then
-        M:feed_keys(M:get_commit_text())
+        M.feed_keys(M.get_commit_text())
         return
     end
     vim.v.char = ""
@@ -144,11 +144,11 @@ function M:draw_ui(key)
             end
         end
     )
-    M:reset_keymaps()
+    M.reset_keymaps()
 end
 
 ---close IME window
-function M:win_close()
+function M.win_close()
     vim.schedule(
         function()
             if M.win_id ~= 0 and vim.api.nvim_win_is_valid(M.win_id) then
@@ -160,12 +160,12 @@ function M:win_close()
 end
 
 ---clear composition
-function M:clear_composition()
+function M.clear_composition()
     M.session_id:clear_composition()
 end
 
 ---initial
-function M:init()
+function M.init()
     if M.session_id == nil then
         vim.fn.mkdir(M.traits.log_dir, "p")
         local traits = M.traits
@@ -181,23 +181,23 @@ end
 ---enable IME
 ---@see disable
 ---@see toggle
-function M:enable()
-    M:init()
+function M.enable()
+    M.init()
     for _, nowait_key in ipairs(M.keys.nowait) do
         vim.keymap.set("i", nowait_key, nowait_key, { buffer = 0, noremap = true, nowait = true })
     end
 
     vim.api.nvim_create_autocmd("InsertCharPre", {
         group = M.augroup_id,
         buffer = 0,
-        callback = M:callback(""),
+        callback = M.callback(""),
     })
     vim.api.nvim_create_autocmd({ "InsertLeave", "WinLeave" }, {
         group = M.augroup_id,
         buffer = 0,
         callback = function()
-            M:clear_composition()
-            M:win_close()
+            M.clear_composition()
+            M.win_close()
         end
     })
     vim.b.rime_is_enabled = true
@@ -206,7 +206,7 @@ end
 ---disable IME
 ---@see enable
 ---@see toggle
-function M:disable()
+function M.disable()
     for _, nowait_key in ipairs(M.keys.nowait) do
         vim.keymap.del("i", nowait_key, { buffer = 0 })
     end
@@ -218,26 +218,26 @@ end
 ---toggle IME
 ---@see enable
 ---@see disable
-function M:toggle()
+function M.toggle()
     if vim.b.rime_is_enabled then
-        M:disable()
+        M.disable()
     else
-        M:enable()
+        M.enable()
     end
-    M:update_status_bar()
+    M.update_status_bar()
 end
 
 ---get context with all candidates, useful for `lua.rime.nvim.cmp`
 ---@param keys string
 ---@return table
-function M:get_context_with_all_candidates(keys)
-    M:init()
-    M:process_keys(keys, {})
+function M.get_context_with_all_candidates(keys)
+    M.init()
+    M.process_keys(keys, {})
     local context = rime.get_context(M.sessionId)
     if (keys ~= '') then
         local result = context
         while (not context.menu.is_last_page) do
-            M:process_key('=', {})
+            M.process_key('=', {})
             context = rime.get_context(M.sessionId)
             result.menu.num_candidates = result.menu.num_candidates + context.menu.num_candidates
             if (result.menu.select_keys and context.menu.select_keys) then
@@ -248,7 +248,7 @@ function M:get_context_with_all_candidates(keys)
             end
         end
     end
-    M:clear_composition()
+    M.clear_composition()
     return context
 end
 
@@ -257,15 +257,15 @@ end
 ---@param old string
 ---@param name string
 ---@return string
-function M:get_new_symbol(old, name)
+function M.get_new_symbol(old, name)
     if old == M.airline_mode_map.i or old == M.airline_mode_map.ic or old == M.airline_mode_map.ix then
         return name
     end
     return old .. name
 end
 
 ---update status bar by `airline_mode_map`. see `help airline`.
-function M:update_status_bar()
+function M.update_status_bar()
     if vim.g.airline_mode_map then
         if M.airline_mode_map == nil then
             M.airline_mode_map = vim.tbl_deep_extend("keep", vim.g.airline_mode_map, M.default.airline_mode_map)
@@ -283,7 +283,7 @@ function M:update_status_bar()
                 if schema.schema_id == schema_id then
                     for k, _ in pairs(M.default.airline_mode_map) do
                         vim.g.airline_mode_map = vim.tbl_deep_extend("keep",
-                            { [k] = M:get_new_symbol(M.airline_mode_map[k], schema.name) }, vim.g.airline_mode_map)
+                            { [k] = M.get_new_symbol(M.airline_mode_map[k], schema.name) }, vim.g.airline_mode_map)
                     end
                     break
                 end