From ca70b402c4f7172f8cde749c0a08b651fbb9831c Mon Sep 17 00:00:00 2001 From: ray Date: Wed, 8 Sep 2021 17:08:30 +0100 Subject: [PATCH 1/4] add SpacesToTabs command --- init.commands.vim | 9 +++++++++ init.vim | 1 + 2 files changed, 10 insertions(+) create mode 100644 init.commands.vim diff --git a/init.commands.vim b/init.commands.vim new file mode 100644 index 0000000..451427d --- /dev/null +++ b/init.commands.vim @@ -0,0 +1,9 @@ +function! s:spacestotabs() + %s/^ / /e + %s/^ / /e + %s/^ / /e + %s/^ / /e + %s/^ / /e + %s/^ / /e +endfunction +command SpacesToTabs call s:spacestotabs() diff --git a/init.vim b/init.vim index 38450e0..0ee58e8 100644 --- a/init.vim +++ b/init.vim @@ -8,6 +8,7 @@ source ~/.config/nvim/init.plugins.vim source ~/.config/nvim/init.tabline.vim source ~/.config/nvim/init.auto-window.vim source ~/.config/nvim/init.fold-text.vim +source ~/.config/nvim/init.commands.vim " TODO - maybe separate some of these into own files too " #functions {{{ From d389e1fed14c0db96e46a69e7e746f7d4cbfe200 Mon Sep 17 00:00:00 2001 From: ray Date: Wed, 8 Sep 2021 22:22:51 +0100 Subject: [PATCH 2/4] move commands to separate file --- init.commands.vim | 18 ++++++++++++++++++ init.vim | 11 ----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/init.commands.vim b/init.commands.vim index 451427d..418e83d 100644 --- a/init.commands.vim +++ b/init.commands.vim @@ -1,3 +1,5 @@ +" SpacesToTabs {{{ +" TODO - ake a proper regex substitution function! s:spacestotabs() %s/^ / /e %s/^ / /e @@ -7,3 +9,19 @@ function! s:spacestotabs() %s/^ / /e endfunction command SpacesToTabs call s:spacestotabs() + + +"}}} +" TrimWhitespace {{{ +command! -range=% TrimWhitespace let b:wv = winsaveview() | + \ keeppattern ,s/\s\+$// | + \ call winrestview(b:wv) + + +"}}} +" Scratch, ScratchVertical {{{ +command! Scratch new | setlocal buftype=nofile | setlocal bufhidden=hide | setlocal noswapfile +command! ScratchVertical vnew | setlocal buftype=nofile | setlocal bufhidden=hide | setlocal noswapfile +"}}} +" +" diff --git a/init.vim b/init.vim index 0ee58e8..3c751b8 100644 --- a/init.vim +++ b/init.vim @@ -181,17 +181,6 @@ function! ToggleHighlights() abort "{{{ endfunction "}}} "----------------------------------------------------------------------------}}} -"#commands{{{ -" TrimWhitespace{{{ -command! -range=% TrimWhitespace let b:wv = winsaveview() | - \ keeppattern ,s/\s\+$// | - \ call winrestview(b:wv) -"}}} -" Scratch, ScratchVertical{{{ -command! Scratch new | setlocal buftype=nofile | setlocal bufhidden=hide | setlocal noswapfile -command! ScratchVertical vnew | setlocal buftype=nofile | setlocal bufhidden=hide | setlocal noswapfile -"}}} -"}}} " #settings {{{ scriptencoding utf-8 From a022178884ef39196695c67544d78a7e350fb065 Mon Sep 17 00:00:00 2001 From: ray Date: Wed, 8 Sep 2021 22:23:18 +0100 Subject: [PATCH 3/4] reformat --- lua/init-plugins.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lua/init-plugins.lua b/lua/init-plugins.lua index 562c7af..6fd76b3 100644 --- a/lua/init-plugins.lua +++ b/lua/init-plugins.lua @@ -130,18 +130,18 @@ local on_attach = function(client, bufnr) buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) + buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', opts) + buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', opts) + buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) + buf_set_keymap('n', 'l', 'lua vim.lsp.diagnostic.set_loclist()', opts) + buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', opts) + buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) + buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) + buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) + buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', opts) -- buf_set_keymap('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) -- buf_set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) -- buf_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) - buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) - buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) - buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', opts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) - buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) - buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', opts) - buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', opts) - buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) - buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', opts) end From 7b13d73648251c25ea77709b1fbecd2716bce9ef Mon Sep 17 00:00:00 2001 From: ray Date: Wed, 8 Sep 2021 22:23:35 +0100 Subject: [PATCH 4/4] add treesitter highlights --- after/queries/css/highlights.scm | 18 ++++++++++++++++++ after/queries/ecma/highlights.scm | 0 after/queries/html/highlights.scm | 17 +++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 after/queries/css/highlights.scm create mode 100644 after/queries/ecma/highlights.scm create mode 100644 after/queries/html/highlights.scm diff --git a/after/queries/css/highlights.scm b/after/queries/css/highlights.scm new file mode 100644 index 0000000..7fa2000 --- /dev/null +++ b/after/queries/css/highlights.scm @@ -0,0 +1,18 @@ +(id_selector (id_name) @CssIdentifier) +(id_selector (id_name)) @CssIdSelector +(tag_name) @HtmlTagName + +(class_selector (class_name) @CssClassName) +(selectors (pseudo_class_selector (class_name) @cssPseudoClass)) +(nesting_selector) @cssNestingSelector + +; need to find out how to make this more specific? +(universal_selector) @CssUniversalSelector + +((property_name) (_)) @CssProp + +(unit) @CssUnit + +(declaration (property_name) (_) @CssPropertyValue) + +(media_statement (feature_query (feature_name) @cssMediaFeatureName (_ (unit) @cssMediaQueryValueUnit) @cssMediaQueryValue) @cssMediaQuery) diff --git a/after/queries/ecma/highlights.scm b/after/queries/ecma/highlights.scm new file mode 100644 index 0000000..e69de29 diff --git a/after/queries/html/highlights.scm b/after/queries/html/highlights.scm new file mode 100644 index 0000000..2b752d4 --- /dev/null +++ b/after/queries/html/highlights.scm @@ -0,0 +1,17 @@ +(start_tag + (attribute + (attribute_name) @ClassNameAttribute (#eq? @ClassNameAttribute "class") + (quoted_attribute_value + (attribute_value) @CssClassName ))) + +(start_tag + (attribute + (attribute_name) @IdAttribute (#eq? @IdAttribute "id") + (quoted_attribute_value + (attribute_value) @CssIdentifier ))) + +(start_tag + (attribute + (attribute_name) @DataAttribute (#match? @DataAttribute "^data-") + (quoted_attribute_value + (attribute_value) @DataAttributeValue )))