Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ The format is based on Keep a Changelog and this project adheres to SemVer.

## [Unreleased]

### Changed

- Logcat severity highlights now default-link to Neovim diagnostic highlight
groups so colorschemes can style them consistently without plugin-specific
overrides.

## [0.6.0] - 2026-03-25

### Added
Expand Down
16 changes: 12 additions & 4 deletions lua/android/logcat/highlight.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ local LEVEL_GROUPS = {
I = "AndroidLogcatInfo",
D = "AndroidLogcatDebug",
}
local HIGHLIGHT_LINKS = {
{ group = "AndroidLogcatError", link = "DiagnosticError" },
{ group = "AndroidLogcatWarn", link = "DiagnosticWarn" },
{ group = "AndroidLogcatInfo", link = "DiagnosticInfo" },
{ group = "AndroidLogcatDebug", link = "DiagnosticHint" },
}

local function detect_level(line)
if type(line) ~= "string" then
Expand All @@ -16,10 +22,12 @@ local function detect_level(line)
end

function M.setup()
vim.api.nvim_set_hl(0, "AndroidLogcatError", { fg = "Red" })
vim.api.nvim_set_hl(0, "AndroidLogcatWarn", { fg = "Yellow" })
vim.api.nvim_set_hl(0, "AndroidLogcatInfo", { fg = "Blue" })
vim.api.nvim_set_hl(0, "AndroidLogcatDebug", { fg = "Green" })
for _, highlight_link in ipairs(HIGHLIGHT_LINKS) do
vim.api.nvim_set_hl(0, highlight_link.group, {
default = true,
link = highlight_link.link,
})
end
end

function M.clear(buf)
Expand Down
53 changes: 53 additions & 0 deletions lua/tests/android/logcat/highlight_test.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
local M = {}

local assert = require("tests.helpers.assert")
local highlight = require("android.logcat.highlight")

local GROUPS = {
"AndroidLogcatError",
"AndroidLogcatWarn",
"AndroidLogcatInfo",
"AndroidLogcatDebug",
}

local function clear_groups()
for _, group in ipairs(GROUPS) do
vim.api.nvim_set_hl(0, group, {})
end
end

local function assert_link(group, expected)
local definition = vim.api.nvim_get_hl(0, { name = group, link = true })

assert.eq(definition.link, expected, group .. " link")
end

local function links_log_levels_to_diagnostic_groups()
clear_groups()

highlight.setup()

assert_link("AndroidLogcatError", "DiagnosticError")
assert_link("AndroidLogcatWarn", "DiagnosticWarn")
assert_link("AndroidLogcatInfo", "DiagnosticInfo")
assert_link("AndroidLogcatDebug", "DiagnosticHint")
end

local function preserves_user_highlight_overrides()
clear_groups()
vim.api.nvim_set_hl(0, "AndroidLogcatError", { fg = "#123456" })

highlight.setup()

local definition = vim.api.nvim_get_hl(0, { name = "AndroidLogcatError", link = true })

assert.eq(definition.link, nil, "override link")
assert.eq(definition.fg, tonumber("123456", 16), "override fg")
end

function M.run()
links_log_levels_to_diagnostic_groups()
preserves_user_highlight_overrides()
end

return M