From 5114d409fd45e76c1154aad20eac9cb21843cd3c Mon Sep 17 00:00:00 2001 From: mitchell <70453897+orbitalquark@users.noreply.github.com> Date: Thu, 24 Feb 2022 00:09:27 -0500 Subject: Ensure preferred "lexer.trigger.ext" snippet files are used over "trigger.ext". The filesystem may yield the latter first. --- modules/textadept/snippets.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/textadept/snippets.lua b/modules/textadept/snippets.lua index 6fcb82ef..58cb8640 100644 --- a/modules/textadept/snippets.lua +++ b/modules/textadept/snippets.lua @@ -170,10 +170,13 @@ local function find_snippet(grep, no_trigger) local f = io.open(string.format('%s/%s', M.paths[i], basename)) local text = f:read('a') f:close() - if not grep then return trigger, text end + if not grep and p1 == lang then return trigger, text end matching_snippets[p1 == lang and p2 or p1] = text end end + if not grep and next(matching_snippets) then + return trigger, select(2, next(matching_snippets)) -- non-preferred "trigger.ext" was found + end end if not grep then return nil, nil end return trigger, matching_snippets -- cgit v1.2.3