Skip to content

Sync with main#1563

Merged
charliie-dev merged 69 commits into0.12from
main
Apr 1, 2026
Merged

Sync with main#1563
charliie-dev merged 69 commits into0.12from
main

Conversation

@charliie-dev
Copy link
Copy Markdown
Collaborator

As title, since we should start working on 0.12 as #1562 stated.

Jint-lzxy and others added 30 commits August 7, 2025 12:34
Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
* Revert "fix: remove manual `LspStart`, close #1478. (#1479)"

This reverts commit 7dab4b9.

* Revert "fixup(#1466): load lsp config with proper event. (#1472)"

This reverts commit 53eeeec.

* fix: LSP start logic

This should acc fix #1472 and #1479 cuz iirc the root cause was that lspconfig
changed how `LspStart` works. Now it only starts one _specific_ server (passed
via the first argument), instead of starting all matching servers automatically.
So we gotta manually start all the servers that match the current filetype
instead.

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>

* fix: redundant return

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>

* fix: invoke `:LspStart` correctly

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>

---------

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
Co-authored-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
* feat(mason)!: migrate to v2.x

Just wrapped up going thru all the changes in mason 2.x (and nvim 0.11 too)!
This should be a follow up to #1466 and (hopefully) fix all the issues related
to the updated LSP API (like servers not spawning and other weirdness) and works
together w #1496.

Acc the main issue was that some mason package names don't match their names in
lspconfig, so just using `lsp_deps` directly works for most, but breaks a bunch
of others (tldr: that mismatch is what was causing all the edge cases and broken
behavior).

I also went ahead and enabled `automatic_installation` because why not lol means
we don't have to manually call `vim.lsp.enable()` for everything, which might
save a tiny bit of perf too.

Didn't test this super thoroughly yet so pls lmk if anything's still broken!

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>

* fixup! feat(mason)!: migrate to v2.x

* fixup! feat(mason)!: migrate to v2.x

* fixup! feat(mason)!: migrate to v2.x

* fix: LSP start logic (#1496)

* Revert "fix: remove manual `LspStart`, close #1478. (#1479)"

This reverts commit 7dab4b9.

* Revert "fixup(#1466): load lsp config with proper event. (#1472)"

This reverts commit 53eeeec.

* fix: LSP start logic

This should acc fix #1472 and #1479 cuz iirc the root cause was that lspconfig
changed how `LspStart` works. Now it only starts one _specific_ server (passed
via the first argument), instead of starting all matching servers automatically.
So we gotta manually start all the servers that match the current filetype
instead.

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>

---------

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>

* fix: unresolved nvim_lsp

* feat(lsp): unify language server setup

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>

---------

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
Co-authored-by: ayamir <lgt986452565@gmail.com>
* refactor(tool): simplify fzf-lua usage and improve lazy loading

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>

* feat: minor optimizations

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>

* style: remove reduntant short circuit logic.

---------

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
Co-authored-by: ayamir <lgt986452565@gmail.com>
Co-authored-by: misumisumi <s.kobayashi@misumi-sumi.com>
* perf(ci): make bot commit verified and add `dependabot` for ci component autoupdate

* chore(doc): update username from `CharlesChiuGit` to `charliie-dev`
ayamir and others added 28 commits November 30, 2025 19:15
details: olimorris/codecompanion.nvim#2439

Co-authored-by: liuguangtian.1024 <liuguangtian.1024@bytedance.com>
* feat!(plugins.editor): set `nvim-treesitter` and `nvim-treesitter-textobjects` branch to `main`

* fix(lockfile): manually remove lockfile to make branch-changing effective

* feat!(configs.editor): migrate `treesitter` and `ts-textobjects` config

* feat!(keymap.editor): move `ts-textobjects`' keymap here

---------

Signed-off-by: Charles Chiu <mail@charliie.dev>
Fixes #1545

When toggleterm terminal has not been created yet, `require("toggleterm.terminal").get(1)` returns nil, causing an error when trying to access `term.direction`.

This commit adds a nil check before accessing the direction property to prevent the error.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
Co-authored-by: misumisumi <s.kobayashi@misumi-sumi.com>
* fix: using project's clang-format config first.

* fix: style lua ci/cd
* fix(codecompanion): update to v18

* fix(settings): remove jsonc treesitter

- jsonc is not available on upstream by nvim-treesitter/nvim-treesitter#8316

---------

Co-authored-by: misumisumi <s.kobayashi@misumi-sumi.com>
* refactor: use telescope/fzf-lua to replace glance.nvim

* fix(ci): lint code

* refactor(ci): remove lint args
Copy link
Copy Markdown
Owner

@ayamir ayamir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@charliie-dev charliie-dev merged commit 7dec501 into 0.12 Apr 1, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants