deno & nvim: turn back to use deno fmt instead of prettier.

13 files changed, 69 insertions, 47 deletions

diff --git a/deno/deno.json b/deno/deno.json
index f4859d1..53cdf7a 100644
--- a/deno/deno.json
+++ b/deno/deno.json
@@ -1,7 +1,7 @@
 {
-  "workspace": ["./base", "./mail-relay", "./tools" ],
+  "workspace": ["./base", "./mail-relay", "./tools"],
   "tasks": {
-    "compile:mail-relay": "deno task --cwd=mail-relay compile",
+    "compile:mail-relay": "deno task --cwd=mail-relay compile"
   },
   "imports": {
     "@std/collections": "jsr:@std/collections@^1.1.1",
@@ -13,7 +13,7 @@
     "@std/testing": "jsr:@std/testing@^1.0.13",
     "@std/dotenv": "jsr:@std/dotenv@^0.225.5",
     "@std/fs": "jsr:@std/fs@^1.0.18",
-    "yargs": "npm:yargs@^18.0.0"
+    "yargs": "npm:yargs@^18.0.0",
     "@types/yargs": "npm:@types/yargs@^17.0.33"
   }
 }
diff --git a/deno/mail-relay/aws/app.ts b/deno/mail-relay/aws/app.ts
index 13db351..cb275ae 100644
--- a/deno/mail-relay/aws/app.ts
+++ b/deno/mail-relay/aws/app.ts
@@ -18,7 +18,7 @@ import {
 } from "./mail.ts";
 import { AwsMailDeliverer } from "./deliver.ts";
 import { AwsMailFetcher, AwsS3MailConsumer } from "./fetch.ts";
-import { createInbound, createHono, sendMail, createSmtp } from "../app.ts";
+import { createHono, createInbound, createSmtp, sendMail } from "../app.ts";
 
 const PREFIX = "crupest-mail-server";
 const CONFIG_DEFINITIONS = {
@@ -103,7 +103,7 @@ function createOutbound(
   );
   deliverer.postHooks.push(
     new AwsMailMessageIdSaveHook((original, aws) =>
-      db.addMessageIdMap({ message_id: original, aws_message_id: aws }).then(),
+      db.addMessageIdMap({ message_id: original, aws_message_id: aws }).then()
     ),
   );
   return deliverer;
@@ -210,8 +210,10 @@ function createServerServices() {
     path: config.get("awsInboundPath"),
     auth: config.get("awsInboundKey"),
     callback: (s3Key, recipients) => {
-      return fetcher.consumeS3Mail(s3Key, (rawMail, _) =>
-        inbound.deliver({ mail: new Mail(rawMail), recipients }).then(),
+      return fetcher.consumeS3Mail(
+        s3Key,
+        (rawMail, _) =>
+          inbound.deliver({ mail: new Mail(rawMail), recipients }).then(),
       );
     },
   });
diff --git a/deno/mail-relay/aws/deliver.ts b/deno/mail-relay/aws/deliver.ts
index a002eda..4dd4b3a 100644
--- a/deno/mail-relay/aws/deliver.ts
+++ b/deno/mail-relay/aws/deliver.ts
@@ -40,14 +40,14 @@ export class AwsMailDeliverer extends SyncMailDeliverer {
       if (res.MessageId == null) {
         console.warn("Aws send-email returns no message id.");
       } else {
-        context.result.awsMessageId = `${res.MessageId}@${
-          this.#aws.region
-        }.amazonses.com`;
+        context.result.awsMessageId =
+          `${res.MessageId}@${this.#aws.region}.amazonses.com`;
       }
 
       context.result.recipients.set("*", {
         kind: "done",
-        message: `Successfully called aws send-email, message id ${context.result.awsMessageId}.`,
+        message:
+          `Successfully called aws send-email, message id ${context.result.awsMessageId}.`,
       });
     } catch (cause) {
       context.result.recipients.set("*", {
diff --git a/deno/mail-relay/aws/fetch.ts b/deno/mail-relay/aws/fetch.ts
index 68e02e6..9278e63 100644
--- a/deno/mail-relay/aws/fetch.ts
+++ b/deno/mail-relay/aws/fetch.ts
@@ -104,8 +104,9 @@ export class AwsMailFetcher {
       .sections()
       .headers()
       .date();
-    const dateString =
-      date != null ? toFileNameString(date, true) : "invalid-date";
+    const dateString = date != null
+      ? toFileNameString(date, true)
+      : "invalid-date";
     const newPath = `${this.#archivePrefix}${dateString}/${s3Key}`;
 
     console.info(`Archiving s3 mail ${s3Key} to ${newPath}...`);
diff --git a/deno/mail-relay/dovecot.ts b/deno/mail-relay/dovecot.ts
index 333b803..bace225 100644
--- a/deno/mail-relay/dovecot.ts
+++ b/deno/mail-relay/dovecot.ts
@@ -46,8 +46,8 @@ export class DovecotMailDeliverer extends MailDeliverer {
         });
 
         const ldaProcess = ldaCommand.spawn();
-        using logFiles =
-          await this.#logFileProvider.createExternalLogStreamsForProgram(
+        using logFiles = await this.#logFileProvider
+          .createExternalLogStreamsForProgram(
             ldaBinName,
           );
         ldaProcess.stdout.pipeTo(logFiles.stdout);
diff --git a/deno/mail-relay/mail.test.ts b/deno/mail-relay/mail.test.ts
index 6abb7d7..cd0c38d 100644
--- a/deno/mail-relay/mail.test.ts
+++ b/deno/mail-relay/mail.test.ts
@@ -87,7 +87,7 @@ describe("Mail", () => {
       }),
     ]).toEqual(
       [...mockToAddresses, mockCcAddress].filter((a) =>
-        a.endsWith("example.com"),
+        a.endsWith("example.com")
       ),
     );
   });
diff --git a/deno/tools/deno.json b/deno/tools/deno.json
index 1b2cf32..355046a 100644
--- a/deno/tools/deno.json
+++ b/deno/tools/deno.json
@@ -3,6 +3,6 @@
   "tasks": {
   },
   "imports": {
-    "mustache": "npm:mustache@^4.2.0",
+    "mustache": "npm:mustache@^4.2.0"
   }
 }
diff --git a/deno/tools/template.ts b/deno/tools/template.ts
index 0b043a1..1b67eb8 100644
--- a/deno/tools/template.ts
+++ b/deno/tools/template.ts
@@ -73,7 +73,9 @@ export class TemplateDir {
 
   generate(vars: Record<string, string>, generatedDir?: string) {
     console.log(
-      `Generating, template dir: ${this.dir}, generated dir: ${generatedDir ?? "[dry-run]"}:`,
+      `Generating, template dir: ${this.dir}, generated dir: ${
+        generatedDir ?? "[dry-run]"
+      }:`,
     );
 
     const undefinedVars = this.allNeededVars().filter((v) => !(v in vars));
diff --git a/store/config/nvim/lazy-lock.json b/store/config/nvim/lazy-lock.json
index f323937..4f6c2b5 100644
--- a/store/config/nvim/lazy-lock.json
+++ b/store/config/nvim/lazy-lock.json
@@ -3,16 +3,15 @@
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
   "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
-  "conform.nvim": { "branch": "master", "commit": "0e93e0d12d2f7ebdea9e3e444dfaff0050cefbe6" },
-  "gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" },
+  "gitsigns.nvim": { "branch": "main", "commit": "731b581428ec6c1ccb451b95190ebbc6d7006db7" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" },
+  "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
-  "nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
-  "nvim-lint": { "branch": "master", "commit": "cc26ae6a620298bb3f33b0e0681f99a10ae57781" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a182334ba933e58240c2c45e6ae2d9c7ae313e00" },
+  "nvim-lint": { "branch": "master", "commit": "2b0039b8be9583704591a13129c600891ac2c596" },
+  "nvim-lspconfig": { "branch": "master", "commit": "7ad4a11cc5742774877c529fcfb2702f7caf75e4" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
diff --git a/store/config/nvim/lua/plugins.lua b/store/config/nvim/lua/plugins.lua
index 8458575..85de362 100644
--- a/store/config/nvim/lua/plugins.lua
+++ b/store/config/nvim/lua/plugins.lua
@@ -37,5 +37,4 @@ return {
     { "hrsh7th/cmp-path" },
     { "windwp/nvim-autopairs" },
     { "mfussenegger/nvim-lint" },
-    { 'stevearc/conform.nvim' }
 }
diff --git a/store/config/nvim/lua/setup/lsp.lua b/store/config/nvim/lua/setup/lsp.lua
index 6a58759..4216f1c 100644
--- a/store/config/nvim/lua/setup/lsp.lua
+++ b/store/config/nvim/lua/setup/lsp.lua
@@ -22,15 +22,23 @@ local function setup_clangd()
 
     vim.lsp.config("clangd", { cmd = { clangd } })
 
-    vim.api.nvim_create_autocmd('LspAttach', {
+    vim.api.nvim_create_autocmd("LspAttach", {
         callback = function(ev)
             if client_name_is(ev, "clangd") then
-                vim.keymap.set('n', 'grs', "<cmd>ClangdSwitchSourceHeader<cr>", {
+                vim.keymap.set("n", "grs", "<cmd>ClangdSwitchSourceHeader<cr>", {
                     buffer = ev.buf
                 })
             end
         end
     })
+
+    vim.api.nvim_create_autocmd("LspDetach", {
+        callback = function(ev)
+            if client_name_is(ev, "clangd") then
+                vim.keymap.del("n", "grs", { buffer = ev.buf })
+            end
+        end
+    })
 end
 
 local function setup_lua_ls()
@@ -55,6 +63,11 @@ local function setup_lua_ls()
     })
 end
 
+function vim.crupest.no_range_format()
+    print("Lsp doesn't support range formatting. Use gqa to format the whole document.")
+    return 0
+end
+
 local function setup_denols()
     vim.lsp.config("denols", {
         root_dir = function(bufnr, on_dir)
@@ -67,10 +80,22 @@ local function setup_denols()
         end,
     })
 
-    vim.api.nvim_create_autocmd('LspAttach', {
+    vim.api.nvim_create_autocmd("LspAttach", {
+        callback = function(ev)
+            if client_name_is(ev, "denols") then
+                vim.api.nvim_set_option_value(
+                    "formatexpr",
+                    "v:lua.vim.crupest.no_range_format()",
+                    { buf = ev.buf }
+                )
+            end
+        end
+    })
+
+    vim.api.nvim_create_autocmd("LspDetach", {
         callback = function(ev)
             if client_name_is(ev, "denols") then
-                vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
+                vim.api.nvim_set_option_value("formatexpr", "", { buf = ev.buf })
             end
         end
     })
@@ -78,6 +103,18 @@ end
 
 
 local function setup()
+    vim.api.nvim_create_autocmd("LspAttach", {
+        callback = function(ev)
+            vim.keymap.set("n", "gqa", vim.lsp.buf.format, { buffer = ev.buf })
+        end
+    })
+
+    vim.api.nvim_create_autocmd("LspDetach", {
+        callback = function(ev)
+            vim.keymap.del("n", "gqa", { buffer = ev.buf })
+        end
+    })
+
     setup_clangd()
     setup_lua_ls()
     setup_denols()
diff --git a/store/config/nvim/lua/setup/plugins/conform.lua b/store/config/nvim/lua/setup/plugins/conform.lua
deleted file mode 100644
index 57b74a9..0000000
--- a/store/config/nvim/lua/setup/plugins/conform.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-local function setup()
-    require("conform").setup({
-        formatters_by_ft = {
-            javascript = { "prettierd", "prettier", stop_after_first = true },
-            typescript = { "prettierd", "prettier", stop_after_first = true },
-            javascriptreact = { "prettierd", "prettier", stop_after_first = true },
-            typescriptreact = { "prettierd", "prettier", stop_after_first = true },
-        },
-        default_format_opts = {
-            lsp_format = "fallback",
-        },
-    })
-end
-
-return {
-    setup = setup
-}
diff --git a/store/config/nvim/lua/setup/plugins/init.lua b/store/config/nvim/lua/setup/plugins/init.lua
index 88eca4f..8f1346b 100644
--- a/store/config/nvim/lua/setup/plugins/init.lua
+++ b/store/config/nvim/lua/setup/plugins/init.lua
@@ -15,7 +15,6 @@ local function setup()
 
     require("setup.plugins.tree-sitter").setup()
     require("setup.plugins.lint").setup()
-    require("setup.plugins.conform").setup()
     require("setup.plugins.cmp").setup()
     require("nvim-autopairs").setup {}
 end