Merge branch 'main' into develop

3 years ago · a3552db7bc
9 changed files with 111 additions and 48 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -116,7 +116,17 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/2058566?v=4",
      "profile": "https://github.com/bdillahu",
      "contributions": [
-        "doc"
+        "doc",
+        "bug"
+      ]
+    },
+    {
+      "login": "amxj9",
+      "name": "amxj9",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2029709?v=4",
+      "profile": "https://github.com/amxj9",
+      "contributions": [
+        "bug"
      ]
    }
  ],
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -7,6 +7,42 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

+## [3.0.7] - 2021-07-13
+
+### Fixed
+
+- Properly lazy-load `format.nvim`
+- Stop lazy-loading `friendly-snippets`
+
+## [3.0.6] - 2021-07-13
+
+### Fixed
+
+- Added `neorg` to completion sources
+- Properly setup for `LuaSnip` + `friendly-snippets`
+
+## [3.0.5] - 2021-07-13
+
+### Fixed
+
+- Do not try to automatically install servers on start if the lspinstall plugin
+  is not loaded
+- Set termguicolors on start instead of wait for the UI module, avoid a strange
+  error that I was having with packer
+
+## [3.0.4] - 2021-07-13
+
+### Fixed
+
+- `doom-themes` plugin was loaded incorrectly
+- Custom keymaps were not working in the `doom_config.lua` file
+
+## [3.0.3] - 2021-07-12
+
+### Changed
+
+- Reverted [3.0.2] changes
+
 ## [3.0.2] - 2021-07-12

 ### Fixed
@ -370,7 +406,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 - Initial stable release

-[unreleased]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.2...develop
+[unreleased]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.7...develop
+[3.0.6]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.6...v3.0.7
+[3.0.6]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.5...v3.0.6
+[3.0.5]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.4...v3.0.5
+[3.0.4]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.3...v3.0.4
+[3.0.3]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.2...v3.0.3
 [3.0.2]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.1...v3.0.2
 [3.0.1]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.0...v3.0.1
 [3.0.0]: https://github.com/NTBBloodbath/doom-nvim/compare/v2.3.6...v3.0.0
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@
 ![Neovim version](https://img.shields.io/badge/Neovim-0.5-57A143?style=for-the-badge&logo=neovim)

 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-12-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-13-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 [Features](#features) • [Install](#install) • [Documentation] • [Contribute](#contribute)
@ -175,7 +175,8 @@ Special thanks to these amazing people for helping improve doom (see [emoji key]
    <td align="center"><a href="https://github.com/ZeusThundr"><img src="https://avatars.githubusercontent.com/u/76399616?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ZeusThundr</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/issues?q=author%3AZeusThundr" title="Bug reports">🐛</a></td>
    <td align="center"><a href="https://github.com/leonistor"><img src="https://avatars.githubusercontent.com/u/310468?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leo Nistor</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/issues?q=author%3Aleonistor" title="Bug reports">🐛</a></td>
    <td align="center"><a href="https://github.com/notusknot"><img src="https://avatars.githubusercontent.com/u/69602000?v=4?s=100" width="100px;" alt=""/><br /><sub><b>notusknot</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/commits?author=notusknot" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/bdillahu"><img src="https://avatars.githubusercontent.com/u/2058566?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bruce Dillahunty</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/commits?author=bdillahu" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/bdillahu"><img src="https://avatars.githubusercontent.com/u/2058566?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bruce Dillahunty</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/commits?author=bdillahu" title="Documentation">📖</a> <a href="https://github.com/NTBBloodbath/doom-nvim/issues?q=author%3Abdillahu" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/amxj9"><img src="https://avatars.githubusercontent.com/u/2029709?v=4?s=100" width="100px;" alt=""/><br /><sub><b>amxj9</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/issues?q=author%3Aamxj9" title="Bug reports">🐛</a></td>
  </tr>
 </table>

--- a/install.sh
+++ b/install.sh
@ -12,15 +12,15 @@
 Color_reset='\033[0m' # Reset

 ## Normal colors
-Black='\033[0;30m'  # Black
+Black='\033.0.70m'  # Black
 Gray='\033[0;90m'   # Gray
-White='\033[0;37m'  # White
-Red='\033[0;31m'    # Red
-Blue='\033[0;34m'   # Blue
-Cyan='\033[0;36m'   # Cyan
-Purple='\033[0;35m' # Purple
-Green='\033[0;32m'  # Green
-Yellow='\033[0;33m' # Yellow
+White='\033.0.77m'  # White
+Red='\033.0.71m'    # Red
+Blue='\033.0.74m'   # Blue
+Cyan='\033.0.76m'   # Cyan
+Purple='\033.0.75m' # Purple
+Green='\033.0.72m'  # Green
+Yellow='\033.0.73m' # Yellow

 ## Bold colors
 BBlack='\033[1;30m'  # Black
--- a/lua/doom/core/config/init.lua
+++ b/lua/doom/core/config/init.lua
@ -24,6 +24,11 @@ else
 	)
 end

+-- Set termguicolors on load
+if vim.fn.has('vim_starting') then
+	vim.opt.termguicolors = true
+end
+
 -- {{{ Default doom_config values

 -- default_doom_config_values loads the default doom_config values
@ -418,29 +423,36 @@ end
 --
 -- @param langs The list of languages in the doomrc
 M.install_servers = function(langs)
-	local lspinstall = require('lspinstall')
-	local installed_servers = lspinstall.installed_servers()
-	local available_servers = lspinstall.available_servers()
-
-	for _, lang in ipairs(langs) do
-		local lang_str = lang
-		lang = lang:gsub('%s+%+lsp', '')
-
-		-- If the +lsp flag exists and the language server is not installed yet
-		if
-			lang_str:find('%+lsp')
-			and (not utils.has_value(installed_servers, lang))
-		then
-			-- Try to install the server only if there is a server available for
-			-- the language, oterwise raise a warning
-			if utils.has_value(available_servers, lang) then
-				lspinstall.install_server(lang)
-			else
-				log.warn(
-					'The language '
-						.. lang
-						.. ' does not have a server, please remove the "+lsp" flag'
-				)
+	-- selene: allow(undefined_variable)
+	if
+		packer_plugins
+		and packer_plugins['lspinstall']
+		and packer_plugins['lspinstall'].loaded
+	then
+		local lspinstall = require('lspinstall')
+		local installed_servers = lspinstall.installed_servers()
+		local available_servers = lspinstall.available_servers()
+
+		for _, lang in ipairs(langs) do
+			local lang_str = lang
+			lang = lang:gsub('%s+%+lsp', '')
+
+			-- If the +lsp flag exists and the language server is not installed yet
+			if
+				lang_str:find('%+lsp')
+				and (not utils.has_value(installed_servers, lang))
+			then
+				-- Try to install the server only if there is a server available for
+				-- the language, oterwise raise a warning
+				if utils.has_value(available_servers, lang) then
+					lspinstall.install_server(lang)
+				else
+					log.warn(
+						'The language '
+							.. lang
+							.. ' does not have a server, please remove the "+lsp" flag'
+					)
+				end
 			end
 		end
 	end
--- a/lua/doom/core/functions/init.lua
+++ b/lua/doom/core/functions/init.lua
@ -67,7 +67,7 @@ M.load_custom_settings = function(settings_tbl, scope)
 			local opts = { silent = true }
 			for _, map in ipairs(settings_tbl) do
 				-- scope, lhs, rhs, options
-				map(map[1], map[2], map[3], opts)
+				utils.map(map[1], map[2], map[3], opts)
 			end
 		elseif scope == 'variables' then
 			for var, val in pairs(settings_tbl) do
--- a/lua/doom/modules/config/doom-compe.lua
+++ b/lua/doom/modules/config/doom-compe.lua
@ -24,8 +24,10 @@ return function()
 			vsnip = false,
 			nvim_lsp = true,
 			nvim_lua = true,
+			luasnip = true,
 			spell = false,
 			tags = true,
+			neorg = true,
 			snippets_nvim = false,
 			treesitter = true,
 		},
--- a/lua/doom/modules/config/doom-luasnip.lua
+++ b/lua/doom/modules/config/doom-luasnip.lua
@ -0,0 +1,3 @@
+return function()
+	require('luasnip.loaders.from_vscode').lazy_load()
+end
--- a/lua/doom/modules/init.lua
+++ b/lua/doom/modules/init.lua
@ -90,7 +90,7 @@ packer.startup(function(use)
 	use({
 		'GustavoPrietoP/doom-themes.nvim',
 		disable = disabled_doom_themes,
-		event = 'TabNewEntered',
+		event = 'ColorSchemePre',
 	})

 	-- Development icons
@ -276,16 +276,10 @@ packer.startup(function(use)
 	local disabled_snippets = functions.is_plugin_disabled('snippets')
 	use({
 		'L3MON4D3/LuaSnip',
-		commit = '24f3317166a91db3d8f16fbaa610b1cfa6615f14',
-		disable = (disabled_lsp and true or disabled_snippets),
-		opt = true,
-		after = 'nvim-compe',
-	})
-	use({
-		'rafamadriz/friendly-snippets',
-		disable = (disabled_lsp and true or disabled_snippets),
-		opt = true,
-		after = 'nvim-compe',
+		config = require('doom.modules.config.doom-luasnip'),
+		disable = disabled_snippets,
+		requires = { 'rafamadriz/friendly-snippets' },
+		event = 'BufWinEnter',
 	})

 	-- install lsp saga
@ -323,7 +317,7 @@ packer.startup(function(use)
 		'lukas-reineke/format.nvim',
 		config = require('doom.modules.config.doom-format'),
 		disable = disabled_formatter,
-		cmd = { 'Format', 'FormatWrite' },
+		event = 'BufWinEnter',
 	})

 	-- Autopairs