Use buffer:get_lexer(true) more often when it should be used.

5 files changed, 9 insertions, 9 deletions

diff --git a/modules/textadept/adeptsense.lua b/modules/textadept/adeptsense.lua
index 75ace0ef..7c1658c4 100644
--- a/modules/textadept/adeptsense.lua
+++ b/modules/textadept/adeptsense.lua
@@ -927,7 +927,7 @@ end
 -- This should be called by key commands and menus instead of `complete()`.
 -- @name complete_symbol
 function M.complete_symbol()
-  local m = _M[buffer:get_lexer()]
+  local m = _M[buffer:get_lexer(true)]
   if m and m.sense then m.sense:complete() end
 end
 
@@ -937,7 +937,7 @@ end
 -- This should be called by key commands and menus instead of `show_apidoc()`.
 -- @name show_documentation
 function M.show_documentation()
-  local m = _M[buffer:get_lexer()]
+  local m = _M[buffer:get_lexer(true)]
   if m and m.sense then m.sense:show_apidoc() end
 end
 
diff --git a/modules/textadept/editing.lua b/modules/textadept/editing.lua
index 5ca59989..9093a150 100644
--- a/modules/textadept/editing.lua
+++ b/modules/textadept/editing.lua
@@ -86,7 +86,7 @@ local K = keys.KEYSYMS
 events_connect(events.CHAR_ADDED, function(c)
   if not M.AUTOPAIR then return end
   local buffer = buffer
-  local match = (M.char_matches[buffer:get_lexer()] or M.char_matches)[c]
+  local match = (M.char_matches[buffer:get_lexer(true)] or M.char_matches)[c]
   if match and buffer.selections == 1 then buffer:insert_text(-1, match) end
 end)
 
@@ -96,7 +96,7 @@ events_connect(events.KEYPRESS, function(code)
   local buffer = buffer
   local pos = buffer.current_pos
   local c = buffer.char_at[pos - 1]
-  local match = (M.char_matches[buffer:get_lexer()] or M.char_matches)[c]
+  local match = (M.char_matches[buffer:get_lexer(true)] or M.char_matches)[c]
   if match and buffer.char_at[pos] == string.byte(match) then buffer:clear() end
 end)
 
@@ -105,7 +105,7 @@ events_connect(events.UPDATE_UI, function()
   if not M.HIGHLIGHT_BRACES then return end
   local buffer = buffer
   local pos = buffer.current_pos
-  if (M.braces[buffer:get_lexer()] or M.braces)[buffer.char_at[pos]] then
+  if (M.braces[buffer:get_lexer(true)] or M.braces)[buffer.char_at[pos]] then
     local match = buffer:brace_match(pos)
     if match ~= -1 then
       buffer:brace_highlight(pos, match)
@@ -238,7 +238,7 @@ end
 function M.block_comment(comment)
   local buffer = buffer
   if not comment then
-    comment = M.comment_string[buffer:get_lexer()]
+    comment = M.comment_string[buffer:get_lexer(true)]
     if not comment then return end
   end
   local anchor, caret = buffer.selection_start, buffer.selection_end
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index 09175dc6..33ceb8e8 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -36,7 +36,7 @@ M.utils = {
     local buffer = buffer
     local style = buffer.style_at[buffer.current_pos]
     local text = string.format("%s %s\n%s %s (%d)", _L['Lexer'],
-                               buffer:get_lexer(), _L['Style'],
+                               buffer:get_lexer(true), _L['Style'],
                                buffer:get_style_name(style), style)
     buffer:call_tip_show(buffer.current_pos, text)
   end,
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index 162a6872..967521a9 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -357,7 +357,7 @@ end)
 
 -- Set a language-specific context menu or the default one.
 local function set_language_contextmenu()
-  local lang = _G.buffer:get_lexer()
+  local lang = _G.buffer:get_lexer(true)
   M.set_contextmenu(_M[lang] and _M[lang].context_menu or M.context_menu)
 end
 events_connect(events.LANGUAGE_MODULE_LOADED, set_language_contextmenu)
diff --git a/modules/textadept/snippets.lua b/modules/textadept/snippets.lua
index 6e6d1806..1647c3fe 100644
--- a/modules/textadept/snippets.lua
+++ b/modules/textadept/snippets.lua
@@ -223,7 +223,7 @@ function M._select()
   for trigger, text in pairs(snippets) do
     if type(text) == 'string' then list[#list + 1] = trigger..'\0 \0'..text end
   end
-  local lexer = buffer:get_lexer()
+  local lexer = buffer:get_lexer(true)
   for trigger, text in pairs(snippets[lexer] or {}) do
     if type(text) == 'string' then
       list[#list + 1] = trigger..'\0'..lexer..'\0'..text