Merge #4299 oxlint

Author: justinmk

lsp/oxlint.lua

@@ -10,23 +10,37 @@
 --- ```sh
 --- npm i -g oxlint
 --- ```
+---
+--- Type-aware linting will automatically be enabled if `tsgolint` exists in your
+--- path and your `.oxlintrc.json` contains the string "typescript".
+---
+--- The default `on_attach` function provides an `:LspOxlintFixAll` command which
+--- can be used to fix all fixable diagnostics. See the `eslint` config entry for
+--- an example of how to use this to automatically fix all errors on write.
 
-local util = require 'lspconfig.util'
+local function oxlint_conf_mentions_typescript(root_dir)
+  local fn = vim.fs.joinpath(root_dir, '.oxlintrc.json')
+  for line in io.lines(fn) do
+    if line:find('typescript') then
+      return true
+    end
+  end
+  return false
+end
 
 ---@type vim.lsp.Config
 return {
   cmd = { 'oxlint', '--lsp' },
   filetypes = {
     'javascript',
     'javascriptreact',
-    'javascript.jsx',
     'typescript',
     'typescriptreact',
-    'typescript.tsx',
     'vue',
     'svelte',
     'astro',
   },
+  root_markers = { '.oxlintrc.json' },
   workspace_required = true,
   on_attach = function(client, bufnr)
     vim.api.nvim_buf_create_user_command(bufnr, 'LspOxlintFixAll', function()
@@ -39,24 +53,26 @@ return {
       desc = 'Apply Oxlint automatic fixes',
     })
   end,
-  root_dir = function(bufnr, on_dir)
-    local fname = vim.api.nvim_buf_get_name(bufnr)
+  settings = {
+    -- run = 'onType',
+    -- configPath = nil,
+    -- tsConfigPath = nil,
+    -- unusedDisableDirectives = 'allow',
+    -- typeAware = false,
+    -- disableNestedConfig = false,
+    -- fixKind = 'safe_fix',
+  },
+  before_init = function(init_params, config)
+    local settings = config.settings or {}
+    if settings.typeAware == nil and vim.fn.executable('tsgolint') == 1 then
+      local ok, res = pcall(oxlint_conf_mentions_typescript, config.root_dir)
+      if ok and res then
+        settings = vim.tbl_extend('force', settings, { typeAware = true })
+      end
+    end
+    local init_options = config.init_options or {}
+    init_options.settings = vim.tbl_extend('force', init_options.settings or {} --[[@as table]], settings)
 
-    -- Oxlint resolves configuration by walking upward and using the nearest config file
-    -- to the file being processed. We therefore compute the root directory by locating
-    -- the closest `.oxlintrc.json` (or `package.json` fallback) above the buffer.
-    local root_markers = util.insert_package_json({ '.oxlintrc.json' }, 'oxlint', fname)[1]
-    on_dir(vim.fs.dirname(vim.fs.find(root_markers, { path = fname, upward = true })[1]))
+    init_params.initializationOptions = init_options
   end,
-  init_options = {
-    settings = {
-      -- ['run'] = 'onType',
-      -- ['configPath'] = nil,
-      -- ['tsConfigPath'] = nil,
-      -- ['unusedDisableDirectives'] = 'allow',
-      -- ['typeAware'] = false,
-      -- ['disableNestedConfig'] = false,
-      -- ['fixKind'] = 'safe_fix',
-    },
-  },
 }