aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Arcangeli <stevearc@stevearc.com>2024-07-15 09:32:56 -0700
committerSteven Arcangeli <stevearc@stevearc.com>2024-07-19 08:41:31 -0700
commit54ea60d1591486e7e56183addf1f45b03244386d (patch)
tree76a0820ccbae7c112ca4dab39882f135b4b0c64a
parent17a3fc6baa36c192994ea2bb7356cf58b1c72605 (diff)
cleanup!: drop support for nvim 0.8
-rw-r--r--README.md4
-rw-r--r--doc/conform.txt2
-rw-r--r--lua/conform/formatters/dcm_format.lua2
-rw-r--r--lua/conform/formatters/injected.lua6
-rw-r--r--lua/conform/init.lua4
-rw-r--r--tests/injected_spec.lua5
6 files changed, 8 insertions, 15 deletions
diff --git a/README.md b/README.md
index 3c5e826..e7860de 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Lightweight yet powerful formatter plugin for Neovim
## Requirements
-- Neovim 0.8+
+- Neovim 0.9+ (for older versions, use a [nvim-0.x branch](https://github.com/stevearc/conform.nvim/branches))
## Features
@@ -216,7 +216,7 @@ You can view this list in vim with `:help conform-formatters`
- [darker](https://github.com/akaihola/darker) - Run black only on changed lines.
- [dart_format](https://dart.dev/tools/dart-format) - Replace the whitespace in your program with formatting that follows Dart guidelines.
- [dcm_fix](https://dcm.dev/docs/cli/formatting/fix/) - Fixes issues produced by dcm analyze, dcm check-unused-code or dcm check-dependencies commands.
-- [dcm_format](https://dcm.dev/docs/cli/formatting/format/) - Formats *.dart files.
+- [dcm_format](https://dcm.dev/docs/cli/formatting/format/) - Formats .dart files.
- [deno_fmt](https://deno.land/manual/tools/formatter) - Use [Deno](https://deno.land/) to format TypeScript, JavaScript/JSON and markdown.
- [dfmt](https://github.com/dlang-community/dfmt) - Formatter for D source code.
- [djlint](https://github.com/Riverside-Healthcare/djLint) - ✨ HTML Template Linter and Formatter. Django - Jinja - Nunjucks - Handlebars - GoLang.
diff --git a/doc/conform.txt b/doc/conform.txt
index d514c62..5af52f8 100644
--- a/doc/conform.txt
+++ b/doc/conform.txt
@@ -301,7 +301,7 @@ FORMATTERS *conform-formatter
follows Dart guidelines.
`dcm_fix` - Fixes issues produced by dcm analyze, dcm check-unused-code or dcm
check-dependencies commands.
-`dcm_format` - Formats *.dart files.
+`dcm_format` - Formats .dart files.
`deno_fmt` - Use [Deno](https://deno.land/) to format TypeScript,
JavaScript/JSON and markdown.
`dfmt` - Formatter for D source code.
diff --git a/lua/conform/formatters/dcm_format.lua b/lua/conform/formatters/dcm_format.lua
index f2af0ac..04adf67 100644
--- a/lua/conform/formatters/dcm_format.lua
+++ b/lua/conform/formatters/dcm_format.lua
@@ -2,7 +2,7 @@
return {
meta = {
url = "https://dcm.dev/docs/cli/formatting/format/",
- description = "Formats *.dart files.",
+ description = "Formats .dart files.",
},
command = "dcm",
args = { "format", "$FILENAME" },
diff --git a/lua/conform/formatters/injected.lua b/lua/conform/formatters/injected.lua
index 6cfd387..bd3313b 100644
--- a/lua/conform/formatters/injected.lua
+++ b/lua/conform/formatters/injected.lua
@@ -136,12 +136,6 @@ return {
-- (defaults to the value from formatters_by_ft)
lang_to_formatters = {},
},
- condition = function(self, ctx)
- local ok, parser = pcall(vim.treesitter.get_parser, ctx.buf)
- -- Require Neovim 0.9 because the treesitter API has changed significantly
- ---@diagnostic disable-next-line: invisible
- return ok and parser._injection_query and vim.fn.has("nvim-0.9") == 1
- end,
format = function(self, ctx, lines, callback)
local conform = require("conform")
local errors = require("conform.errors")
diff --git a/lua/conform/init.lua b/lua/conform/init.lua
index 5d515c4..c174dea 100644
--- a/lua/conform/init.lua
+++ b/lua/conform/init.lua
@@ -52,6 +52,10 @@ end
---@param opts? conform.setupOpts
M.setup = function(opts)
+ if vim.fn.has("nvim-0.9") == 0 then
+ notify("conform.nvim requires Neovim 0.9+", vim.log.levels.ERROR)
+ return
+ end
opts = opts or {}
M.formatters = vim.tbl_extend("force", M.formatters, opts.formatters or {})
diff --git a/tests/injected_spec.lua b/tests/injected_spec.lua
index f6c7175..94d96b1 100644
--- a/tests/injected_spec.lua
+++ b/tests/injected_spec.lua
@@ -4,11 +4,6 @@ local injected = require("conform.formatters.injected")
local runner = require("conform.runner")
local test_util = require("tests.test_util")
--- injected formatter only supported on neovim 0.9+
-if vim.fn.has("nvim-0.9") == 0 then
- return
-end
-
---@param dir string
---@return string[]
local function list_test_files(dir)