Merge branch 'fix/texlab'

misumisumi · Dec 28, 2024 · 24c1fff · 24c1fff
2 parents 1d3f918 + 9723d0c
commit 24c1fff
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/lua/user/configs/lsp-servers/texlab.lua b/lua/user/configs/lsp-servers/texlab.lua
@@ -1,5 +1,17 @@
+local forward_search_tbl = function()
+	if require("core.global").is_windows then
+		return {
+			args = { "-reuse-instance", "%p", "-forward-search", "%f", "%l" },
+			executable = require("core.global").home .. "/AppData/Local/SumatraPDF/SumatraPDF.exe",
+		}
+	else
+		return {
+			args = { "--synctex-forward", "%l:1:%f", "%p" },
+			executable = "zathura",
+		}
+	end
+end
 return {
-	-- cmd = { "texlab" },
 	cmd = { "texlab", "-vv", "--log-file=./texlab.log" },
 	filetypes = { "tex", "plaintex", "bib" },
 	root_dir = require("lspconfig.util").root_pattern(
@@ -26,19 +38,7 @@ return {
 			},
 			diagnosticsDelay = 300,
 			formatterLineLength = 80,
-			forwardSearch = function()
-				if require("core.global").is_windows then
-					return {
-						args = { "-reuse-instance", "%p", "-forward-search", "%f", "%l" },
-						executable = require("core.global").home .. "/AppData/Local/SumatraPDF/SumatraPDF.exe",
-					}
-				else
-					return {
-						args = { "--synctex-forward", "%l:1:%f", "%p" },
-						executable = "zathura",
-					}
-				end
-			end,
+			forwardSearch = forward_search_tbl(),
 			latexFormatter = "latexindent",
 			latexindent = {
 				modifyLineBreaks = false,

diff --git a/lua/user/configs/tool/skkeleton.lua b/lua/user/configs/tool/skkeleton.lua
@@ -43,7 +43,6 @@ return function()
 		skkServerReqEnc = "utf-8",
 		skkServerResEnc = "utf-8",
 		sources = { "skk_dictionary", "skk_server" },
-		usePopup = true,
 		userDictionary = global.cache_dir .. "skkeleton",
 	}
 	vim.fn["skkeleton#config"](opts)