Update

diff --git a/colors/marked.lua b/colors/marked.lua
index bdf5263ca55ca17f369e8e55e966d9de0b18ff8b..abcb0e0a1ce9858e3770db4e29a5fedb438504d5 100644 (file)
--- a/colors/marked.lua
+++ b/colors/marked.lua
@@ -83,7 +83,7 @@ local colors = {
        identifier = { fg = p.black, },
        func = { fg = p.black, },
        include = { fg = p.black, },
-       type = { fg = p.black, bg = p.red },
+       type = { fg = p.black, bg = p.red , bold = false },
 
        error = { fg = p.white, bg = p.errors, bold = true, },
        warn = { fg = p.black, bg = p.warnings, bold = true, },
@@ -238,6 +238,8 @@ local marked = {
        ["@text.uri"] = colors.uri,
        ["@container"] = colors.string,
 
+       Type = colors.default,
+
        --- Temporary Bug Fixes
        -- markdownError = colors.default,
 }
@@ -250,7 +252,6 @@ local disable = {
        Number = colors.default,
        Boolean = colors.default,
        Float = colors.default,
-       Type = colors.default,
        TypeDef = colors.default,
 
        ["@string.escape"] = colors.default,
@@ -261,6 +262,10 @@ local disable = {
        ["@branch"] = colors.default,
        ["@loop"] = colors.default,
        ["@goto"] = colors.default,
+       ["@constant"] = colors.default,
+       ["@type.builtin"] = colors.default,
+       ["@type.created"] = colors.default,
+       -- ["@module"] = colors.default,
 }
 
 local default = {
@@ -271,12 +276,15 @@ local default = {
        Number = colors.nums,
        Boolean = colors.bool,
        Float = colors.nums,
-       Type = colors.type,
        TypeDef = colors.type,
 
        ["@string.escape"] = colors.nums,
        ["@tag"] = colors.tag,
        ["@tag.attribute"] = colors.nums,
+       ["@type.builtin"] = colors.type,
+       ["@type.created"] = colors.type,
+       -- ["@module"] = colors.type,
+       ["@constant"] = colors.const,
 
        -- Disable
        ["@branch"] = colors.default,
@@ -297,12 +305,15 @@ local control_flow = {
        Number = colors.default,
        Boolean = colors.default,
        Float = colors.default,
-       Type = colors.default,
        TypeDef = colors.default,
 
        ["@string.escape"] = colors.default,
        ["@tag"] = colors.default,
        ["@tag.attribute"] = colors.default,
+       ["@constant"] = colors.default,
+       ["@type.builtin"] = colors.default,
+       ["@type.created"] = colors.default,
+       -- ["@module"] = colors.default,
 }
 
 -- - `RainbowDelimiterRed`

diff --git a/lazy-lock.json b/lazy-lock.json
index 02df08f00ecc2d726122f7a04aa32bd685216036..5c370d9994fae7137f4cca239f3c3e64b3a584db 100644 (file)
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,40 +1,40 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
-  "dashboard-nvim": { "branch": "master", "commit": "04a48b2e230bc5e50dd099d839443703023b0472" },
-  "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
-  "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
+  "dashboard-nvim": { "branch": "master", "commit": "5182c09ac8085dc73b78ad0ea9f5479c9a866fc4" },
+  "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
+  "lazy.nvim": { "branch": "main", "commit": "5d29ffeaa0f2d91f1dfbc21943d19a11e59a6fc6" },
   "leap-ast.nvim": { "branch": "main", "commit": "1a21b70505ebb868a1e196c0d63797e1426b53a5" },
-  "leap.nvim": { "branch": "main", "commit": "e285f3c9a3fb11367f859faf553d28f332da0a2c" },
-  "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" },
-  "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
-  "none-ls.nvim": { "branch": "main", "commit": "c10b7be7751aee820a02f2d1fafe76bc316fe223" },
-  "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" },
-  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
-  "nvim-lspconfig": { "branch": "master", "commit": "0a1a2aa549da0d2294e072e2d725f02cca32f64e" },
-  "nvim-surround": { "branch": "main", "commit": "f81bbef3da28bd2a7d5a736575c71f3f953d49f9" },
-  "nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" },
-  "nvim-treesitter": { "branch": "master", "commit": "5973b617a9a48212e40c5c0a0727ad7c91b27484" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" },
-  "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" },
-  "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
+  "leap.nvim": { "branch": "main", "commit": "b1ecfb63c0b8babfd0dcd6b5ca6de37bbf3526cd" },
+  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" },
+  "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
+  "none-ls.nvim": { "branch": "main", "commit": "37671797d6e5f9bd0ee3ab965ab2e6de251e1930" },
+  "nvim-autopairs": { "branch": "master", "commit": "b0b79e42a28f09719a7da9534c3731fa37319d9b" },
+  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
+  "nvim-lspconfig": { "branch": "master", "commit": "6d2ae9fdc3111a6e8fd5db2467aca11737195a30" },
+  "nvim-surround": { "branch": "main", "commit": "79aaa42da1f698ed31bcbe7f83081f69dca7ba17" },
+  "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" },
+  "nvim-treesitter": { "branch": "master", "commit": "1eabe69bfa8f78e14fcf5d42a2b3881babaca30a" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "55e29081e73d2e4b2d62fb4dc3eebe21bf66a1e2" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "aeb7090098722ffce16597bd0331105495640153" },
+  "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" },
+  "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
   "rainbow-delimiters": { "branch": "feature/fill", "commit": "d32ad456a9d736987e603d6631b7c9af7f19659f" },
-  "rustaceanvim": { "branch": "master", "commit": "5dc35a075ad7c9d2f6493065e1e5970e4ad61504" },
+  "rustaceanvim": { "branch": "master", "commit": "66466d4fe0b8988ba9e2932d3c41782c2efb683b" },
   "syntax-tree-surfer": { "branch": "master", "commit": "732ea6d0f868bcccd2f526be73afa46997d5a2fb" },
-  "telescope-frecency.nvim": { "branch": "master", "commit": "a61ede8740643f09e1a7706fbb49b152e8f25d42" },
-  "telescope.nvim": { "branch": "master", "commit": "236083884cfe6c874e03e6cb4e7cb08809c1333c" },
-  "toggleterm.nvim": { "branch": "main", "commit": "b49df5cdce67a8964d1b027dae94bde212092b51" },
-  "undotree": { "branch": "master", "commit": "7df3be7a261ea31b528aa442b494fcb458f3d968" },
+  "telescope-frecency.nvim": { "branch": "master", "commit": "6b6565e6584c86ca501bdac485cbdc2ca64556e4" },
+  "telescope.nvim": { "branch": "master", "commit": "0c12735d5aff6a48ffd8111bf144dc2ff44e5975" },
+  "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
+  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
   "vim-bufsurf": { "branch": "master", "commit": "e6dbc7ad66c7e436e5eb20d304464e378bd7f28c" },
-  "vim-visual-multi": { "branch": "master", "commit": "e67f7fa011c98fc5426352d3bb06362a0f70af3c" },
+  "vim-visual-multi": { "branch": "master", "commit": "b84a6d42c1c10678928b0bf8327f378c8bc8af5a" },
   "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 }
\ No newline at end of file

diff --git a/lua/lsp.lua b/lua/lsp.lua
index 863ec0951184adfe21fd075a209e4eff92946d0c..ba1f30b134355fe64923a67a64c459b7a26c8e8d 100644 (file)
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -170,9 +170,7 @@ if status_ok_null_ls then
                        null_ls.builtins.formatting.black,
                        null_ls.builtins.formatting.isort,
                        null_ls.builtins.formatting.prettier,
-                       null_ls.builtins.formatting.rustfmt,
                        null_ls.builtins.diagnostics.mypy,
-                       null_ls.builtins.diagnostics.flake8,
                },
        })
 end

diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 19098f5a093e7ec65dcfa839283dd28ce677314e..5d2c54ca8e4880d9afd6ff7a9a94408310ab92b3 100644 (file)
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -1,5 +1,7 @@
 ;; extends
 
+(type_identifier) @type.created
+
 (if_statement) @branch
 (case_statement) @branch
 (for_statement) @loop

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index af2adc6e9b0d815278d2cea045b6be002e0795a3..123b1b72888b704f84c007db2e08cd6609518f75 100644 (file)
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -1,5 +1,7 @@
 ;; extends
 
+(type_identifier) @type.created
+
 (if_statement) @branch
 (case_clause) @branch
 (for_statement) @loop

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
new file mode 100644 (file)
index 0000000..23b0d72
--- /dev/null
+++ b/queries/rust/highlights.scm
@@ -0,0 +1,3 @@
+;; extends
+
+(type_identifier) @type.created