1
1
mirror of https://github.com/qvacua/vimr.git synced 2024-12-24 06:12:45 +03:00

Update neovim

This commit is contained in:
Tae Won Ha 2020-12-20 15:53:11 +01:00
parent 98b5d51212
commit 18a9c93e68
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
6 changed files with 116 additions and 112 deletions

@ -1 +1 @@
Subproject commit 1ce70ab180634b6760fc950395bbe2106fad8eb9
Subproject commit 4f329dcde324466928562670c962463725dffcbd

View File

@ -10,110 +10,113 @@ enum NvimAutoCommandEvent: Int {
case buffilepre = 4
case bufhidden = 5
case bufleave = 6
case bufnew = 7
case bufnewfile = 8
case bufreadcmd = 9
case bufreadpost = 10
case bufreadpre = 11
case bufunload = 12
case bufwinenter = 13
case bufwinleave = 14
case bufwipeout = 15
case bufwritecmd = 16
case bufwritepost = 17
case bufwritepre = 18
case chaninfo = 19
case chanopen = 20
case cmdundefined = 21
case cmdwinenter = 22
case cmdwinleave = 23
case cmdlinechanged = 24
case cmdlineenter = 25
case cmdlineleave = 26
case colorscheme = 27
case colorschemepre = 28
case completechanged = 29
case completedone = 30
case completedonepre = 31
case cursorhold = 32
case cursorholdi = 33
case cursormoved = 34
case cursormovedi = 35
case diffupdated = 36
case dirchanged = 37
case encodingchanged = 38
case exitpre = 39
case fileappendcmd = 40
case fileappendpost = 41
case fileappendpre = 42
case filechangedro = 43
case filechangedshell = 44
case filechangedshellpost = 45
case filereadcmd = 46
case filereadpost = 47
case filereadpre = 48
case filetype = 49
case filewritecmd = 50
case filewritepost = 51
case filewritepre = 52
case filterreadpost = 53
case filterreadpre = 54
case filterwritepost = 55
case filterwritepre = 56
case focusgained = 57
case focuslost = 58
case funcundefined = 59
case guienter = 60
case guifailed = 61
case insertchange = 62
case insertcharpre = 63
case insertenter = 64
case insertleave = 65
case menupopup = 66
case optionset = 67
case quickfixcmdpost = 68
case quickfixcmdpre = 69
case quitpre = 70
case remotereply = 71
case sessionloadpost = 72
case shellcmdpost = 73
case shellfilterpost = 74
case signal = 75
case sourcecmd = 76
case sourcepost = 77
case sourcepre = 78
case spellfilemissing = 79
case stdinreadpost = 80
case stdinreadpre = 81
case swapexists = 82
case syntax = 83
case tabclosed = 84
case tabenter = 85
case tableave = 86
case tabnew = 87
case tabnewentered = 88
case termchanged = 89
case termclose = 90
case termenter = 91
case termleave = 92
case termopen = 93
case termresponse = 94
case textchanged = 95
case textchangedi = 96
case textchangedp = 97
case textyankpost = 98
case uienter = 99
case uileave = 100
case user = 101
case vimenter = 102
case vimleave = 103
case vimleavepre = 104
case vimresized = 105
case vimresume = 106
case vimsuspend = 107
case winclosed = 108
case winenter = 109
case winleave = 110
case winnew = 111
case bufmodifiedset = 7
case bufnew = 8
case bufnewfile = 9
case bufreadcmd = 10
case bufreadpost = 11
case bufreadpre = 12
case bufunload = 13
case bufwinenter = 14
case bufwinleave = 15
case bufwipeout = 16
case bufwritecmd = 17
case bufwritepost = 18
case bufwritepre = 19
case chaninfo = 20
case chanopen = 21
case cmdundefined = 22
case cmdwinenter = 23
case cmdwinleave = 24
case cmdlinechanged = 25
case cmdlineenter = 26
case cmdlineleave = 27
case colorscheme = 28
case colorschemepre = 29
case completechanged = 30
case completedone = 31
case completedonepre = 32
case cursorhold = 33
case cursorholdi = 34
case cursormoved = 35
case cursormovedi = 36
case diffupdated = 37
case dirchanged = 38
case encodingchanged = 39
case exitpre = 40
case fileappendcmd = 41
case fileappendpost = 42
case fileappendpre = 43
case filechangedro = 44
case filechangedshell = 45
case filechangedshellpost = 46
case filereadcmd = 47
case filereadpost = 48
case filereadpre = 49
case filetype = 50
case filewritecmd = 51
case filewritepost = 52
case filewritepre = 53
case filterreadpost = 54
case filterreadpre = 55
case filterwritepost = 56
case filterwritepre = 57
case focusgained = 58
case focuslost = 59
case funcundefined = 60
case guienter = 61
case guifailed = 62
case insertchange = 63
case insertcharpre = 64
case insertenter = 65
case insertleave = 66
case insertleavepre = 67
case menupopup = 68
case optionset = 69
case quickfixcmdpost = 70
case quickfixcmdpre = 71
case quitpre = 72
case remotereply = 73
case sessionloadpost = 74
case shellcmdpost = 75
case shellfilterpost = 76
case signal = 77
case sourcecmd = 78
case sourcepost = 79
case sourcepre = 80
case spellfilemissing = 81
case stdinreadpost = 82
case stdinreadpre = 83
case swapexists = 84
case syntax = 85
case tabclosed = 86
case tabenter = 87
case tableave = 88
case tabnew = 89
case tabnewentered = 90
case termchanged = 91
case termclose = 92
case termenter = 93
case termleave = 94
case termopen = 95
case termresponse = 96
case textchanged = 97
case textchangedi = 98
case textchangedp = 99
case textyankpost = 100
case uienter = 101
case uileave = 102
case user = 103
case vimenter = 104
case vimleave = 105
case vimleavepre = 106
case vimresized = 107
case vimresume = 108
case vimsuspend = 109
case winclosed = 110
case winenter = 111
case winleave = 112
case winnew = 113
case winscrolled = 114
}

View File

@ -121,7 +121,8 @@ public final class RxMsgpackRpc {
guard let socket = self.socket else {
single(.error(Error(
msg: "Socket is invalid, but trying to send a request with msg id \(msgid)"
msg: "Socket is invalid, but trying to send a request with " +
"msg id \(msgid): \(method) with \(params)"
)))
return
}

View File

@ -7,7 +7,7 @@ from string import Template
# Assume that we're in $REPO_ROOT/NvimView
NVIM_AUEVENTS_ENUM_FILE = "./neovim/build/include/auevents_enum.generated.h"
NVIM_AUEVENTS_ENUM_FILE = "./build/include/auevents_enum.generated.h"
SWIFT_TEMPLATE_FILE = "../resources/autocmds.template.swift"

View File

@ -8,7 +8,7 @@ from string import Template
# Assume that we're in $REPO_ROOT/NvimView
NVIM_CURSOR_SHAPE_ENUM_FILE = "./neovim/src/nvim/cursor_shape.h"
NVIM_CURSOR_SHAPE_ENUM_FILE = "./src/nvim/cursor_shape.h"
SWIFT_TEMPLATE_FILE = "../resources/cursor_shape.template.swift"
SHAPE_NAMES = {

View File

@ -27,9 +27,9 @@ main() {
./NvimServer/bin/build_libnvim.sh
popd > /dev/null
pushd NvimView
version=${nvim_version} ../bin/generate_autocmds.py > "./Sources/NvimView/NvimAutoCommandEvent.generated.swift"
version=${nvim_version} ../bin/generate_cursor_shape.py > "./Sources/NvimView/NvimCursorModeShape.generated.swift"
pushd NvimServer
version=${nvim_version} ../bin/generate_autocmds.py > "../NvimView/Sources/NvimView/NvimAutoCommandEvent.generated.swift"
version=${nvim_version} ../bin/generate_cursor_shape.py > "../NvimView/Sources/NvimView/NvimCursorModeShape.generated.swift"
popd > /dev/null
popd > /dev/null