NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-04-13 13:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1511 from NotAShelf/revert-1505-patch/asm
Some checks are pending
Set up binary cache / cachix (default) (push) Waiting to run
Details
Set up binary cache / cachix (maximal) (push) Waiting to run
Details
Set up binary cache / cachix (nix) (push) Waiting to run
Details
Treewide Checks / Validate flake (push) Waiting to run
Details
Treewide Checks / Check formatting (push) Waiting to run
Details
Treewide Checks / Check source tree for typos (push) Waiting to run
Details
Treewide Checks / Validate documentation builds (push) Waiting to run
Details
Treewide Checks / Validate documentation builds-1 (push) Waiting to run
Details
Treewide Checks / Validate documentation builds-2 (push) Waiting to run
Details
Treewide Checks / Validate documentation builds-3 (push) Waiting to run
Details
Treewide Checks / Validate hyperlinks in documentation sources (push) Waiting to run
Details
Treewide Checks / Validate Editorconfig conformance (push) Waiting to run
Details
Build and deploy documentation / Check latest commit (push) Waiting to run
Details
Build and deploy documentation / publish (push) Blocked by required conditions
Details

Browse source 
Revert "language/asm: add more filetypes"
This commit is contained in:
raf 2026-04-10 22:11:21 +03:00 • committed by GitHub
commit 394ff0528e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/manual/release-notes/rl-0.9.md
View file

@ -304,8 +304,6 @@
- Added `languages.jq`. Supports highlighting, formatting and lsp. - Added `languages.jq`. Supports highlighting, formatting and lsp.
- Extend `languages.asm` to support more filetypes out of the box.
- Didn't Add - Didn't Add
[`syntax-gaslighting`](https://github.com/NotAShelf/syntax-gaslighting.nvim), [`syntax-gaslighting`](https://github.com/NotAShelf/syntax-gaslighting.nvim),
you're crazy. you're crazy.

12
modules/plugins/languages/asm.nix
View file

@ -18,7 +18,7 @@
asm-lsp = { asm-lsp = {
enable = true; enable = true;
cmd = [(getExe pkgs.asm-lsp)]; cmd = [(getExe pkgs.asm-lsp)];
filetypes = ["asm" "nasm" "masm" "vmasm" "fasm" "tasm" "tiasm" "asm68k" "asm8300"]; filetypes = ["asm" "vmasm"];
root_markers = [".asm-lsp.toml" ".git"]; root_markers = [".asm-lsp.toml" ".git"];
}; };
}; };
@ -33,9 +33,7 @@ in {
default = config.vim.languages.enableTreesitter; default = config.vim.languages.enableTreesitter;
defaultText = literalExpression "config.vim.languages.enableTreesitter"; defaultText = literalExpression "config.vim.languages.enableTreesitter";
}; };
packageASM = mkGrammarOption pkgs "asm"; package = mkGrammarOption pkgs "asm";
packageNASM = mkGrammarOption pkgs "nasm";
packagePicoASM = mkGrammarOption pkgs "picoasm";
}; };
lsp = { lsp = {
@ -55,11 +53,7 @@ in {
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
(mkIf cfg.treesitter.enable { (mkIf cfg.treesitter.enable {
vim.treesitter.enable = true; vim.treesitter.enable = true;
vim.treesitter.grammars = [ vim.treesitter.grammars = [cfg.treesitter.package];
cfg.treesitter.packageASM
cfg.treesitter.packageNASM
cfg.treesitter.packagePicoASM
];
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {