mirror of
				https://github.com/NotAShelf/nvf.git
				synced 2025-10-31 11:02:37 +00:00 
			
		
		
		
	Merge pull request #900 from ckoehler/fix-rustfmt
lannguages/rust: disable conform while LSP is enabled
This commit is contained in:
		
				commit
				
					
						7a4f8132e4
					
				
			
		
					 2 changed files with 11 additions and 2 deletions
				
			
		|  | @ -347,6 +347,8 @@ | |||
| - Fix default telescope ignore list entry for '.git/' to properly match | ||||
| - Add [gitlinker.nvim] plugin to `vim.git.gitlinker-nvim` | ||||
| - Add [nvim-treesitter-textobjects] plugin to `vim.treesitter.textobjects` | ||||
| - Default to disabling Conform for Rust if rust-analyzer is used | ||||
|   - To force using Conform, set `languages.rust.format.enable = true`. | ||||
| 
 | ||||
| [rrvsh](https://github.com/rrvsh): | ||||
| 
 | ||||
|  |  | |||
|  | @ -7,7 +7,7 @@ | |||
|   inherit (builtins) attrNames; | ||||
|   inherit (lib.meta) getExe; | ||||
|   inherit (lib.modules) mkIf mkMerge; | ||||
|   inherit (lib.options) mkOption mkEnableOption; | ||||
|   inherit (lib.options) mkOption mkEnableOption literalMD; | ||||
|   inherit (lib.strings) optionalString; | ||||
|   inherit (lib.trivial) boolToString; | ||||
|   inherit (lib.lists) isList; | ||||
|  | @ -68,7 +68,14 @@ in { | |||
|     }; | ||||
| 
 | ||||
|     format = { | ||||
|       enable = mkEnableOption "Rust formatting" // {default = config.vim.languages.enableFormat;}; | ||||
|       enable = | ||||
|         mkEnableOption "Rust formatting" | ||||
|         // { | ||||
|           default = !cfg.lsp.enable && config.vim.languages.enableFormat; | ||||
|           defaultText = literalMD '' | ||||
|             Disabled if Rust LSP is enabled, otherwise follows {option}`vim.languages.enableFormat` | ||||
|           ''; | ||||
|         }; | ||||
| 
 | ||||
|       type = mkOption { | ||||
|         description = "Rust formatter to use"; | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 GitHub
					GitHub