aboutsummaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorGravatar mitchell <70453897+orbitalquark@users.noreply.github.com>2022-02-24 00:09:27 -0500
committerGravatar mitchell <70453897+orbitalquark@users.noreply.github.com>2022-02-24 00:09:27 -0500
commit5114d409fd45e76c1154aad20eac9cb21843cd3c (patch)
tree39eae57c92a0b1456d3a0b5c4c1b52ff318f08f0 /modules
parentd964123cd968a1bda854bbc6931677994d03bd33 (diff)
Ensure preferred "lexer.trigger.ext" snippet files are used over "trigger.ext".
The filesystem may yield the latter first.
Diffstat (limited to 'modules')
-rw-r--r--modules/textadept/snippets.lua5
1 files changed, 4 insertions, 1 deletions
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