fix: _use_plenary private option

barreiroleo · May 1, 2024 · 57192d7 · 57192d7
1 parent b39c11a
commit 57192d7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/lua/ltex_extra/init.lua b/lua/ltex_extra/init.lua
@@ -1,5 +1,5 @@
 local LoggerBuilder = require("ltex_extra.utils.log")
-local legacy_opts = require("ltex_extra.opts").legacy_def_opts
+local def_opts = require("ltex_extra.opts").legacy_def_opts
 
 ---@alias LtexClientSettings {ltex: {dictionary: content, hiddenFalsePositives: content, disabledRules: content }}
 ---@alias content {[string]: string[]}
@@ -131,7 +131,7 @@ function LtexExtra:RegisterClientMethods()
     vim.lsp.commands["_ltex.disableRules"] = require("ltex_extra.commands-lsp").disableRules
 end
 
----@param opts Legacy_LtexExtraOpts
+---@param opts LtexExtraOpts
 function LtexExtra:CheckLegacyOpts(opts)
     local deprecated_in_use = {}
     if opts.server_start then
@@ -158,10 +158,10 @@ function LtexExtra:CallLtexServer(opts)
 end
 
 function ltex_extra_api.setup(opts)
-    opts = vim.tbl_deep_extend("force", legacy_opts, opts or {})
+    opts = vim.tbl_deep_extend("force", def_opts, opts or {})
     opts.path = vim.fs.normalize(opts.path)
     -- Initialize the logger
-    LoggerBuilder:new({ logLevel = opts.log_level, usePlenary = true })
+    LoggerBuilder:new({ logLevel = opts.log_level, _use_plenary = opts._use_plenary })
     LtexExtra:new(opts)
     LtexExtra:RegisterAutocommands()
     LtexExtra:RegisterClientMethods()

diff --git a/lua/ltex_extra/opts.lua b/lua/ltex_extra/opts.lua
@@ -4,16 +4,12 @@
 ---@alias server_opts LSPServerOpts|nil
 
 ---@class LtexExtraOpts
+---@field init_check boolean Perform a scan inmediatelly after load the dictionaries
 ---@field load_langs string[] Languages to load. See LTeX definitions
 ---@field log_level LogLevel
 ---@field path string Path to store dictionaries. Relative to CWD or absolute
----@field server_opts server_opts
-
----@class Legacy_LtexExtraOpts: LtexExtraOpts
----@field init_check boolean Perform a scan inmediatelly after load the dictionaries
 ---@field server_start server_start Enable the call to ltex. Usefull for migration and test
----@field server_opts LSPServerOpts|nil
-
+---@field server_opts server_opts
 
 ---@class LSPServerOpts
 ---@field on_attach function(client: any, bufnr: integer)
@@ -27,7 +23,7 @@
 ---@field language string
 ---@field additionalRules table {enablePickyRules: boolean, motherTongue: string}
 
----@type Legacy_LtexExtraOpts
+---@type LtexExtraOpts
 local legacy_opts = {
     ---@deprecated
     init_check = true,
@@ -38,9 +34,10 @@ local legacy_opts = {
     server_start = false,
     ---@deprecated
     server_opts = nil,
+    _use_plenary = false
 }
 
----@type Legacy_LtexExtraOpts
+---@type LtexExtraOpts
 local tests_opts = {
     init_check = true,
     load_langs = { "es-AR", "en-US" },

diff --git a/lua/ltex_extra/utils/log.lua b/lua/ltex_extra/utils/log.lua
@@ -7,12 +7,12 @@
 ---@field fatal fun(...: string)
 
 ---@class LoggerOpts
----@field usePlenary boolean
 ---@field logLevel LogLevel
+---@field _use_plenary boolean
 
 ---@class LoggerBuilder
 ---@field log Logger
----@field usePlenary boolean
+---@field _use_plenary boolean
 ---@field loglevel LogLevel
 
 ---@enum (key) LogLevel
@@ -37,11 +37,10 @@ function LoggerBuilder:new(opts)
     ---@type Logger
     self.log = nil
     ---@type boolean
-    self.usePlenary = opts.usePlenary or false
-    ---@type string
+    self._use_plenary = opts._use_plenary
     self.logLevel = opts.logLevel or "trace"
 
-    if self.usePlenary then
+    if self._use_plenary then
         self.log = self:GetPlenaryLogger(self.logLevel)
     else
         self.log = self:GetVimLogger(self.logLevel)