5 files changed, 115 insertions, 35 deletions

diff --git a/lua/completions.lua b/lua/completions.lua
index f7598a6..bd90178 100644
--- a/lua/completions.lua
+++ b/lua/completions.lua
@@ -14,6 +14,22 @@ cmp.setup({
             c = cmp.mapping.close(),
         }),
         ['<CR>'] = cmp.mapping.confirm({ select = true }),
+
+        ['<C-n>'] = cmp.mapping(function(fallback)
+            if cmp.visible() then
+                cmp.select_next_item()
+            else
+                fallback()
+            end
+        end, { 'i', 's', 'c' }),
+
+        ['<C-p>'] = cmp.mapping(function(fallback)
+            if cmp.visible() then
+                cmp.select_prev_item()
+            else
+                fallback()
+            end
+        end, { 'i', 's', 'c' }),
     },
     sources = cmp.config.sources({
         { name = 'nvim_lsp' },
diff --git a/lua/leap-ast.lua b/lua/leap-ast.lua
new file mode 100644
index 0000000..22a5876
--- /dev/null
+++ b/lua/leap-ast.lua
@@ -0,0 +1,51 @@
+local api = vim.api
+-- Note: The functions used here will be upstreamed eventually.
+local ts_utils = require('nvim-treesitter.ts_utils')
+
+local function get_ast_nodes()
+  local wininfo = vim.fn.getwininfo(api.nvim_get_current_win())[1]
+  -- Get current TS node.
+  local cur_node = ts_utils.get_node_at_cursor(0)
+  if not cur_node then return end
+  -- Get parent nodes recursively.
+  local nodes = { cur_node }
+  local parent = cur_node:parent()
+  while parent do
+    table.insert(nodes, parent)
+    parent = parent:parent()
+  end
+  -- Create Leap targets from TS nodes.
+  local targets = {}
+  local startline, startcol
+  for _, node in ipairs(nodes) do
+    startline, startcol, _, _ = node:range()  -- (0,0)
+    if startline + 1 >= wininfo.topline then
+      local target = { node = node, pos = { startline + 1, startcol + 1 } }
+      table.insert(targets, target)
+    end
+  end
+  if #targets >= 1 then return targets end
+end
+
+local function select_range(target)
+  local mode = api.nvim_get_mode().mode
+  if not mode:match('n?o') then
+    -- Force going back to Normal (implies mode = v | V | ).
+    vim.cmd('normal! ' .. mode)
+  end
+  ts_utils.update_selection(0, target.node,
+    mode:match('V') and 'linewise' or
+    mode:match('') and 'blockwise' or
+    'charwise'
+  )
+end
+
+local function leap()
+  require('leap').leap {
+    targets = get_ast_nodes(),
+    action = api.nvim_get_mode().mode ~= 'n' and select_range,  -- or jump
+    backward = true
+  }
+end
+
+return { leap = leap }
diff --git a/lua/leap.lua b/lua/leap.lua
new file mode 100644
index 0000000..14be3bd
--- /dev/null
+++ b/lua/leap.lua
@@ -0,0 +1,10 @@
+local leap = require 'leap'
+leap.opts.safe_labels = {}
+leap.opts.labels = {
+    "a", "r", "s", "t", "n", "e", "i", "o", "d", "h",
+    "A", "R", "S", "T", "N", "E", "I", "O", "D", "H"
+}
+leap.opts.special_keys = {
+    next_target = '<c-n>',
+    prev_target = '<c-p>',
+}
diff --git a/lua/lsp.lua b/lua/lsp.lua
index 7509593..349c719 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -6,53 +6,51 @@ local on_attach = function(client, bufnr)
     buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
 
     -- Mappings.
-    local opts = { noremap=true, silent=true }
-    buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-    buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
-    buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
-    buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
-    buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-    buf_set_keymap('n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-    buf_set_keymap('n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-    buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
-    buf_set_keymap('n', '<leader>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
-    buf_set_keymap('n', '[g', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
-    buf_set_keymap('n', ']g', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
-    buf_set_keymap('n', '<leader>q', '<cmd>lua vim.diagnostic.set_qflist()<CR>', opts)
+    local bufopts = { noremap=true, silent=true, buffer=bufnr }
+    vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
+    vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
+    vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
+    vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
+    vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
 
-    -- Set some keybinds conditional on server capabilities
-    if client.server_capabilities.document_formatting then
-        buf_set_keymap("n", "<leader>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
-    elseif client.server_capabilities.document_range_formatting then
-        buf_set_keymap("n", "<leader>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts)
-    end
+    local opts = { noremap=true, silent=true }
+    vim.keymap.set('n', '<space>d', vim.diagnostic.open_float, opts)
+    vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
+    vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
+    vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
+    vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
 end
 
-local servers = { "hls", "rnix", "bashls" }
+local servers = { "hls", "bashls" }
 for _, lsp in ipairs(servers) do
     nvim_lsp[lsp].setup {
         on_attach = on_attach,
     }
 end
 
-local capabilities = vim.lsp.protocol.make_client_capabilities()
+local capabilities = require('cmp_nvim_lsp')
+    .default_capabilities(vim.lsp.protocol.make_client_capabilities())
+
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 
-nvim_lsp.rust_analyzer.setup {
-    capabilities = capabilities, 
-    settings = {
-        ["rust-analyzer"] = {
-            procMacro = {
-                enable = true
-            },
-            cargo = {
-                allFeatures = true,
-            },
-        },
-    },
-}
+-- nvim_lsp.rust_analyzer.setup {
+--     on_attach = on_attach,
+--     settings = {
+--         ["rust-analyzer"] = {
+--             procMacro = {
+--                 enable = true
+--             },
+--             cargo = {
+--                 allFeatures = false,
+--             },
+--             checkOnSave = false,
+--         },
+--     },
+-- }
 
 nvim_lsp.ccls.setup {
+    capabilities = capabilities, 
+    on_attach = on_attach,
     init_options = {
         index = {
             threads = 0;
@@ -63,3 +61,8 @@ nvim_lsp.ccls.setup {
         };
     }
 }
+
+nvim_lsp.jdtls.setup{
+    cmd = {"jdtls"};
+}
+
diff --git a/lua/treesitter.lua b/lua/treesitter.lua
index 344abf0..f63cb3b 100644
--- a/lua/treesitter.lua
+++ b/lua/treesitter.lua
@@ -1,6 +1,6 @@
 require'nvim-treesitter.configs'.setup {
   highlight = {
-    enable = true,
+    enable = false,
     -- disable = { "c"},
   },
   incremental_selection = {