diff options
| author | Gaëtan Covelli <gaetan_covelli@hotmail.com> | 2025-10-21 00:08:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-20 15:08:35 -0700 |
| commit | ad9f25903086ad87f46ca9843c163c8a871709e5 (patch) | |
| tree | 60b1f019ec285f98538e1083e54d8cb6b888a508 /lsp | |
| parent | docs: remove outdated mention of "++force" (diff) | |
| download | nvim-lspconfig-ad9f25903086ad87f46ca9843c163c8a871709e5.tar nvim-lspconfig-ad9f25903086ad87f46ca9843c163c8a871709e5.tar.gz nvim-lspconfig-ad9f25903086ad87f46ca9843c163c8a871709e5.tar.bz2 nvim-lspconfig-ad9f25903086ad87f46ca9843c163c8a871709e5.tar.lz nvim-lspconfig-ad9f25903086ad87f46ca9843c163c8a871709e5.tar.xz nvim-lspconfig-ad9f25903086ad87f46ca9843c163c8a871709e5.tar.zst nvim-lspconfig-ad9f25903086ad87f46ca9843c163c8a871709e5.zip | |
fix(css_variables): wrong root dir if subdir has package.json #4127
Problem:
Root directory is incorrect for projects containing a `package.json` file in subdirectories.
For a project with a given file structure:
```
my-monorepo/
├── package.json
├── yarn.lock
├── css/
│ └── css-variables/
│ ├── color.css
│ └── typography.css
└── components/
└── core/
└── my-feature/
├── package.json ← 2. causes LSP root to stop here
├── feature-component-a/
│ └── feature-component-a.module.css ← 1. current open buffer
└── feature-component-b/
└── feature-component-b.module.css
```
The LSP is using `my-feature` as the root directory. This directory is not the one where the css variables are defined. It leads to an issue where the css variables are not indexed, and from `feature-component-a.module.css` auto-completion and jump to definition are not working.
Solution:
Using the same `root_dir` logic as `ts_ls` (which prefers lockfiles like yarn.lock or .git as root markers) correctly sets the project root to `my-monorepo/`, allowing `css/css-variables/` to be discoverable for the LSP.
Diffstat (limited to 'lsp')
| -rw-r--r-- | lsp/css_variables.lua | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lsp/css_variables.lua b/lsp/css_variables.lua index f9cdbcd4..ce63617b 100644 --- a/lsp/css_variables.lua +++ b/lsp/css_variables.lua @@ -14,7 +14,19 @@ return { cmd = { 'css-variables-language-server', '--stdio' }, filetypes = { 'css', 'scss', 'less' }, - root_markers = { 'package.json', '.git' }, + + -- Taken from lsp/ts_ls.lua to handle simple projects and monorepos. + root_dir = function(bufnr, on_dir) + local root_markers = { 'package-lock.json', 'yarn.lock', 'pnpm-lock.yaml', 'bun.lockb', 'bun.lock' } + -- Give the root markers equal priority by wrapping them in a table + root_markers = vim.fn.has 'nvim-0.11.3' == 1 and { root_markers, { '.git' } } + or vim.list_extend(root_markers, { '.git' }) + -- We fallback to the current working directory if no project root is found + local project_root = vim.fs.root(bufnr, root_markers) or vim.fn.getcwd() + + on_dir(project_root) + end, + -- Same as inlined defaults that don't seem to work without hardcoding them in the lua config -- https://github.com/vunguyentuan/vscode-css-variables/blob/763a564df763f17aceb5f3d6070e0b444a2f47ff/packages/css-variables-language-server/src/CSSVariableManager.ts#L31-L50 settings = { |
