Merge pull request 'add vscode support' (#11) from add-vscode-support into main

Reviewed-on: #11

init.lua

@@ -1,94 +1,99 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if vim.g.vscode then
-if not vim.loop.fs_stat(lazypath) then
+  -- VSCode Neovim
-  vim.fn.system({
+  require("user.vscode_keymaps")
-    "git",
+else
-    "clone",
+  local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-    "--filter=blob:none",
+  if not vim.loop.fs_stat(lazypath) then
-    "https://github.com/folke/lazy.nvim.git",
+    vim.fn.system({
-    "--branch=stable", -- latest stable release
+      "git",
-    lazypath,
+      "clone",
+      "--filter=blob:none",
+      "https://github.com/folke/lazy.nvim.git",
+      "--branch=stable", -- latest stable release
+      lazypath,
+    })
+  end
+  vim.opt.rtp:prepend(lazypath)
+
+  -- Set <space> as the leader key
+  -- See `:help mapleader`
+  --  NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
+  vim.g.mapleader = " "
+  vim.g.maplocalleader = " "
+
+  require("lazy").setup("plugins", {
+    lockfile = vim.fn.stdpath("data") .. "/lazy-lock.json", -- in data directory as normal location read only as managed by nix
+    dev = {
+      path = "~/Projects/Neovim",
+    },
   })
+
+  -- [[ Setting options ]]
+  -- See `:help vim.o`
+
+  -- Set highlight on search
+  vim.o.hlsearch = true
+  vim.o.incsearch = true
+
+  -- clipboard
+  vim.o.clipboard = "unnamedplus"
+
+  -- Make line numbers default
+  vim.wo.number = true
+
+  -- Enable mouse mode
+  vim.o.mouse = "a"
+
+  -- Enable break indent
+  vim.o.breakindent = true
+
+  -- Save undo history
+  vim.o.undofile = true
+
+  -- Case insensitive searching UNLESS /C or capital in search
+  vim.o.ignorecase = true
+  vim.o.smartcase = true
+
+  -- Decrease update time
+  vim.o.updatetime = 250
+  vim.wo.signcolumn = "yes"
+
+  vim.g.loaded_netrw = 1
+  vim.g.loaded_netrwPlugin = 1
+
+  -- Set completeopt to have a better completion experience
+  vim.o.completeopt = "menuone,noselect"
+
+  -- [[ Basic Keymaps ]]
+
+  -- Keymaps for better default experience
+  -- See `:help vim.keymap.set()`
+  vim.keymap.set({ "n", "v" }, "<Space>", "<Nop>", { silent = true })
+
+  -- Remap for dealing with word wrap
+  vim.keymap.set("n", "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
+  vim.keymap.set("n", "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+
+  -- [[ Highlight on yank ]]
+  -- See `:help vim.highlight.on_yank()`
+  local highlight_group = vim.api.nvim_create_augroup("YankHighlight", { clear = true })
+  vim.api.nvim_create_autocmd("TextYankPost", {
+    callback = function()
+      vim.highlight.on_yank()
+    end,
+    group = highlight_group,
+    pattern = "*",
+  })
+
+  -- Terminal Escape Key Mapping
+  vim.keymap.set("t", "<Esc>", [[<C-\><C-n>]])
+
+  -- Diagnostic keymaps
+  vim.keymap.set("n", "[d", vim.diagnostic.goto_prev)
+  vim.keymap.set("n", "]d", vim.diagnostic.goto_next)
+  vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float)
+  vim.keymap.set("n", "<leader>q", vim.diagnostic.setloclist)
+
+  -- The line beneath this is called `modeline`. See `:help modeline`
+  -- vim: ts=2 sts=2 sw=2 et
 end
-vim.opt.rtp:prepend(lazypath)
-
--- Set <space> as the leader key
--- See `:help mapleader`
---  NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
-vim.g.mapleader = " "
-vim.g.maplocalleader = " "
-
-require("lazy").setup("plugins", {
-  lockfile = vim.fn.stdpath("data") .. "/lazy-lock.json", -- in data directory as normal location read only as managed by nix
-  dev = {
-    path = "~/Projects/Neovim",
-  },
-})
-
--- [[ Setting options ]]
--- See `:help vim.o`
-
--- Set highlight on search
-vim.o.hlsearch = true
-vim.o.incsearch = true
-
--- clipboard
-vim.o.clipboard = "unnamedplus"
-
--- Make line numbers default
-vim.wo.number = true
-
--- Enable mouse mode
-vim.o.mouse = "a"
-
--- Enable break indent
-vim.o.breakindent = true
-
--- Save undo history
-vim.o.undofile = true
-
--- Case insensitive searching UNLESS /C or capital in search
-vim.o.ignorecase = true
-vim.o.smartcase = true
-
--- Decrease update time
-vim.o.updatetime = 250
-vim.wo.signcolumn = "yes"
-
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-
--- Set completeopt to have a better completion experience
-vim.o.completeopt = "menuone,noselect"
-
--- [[ Basic Keymaps ]]
-
--- Keymaps for better default experience
--- See `:help vim.keymap.set()`
-vim.keymap.set({ "n", "v" }, "<Space>", "<Nop>", { silent = true })
-
--- Remap for dealing with word wrap
-vim.keymap.set("n", "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
-vim.keymap.set("n", "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
-
--- [[ Highlight on yank ]]
--- See `:help vim.highlight.on_yank()`
-local highlight_group = vim.api.nvim_create_augroup("YankHighlight", { clear = true })
-vim.api.nvim_create_autocmd("TextYankPost", {
-  callback = function()
-    vim.highlight.on_yank()
-  end,
-  group = highlight_group,
-  pattern = "*",
-})
-
--- Terminal Escape Key Mapping
-vim.keymap.set("t", "<Esc>", [[<C-\><C-n>]])
-
--- Diagnostic keymaps
-vim.keymap.set("n", "[d", vim.diagnostic.goto_prev)
-vim.keymap.set("n", "]d", vim.diagnostic.goto_next)
-vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float)
-vim.keymap.set("n", "<leader>q", vim.diagnostic.setloclist)
-
--- The line beneath this is called `modeline`. See `:help modeline`
--- vim: ts=2 sts=2 sw=2 et

lua/user/vscode_keymaps.lua

@@ -0,0 +1,41 @@
+local keymap = vim.keymap.set
+local opts = { noremap = true, silent = true }
+
+-- remap leader key
+keymap("n", "<Space>", "", opts)
+vim.g.mapleader = " "
+vim.g.maplocalleader = " "
+
+-- yank to system clipboard
+keymap({ "n", "v" }, "<leader>y", '"+y', opts)
+
+-- paste from system clipboard
+keymap({ "n", "v" }, "<leader>p", '"+p', opts)
+
+-- better indent handling
+keymap("v", "<", "<gv", opts)
+keymap("v", ">", ">gv", opts)
+
+-- move text up and down
+keymap("v", "J", ":m .+1<CR>==", opts)
+keymap("v", "K", ":m .-2<CR>==", opts)
+keymap("x", "J", ":move '>+1<CR>gv-gv", opts)
+keymap("x", "K", ":move '<-2<CR>gv-gv", opts)
+
+-- paste preserves primal yanked piece
+keymap("v", "p", '"_dP', opts)
+
+-- removes highlighting after escaping vim search
+keymap("n", "<Esc>", "<Esc>:noh<CR>", opts)
+
+-- call vscode commands from neovim
+keymap({ "n", "v" }, "<leader>t", "<cmd>lua require('vscode').action('workbench.action.terminal.toggleTerminal')<CR>")
+keymap({ "n", "v" }, "<leader>b", "<cmd>lua require('vscode').action('editor.debug.action.toggleBreakpoint')<CR>")
+keymap({ "n", "v" }, "<leader>d", "<cmd>lua require('vscode').action('editor.action.showHover')<CR>")
+keymap({ "n", "v" }, "<leader>a", "<cmd>lua require('vscode').action('editor.action.quickFix')<CR>")
+keymap({ "n", "v" }, "<leader>sp", "<cmd>lua require('vscode').action('workbench.actions.view.problems')<CR>")
+keymap({ "n", "v" }, "<leader>cn", "<cmd>lua require('vscode').action('notifications.clearAll')<CR>")
+keymap({ "n", "v" }, "<leader>ff", "<cmd>lua require('vscode').action('workbench.action.quickOpen')<CR>")
+keymap({ "n", "v" }, "<leader>cp", "<cmd>lua require('vscode').action('workbench.action.showCommands')<CR>")
+keymap({ "n", "v" }, "<leader>pr", "<cmd>lua require('vscode').action('code-runner.run')<CR>")
+keymap({ "n", "v" }, "<leader>fd", "<cmd>lua require('vscode').action('editor.action.formatDocument')<CR>")