[pull] master from zbirenbaum:master

.gitattributes

@@ -1,2 +1,3 @@
 /copilot/dist/** -whitespace -diff
 /dist/** -whitespace -diff
+*.lua eol=lf

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 10

.github/workflows/ci.yaml

@@ -0,0 +1,44 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  unit_tests:
+    name: unit tests
+    if: github.repository == 'AntoineGS/copilot.lua'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-24.04, ubuntu-24.04-arm, macos-latest, windows-2025]
+        rev: [nightly, v0.10.4, v0.11.0]
+        include:
+          - os: ubuntu-24.04
+            install-rg: sudo apt-get update && sudo apt-get install -y nodejs curl
+          - os: ubuntu-24.04-arm
+            install-rg: sudo apt-get update && sudo apt-get install -y nodejs curl
+          - os: macos-latest
+            install-rg: brew update && brew install node curl
+          - os: windows-2025
+            install-rg: choco install nodejs-lts curl
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: rhysd/action-setup-vim@v1
+        with:
+          neovim: true
+          version: ${{ matrix.rev }}
+
+      - name: Prepare
+        run: |
+          ${{ matrix.install-rg }}
+          git clone --filter=blob:none https://github.com/echasnovski/mini.nvim deps/mini.nvim
+          mv ./tests/env.lua.ci ./tests/env.lua
+
+      - name: Run tests
+        env:
+          GH_COPILOT_TOKEN: ${{ secrets.GH_COPILOT_TOKEN }}
+        run: |
+          nvim --version
+          make test

.github/workflows/update-copilot-nodejs.yaml

@@ -5,14 +5,16 @@ on:
     - cron: "0 0 * * *"
   push:
     branches: [master]
+  workflow_dispatch:
 
 jobs:
   update_copilot_lsp:
     runs-on: ubuntu-latest
     name: Update Copilot LSP
+    if: github.repository == 'zbirenbaum/copilot.lua'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create directory
         run: |
@@ -22,18 +24,23 @@ jobs:
         run: |
           curl -s https://github.com/api/repos/github/copilot-language-server-release/releases/latest | grep "browser_download_url.*copilot-language-server-js-.*zip" | cut -d : -f 2,3 | tr -d \" | wget -vi -
 
+      - name: Update version in util.lua
+        run: |
+          COPILOT_LATEST_RELEASE_VER=$(curl -s https://github.com/api/repos/github/copilot-language-server-release/releases | jq -r '.[0].tag_name') && sed -i.bak -E "s/(version = \")[^\"]+(\",)/\1$COPILOT_LATEST_RELEASE_VER\2/" "lua/copilot/util.lua" && rm lua/copilot/util.lua.bak
+
       - name: Unzip LSP
         run: |
           unzip -o copilot-language-server-js-*.zip -d copilot/js
           rm copilot-language-server-js-*.zip
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v7
         with:
-          add-paths: "copilot/js/*"
+          add-paths: |
+            copilot/js/*
+            lua/copilot/util.lua
           author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
           base: master
           branch: create-pull-request/update-copilot-lsp
           commit-message: "feat: update to latest Copilot LSP"
-          reviewers: MunifTanjim,zbirenbaum,AntoineGS
           title: "Update Copilot LSP"

.github/workflows/vimdocgen.yml

@@ -0,0 +1,36 @@
+name: Auto Generate Vimdoc
+on:
+  push:
+    branches: [master]
+    paths:
+      - README.md
+      - .github/workflows/vimdocgen.yml
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+    name: Convert Markdown to Vimdoc
+    steps:
+      - uses: actions/checkout@v4
+      - uses: kdheepak/panvimdoc@main
+        with:
+          vimdoc: "copilot"
+          version: "NVIM v0.11.0"
+          description: "Fully featured & enhanced replacement for copilot.vim complete with API for interacting with Github Copilot"
+          titledatepattern: "%d %B, %Y"
+          toc: false
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          add-paths: |
+            doc/*
+          author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
+          base: master
+          branch: create-pull-request/autogenerate-vimdoc
+          commit-message: "docs: update vimdocs"
+          title: "Update Vimdocs"

.gitignore

@@ -1,3 +1,3 @@
 tests/logs
 tests/env.lua
-tests/deps
+deps/

Makefile

@@ -1,13 +1,14 @@
 # Run all test files
 # test: deps/mini.nvim
 test: 
-	nvim --headless --noplugin -u ./scripts/minimal_init.lua -c "lua MiniTest.run()"
+	nvim --headless --noplugin -u ./tests/scripts/minimal_init.lua -c "lua MiniTest.run()"
 
 # Run test from file at `$FILE` environment variable
 test_file: deps/mini.nvim
-	nvim --headless --noplugin -u ./scripts/minimal_init.lua -c "lua MiniTest.run_file('$(FILE)')"
+	nvim --headless --noplugin -u ./tests/scripts/minimal_init.lua -c "lua MiniTest.run_file('$(FILE)')"
 
 # Download 'mini.nvim' to use its 'mini.test' testing module
 # deps/mini.nvim:
 # 	@mkdir deps
-# 	git clone --filter=blob:none https://github.com/echasnovski/mini.nvim $@
+# 	git clone --filter=blob:none https://github.com/echasnovski/mini.nvim deps/mini.nvim 
+# 	git clone https://github.com/jbyuki/one-small-step-for-vimkind deps/osv

README.md

@@ -11,6 +11,31 @@ As lua is far more efficient and makes things easier to integrate with modern pl
 
 </details>
 
+## Table Of Contents
+
+<!--toc:start-->
+
+- [Requirements](#requirements)
+- [Install](#install)
+  - [Authentication](#authentication)
+    - [Authentication with Alternate GitHub Instances](#authentication-with-alternate-github-instances)
+- [Setup and Configuration](#setup-and-configuration)
+  - [panel](#panel)
+  - [suggestion](#suggestion)
+  - [filetypes](#filetypes)
+  - [logger](#logger)
+  - [copilot_node_command](#copilot_node_command)
+  - [server_opts_overrides](#server_opts_overrides)
+  - [workspace_folders](#workspace_folders)
+  - [root_dir](#root_dir)
+  - [should_attach](#should_attach)
+  - [server](#server)
+- [Commands](#commands)
+- [Integrations](#integrations)
+- [FAQ](#faq)
+
+<!--toc:end-->
+
 ## Requirements
 
 - Curl
@@ -76,7 +101,8 @@ use {
 }
 ```
 
-The following is the default configuration:
+<details>
+<summary>Default configuration</summary>
 
 ```lua
 require('copilot').setup({
@@ -91,7 +117,7 @@ require('copilot').setup({
       open = "<M-CR>"
     },
     layout = {
-      position = "bottom", -- | top | left | right | horizontal | vertical
+      position = "bottom", -- | top | left | right | bottom |
       ratio = 0.4
     },
   },
@@ -132,7 +158,7 @@ require('copilot').setup({
   },
   copilot_node_command = 'node', -- Node.js version must be > 20
   workspace_folders = {},
-  copilot_model = "",  -- Current LSP default is gpt-35-turbo, supports gpt-4o-copilot
+  copilot_model = "",
   root_dir = function()
     return vim.fs.dirname(vim.fs.find(".git", { upward = true })[1])
   end,
@@ -157,6 +183,8 @@ require('copilot').setup({
 })
 ```
 
+</details>
+
 ### panel
 
 Panel can be used to preview suggestions in a split window. You can run the
@@ -297,7 +325,7 @@ vim.log = {
 
 - `off`
 - `messages` which will output the LSP messages
-- `verbose` which adds additonal information to the message.
+- `verbose` which adds additional information to the message.
 
 When `trace_lsp_progress` is true, LSP progress messages (`$/progress`) will also be logged.
 When `log_lsp_messages` is true, LSP log messages (`window/logMessage`) events will be logged.
@@ -318,7 +346,7 @@ copilot_node_command = vim.fn.expand("$HOME") .. "/.config/nvm/versions/node/v20
 
 Override copilot lsp client settings. The `settings` field is where you can set the values of the options defined in [SettingsOpts.md](./SettingsOpts.md).
 These options are specific to the copilot lsp and can be used to customize its behavior. Ensure that the name field is not overridden as is is used for
-efficiency reasons in numerous checks to verify copilot is actually running. See `:h vim.lsp.start_client` for list of options.
+efficiency reasons in numerous checks to verify copilot is actually running. See `:h vim.lsp.start` for list of options.
 
 Example:
 
@@ -339,7 +367,7 @@ require("copilot").setup {
 ### workspace_folders
 
 Workspace folders improve Copilot's suggestions.
-By default, the root_dir is used as a wokspace_folder.
+By default, the root_dir is used as a workspace_folder.
 
 Additional folders can be added through the configuration as such:
 
@@ -380,11 +408,13 @@ require("copilot").setup {
 
 ### server
 
-> [!CAUTION] > `"binary"` mode is still very much experimental, please report any issues you encounter.
+> [!CAUTION]
+> `"binary"` mode is still very much experimental, please report any issues you encounter.
 
 `type` can be either `"nodejs"` or `"binary"`. The binary version will be downloaded if used.
 
-`custom_server_filepath` is used to specify the path of either the path (filename included) of the `js` file if using `"nodejs"` or the path to the binary if using `"binary"`.
+`custom_server_filepath` is used to specify the server path (filename included) of either the `js` file if using `"nodejs"` or to the binary if using `"binary"`.
+The filename on its own can also be set if accessible through your PATH.
 When using `"binary"`, the download process will be disabled and the binary will be used directly.
 example:
 
@@ -409,3 +439,31 @@ The `copilot.api` module can be used to build integrations on top of `copilot.lu
 - [giuxtaposition/blink-cmp-copilot](https://github.com/giuxtaposition/blink-cmp-copilot): Integration with [`blink.cmp`](https://github.com/Saghen/blink.cmp).
 - [fang2hou/blink-copilot](https://github.com/fang2hou/blink-copilot): Integration with [`blink.cmp`](https://github.com/Saghen/blink.cmp), with some differences.
 - [AndreM222/copilot-lualine](https://github.com/AndreM222/copilot-lualine): Integration with [`lualine.nvim`](https://github.com/nvim-lualine/lualine.nvim).
+
+## FAQ
+
+> Certificate Parsing Error
+
+This is an issue with the copilot lsp itself as described in [this discussion](https://github.com/orgs/community/discussions/136273#discussioncomment-10433527). Please update the plugin to the latest version to solve this issue.
+If updating does not help, some users have reported that updating the `/usr/bin/update-ca-trust` and removing the --comment option from the trust extract commands solves the issue.
+However this has not been verified by the author of this plugin and may have unintended consequences so thread with care.
+
+> Multiple offset encodings warning
+
+As discussed in #247, the problem arises because two or more clients are using different offset encodings. To solve this, in lspconfig:
+
+```lua
+local capabilities = vim.lsp.protocol.make_client_capabilities() -- Get The capabilities
+capabilities.general.positionEncodings = { "utf-16" } -- Set the offset encoding, see `:h vim.lsp.start` for more info
+require("lspconfig")[server].setup({ capabilities = capabilities }) -- Setup the server
+```
+
+Set the same for copilot in `server_opts_overrides`:
+
+```lua
+server_opts_overrides = {
+  offset_encoding = "utf-16" -- Set the offset encoding same as above, see `:h vim.lsp.start` for more info
+}
+```
+
+Refer to your plugins documentation for changes.

copilot/js/api/types.d.ts

@@ -51,8 +51,14 @@ export interface ContextProvider<T extends SupportedContextItem> {
     selector: DocumentSelector;
     resolver: ContextResolver<T>;
 }
+
+export type ResolveOnTimeoutResult<T> = T | readonly T[];
+export type ResolveResult<T> = Promise<T> | Promise<readonly T[]> | AsyncIterable<T>;
+
 export interface ContextResolver<T extends SupportedContextItem> {
-    resolve(request: ResolveRequest, token: CancellationToken): Promise<T> | Promise<T[]> | AsyncIterable<T>;
+    resolve(request: ResolveRequest, token: CancellationToken): ResolveResult<T>;
+    // Optional method to be invoked if the request timed out. This requests additional context items.
+    resolveOnTimeout?(request: ResolveRequest): ResolveOnTimeoutResult<T> | undefined;
 }
 
 /**
@@ -86,20 +92,29 @@ export type ContextUsageStatistics = {
     usageDetails?: ContextItemUsageDetails[];
 };
 
+export type ProposedTextEdit = TextEdit & {
+    positionAfterEdit: Position;
+    // Indicates whether the edit is suggested by the IDE. Otherwise it's assumed to be speculative
+    source?: 'selectedCompletionInfo';
+};
+
 export interface DocumentContext {
     uri: DocumentUri;
     languageId: string;
     version: number;
+    // Position and offset are relative to the provided version of the document.
+    // The position after an edit is applied is found in ProposedTextEdit.positionAfterEdit.
     /**
      * @deprecated Use `position` instead.
      */
     offset: number;
     position: Position;
-    proposedEdits?: TextEdit[];
+    proposedEdits?: ProposedTextEdit[];
 }
 export interface ResolveRequest {
     // A unique ID to correlate the request with the completion request.
     completionId: string;
+    opportunityId: string;
     documentContext: DocumentContext;
 
     activeExperiments: Map<string, string | number | boolean | string[]>;
@@ -109,9 +124,16 @@ export interface ResolveRequest {
      * After the time budget runs out, the request will be cancelled via the CancellationToken.
      * Providers can use this value as a hint when computing context. Providers should expect the
      * request to be cancelled once the time budget runs out.
+     *
+     * @deprecated Use `timeoutEnd` instead.
      */
     timeBudget: number;
 
+    /**
+     * Unix timestamp representing the exact time the request will be cancelled via the CancellationToken.
+     */
+    timeoutEnd: number;
+
     /**
      * Various statistics about the last completion request. This can be used by the context provider
      * to make decisions about what context to provide for the current call.