Improve regex handling

Jeanno · Nov 9, 2021 · a62375e · a62375e
1 parent c7a1b9f
commit a62375e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/lua/cmp/context.lua b/lua/cmp/context.lua
@@ -68,7 +68,7 @@ end
 ---@return number|nil
 context.get_offset = function(self, keyword_pattern)
   return self.cache:ensure({ 'get_offset', keyword_pattern, self.cursor_before_line }, function()
-    return pattern.offset(keyword_pattern .. '$', self.cursor_before_line) or self.cursor.col
+    return pattern.offset(keyword_pattern .. '\\m$', self.cursor_before_line) or self.cursor.col
   end)
 end
 

diff --git a/plugin/cmp.lua b/plugin/cmp.lua
@@ -20,34 +20,31 @@ vim.cmd [[
     autocmd CompleteDone * lua require'cmp.utils.autocmd'.emit('CompleteDone')
     autocmd ColorScheme * call v:lua.cmp.plugin.colorscheme()
     autocmd CmdlineEnter * call v:lua.cmp.plugin.cmdline.enter()
-    autocmd CmdlineLeave * call v:lua.cmp.plugin.cmdline.leave()
   augroup END
 ]]
 
 misc.set(_G, { 'cmp', 'plugin', 'cmdline', 'enter' }, function()
   if config.get().experimental.native_menu then
     return
   end
-  local cmdtype = vim.fn.expand('<afile>')
-  if cmdtype ~= '=' then
-    if api.is_cmdline_mode() then
-      vim.cmd [[
-        augroup cmp-cmdline
-          autocmd!
-          autocmd CmdlineChanged * lua require'cmp.utils.autocmd'.emit('TextChanged')
-        augroup END
-      ]]
-      require('cmp.utils.autocmd').emit('CmdlineEnter')
-    end
+  if vim.fn.expand('<afile>')~= '=' then
+    vim.schedule(function()
+      if api.is_cmdline_mode() then
+        vim.cmd [[
+          augroup cmp-cmdline
+            autocmd!
+            autocmd CmdlineChanged * lua require'cmp.utils.autocmd'.emit('TextChanged')
+            autocmd CmdlineLeave * call v:lua.cmp.plugin.cmdline.leave()
+          augroup END
+        ]]
+        require('cmp.utils.autocmd').emit('CmdlineEnter')
+      end
+    end)
   end
 end)
 
 misc.set(_G, { 'cmp', 'plugin', 'cmdline', 'leave' }, function()
-  if config.get().experimental.native_menu then
-    return
-  end
-  local cmdtype = vim.fn.expand('<afile>')
-  if cmdtype ~= '=' then
+  if vim.fn.expand('<afile>') ~= '=' then
     vim.cmd [[
       augroup cmp-cmdline
         autocmd!