breaking change: require('copilot') -> require('copilot').setup() + formatting

Author: zbirenbaum

.stylua.toml

@@ -0,0 +1,6 @@
+column_width = 120
+line_endings = "Unix"
+indent_type = "Spaces"
+indent_width = 2
+quote_style = "AutoPreferDouble"
+no_call_parentheses = false

README.md

@@ -56,6 +56,6 @@ The following is the default configuration:
 
 ```lua
 {
-	plugin_manager_path = vim.fn.stdpath("data") .. "/site/pack/packer", -- Installation Path of packer, change to the plugin manager installation path of your choice
+  plugin_manager_path = vim.fn.stdpath("data") .. "/site/pack/packer", -- Installation Path of packer, change to the plugin manager installation path of your choice
 }
 ```

lua/copilot/config.lua

@@ -1,19 +1,19 @@
 local M = {}
 
 local defaults = {
-	plugin_manager_path = vim.fn.stdpath("data") .. "/site/pack/packer",
+  plugin_manager_path = vim.fn.stdpath("data") .. "/site/pack/packer",
 }
 
 M.params = {}
 
 M.setup = function(options)
-	if not options then
-		M.params = defaults
-	else
-		for key, value in pairs(defaults) do
-			M.params[key] = options[key] or value
-		end
-	end
+  if not options then
+    M.params = defaults
+  else
+    for key, value in pairs(defaults) do
+      M.params[key] = options[key] or value
+    end
+  end
 end
 
 return M

lua/copilot/copilot_handler.lua

@@ -1,54 +1,58 @@
-local user_data = require('copilot.setup').get_cred()
-local util = require('copilot.util')
+local user_data = require("copilot.setup").get_cred()
+local util = require("copilot.util")
 local M = {}
 
-local send_editor_info = function (a, b, c, d)
-   local responses = vim.lsp.buf_request_sync(0, 'setEditorInfo', {
-      editorPluginInfo = {
-         name = 'copilot.vim',
-         version = '1.1.0',
-      },
-      editorInfo= {
-         version = '0.7.0-dev+1343-g4d3acd6be-dirty',
-         name = "Neovim",
-      },
-   }, 600)
+local send_editor_info = function(a, b, c, d)
+  local responses = vim.lsp.buf_request_sync(0, "setEditorInfo", {
+    editorPluginInfo = {
+      name = "copilot.vim",
+      version = "1.1.0",
+    },
+    editorInfo = {
+      version = "0.7.0-dev+1343-g4d3acd6be-dirty",
+      name = "Neovim",
+    },
+  }, 600)
 end
 
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities.getCompletions = true
 
-M.start = function (plugin_path)
-   vim.lsp.start_client({
-      cmd = {require('copilot.util').get_copilot_path(plugin_path)},
-      cmd_env = {
-         ["GITHUB_USER"] = user_data.user,
-         ["GITHUB_TOKEN"] = user_data.token,
-         ["COPILOT_AGENT_VERBOSE"] = 1,
-      },
-      handlers={
-         ["getCompletions"] = function () print("get completions") end,
-         ["textDocumentSync"] = function () print("handle") end,
-      },
-      name = "copilot",
-      trace = "messages",
-      root_dir = vim.loop.cwd(),
-      autostart = true,
-      on_init = function(client, _)
-         vim.lsp.buf_attach_client(0, client.id)
-         vim.api.nvim_create_autocmd({'BufEnter'}, {
-            callback = function ()
-               if not vim.lsp.buf_get_clients(0)[client.id] then
-                  vim.lsp.buf_attach_client(0, client.id)
-               end
-            end,
-            once = false,
-         })
+M.start = function(plugin_path)
+  vim.lsp.start_client({
+    cmd = { require("copilot.util").get_copilot_path(plugin_path) },
+    cmd_env = {
+      ["GITHUB_USER"] = user_data.user,
+      ["GITHUB_TOKEN"] = user_data.token,
+      ["COPILOT_AGENT_VERBOSE"] = 1,
+    },
+    handlers = {
+      ["getCompletions"] = function()
+        print("get completions")
       end,
-      on_attach = function()
-         send_editor_info()
-      end
-   })
+      ["textDocumentSync"] = function()
+        print("handle")
+      end,
+    },
+    name = "copilot",
+    trace = "messages",
+    root_dir = vim.loop.cwd(),
+    autostart = true,
+    on_init = function(client, _)
+      vim.lsp.buf_attach_client(0, client.id)
+      vim.api.nvim_create_autocmd({ "BufEnter" }, {
+        callback = function()
+          if not vim.lsp.buf_get_clients(0)[client.id] then
+            vim.lsp.buf_attach_client(0, client.id)
+          end
+        end,
+        once = false,
+      })
+    end,
+    on_attach = function()
+      send_editor_info()
+    end,
+  })
 end
 
 return M

lua/copilot/init.lua

@@ -1,11 +1,10 @@
 local config = require("copilot.config")
 local M = {}
 
-M.setup = function (params)
-    config.setup(params)
-    config.params.plugin_manager_path = vim.fn.expand(config.params.plugin_manager_path) -- resolve wildcard and variable containing paths
-    require("copilot.copilot_handler").start(config.params.plugin_manager_path)
+M.setup = function(params)
+  config.setup(params)
+  config.params.plugin_manager_path = vim.fn.expand(config.params.plugin_manager_path) -- resolve wildcard and variable containing paths
+  require("copilot.copilot_handler").start(config.params.plugin_manager_path)
 end
 
-
 return M

lua/copilot/setup.lua

@@ -1,42 +1,49 @@
 local M = {}
 
 local function find_config_path()
-   local config = vim.fn.expand('$XDG_CONFIG_HOME')
-   if config and vim.fn.isdirectory(config) > 0 then
+  local config = vim.fn.expand("$XDG_CONFIG_HOME")
+  if config and vim.fn.isdirectory(config) > 0 then
+    return config
+  elseif vim.fn.has("win32") > 0 then
+    config = vim.fn.expand("~/AppData/Local")
+    if vim.fn.isdirectory(config) > 0 then
       return config
-   elseif vim.fn.has('win32') > 0 then
-      config = vim.fn.expand('~/AppData/Local')
-      if vim.fn.isdirectory(config) > 0 then return config end
-   else
-      config = vim.fn.expand('~/.config')
-      if vim.fn.isdirectory(config) > 0 then return config
-      else print("Error: could not find config path")
-      end
-   end
+    end
+  else
+    config = vim.fn.expand("~/.config")
+    if vim.fn.isdirectory(config) > 0 then
+      return config
+    else
+      print("Error: could not find config path")
+    end
+  end
 end
 
-
 local function json_body(response)
-   if response.headers['content-type'] == 'application/json' then
-      return vim.json.decode(response.body)
-   end
+  if response.headers["content-type"] == "application/json" then
+    return vim.json.decode(response.body)
+  end
 end
 
 local function oauth_user(token)
-   return vim.json.decode(vim.fn.system("curl -s --header \"Authorization: Bearer " .. token .. "\" https://api.github.com/user"))
+  return vim.json.decode(
+    vim.fn.system('curl -s --header "Authorization: Bearer ' .. token .. '" https://api.github.com/user')
+  )
 end
 
 local function oauth_save(oauth_token)
-   local user_data = oauth_user(oauth_token)
-   local github = {oauth_token = oauth_token, user = user_data.login}
-   return github
+  local user_data = oauth_user(oauth_token)
+  local github = { oauth_token = oauth_token, user = user_data.login }
+  return github
 end
 
-M.get_cred = function ()
-   local userdata = vim.json.decode(vim.api.nvim_eval("readfile('" .. find_config_path() .. "/github-copilot/hosts.json')")[1])
-   local token = userdata["github.com"].oauth_token
-   local user = oauth_user(token)
-   return {user = user, token = token}
+M.get_cred = function()
+  local userdata = vim.json.decode(
+    vim.api.nvim_eval("readfile('" .. find_config_path() .. "/github-copilot/hosts.json')")[1]
+  )
+  local token = userdata["github.com"].oauth_token
+  local user = oauth_user(token)
+  return { user = user, token = token }
 end
 
 return M

lua/copilot/util.lua

@@ -1,56 +1,58 @@
 local M = {}
 
 local format_pos = function()
-   local pos = vim.api.nvim_win_get_cursor(0)
-   return { character = pos[2], line = pos[1]-1 }
+  local pos = vim.api.nvim_win_get_cursor(0)
+  return { character = pos[2], line = pos[1] - 1 }
 end
 
 local get_relfile = function()
-   local file,_= string.gsub(vim.api.nvim_buf_get_name(0), vim.loop.cwd() .. "/", '')
-   return file
+  local file, _ = string.gsub(vim.api.nvim_buf_get_name(0), vim.loop.cwd() .. "/", "")
+  return file
 end
 
 M.get_completion_params = function()
-   local params = {
-      options = vim.empty_dict(),
-      doc = {
-         relativePath = get_relfile(),
-         source = table.concat(vim.api.nvim_buf_get_lines(0, 0, -1, false), '\n'),
-         languageId = vim.bo.filetype,
-         insertSpaces = true,
-         tabsize = vim.bo.shiftwidth,
-         indentsize = vim.bo.shiftwidth,
-         position = format_pos(),
-         path = vim.api.nvim_buf_get_name(0),
-      },
-   }
-   return params
+  local params = {
+    options = vim.empty_dict(),
+    doc = {
+      relativePath = get_relfile(),
+      source = table.concat(vim.api.nvim_buf_get_lines(0, 0, -1, false), "\n"),
+      languageId = vim.bo.filetype,
+      insertSpaces = true,
+      tabsize = vim.bo.shiftwidth,
+      indentsize = vim.bo.shiftwidth,
+      position = format_pos(),
+      path = vim.api.nvim_buf_get_name(0),
+    },
+  }
+  return params
 end
 
 M.get_copilot_path = function(plugin_path)
-   for _, loc in ipairs{"/opt", "/start", ""} do
-      local copilot_path = plugin_path .. loc .. "/copilot.lua/copilot/index.js"
-      if vim.fn.filereadable(copilot_path) ~= 0 then
-         return copilot_path
-      end
-   end
+  for _, loc in ipairs({ "/opt", "/start", "" }) do
+    local copilot_path = plugin_path .. loc .. "/copilot.lua/copilot/index.js"
+    if vim.fn.filereadable(copilot_path) ~= 0 then
+      return copilot_path
+    end
+  end
 end
 
-local function completion_handler (_, result, _, _)
-   print(vim.inspect(result))
+local function completion_handler(_, result, _, _)
+  print(vim.inspect(result))
 end
 
-M.register_completion_handler = function (handler)
-   if handler then completion_handler = handler end
+M.register_completion_handler = function(handler)
+  if handler then
+    completion_handler = handler
+  end
 end
 
 M.send_completion_request = function()
-   local params = M.get_completion_params()
-   vim.lsp.buf_request(0, 'getCompletions', params, completion_handler)
+  local params = M.get_completion_params()
+  vim.lsp.buf_request(0, "getCompletions", params, completion_handler)
 end
 
 M.create_request_autocmd = function(group)
-   vim.api.nvim_create_autocmd(group, {callback = M.send_completion_request})
+  vim.api.nvim_create_autocmd(group, { callback = M.send_completion_request })
 end
 
 return M