js filetype normalization & update copilot version

Author: zbirenbaum

copilot/dist/agent.js

@@ -1,4 +1,5 @@
 local M = { params = {} }
+local util = require("copilot.util")
 
 local register_autocmd = function ()
   vim.api.nvim_create_autocmd({ "BufEnter" }, {
@@ -20,11 +21,15 @@ end
 
 M.merge_server_opts = function (params)
   return vim.tbl_deep_extend("force", {
-    cmd = { "node", require("copilot.util").get_copilot_path(params.plugin_manager_path) },
-    name = "copilot",
+    cmd = {'node', require("copilot.util").get_copilot_path(params.plugin_manager_path)},
+    cmd_cwd = vim.fn.expand('~'),
     root_dir = vim.loop.cwd(),
+    name = "copilot",
     autostart = true,
-    on_init = function(_, _)
+    single_file_support = true,
+    on_init = function(client, initialize_result)
+      local notify = client.rpc.notify
+      notify('setEditorInfo', util.get_editor_info())
       vim.schedule(M.buf_attach_copilot)
       vim.schedule(register_autocmd)
     end,

lua/copilot/client.lua

@@ -1,6 +1,5 @@
 local M = { client_info = nil }
 local client = require("copilot.client")
-
 local defaults = {
   cmp = {
     enabled = true,

lua/copilot/init.lua

@@ -1,5 +1,35 @@
 local M = {}
 
+-- keep for debugging reasons
+M.get_editor_info = function ()
+  local info = vim.empty_dict()
+  info.editorInfo = vim.empty_dict()
+  info.editorInfo.name = 'Neovim'
+  info.editorInfo.version = '0.8.0-dev-809-g7dde6d4fd'
+  info.editorPluginInfo = vim.empty_dict()
+  info.editorPluginInfo.name = 'copilot.vim'
+  info.editorPluginInfo.version = '1.5.3'
+  return info
+end
+
+-- keep for debugging reasons
+local get_capabilities = function ()
+  return {
+    capabilities = {
+      textDocumentSync = {
+        change = 2,
+        openClose = true
+      },
+      workspace = {
+        workspaceFolders = {
+          changeNotifications = true,
+          supported = true
+        }
+      }
+    }
+  }
+end
+
 local format_pos = function()
   local pos = vim.api.nvim_win_get_cursor(0)
   return { character = pos[2], line = pos[1] - 1 }
@@ -17,16 +47,28 @@ M.get_copilot_client = function()
   end
 end
 
-M.get_completion_params = function()
+local normalize_ft = function (ft)
+  local resolve_map = {
+    text = "plaintext",
+    javascriptreact = "javascript",
+    jsx = "javascript",
+    typescriptreact = "typescript",
+  }
+  if not ft or ft == '' then
+    return 'plaintext'
+  end
+  return resolve_map[ft] or ft
+end
+
+M.get_completion_params = function(opts)
   local rel_path = get_relfile()
   local uri = vim.uri_from_bufnr(0)
   local params = {
-    options = vim.empty_dict(),
     doc = {
       source = table.concat(vim.api.nvim_buf_get_lines(0, 0, -1, false), "\n"),
       relativePath = rel_path,
-      languageId = vim.bo.filetype,
-      insertSpaces = true,
+      languageId = normalize_ft(vim.api.nvim_buf_get_option(0, 'filetype')),
+      insertSpaces = vim.o.expandtab,
       tabsize = vim.bo.shiftwidth,
       indentsize = vim.bo.shiftwidth,
       position = format_pos(),
@@ -39,6 +81,8 @@ M.get_completion_params = function()
       uri = uri,
     }
   }
+  params.position = params.doc.position
+  if opts then params.doc = vim.tbl_deep_extend('keep', params.doc, opts) end
   return params
 end