|
@@ -2,7 +2,6 @@
|
|
, stdenv
|
|
, stdenv
|
|
, runCommand
|
|
, runCommand
|
|
, writeShellScriptBin
|
|
, writeShellScriptBin
|
|
-, writeTextFile
|
|
|
|
, neovim-unwrapped
|
|
, neovim-unwrapped
|
|
, makeWrapper
|
|
, makeWrapper
|
|
, tree-sitter
|
|
, tree-sitter
|
|
@@ -26,23 +25,6 @@ let
|
|
fi
|
|
fi
|
|
'';
|
|
'';
|
|
} // attrs);
|
|
} // attrs);
|
|
- extra-treesitter-textobjects = writeTextFile {
|
|
|
|
- name = "extra-treesitter-textobjects";
|
|
|
|
- destination = "/queries/ecma/textobjects.scm";
|
|
|
|
- text = ''
|
|
|
|
- ;; extends
|
|
|
|
-
|
|
|
|
- ; consider array elements as @parameter text objects too
|
|
|
|
- (array
|
|
|
|
- "," @_start .
|
|
|
|
- (_) @parameter.inner
|
|
|
|
- (#make-range! "parameter.outer" @_start @parameter.inner))
|
|
|
|
- (array
|
|
|
|
- . (_) @parameter.inner
|
|
|
|
- . ","? @_end
|
|
|
|
- (#make-range! "parameter.outer" @parameter.inner @_end))
|
|
|
|
- '';
|
|
|
|
- };
|
|
|
|
tsc = writeShellScriptBin "tsc" ''
|
|
tsc = writeShellScriptBin "tsc" ''
|
|
if [ -x "./node_modules/.bin/tsc" ]; then
|
|
if [ -x "./node_modules/.bin/tsc" ]; then
|
|
exec ./node_modules/.bin/tsc "$@"
|
|
exec ./node_modules/.bin/tsc "$@"
|
|
@@ -69,10 +51,7 @@ let
|
|
|
|
|
|
plugins = (builtins.filter (p: !p.optional) (lib.attrValues pinnedPlugins))
|
|
plugins = (builtins.filter (p: !p.optional) (lib.attrValues pinnedPlugins))
|
|
++ (lib.attrValues treesitterPlugins)
|
|
++ (lib.attrValues treesitterPlugins)
|
|
- ++ [
|
|
|
|
- extra-treesitter-textobjects
|
|
|
|
- blink-cmp
|
|
|
|
- ];
|
|
|
|
|
|
+ ++ [ blink-cmp ];
|
|
|
|
|
|
optionalPlugins = builtins.filter (p: p.optional) (lib.attrValues pinnedPlugins);
|
|
optionalPlugins = builtins.filter (p: p.optional) (lib.attrValues pinnedPlugins);
|
|
|
|
|