From b0e1e68e78429659f6fd3b26e6691e921fa0d7e1 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 11 Jul 2024 23:32:05 -0400 Subject: [PATCH] fix(cc): disable modern-cpp-font-lock if +tree-sitter Fix: #7941 --- modules/lang/cc/README.org | 2 +- modules/lang/cc/config.el | 1 + modules/lang/cc/packages.el | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/lang/cc/README.org b/modules/lang/cc/README.org index bf4d3eac7..158b3fef8 100644 --- a/modules/lang/cc/README.org +++ b/modules/lang/cc/README.org @@ -35,7 +35,7 @@ This module adds support for the C-family of languages: C, C++, and Objective-C. - [[doom-package:demangle-mode]] - [[doom-package:disaster]] - [[doom-package:glsl-mode]] -- [[doom-package:modern-cpp-font-lock]] +- [[doom-package:modern-cpp-font-lock]] unless [[doom-module:+tree-sitter]] - [[doom-package:opencl-mode]] - if [[doom-module:+lsp]] - [[doom-package:ccls]] if [[doom-module::tools lsp -eglot]] diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index c4b0ce5ad..dbccd6d8a 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -135,6 +135,7 @@ This is ignored by ccls.") (use-package! modern-cpp-font-lock + :unless (modulep! +tree-sitter) :hook (c++-mode . modern-c++-font-lock-mode)) diff --git a/modules/lang/cc/packages.el b/modules/lang/cc/packages.el index fd86fe895..edd29fec0 100644 --- a/modules/lang/cc/packages.el +++ b/modules/lang/cc/packages.el @@ -7,7 +7,8 @@ (package! cuda-mode :pin "7f593518fd135fc6af994024bcb47986dfa502d2") (package! demangle-mode :pin "04f545adab066708d6151f13da65aaf519f8ac4e") (package! disaster :pin "16bba9afb92aacf06c088c29ba47813b65a80d87") -(package! modern-cpp-font-lock :pin "43c6b68ff58fccdf9deef11674a172e4eaa8455c") +(unless (modulep! +tree-sitter) + (package! modern-cpp-font-lock :pin "43c6b68ff58fccdf9deef11674a172e4eaa8455c")) (package! opencl-mode :pin "10ae7742d57ae79d96cf52753800b3490589b3f6") (when (package! glsl-mode :pin "9b2e5f28e489a1f73c4aed734105618ac0dc0c43")