Skip to content
This repository was archived by the owner on Apr 16, 2024. It is now read-only.

Commit e0a3a11

Browse files
authored
fix(docker,lsp,core): Dockerfile, lsp warning and preserve_edit_pos (#371)
* chore(.gitignore): contribute got renamed to tools delete packer_compiled.lua: this should not be commited! Signed-off-by: Edwin Török <[email protected]> * chore(Dockerfile): add luacheck/stylua * chore(init.lua): fix luacheck warnings Delete dead code Signed-off-by: Edwin Török <[email protected]> * chore(contribute): do not move branch in detached HEAD state When rebasing / bisecting / etc. the worktree would be in a detached HEAD state. Do not checkout the branch because this would unexpectedly move the currently checked out commit. Especially important if we want to compare performance one-by-one by rebasing in edit mode. Signed-off-by: Edwin Török <[email protected]> * chore: fix contribute/start_docker pacman was stopping and asking a question, needs noconfirm flag. Directories mounted as volumes need to be created on first use. 'make' needs to be installed otherwise nvim-treesitter fails to compile the treesitter parsers and hangs at 'Compiling' (sync_install=true can be used to show actual error). Signed-off-by: Edwin Török <[email protected]> * fix(preserve_edit_pos): do not jump to last position in git commit/rebase buffers See ':h last-position-jump' The commit message will likely be different each time, although the filename will be the same (`COMMIT_EDITMSG`). Signed-off-by: Edwin Török <[email protected]> * fix(lsp): do not use deprecated vim.lsp.diagnostic APIs Use the vim.diagnostic API instead, see :h deprecated. Otherwise a message is printed on every use that they are deprecated. Signed-off-by: Edwin Török <[email protected]>
1 parent 0294e7c commit e0a3a11

11 files changed

+13
-397
lines changed

.gitignore

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ tags
1010
# OS files
1111
.DS_Store
1212
# Doom Nvim Contrib files
13-
contribute/doom-nvim-contrib
14-
contribute/local-share-nvim
15-
contribute/workspace
13+
tools/doom-nvim-contrib
14+
tools/local-share-nvim
15+
tools/workspace
1616

1717
# User modules
1818
user/modules/*

lua/doom/modules/core/doom/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ required.autocmds = function()
332332
table.insert(autocmds, {
333333
"BufReadPost",
334334
"*",
335-
[[if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif]],
335+
[[if &ft !~# 'commit\|rebase' && line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif]],
336336
})
337337
end
338338
return autocmds

lua/doom/modules/core/nest/init.lua

-2
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ mapper.configs["nvim-mapper"] = function()
108108
if id ~= nil then
109109
local rhs = type(node.rhs) == "function" and "<function>" or node.rhs
110110
if node_settings.buffer then
111-
local bufnr = type(node_settings.buffer) == "number" and node_settings.buffer
112-
or vim.api.nvim_get_current_buf()
113111
Mapper.map_buf_virtual(
114112
sanitizedMode,
115113
node.lhs,

lua/doom/modules/features/lsp/init.lua

+1-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ lsp.settings = {
9595
},
9696
}
9797

98-
local is_module_enabled = require("doom.utils").is_module_enabled
9998
lsp.packages = {
10099
["nvim-lspconfig"] = {
101100
"neovim/nvim-lspconfig",
@@ -377,7 +376,7 @@ lsp.binds = {
377376
end,
378377
name = "Line",
379378
},
380-
{ "l", vim.lsp.diagnostic.set_loclist, name = "Loclist" },
379+
{ "l", vim.diagnostic.setloclist, name = "Loclist" },
381380
},
382381
},
383382
},

tools/Dockerfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ RUN pacman -Sy neovim --noconfirm
2424
# Install runtime dependencies of doom-nvim
2525
RUN pacman -Sy ripgrep nodejs-lts-fermium npm git bash gcc jq --noconfirm
2626

27+
# Lua
28+
RUN pacman -Sy luacheck stylua --noconfirm
29+
2730
# Required for nvim-lsp-installer
28-
RUN pacman -Sy wget unzip
31+
RUN pacman -Sy wget unzip make --noconfirm
2932

3033
# Required for watching Doom-nvim-contrib for changes
3134
RUN npm i -g chokidar-cli

tools/local-share-nvim/plugin/packer_compiled.lua

-203
This file was deleted.

tools/local-share-nvim/sessions/%home%doom%.config%nvim%lua%doom%modules%config.vim

-37
This file was deleted.

tools/local-share-nvim/sessions/%home%doom%.config%nvim.vim

-47
This file was deleted.

0 commit comments

Comments
 (0)