5 files changed, 223 insertions, 0 deletions

diff --git a/lua/completions.lua b/lua/completions.lua
new file mode 100644
index 0000000..bd90178
--- /dev/null
+++ b/lua/completions.lua
@@ -0,0 +1,53 @@
+local cmp = require 'cmp'
+
+cmp.setup({
+    snippet = {
+        expand = function(args) end,
+    },
+    mapping = {
+        ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
+        ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
+        ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
+        ['<C-y>'] = cmp.config.disable,
+        ['<C-e>'] = cmp.mapping({
+            i = cmp.mapping.abort(),
+            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' },
+    }, {
+        { name = 'buffer' },
+    })
+})
+
+cmp.setup.cmdline('/', {
+    sources = {
+        { name = 'buffer' }
+    }
+})
+
+cmp.setup.cmdline(':', {
+    sources = cmp.config.sources({
+        { name = 'path' }
+    }, {
+        { name = 'cmdline' }
+    })
+})
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
new file mode 100644
index 0000000..349c719
--- /dev/null
+++ b/lua/lsp.lua
@@ -0,0 +1,68 @@
+local nvim_lsp = require('lspconfig')
+local on_attach = function(client, bufnr)
+    local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
+    local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
+
+    buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
+
+    -- Mappings.
+    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)
+
+    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", "bashls" }
+for _, lsp in ipairs(servers) do
+    nvim_lsp[lsp].setup {
+        on_attach = on_attach,
+    }
+end
+
+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 {
+--     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;
+        };
+        clang = {
+            extraArgs = { "-fopenmp" };
+            excludeArgs = { "-frounding-math" } ;
+        };
+    }
+}
+
+nvim_lsp.jdtls.setup{
+    cmd = {"jdtls"};
+}
+
diff --git a/lua/treesitter.lua b/lua/treesitter.lua
new file mode 100644
index 0000000..f63cb3b
--- /dev/null
+++ b/lua/treesitter.lua
@@ -0,0 +1,41 @@
+require'nvim-treesitter.configs'.setup {
+  highlight = {
+    enable = false,
+    -- disable = { "c"},
+  },
+  incremental_selection = {
+      enable = true,
+      keymaps = {
+          init_selection = "gnn",
+          node_incremental = "g}",
+          scope_incremental = "grc",
+          node_decremental = "g{",
+      },
+  },
+  indent = {
+      enable = false
+  },
+  playground = {
+      enable = true,
+      disable = {},
+      updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
+      persist_queries = false, -- Whether the query persists across vim sessions
+      keybindings = {
+          toggle_query_editor = 'o',
+          toggle_hl_groups = 'i',
+          toggle_injected_languages = 't',
+          toggle_anonymous_nodes = 'a',
+          toggle_language_display = 'I',
+          focus_language = 'f',
+          unfocus_language = 'F',
+          update = 'R',
+          goto_node = '<cr>',
+          show_help = '?',
+      },
+  },
+  query_linter = {
+      enable = true,
+      use_virtual_text = true,
+      lint_events = {"BufWrite", "CursorHold"},
+  },
+}