perf: dont set filetype for highlights. Use vim.treesitter.start inst…

…ead. Fixes #104
folke · Oct 23, 2022 · df02aa2 · df02aa2
1 parent f7c093c
commit df02aa2
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -59,18 +59,18 @@ Check the [wiki](https://github.com/folke/noice.nvim/wiki/Configuration-Recipes)
   cmdline = {
     enabled = true, -- enables the Noice cmdline UI
     view = "cmdline_popup", -- view for rendering the cmdline. Change to `cmdline` to get a classic cmdline at the bottom
-    opts = { buf_options = { filetype = "vim" } }, -- enable syntax highlighting in the cmdline
+    opts = { lang = "vim" }, -- enable syntax highlighting in the cmdline
     ---@type table<string, CmdlineFormat>
     format = {
       -- conceal: (default=true) This will hide the text in the cmdline that matches the pattern.
       -- view: (default is cmdline view)
       -- opts: any options passed to the view
       -- icon_hl_group: optional hl_group for the icon
       cmdline = { pattern = "^:", icon = "" },
-      search_down = { kind = "search", pattern = "^/", icon = " ", ft = "regex" },
-      search_up = { kind = "search", pattern = "^%?", icon = " ", ft = "regex" },
-      filter = { pattern = "^:%s*!", icon = "$", ft = "sh" },
-      lua = { pattern = "^:%s*lua%s+", icon = "", ft = "lua" },
+      search_down = { kind = "search", pattern = "^/", icon = " ", lang = "regex" },
+      search_up = { kind = "search", pattern = "^%?", icon = " ", lang = "regex" },
+      filter = { pattern = "^:%s*!", icon = "$", lang = "sh" },
+      lua = { pattern = "^:%s*lua%s+", icon = "", lang = "lua" },
       -- lua = false, -- to disable a format, set to `false`
     },
   },

diff --git a/lua/noice/config/cmdline.lua b/lua/noice/config/cmdline.lua
@@ -26,9 +26,8 @@ function M.setup()
         icon_hl_group = "Noice" .. hl_group_icon,
         view = Config.options.cmdline.view,
         opts = {
-          buf_options = {
-            filetype = format.ft,
-          },
+          ---@diagnostic disable-next-line: undefined-field
+          lang = format.lang or format.ft,
           border = {
             text = {
               top = " " .. kind_cc .. " ",

diff --git a/lua/noice/config/init.lua b/lua/noice/config/init.lua
@@ -11,18 +11,18 @@ M.defaults = {
   cmdline = {
     enabled = true, -- enables the Noice cmdline UI
     view = "cmdline_popup", -- view for rendering the cmdline. Change to `cmdline` to get a classic cmdline at the bottom
-    opts = { buf_options = { filetype = "vim" } }, -- enable syntax highlighting in the cmdline
+    opts = { lang = "vim" }, -- enable syntax highlighting in the cmdline
     ---@type table<string, CmdlineFormat>
     format = {
       -- conceal: (default=true) This will hide the text in the cmdline that matches the pattern.
       -- view: (default is cmdline view)
       -- opts: any options passed to the view
       -- icon_hl_group: optional hl_group for the icon
       cmdline = { pattern = "^:", icon = "" },
-      search_down = { kind = "search", pattern = "^/", icon = " ", ft = "regex" },
-      search_up = { kind = "search", pattern = "^%?", icon = " ", ft = "regex" },
-      filter = { pattern = "^:%s*!", icon = "$", ft = "sh" },
-      lua = { pattern = "^:%s*lua%s+", icon = "", ft = "lua" },
+      search_down = { kind = "search", pattern = "^/", icon = " ", lang = "regex" },
+      search_up = { kind = "search", pattern = "^%?", icon = " ", lang = "regex" },
+      filter = { pattern = "^:%s*!", icon = "$", lang = "bash" },
+      lua = { pattern = "^:%s*lua%s+", icon = "", lang = "lua" },
       -- lua = false, -- to disable a format, set to `false`
     },
   },

diff --git a/lua/noice/config/routes.lua b/lua/noice/config/routes.lua
@@ -103,7 +103,7 @@ function M.defaults()
         event = "noice",
         kind = { "stats", "debug" },
       },
-      opts = { buf_options = { filetype = "lua" }, replace = true, title = "Noice" },
+      opts = { lang = "lua", replace = true, title = "Noice" },
     },
     {
       view = Config.options.lsp_progress.view,

diff --git a/lua/noice/ui/cmdline.lua b/lua/noice/ui/cmdline.lua
@@ -43,7 +43,7 @@ M.events = {
 ---@field icon? string
 ---@field icon_hl_group? string
 ---@field opts? NoiceViewOptions
----@field ft? string
+---@field lang? string
 
 ---@class NoiceCmdline
 ---@field state CmdlineState

diff --git a/lua/noice/view/init.lua b/lua/noice/view/init.lua
@@ -12,6 +12,7 @@ local Format = require("noice.text.format")
 ---@field fallback string Fallback view in case the backend could not be loaded
 ---@field format? NoiceFormat|string
 ---@field align? NoiceAlign
+---@field lang? string
 ---@field view string
 
 ---@alias NoiceViewOptions NoiceViewBaseOptions|NoiceNuiOptions|NoiceNotifyOptions
@@ -199,6 +200,10 @@ function View:render(buf, opts)
     require("nui.utils")._.set_buf_options(buf, self._opts.buf_options)
   end
 
+  if self._opts.lang and not vim.b[buf].ts_highlight then
+    vim.treesitter.start(buf, self._opts.lang)
+  end
+
   vim.api.nvim_buf_clear_namespace(buf, Config.ns, linenr - 1, -1)
 
   if not opts.highlight then