1 files changed, 27 insertions, 13 deletions

diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua
index 29dee94..558742d 100644
--- a/nvim/lua/config/keymaps.lua
+++ b/nvim/lua/config/keymaps.lua
@@ -16,24 +16,40 @@ function M.lsp(buffer, client)
   map("n", "<leader>rn", vim.lsp.buf.rename, opts)
   map("n", "<leader>ca", vim.lsp.buf.code_action, opts)
 
+  local function run_in_terminal(cmd)
+    vim.cmd("botright split | terminal " .. cmd)
+  end
+
   local function set_c_bindings()
-    if client and client.name == "clangd" then map("n", "<leader>hs", "<cmd>ClangdSwitchSourceHeader<cr>", opts) end
+    map("n", "<leader>hs", "<cmd>ClangdSwitchSourceHeader<cr>", opts)
+
+    map("n", "<F5>", function()
+      vim.cmd("make")
+      vim.cmd("cwindow")
+    end, opts)
+
+    map("n", "<F6>", function() run_in_terminal("gmake test") end, opts)
   end
 
   local function set_python_bindings()
-    if client and (client.name == "basedpyright" or client.name == "pyright" or client.name == "pylsp") then
-      local function run_pytest()
-        vim.cmd("botright split | terminal pytest")
-      end
+    map("n", "<F6>", function() run_in_terminal("pytest") end, opts)
+  end
 
-      map("n", "<F6>", run_pytest, {
-        desc = "Run pytest (nur Python-Projekt)",
-      })
-    end
+  local function set_npm_bindings()
+    map("n", "<F5>", function() run_in_terminal("npm run build") end, opts)
+    map("n", "<F6>", function() run_in_terminal("npm test") end, opts)
+    map("n", "<F7>", function() run_in_terminal("npm start") end, opts)
   end
 
-  set_c_bindings()
-  set_python_bindings()
+  if client then
+    if client.name == "clangd" then
+      set_c_bindings()
+    elseif client.name == "basedpyright" or client.name == "pyright" or client.name == "pylsp" then
+      set_python_bindings()
+    elseif client.name == "tsserver" or client.name == "vtsls" or client.name == "typescript_tools" then
+      set_npm_bindings()
+    end
+  end
 end
 
 function M.gitsigns()
@@ -103,8 +119,6 @@ function M.global()
     return vim.v.count == 0 and "gk" or "k"
   end, { expr = true, silent = true })
 
-  map("n", "<F5>", "<cmd>make<CR>", opts)
-
   -- Kombinationen mit Leader-Key
   map("n", "<leader>K", function()
     vim.diagnostic.open_float({ scope = "cursor", border = "rounded" })