neovim

commit 6df103e08e4ae5c36ed61b0590180acd6acab59a
parent 02062c8f9088eaede1ecd156a41dc8ffe6660398
Author: Tomas Nemec <owl@gtms.dev>
Date:   Thu,  5 Sep 2024 09:21:54 +0200

update

Diffstat:
M
after/plugin/format.lua
 | 
1
+
D
after/plugin/pubspec.lua
 | 
14
--------------
M
ftplugin/dart.lua
 | 
2
++
A
ftplugin/htmlangular.lua
 | 
3
+++
M
ftplugin/java.lua
 | 
2
+-

5 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/after/plugin/format.lua b/after/plugin/format.lua
@@ -14,6 +14,7 @@ require 'conform'.setup {
     json = prettier,
     markdown = prettier,
     html = prettier,
+    htmlangular = prettier,
     css = prettier,
     graphql = prettier,
     scss = prettier,
diff --git a/after/plugin/pubspec.lua b/after/plugin/pubspec.lua
@@ -1,14 +0,0 @@
-local group = vim.api.nvim_create_augroup('tms-dart-pubspec', {})
-vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
-  group = group,
-  callback = function()
-    if #vim.fs.find('pubspec.yaml', { upward = true, type = 'file' }) == 0 then
-      return
-    end
-    vim.keymap.set('n', '<leader>an', require 'tms.ft.dart.analyze'.qf2131, { buffer = true, desc = 'Dart Analyze' })
-  end,
-})
-
-if pcall(require, 'pubspec-assist') then
-  require 'pubspec-assist'.setup()
-end
diff --git a/ftplugin/dart.lua b/ftplugin/dart.lua
@@ -47,6 +47,7 @@ if pcall(require, 'dart-tools') then
   local dt_lsp = require 'dart-tools.lsp'
   local dt_req = require 'dart-tools.lsp.request'
   local ddebug = require 'tms.ft.dart.debug'
+  local analyze = require 'tms.ft.dart.analyze'
 
   local cmd_opts = {}
   vim.api.nvim_buf_create_user_command(0, 'DartDebug', ddebug.func, cmd_opts)
@@ -55,6 +56,7 @@ if pcall(require, 'dart-tools') then
   vim.api.nvim_buf_create_user_command(0, 'DartFixAll', dt_lsp.fix_all, cmd_opts)
   vim.api.nvim_buf_create_user_command(0, 'DartExtract', dt_lsp.extract_method, cmd_opts)
   vim.api.nvim_buf_create_user_command(0, 'DartVariable', dt_lsp.extract_local_variable, cmd_opts)
+  vim.api.nvim_buf_create_user_command(0, 'DartAnalyze', analyze.qf2131, cmd_opts)
 
   local opts = function(desc)
     return { buffer = true, desc = desc }
diff --git a/ftplugin/htmlangular.lua b/ftplugin/htmlangular.lua
@@ -0,0 +1,3 @@
+-- require 'tms.lsp.dart'.start()
+vim.o.shiftwidth = 4
+vim.treesitter.start(nil, 'html')
diff --git a/ftplugin/java.lua b/ftplugin/java.lua
@@ -28,7 +28,7 @@ local config = {
     "-javaagent:" .. vim.env.XDG_DATA_HOME .. "/maven/repository/org/projectlombok/lombok/1.18.30/lombok-1.18.30.jar",
 
     -- 💀
-    '-jar', vim.env.MASON .. '/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.800.v20240330-1250.jar',
+    '-jar', vim.env.MASON .. '/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.900.v20240613-2009.jar',
     -- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^                                               ^^^^^^^^^^^^^^
     -- Must point to the                                                             Change this to
     -- eclipse.jdt.ls installation                                                   the actual version