From 6a3f415f263ed9a3a5667c02c8798562e95e812c Mon Sep 17 00:00:00 2001
From: m4ttm <matt.mitchell97@hotmail.com>
Date: Wed, 12 Oct 2022 06:05:44 +0100
Subject: [PATCH 1/6] Insert single word

---
 README.md            | 43 +++++++++++++++++++++++++++++++++++++++++++
 autoload/copilot.vim | 10 ++++++++++
 2 files changed, 53 insertions(+)

diff --git a/README.md b/README.md
index cfac4e5e..cad119ef 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,46 @@
+# Copilot-One-Word.vim
+This is a fork of the Neovim plugin for GitHub Copilot with the added feature of being able to add a single word at a time by pressing the shift and tab keys together.
+
+## Getting started
+
+1.  Install [Neovim][] or the latest patch of [Vim][] (9.0.0185 or newer).
+
+2.  Install [Node.js][] version 16.  (Other versions should work too, except
+    Node 18 which isn't supported yet.)
+
+3.  Install `github/copilot.vim` using vim-plug, packer.nvim, or any other
+    plugin manager.  Or to install manually, run one of the following
+    commands:
+
+    * Vim, Linux/macOS:
+
+          git clone https://github.com/m4ttm/copilot.vim.git \
+            ~/.vim/pack/github/start/copilot.vim
+
+    * Neovim, Linux/macOS:
+
+          git clone https://github.com/m4ttm/copilot.vim.git \
+            ~/.config/nvim/pack/github/start/copilot.vim
+
+    * Vim, Windows (PowerShell command):
+
+          git clone https://github.com/m4ttm/copilot.vim.git `
+            $HOME/vimfiles/pack/github/start/copilot.vim
+
+    * Neovim, Windows (PowerShell command):
+
+          git clone https://github.com/m4ttm/copilot.vim.git `
+            $HOME/AppData/Local/nvim/pack/github/start/copilot.vim
+
+4.  Start Neovim and invoke `:Copilot setup`.
+
+[Node.js]: https://nodejs.org/en/download/
+[Neovim]: https://github.com/neovim/neovim/releases/latest
+[Vim]: https://github.com/vim/vim
+
+Suggestions are displayed inline and can be accepted by pressing the tab key.
+See `:help copilot` for more information.
+
 # Copilot.vim
 
 GitHub Copilot uses OpenAI Codex to suggest code and entire functions in
diff --git a/autoload/copilot.vim b/autoload/copilot.vim
index 3d61311b..e88e6d05 100644
--- a/autoload/copilot.vim
+++ b/autoload/copilot.vim
@@ -457,6 +457,8 @@ function! copilot#TextQueuedForInsertion() abort
   endtry
 endfunction
 
+
+
 function! copilot#Accept(...) abort
   let s = copilot#GetDisplayedSuggestion()
   if !empty(s.text)
@@ -791,3 +793,11 @@ function! copilot#Command(line1, line2, range, bang, mods, arg) abort
     return 'echoerr ' . string(v:exception)
   endtry
 endfunction
+
+function! AcceptSingleWord()
+    let suggestion = copilot#Accept("")
+    let bar = copilot#TextQueuedForInsertion()
+    return split(bar, '[ .]\zs')[0]
+endfunction
+
+imap <script><expr> <S-Tab> AcceptSingleWord()

From 6076e716dce33f3a3070739a46f36af22520f131 Mon Sep 17 00:00:00 2001
From: m4ttm <matt.mitchell97@hotmail.com>
Date: Wed, 12 Oct 2022 06:21:24 +0100
Subject: [PATCH 2/6] Allow markdown by default

---
 autoload/copilot.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/autoload/copilot.vim b/autoload/copilot.vim
index e88e6d05..af694baa 100644
--- a/autoload/copilot.vim
+++ b/autoload/copilot.vim
@@ -801,3 +801,7 @@ function! AcceptSingleWord()
 endfunction
 
 imap <script><expr> <S-Tab> AcceptSingleWord()
+
+let g:copilot_filetypes = {
+   \ 'markdown': v:true,
+   \ }

From d55d169e60d4f2c198d23c5fc573377d2ecdad30 Mon Sep 17 00:00:00 2001
From: akhyarudinx <115749406+akhyarudinx@users.noreply.github.com>
Date: Sun, 20 Nov 2022 10:21:25 +0000
Subject: [PATCH 3/6] Update copilot.vim

Also use Ctrl-Tab
---
 autoload/copilot.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autoload/copilot.vim b/autoload/copilot.vim
index af694baa..55e7acc0 100644
--- a/autoload/copilot.vim
+++ b/autoload/copilot.vim
@@ -801,6 +801,7 @@ function! AcceptSingleWord()
 endfunction
 
 imap <script><expr> <S-Tab> AcceptSingleWord()
+imap <script><expr> <C-Tab> AcceptSingleWord()
 
 let g:copilot_filetypes = {
    \ 'markdown': v:true,

From eea9ae66e05b55706b8c0cf943210f6370cca809 Mon Sep 17 00:00:00 2001
From: m4ttm <matt.mitchell97@hotmail.com>
Date: Tue, 22 Nov 2022 01:53:12 +0000
Subject: [PATCH 4/6] Single character, shortcuts in init.vim

---
 README.md            | 47 ++++++++++++++++++++++----------------------
 autoload/copilot.vim |  8 +++++---
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index cad119ef..4e80487a 100644
--- a/README.md
+++ b/README.md
@@ -1,42 +1,43 @@
-# Copilot-One-Word.vim
-This is a fork of the Neovim plugin for GitHub Copilot with the added feature of being able to add a single word at a time by pressing the shift and tab keys together.
+# m4ttm/copilot.vim
+
+This is a fork of the Neovim plugin for GitHub Copilot with the added feature of being able to add a single word or letter at a time. Map to your desired shortcuts with the copilot#AcceptWord and copilot#AcceptCharacter functions in your init.vim
 
 ## Getting started
 
 1.  Install [Neovim][] or the latest patch of [Vim][] (9.0.0185 or newer).
 
-2.  Install [Node.js][] version 16.  (Other versions should work too, except
+2.  Install [Node.js][] version 16. (Other versions should work too, except
     Node 18 which isn't supported yet.)
 
 3.  Install `github/copilot.vim` using vim-plug, packer.nvim, or any other
-    plugin manager.  Or to install manually, run one of the following
+    plugin manager. Or to install manually, run one of the following
     commands:
 
-    * Vim, Linux/macOS:
+    - Vim, Linux/macOS:
 
           git clone https://github.com/m4ttm/copilot.vim.git \
             ~/.vim/pack/github/start/copilot.vim
 
-    * Neovim, Linux/macOS:
+    - Neovim, Linux/macOS:
 
           git clone https://github.com/m4ttm/copilot.vim.git \
             ~/.config/nvim/pack/github/start/copilot.vim
 
-    * Vim, Windows (PowerShell command):
+    - Vim, Windows (PowerShell command):
 
           git clone https://github.com/m4ttm/copilot.vim.git `
             $HOME/vimfiles/pack/github/start/copilot.vim
 
-    * Neovim, Windows (PowerShell command):
+    - Neovim, Windows (PowerShell command):
 
           git clone https://github.com/m4ttm/copilot.vim.git `
             $HOME/AppData/Local/nvim/pack/github/start/copilot.vim
 
 4.  Start Neovim and invoke `:Copilot setup`.
 
-[Node.js]: https://nodejs.org/en/download/
-[Neovim]: https://github.com/neovim/neovim/releases/latest
-[Vim]: https://github.com/vim/vim
+[node.js]: https://nodejs.org/en/download/
+[neovim]: https://github.com/neovim/neovim/releases/latest
+[vim]: https://github.com/vim/vim
 
 Suggestions are displayed inline and can be accepted by pressing the tab key.
 See `:help copilot` for more information.
@@ -44,7 +45,7 @@ See `:help copilot` for more information.
 # Copilot.vim
 
 GitHub Copilot uses OpenAI Codex to suggest code and entire functions in
-real-time right from your editor.  Trained on billions of lines of public
+real-time right from your editor. Trained on billions of lines of public
 code, GitHub Copilot turns natural language prompts including comments and
 method names into coding suggestions across dozens of languages.
 
@@ -55,7 +56,7 @@ To learn more, visit
 
 ## Subscription
 
-GitHub Copilot requires a subscription.  It is free for verified students and
+GitHub Copilot requires a subscription. It is free for verified students and
 maintainers of popular open source projects on GitHub.
 
 GitHub Copilot is subject to the [GitHub Additional Product
@@ -65,44 +66,44 @@ Terms](https://docs.github.com/en/site-policy/github-terms/github-terms-for-addi
 
 1.  Install [Neovim][] or the latest patch of [Vim][] (9.0.0185 or newer).
 
-2.  Install [Node.js][] version 16.  (Other versions should work too, except
+2.  Install [Node.js][] version 16. (Other versions should work too, except
     Node 18 which isn't supported yet.)
 
 3.  Install `github/copilot.vim` using vim-plug, packer.nvim, or any other
-    plugin manager.  Or to install manually, run one of the following
+    plugin manager. Or to install manually, run one of the following
     commands:
 
-    * Vim, Linux/macOS:
+    - Vim, Linux/macOS:
 
           git clone https://github.com/github/copilot.vim.git \
             ~/.vim/pack/github/start/copilot.vim
 
-    * Neovim, Linux/macOS:
+    - Neovim, Linux/macOS:
 
           git clone https://github.com/github/copilot.vim.git \
             ~/.config/nvim/pack/github/start/copilot.vim
 
-    * Vim, Windows (PowerShell command):
+    - Vim, Windows (PowerShell command):
 
           git clone https://github.com/github/copilot.vim.git `
             $HOME/vimfiles/pack/github/start/copilot.vim
 
-    * Neovim, Windows (PowerShell command):
+    - Neovim, Windows (PowerShell command):
 
           git clone https://github.com/github/copilot.vim.git `
             $HOME/AppData/Local/nvim/pack/github/start/copilot.vim
 
 4.  Start Neovim and invoke `:Copilot setup`.
 
-[Node.js]: https://nodejs.org/en/download/
-[Neovim]: https://github.com/neovim/neovim/releases/latest
-[Vim]: https://github.com/vim/vim
+[node.js]: https://nodejs.org/en/download/
+[neovim]: https://github.com/neovim/neovim/releases/latest
+[vim]: https://github.com/vim/vim
 
 Suggestions are displayed inline and can be accepted by pressing the tab key.
 See `:help copilot` for more information.
 
 ## Troubleshooting
 
-We’d love to get your help in making GitHub Copilot better!  If you have
+We’d love to get your help in making GitHub Copilot better! If you have
 feedback or encounter any problems, please reach out on our [Feedback
 forum](https://github.com/github-community/community/discussions/categories/copilot).
diff --git a/autoload/copilot.vim b/autoload/copilot.vim
index 55e7acc0..a9cae86b 100644
--- a/autoload/copilot.vim
+++ b/autoload/copilot.vim
@@ -794,14 +794,16 @@ function! copilot#Command(line1, line2, range, bang, mods, arg) abort
   endtry
 endfunction
 
-function! AcceptSingleWord()
+function! copilot#AcceptWord()
     let suggestion = copilot#Accept("")
     let bar = copilot#TextQueuedForInsertion()
     return split(bar, '[ .]\zs')[0]
 endfunction
 
-imap <script><expr> <S-Tab> AcceptSingleWord()
-imap <script><expr> <C-Tab> AcceptSingleWord()
+function! copilot#AcceptCharacter()
+    let suggestion = copilot#Accept("")
+    let bar = copilot#TextQueuedForInsertion()
+    return split(bar, '[ .]\zs')[0][0]
 
 let g:copilot_filetypes = {
    \ 'markdown': v:true,

From 31158e82346083acff43dd31d6418b0bdff44f5a Mon Sep 17 00:00:00 2001
From: m4ttm <matt.mitchell97@hotmail.com>
Date: Tue, 22 Nov 2022 01:57:48 +0000
Subject: [PATCH 5/6] Bug in copilot#AcceptCharacter

---
 autoload/copilot.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autoload/copilot.vim b/autoload/copilot.vim
index a9cae86b..51dd58de 100644
--- a/autoload/copilot.vim
+++ b/autoload/copilot.vim
@@ -804,6 +804,7 @@ function! copilot#AcceptCharacter()
     let suggestion = copilot#Accept("")
     let bar = copilot#TextQueuedForInsertion()
     return split(bar, '[ .]\zs')[0][0]
+endfunction
 
 let g:copilot_filetypes = {
    \ 'markdown': v:true,

From ce7085e4b77856f043f07073cac4f4f0afe0c1d8 Mon Sep 17 00:00:00 2001
From: m4ttm <matt.mitchell97@hotmail.com>
Date: Thu, 1 Feb 2024 01:08:15 +0000
Subject: [PATCH 6/6] add - single word keybind

---
 plugin/copilot.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin/copilot.vim b/plugin/copilot.vim
index 7ec0255c..15394788 100644
--- a/plugin/copilot.vim
+++ b/plugin/copilot.vim
@@ -40,6 +40,7 @@ function! s:MapTab() abort
       exe 'imap <silent><nowait><expr>         <Tab> copilot#Accept(' . tab_fallback . ')'
     endif
   endif
+  imap <script><silent><nowait><expr> <S-Tab> copilot#AcceptWord()
 endfunction
 
 function! s:Event(type) abort