Merge branch 'feature-ts'

vim/my.nvim/coc-settings.json

@@ -17,28 +17,9 @@
             "ignoredRootPaths": [
                 "~"
             ]
-        },
-        "lua": {
-            "command": "lua-language-server",
-            "filetypes": [
-                "lua"
-            ],
-            "settings": {
-                "Lua": {
-                    "workspace.library": {
-                        "/usr/share/nvim/runtime/lua": true,
-                        "/usr/share/nvim/runtime/lua/vim": true,
-                        "/usr/share/nvim/runtime/lua/vim/lsp": true
-                    },
-                    "diagnostics": {
-                        "globals": [
-                            "vim"
-                        ]
-                    }
-                }
-            }
         }
     },
+    "sumneko-lua.enableNvimLuaDev": true,
     "java.import.maven.enabled": true,
     "java.errors.incompleteClasspath.severity": "ignore",
     "python.jediEnabled": false,

vim/my.nvim/lazy-lock.json

@@ -1,17 +1,16 @@
 {
   "asyncrun.vim": { "branch": "master", "commit": "61cc3081963a12048e00e89f8cedc8bd1cb83b8c" },
   "asynctasks.vim": { "branch": "master", "commit": "7b77b195a4297d3e4c9dde01c20aa6be17e3fcf3" },
-  "barbar.nvim": { "branch": "master", "commit": "283bceab39f549c5e5228212661750704fcfcd9e" },
+  "barbar.nvim": { "branch": "master", "commit": "40c176c9af7e9aefe3af9ec9d985a3edb50d66a3" },
   "challenger-deep": { "branch": "master", "commit": "e3d5b7d9711c7ebbf12c63c2345116985656da0d" },
-  "challenger-deep-theme": { "branch": "master", "commit": "e3d5b7d9711c7ebbf12c63c2345116985656da0d" },
   "cmake4vim": { "branch": "master", "commit": "79692cfd49457c08768ff584aab32cbb05c97800" },
   "coc-fzf": { "branch": "master", "commit": "5fae5a15497750483e21fc207aa6005f340f02f2" },
   "coc-go": { "branch": "feature-goimpl-list", "commit": "eb6c007b3de9a6a4fc41d642a0b8ecfdb0660f0f" },
-  "coc.nvim": { "branch": "master", "commit": "9181a83f14929e7cb62069d4c61c7515e78674e4" },
+  "coc.nvim": { "branch": "master", "commit": "baac60ac1676cd5640648af9f07c15be24041a3e" },
   "copilot.vim": { "branch": "release", "commit": "2c31989063b145830d5f0bea8ab529d2aef2427b" },
   "dash.vim": { "branch": "master", "commit": "25b17d9488454a1fcdbb2cbe829a23226f95e3c2" },
   "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
-  "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
+  "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
   "fzf": { "branch": "master", "commit": "8b0e1f941a419258b0877d9a5f71373d76472043" },
   "fzf-filemru": { "branch": "master", "commit": "090087d1b786758c9d2cb7e02dcdc2dcb2f3b605" },
   "fzf-preview.vim": { "branch": "release/rpc", "commit": "61fe1af3dbe96c2d45efd5cec5e54634e397fbef" },
@@ -21,24 +20,25 @@
   "goyo.vim": { "branch": "master", "commit": "fa0263d456dd43f5926484d1c4c7022dfcb21ba9" },
   "gruvbox": { "branch": "master", "commit": "f1ecde848f0cdba877acb0c740320568252cc482" },
   "indentLine": { "branch": "master", "commit": "b96a75985736da969ac38b72a7716a8c57bdde98" },
-  "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" },
+  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
   "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mirror.vim": { "branch": "master", "commit": "fe732ee567fcd2b25191a80b7ac2a880a74ff5c6" },
   "mynvim": { "branch": "master", "commit": "a2539d211f0f41a4301220d2b95de9360ba5ab47" },
-  "nerdcommenter": { "branch": "master", "commit": "1b53686d5f1d1607dc67430e9243283fee3a9764" },
+  "nerdcommenter": { "branch": "master", "commit": "66c07e4083ab02ed2540ac289cc602c70b858c13" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
   "nvim-coverage": { "branch": "main", "commit": "13e357d4a2a230070c64ede61252225f0b7d3b5e" },
-  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
+  "nvim-dap-ui": { "branch": "master", "commit": "0d5c37a43bc039c42a0a9bf801e53f77adf06a24" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
   "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
   "nvim-osc52": { "branch": "main", "commit": "89307570b3bffe115d8b6b6fd3a4066cde0ba2d7" },
-  "nvim-treesitter": { "branch": "master", "commit": "584ccea56e2d37b31ba292da2b539e1a4bb411ca" },
+  "nvim-transparent": { "branch": "main", "commit": "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21" },
+  "nvim-treesitter": { "branch": "master", "commit": "6587a5886873cce8698a47477224c30578b33a24" },
   "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" },
   "onedark.vim": { "branch": "main", "commit": "57b77747694ea5676c3ca0eeaf9567dc499730c0" },
   "open-browser.vim": { "branch": "master", "commit": "7d4c1d8198e889d513a030b5a83faa07606bac27" },
   "orgmode": { "branch": "master", "commit": "cbb10d4c7514680e90f791d62f1168cb87aad0ce" },
-  "papercolor-theme": { "branch": "master", "commit": "9051480ad9129ff4ab4fffb38b44779b9081626f" },
+  "papercolor-theme": { "branch": "master", "commit": "0cfe64ffb24c21a6101b5f994ca342a74c977aef" },
   "persistent-breakpoints.nvim": { "branch": "main", "commit": "db2ad5974b0435cb806cd287e7525219d6ac4bd3" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
   "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
@@ -47,7 +47,7 @@
   "sniprun": { "branch": "master", "commit": "7a8bc30fcf04fd4efec43be368f12eb4266fabf6" },
   "space-vim-dark": { "branch": "master", "commit": "0ab698bd2a3959e3bed7691ac55ba4d8abefd143" },
   "stylish.nvim": { "branch": "main", "commit": "63c21552bce62175f2d067a92bf7c856e062c314" },
-  "switch.vim": { "branch": "main", "commit": "68d269301181835788dcdcb6d5bca337fb954395" },
+  "switch.vim": { "branch": "main", "commit": "0de9b271dfb840e71e36e831f6a487f3422ff562" },
   "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
   "targets.vim": { "branch": "master", "commit": "642d3a4ce306264b05ea3219920b13ea80931767" },
   "telescope-coc.nvim": { "branch": "master", "commit": "a1aaabdb3b546f63d24f1fd156dfb1ddc0bc03de" },
@@ -69,7 +69,7 @@
   "vim-dispatch": { "branch": "master", "commit": "6cc2691576f97d43f8751664d1a1a908b99927e5" },
   "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
   "vim-fixkey": { "branch": "main", "commit": "53c832b91af983cd7963b681625bc586ce330d00" },
-  "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" },
+  "vim-fugitive": { "branch": "master", "commit": "d74a7cff4cfcf84f83cc7eccfa365488f3bbabc2" },
   "vim-keysound": { "branch": "master", "commit": "6c662549b477f79347c32fb3683432137c391a96" },
   "vim-markdown": { "branch": "master", "commit": "46add6c3017d3e4035dc10ffa9cb54221d8dfe1a" },
   "vim-matchup": { "branch": "master", "commit": "71b97bac53aa09760e8d8c36767c657b274c468d" },
@@ -86,7 +86,7 @@
   "vim-startify": { "branch": "master", "commit": "4e089dffdad46f3f5593f34362d530e8fe823dcf" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "vim-swap": { "branch": "master", "commit": "fecb76d5d68494a2e75b37847d5744526ffa0f14" },
-  "vim-table-mode": { "branch": "master", "commit": "4ff8de2ac93431ee6d85a9e04177012752e6abdc" },
+  "vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" },
   "vim-template": { "branch": "master", "commit": "0bf607233719a0ed6e14bf0197ba8950bf8833fc" },
   "vim-visual-multi": { "branch": "master", "commit": "aec289a9fdabaa0ee6087d044d75b32e12084344" },
   "vim-vue": { "branch": "master", "commit": "c424294e769b26659176065f9713c395731f7b3a" },

vim/my.nvim/lua/lualib_bundle.lua

@@ -1094,6 +1094,11 @@ do
         end
         if __TS__StringIncludes(_VERSION, "Lua 5.0") then
             return debug.traceback(("[Level " .. tostring(level)) .. "]")
+        elseif _VERSION == "Lua 5.1" then
+            return string.sub(
+                debug.traceback("", level),
+                2
+            )
         else
             return debug.traceback(nil, level)
         end
@@ -1102,7 +1107,7 @@ do
         return function(self)
             local description = getDescription(self)
             local caller = debug.getinfo(3, "f")
-            local isClassicLua = __TS__StringIncludes(_VERSION, "Lua 5.0") or _VERSION == "Lua 5.1"
+            local isClassicLua = __TS__StringIncludes(_VERSION, "Lua 5.0")
             if isClassicLua or caller and caller.func ~= error then
                 return description
             else
@@ -1126,7 +1131,7 @@ do
         end
         self.message = message
         self.name = "Error"
-        self.stack = getErrorStack(nil, self.constructor.new)
+        self.stack = getErrorStack(nil, __TS__New)
         local metatable = getmetatable(self)
         if metatable and not metatable.__errorToStringPatched then
             metatable.__errorToStringPatched = true

vim/my.nvim/lua/plugins/treesitter.lua

@@ -4,7 +4,7 @@ end
 
 require 'nvim-treesitter.configs'.setup {
     -- One of "all", "maintained" (parsers with maintainers), or a list of languages
-    --ensure_installed = {"go","c","cpp","rust","java","javascript",},
+    ensure_installed = {"go","c","cpp","rust","java","javascript","lua"},
     --ensure_installed = "maintained",
 
     -- Install languages synchronously (only applied to `ensure_installed`)

vim/my.nvim/lua/setup.lua

@@ -135,7 +135,7 @@ function ensurePlugins(dir)
         "nvim-telescope/telescope.nvim",
         {[1] = "nvim-telescope/telescope-fzf-native.nvim", build = "make"},
         "fannheyward/telescope-coc.nvim",
-        "nvim-treesitter/nvim-treesitter",
+        {[1] = "nvim-treesitter/nvim-treesitter", build = ":TSUpdate"},
         "xiyaowong/nvim-transparent",
         "github/copilot.vim",
         "theHamsta/nvim-dap-virtual-text",
@@ -198,7 +198,8 @@ function configCoc()
         "[email protected]",
         "[email protected]",
         "[email protected]",
-        "[email protected]"
+        "[email protected]",
+        "[email protected]"
     }
 end
 function configVim()

vim/my.nvim/ts/setup.ts

@@ -149,7 +149,7 @@ function ensurePlugins(dir: string) {
       "nvim-telescope/telescope.nvim",
       { 1: "nvim-telescope/telescope-fzf-native.nvim", build: "make" },
       "fannheyward/telescope-coc.nvim",
-      "nvim-treesitter/nvim-treesitter",
+      { 1: "nvim-treesitter/nvim-treesitter", build: ":TSUpdate" },
       "xiyaowong/nvim-transparent",
       "github/copilot.vim",
       "theHamsta/nvim-dap-virtual-text",
@@ -223,6 +223,7 @@ function configCoc() {
     "[email protected]",
     "[email protected]",
     "[email protected]",
+    "[email protected]",
   ];
 }