comps

Author: tjdevries

xdg_config/nvim/after/plugin/colorscheme.lua

@@ -45,5 +45,9 @@ Group.new("WinSeparator", nil, nil)
 -- Group.new("TSKeyword", c.purple, nil, s.underline, c.blue)
 -- Group.new("LuaFunctionCall", c.green, nil, s.underline + s.nocombine, g.TSKeyword.guisp)
 
--- Hello
 Group.new("TSTitle", c.blue)
+
+-- TODO: It would be nice if we could only highlight
+-- the text with characters or something like that...
+-- but we'll have to stick to that for later.
+Group.new("InjectedLanguage", nil, g.Normal.bg:dark())

xdg_config/nvim/after/plugin/sql_rust_automagic.lua

@@ -1,61 +1,73 @@
-local query = vim.treesitter.parse_query(
+local run_formatter = function(text)
+  local split = vim.split(text, "\n")
+  local result = table.concat(vim.list_slice(split, 2, #split - 1), "\n")
+
+  -- Finds sql-format-via-python somewhere in your nvim config path
+  local bin = vim.api.nvim_get_runtime_file("bin/sql-format-via-python.py", false)[1]
+
+  local j = require("plenary.job"):new {
+    command = "python",
+    args = { bin },
+    writer = { result },
+  }
+  return j:sync()
+end
+
+local embedded_sql = vim.treesitter.parse_query(
   "rust",
   [[
-(
- (macro_invocation
-  (scoped_identifier
-     path: (identifier) @_path
-     name: (identifier) @_identifier)
-
-  (token_tree (raw_string_literal) @raw))
+(macro_invocation
+ (scoped_identifier
+    path: (identifier) @path (#eq? @path "sqlx")
+    name: (identifier) @name (#eq? @name "query"))
 
- (#eq? @_path "sqlx")
- (#eq? @_identifier "query")
- (#offset! @raw 1 0 -1 0)
-)
+ (token_tree
+   (raw_string_literal) @sql) 
+   (#offset! @sql 1 0 -1 0))
 ]]
 )
 
-local Job = require "plenary.job"
+local get_root = function(bufnr)
+  local parser = vim.treesitter.get_parser(bufnr, "rust", {})
+  local tree = parser:parse()[1]
+  return tree:root()
+end
 
 local format_dat_sql = function(bufnr)
-  if not bufnr then
-    bufnr = vim.api.nvim_get_current_buf()
-  end
+  bufnr = bufnr or vim.api.nvim_get_current_buf()
 
   if vim.bo[bufnr].filetype ~= "rust" then
     vim.notify "can only be used in rust"
     return
   end
 
-  local parser = vim.treesitter.get_parser(bufnr, "rust", {})
-  local tree = parser:parse()[1]
-
-  -- Finds sql-format-via-python somewhere in your nvim config path
-  local bin = vim.api.nvim_get_runtime_file("bin/sql-format-via-python.py", false)[1]
+  local root = get_root(bufnr)
 
   local changes = {}
-  for id, node, metadata in query:iter_captures(tree:root(), bufnr, 0, -1) do
-    if id == 3 then
-      local text = vim.treesitter.get_node_text(node, bufnr)
-      local split = vim.split(text, "\n")
-      local result = table.concat(vim.list_slice(split, 2, #split - 1), "\n")
-
-      local j = Job:new {
-        command = "python",
-        args = { bin },
-        writer = { result },
-      }
-
+  for id, node in embedded_sql:iter_captures(root, bufnr, 0, -1) do
+    local name = embedded_sql.captures[id]
+    if name == "sql" then
+      -- { start row, start col, end row, end col }
       local range = { node:range() }
+      local indentation = string.rep(" ", range[2])
+
+      -- Run the formatter, based on the node text
+      local formatted = run_formatter(vim.treesitter.get_node_text(node, bufnr))
 
-      local formatted = j:sync()
-      local rep = string.rep(" ", range[2])
+      -- Add some indentation (can be anything you like!)
       for idx, line in ipairs(formatted) do
-        formatted[idx] = rep .. line
+        formatted[idx] = indentation .. line
       end
 
-      table.insert(changes, 1, { start = range[1] + 1, final = range[3], formatted = formatted })
+      -- Keep track of changes
+      --    But insert them in reverse order of the file,
+      --    so that when we make modifications, we don't have
+      --    any out of date line numbers
+      table.insert(changes, 1, {
+        start = range[1] + 1,
+        final = range[3],
+        formatted = formatted,
+      })
     end
   end
 

xdg_config/nvim/bin/sql-format-via-python.py

@@ -1,7 +1,6 @@
 import sys
 import sqlparse
 
-
 # TODO: Decide what to do about $/?
 # contents = contents.replace(f"${identifier}", f"__id_{identifier}")
 

xdg_config/nvim/queries/rust/highlights.scm

@@ -244,3 +244,15 @@
 ; (let_declaration (type_identifier) @LetType)
 ; (struct_expression
 ;  name: (type_identifier) @StructType)
+
+; (
+;  (macro_invocation
+;   (scoped_identifier
+;      path: (identifier) @_path
+;      name: (identifier) @_identifier)
+;
+;   (token_tree (raw_string_literal) @InjectedLanguage))
+;
+;  (#eq? @_path "sqlx")
+;  (#eq? @_identifier "query")
+; )

xdg_config/nvim/queries/rust/injections.scm

@@ -18,15 +18,12 @@
     (#eq? @_html_def "html")
 )
 
-(
- (macro_invocation
-  (scoped_identifier
-     path: (identifier) @_path
-     name: (identifier) @_identifier)
-
-  (token_tree (raw_string_literal) @sql))
-
- (#eq? @_path "sqlx")
- (#eq? @_identifier "query")
- (#offset! @sql 1 0 0 0)
-)
+; Inject into sqlx::query!(r#"..."#, ...) as sql
+(macro_invocation
+ (scoped_identifier
+    path: (identifier) @_path (#eq? @_path "sqlx")
+    name: (identifier) @_name (#eq? @_name "query"))
+
+ (token_tree
+   (raw_string_literal) @sql) 
+   (#offset! @sql 1 0 0 0))

xdg_config/nvim/scratch/automagic/part3.lua

@@ -18,7 +18,8 @@ local test_function_query_string = [[
 ]]
 
 local find_test_line = function(go_bufnr, name)
-  local query = vim.treesitter.parse_query("go", string.format(test_function_query_string, name))
+  local formatted = string.format(test_function_query_string, name)
+  local query = vim.treesitter.parse_query("go", formatted)
   local parser = vim.treesitter.get_parser(go_bufnr, "go", {})
   local tree = parser:parse()[1]
   local root = tree:root()
@@ -57,6 +58,7 @@ end
 -- local display_golang_output = function(state, bufnr) end
 
 local ns = vim.api.nvim_create_namespace "live-tests"
+local group = vim.api.nvim_create_augroup("teej-automagic", { clear = true })
 
 local attach_to_buffer = function(bufnr, command)
   local state = {
@@ -65,18 +67,17 @@ local attach_to_buffer = function(bufnr, command)
   }
 
   vim.api.nvim_buf_create_user_command(bufnr, "GoTestLineDiag", function()
-    -- print(vim.inspect(state))
     local line = vim.fn.line "." - 1
     for _, test in pairs(state.tests) do
       if test.line == line then
-        vim.cmd.vnew()
+        vim.cmd.new()
         vim.api.nvim_buf_set_lines(vim.api.nvim_get_current_buf(), 0, -1, false, test.output)
       end
     end
   end, {})
 
   vim.api.nvim_create_autocmd("BufWritePost", {
-    group = vim.api.nvim_create_augroup(string.format("teej-automagic-%s", bufnr), { clear = true }),
+    group = group,
     pattern = "*.go",
     callback = function()
       vim.api.nvim_buf_clear_namespace(bufnr, ns, 0, -1)
@@ -146,6 +147,10 @@ local attach_to_buffer = function(bufnr, command)
   })
 end
 
+vim.api.nvim_create_user_command("GoTestOnSave", function()
+  attach_to_buffer(vim.api.nvim_get_current_buf(), { "go", "test", "./...", "-v", "-json" })
+end, {})
+
 -- attach_to_buffer(80, { "go", "run", "main.go" })
-attach_to_buffer(16, { "go", "test", "./...", "-v", "-json" })
+-- attach_to_buffer(16, { "go", "test", "./...", "-v", "-json" })
 -- attach_to_buffer(1, { "go", "test", "./...", "-v", "-json", "-run", "TestDoesFailStill" })